[MediaWiki-commits] [Gerrit] mediawiki: reimage mw1022 to HAT - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164517
Change subject: mediawiki: reimage mw1022 to HAT
..
mediawiki: reimage mw1022 to HAT
Change-Id: I8571487a09cabc12c53ed4ad46f1b92bf879ba3f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/hosts/mw1022.yaml
M manifests/site.pp
2 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/164517/1
diff --git a/hieradata/hosts/mw1022.yaml b/hieradata/hosts/mw1022.yaml
index 2c726b4..e30aca3 100644
--- a/hieradata/hosts/mw1022.yaml
+++ b/hieradata/hosts/mw1022.yaml
@@ -1 +1 @@
-mainrole: appserver
+mainrole: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index 0f3073f..0f7f58d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2076,8 +2076,9 @@
include role::mediawiki::jobrunner
}
-#mw1017-1021 are apaches (trusty)
-node /^mw10(1[7-9]|2[01])\.eqiad\.wmnet$/ {
+# mw1017-1022 are apaches (trusty)
+# mw1023-1052 are apaches (precise)
+node /^mw10(1[7-9]|[2-4][0-9]|5[0-2])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
$cluster = hiera('cluster')
@@ -2089,14 +2090,6 @@
include role::mediawiki::appserver
}
-# mw1022-1052 are apaches (precise)
-node /^mw10(2[2-9]|[3-4][0-9]|5[0-2])\.eqiad\.wmnet$/ {
-
-class {'::admin': groups = ['deployment']}
-$cluster = 'appserver'
-
-include role::mediawiki::appserver
-}
# mw1054-1113 are apaches (precise)
node /^mw1(05[4-9]|0[6-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/164517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8571487a09cabc12c53ed4ad46f1b92bf879ba3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Differentiate between no mt, use source and mt disabled by user - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Differentiate between no mt, use source and mt disabled by user
..
Differentiate between no mt, use source and mt disabled by user
Removed mw.cx.translation.change which was fired without parameter.
The MT card no longer disappears when you type text. Because of this,
instruction card will not appear as we type.
Bug: 70941
Change-Id: I5b28a426da669ec43937551d16f8a3e70715fb46
---
M hooks.md
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
3 files changed, 38 insertions(+), 14 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
Objections:
Nemo bis: There's a problem with this change, please improve
diff --git a/hooks.md b/hooks.md
index cd17b59..86f8ef6 100644
--- a/hooks.md
+++ b/hooks.md
@@ -88,7 +88,7 @@
## mw.cx.translation.add
-Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a string which explains what action is
appropriate. Known values are: clear, click, mt-disabled, non-editable,
restore, service-failure.
+Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a string which explains what action is
appropriate. Known values are: clear, click, mt-not-available,
mt-user-disabled, non-editable, restore, service-failure.
## mw.cx.translation.change
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 9f170f6..61900ff 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -13,7 +13,9 @@
var cache = {}, // MT requests cache
providerIdPrefix = 'cx-provider-',
- disableMT = 'disable-mt';
+ disableMT = 'disable-mt',
+ noMT = 'no-mt',
+ sourceMT = 'source-mt';
/**
* Get the registry of machine translation providers
@@ -40,7 +42,7 @@
MTControlCard.providers = response.providers;
if ( $.isEmptyObject( MTControlCard.providers )
) {
- MTControlCard.provider = disableMT;
+ MTControlCard.provider = noMT;
} else {
// TODO Consider user preferences
MTControlCard.provider =
MTControlCard.providers[ 0 ];
@@ -117,8 +119,16 @@
} );
}
- if ( MTControlCard.provider === disableMT ) {
- return $.Deferred().reject( 'mt-disabled' ).promise();
+ if ( provider === disableMT ) {
+ return $.Deferred().reject( 'mt-user-disabled'
).promise();
+ }
+
+ if ( provider === noMT ) {
+ return $.Deferred().reject( 'mt-not-available'
).promise();
+ }
+
+ if ( provider === sourceMT ) {
+ return $.Deferred().reject( 'mt-not-available'
).promise();
}
if ( $section.data( 'editable' ) === false ) {
@@ -134,7 +144,7 @@
doMT( mw.cx.sourceLanguage,
mw.cx.targetLanguage, sourceContent );
// Put that in cache.
cache[ sectionId ] = cache[ sectionId ] || {};
- cache[ sectionId ][ MTControlCard.provider ] =
sectionTranslationRequest;
+ cache[ sectionId ][ provider ] =
sectionTranslationRequest;
}
if ( prefetch ) {
@@ -330,7 +340,10 @@
}
// Add an item to disable machine translation for the language
- this.$providersMenu.append( this.getProviderItem( disableMT ) );
+ this.$providersMenu.append(
+ this.getProviderItem( sourceMT ),
+ this.getProviderItem( disableMT )
+ );
this.$providerSelectorTrigger
.on( 'click', function ( e ) {
@@ -355,6 +368,11 @@
MTControlCard.prototype.getProviderTitle = function ( id ) {
if ( id === disableMT ) {
return mw.msg( 'cx-tools-mt-dont-use' );
+ } else if ( id === noMT ) {
+ return mw.msg( 'cx-tools-mt-not-available',
$.uls.data.getAutonym( mw.cx.targetLanguage ) );
+ } else if ( id === sourceMT ) {
+ // FIXME: message reuse
+ return mw.msg( 'cx-tools-mt-use-source' );
} else {
return mw.msg( 'cx-tools-mt-provider-title', id );
}
@@ -377,10 +395,11 @@
};
[MediaWiki-commits] [Gerrit] Remove unwanted comma - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164518
Change subject: Remove unwanted comma
..
Remove unwanted comma
Change-Id: Icc7f501a7ada7b2a5cde6acc0822ebaca720
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/18/164518/1
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 9f170f6..11d7d1a 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -167,7 +167,7 @@
.children()
.attr( {
id: 'cx' + sourceId,
- 'data-source': sourceId,
+ 'data-source': sourceId
} )
.data( 'cx-state', 'mt' )
);
--
To view, visit https://gerrit.wikimedia.org/r/164518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc7f501a7ada7b2a5cde6acc0822ebaca720
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: reimage mw1022 to HAT - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: reimage mw1022 to HAT
..
mediawiki: reimage mw1022 to HAT
Change-Id: I8571487a09cabc12c53ed4ad46f1b92bf879ba3f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/hosts/mw1022.yaml
M manifests/site.pp
2 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/mw1022.yaml b/hieradata/hosts/mw1022.yaml
index 2c726b4..e30aca3 100644
--- a/hieradata/hosts/mw1022.yaml
+++ b/hieradata/hosts/mw1022.yaml
@@ -1 +1 @@
-mainrole: appserver
+mainrole: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index 0f3073f..0f7f58d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2076,8 +2076,9 @@
include role::mediawiki::jobrunner
}
-#mw1017-1021 are apaches (trusty)
-node /^mw10(1[7-9]|2[01])\.eqiad\.wmnet$/ {
+# mw1017-1022 are apaches (trusty)
+# mw1023-1052 are apaches (precise)
+node /^mw10(1[7-9]|[2-4][0-9]|5[0-2])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
$cluster = hiera('cluster')
@@ -2089,14 +2090,6 @@
include role::mediawiki::appserver
}
-# mw1022-1052 are apaches (precise)
-node /^mw10(2[2-9]|[3-4][0-9]|5[0-2])\.eqiad\.wmnet$/ {
-
-class {'::admin': groups = ['deployment']}
-$cluster = 'appserver'
-
-include role::mediawiki::appserver
-}
# mw1054-1113 are apaches (precise)
node /^mw1(05[4-9]|0[6-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/164517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8571487a09cabc12c53ed4ad46f1b92bf879ba3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed isZeroSite()'s caching - change (mediawiki...ZeroBanner)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164519
Change subject: Removed isZeroSite()'s caching
..
Removed isZeroSite()'s caching
Change-Id: I1d1611d1f959bfd33cce8e5d42affd5a634faf77
---
M includes/PageRendering.php
1 file changed, 3 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroBanner
refs/changes/19/164519/1
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 88bcb95..1dd2645 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -651,13 +651,9 @@
* @return bool
*/
private function isZeroSite() {
- static $isZero = null;
- if ( $isZero === null ) {
- $info = $this-getWikiInfo();
- // @FIXME: this check should only see if this is a
mobileview, the rest is a check in partner's config
- $isZero = $info[2] === 'wikipedia'
MobileContext::singleton()-shouldDisplayMobileView();
- }
- return $isZero;
+ $info = $this-getWikiInfo();
+ // @FIXME: this check should only see if this is a mobileview,
the rest is a check in partner's config
+ return $info[2] === 'wikipedia'
MobileContext::singleton()-shouldDisplayMobileView();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/164519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d1611d1f959bfd33cce8e5d42affd5a634faf77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove HHVM beta feature - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove HHVM beta feature
..
Remove HHVM beta feature
I haven't found this useful with our user base. I have found
other ways to expose HHVM.
Change-Id: I55d6107ec0a97f8a519a8c27db7c2077ea5639b5
---
M TranslatewikiSettings.php
1 file changed, 0 insertions(+), 31 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index acce44a..36f3d10 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -475,37 +475,6 @@
# Dynamic code starts here
-$wgHooks['GetBetaFeaturePreferences'][] = function ( $user, $prefs ) {
- $prefs['hhvm-beta'] = array(
- 'label-message' = 'hhvm-beta-label',
- 'desc-message' = 'hhvm-beta-desc',
- 'screenshot' =
'https://fbcdn-photos-f-a.akamaihd.net/hphotos-ak-prn2/1393601_10151895286787200_231799865_a.jpg',
- 'info-link' = 'http://www.hhvm.com/blog/',
- 'discussion-link' = '/wiki/Thread:Support/HHVM',
- );
-};
-$wgHooks['BeforePageDisplay'][] = function ( OutputPage $out ) {
- $req = $out-getRequest();
- $user = $out-getUser();
-
- $hasCookie = $req-getCookie( 'hhvm', '' );
- $wantsCookie = BetaFeatures::isFeatureEnabled( $user, 'hhvm-beta' );
-
- if ( !$hasCookie $wantsCookie ) {
- $req-response()-setcookie( 'hhvm', '1', 0, array( 'prefix' =
'' ) );
- }
-
- if ( $hasCookie !$wantsCookie ) {
- $req-response()-setcookie( 'hhvm', '0', -1, array( 'prefix'
= '' ) );
- }
-};
-$wgHooks['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
- if ( $code === 'en' ) {
- $cachedData['messages']['hhvm-beta-label'] = 'HHVM';
- $cachedData['messages']['hhvm-beta-desc'] = 'HHVM is A new,
supposedly faster, PHP runtime.';
- }
-};
-
if ( $wgCanonicalServer !== https://translatewiki.net; ) {
$wgHooks['SiteNoticeAfter'] = array( 'nbwWarn' );
}
--
To view, visit https://gerrit.wikimedia.org/r/164346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55d6107ec0a97f8a519a8c27db7c2077ea5639b5
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs: reduce acct archiving retention - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164520
Change subject: labs: reduce acct archiving retention
..
labs: reduce acct archiving retention
In our standard packages we install 'acct' which does user and process
accounting (see commands 'ac' and 'lastcomm'). The log are held in
/var/log/account which, on labs is a 2GB partition that ends up filling
quite rapidly on busy instances.
On the beta cluster deployment-bastion instance, it takes up to 500MB or
a quarter of the /var instance. Reading the SAL I noticed we keep
cleaning up manually to reclaim disk space.
The files are rotated via a daily cron using the 'savelog' command. It
is passed $ACCT_LOGGING which default to 30 days. Reduce it on all labs
instance to 12 days. On deployment-bastion that would save up roughly
360MB.
Bug: 69604
Change-Id: Iae6adb6e5783e6ddbcba11779d204aff8e76f9b9
---
M manifests/role/labs.pp
A modules/base/files/labs-acct.default
2 files changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/164520/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 7356b51..b1dd4d3 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -141,6 +141,16 @@
source = 'puppet:///files/nfs/idmapd.conf',
}
+# Labs instances /var is quite small, provide our own default
+# to keep less records (bug 69604).
+file { '/etc/default/acct':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode = '0444',
+source = 'puppet:///modules/base/labs-acct.default',
+}
+
# In production, we try to be punctilious about having Puppet manage
# system state, and thus it's reasonable to purge Apache site configs
# that have not been declared via Puppet. But on Labs we want to allow
diff --git a/modules/base/files/labs-acct.default
b/modules/base/files/labs-acct.default
new file mode 100644
index 000..5c37ce5
--- /dev/null
+++ b/modules/base/files/labs-acct.default
@@ -0,0 +1,16 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///modules/base/labs-acct.default
+#
+
+# Defaults for acct
+
+# If you want to keep acct installed, but not started automatically, set this
+# variable to 0. Because /etc/cron.daily/acct calls the initscript daily, it is
+# not sufficient to stop acct once after booting if your machine remains up.
+ACCT_ENABLE=1
+
+# Amount of days that the logs are kept.
+#ACCT_LOGGING=30
+# Labs instances /var is quite small, keep less records (bug 69604).
+ACCT_LOGGING=12
--
To view, visit https://gerrit.wikimedia.org/r/164520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae6adb6e5783e6ddbcba11779d204aff8e76f9b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] General cleanup - change (mediawiki...BayesianFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: General cleanup
..
General cleanup
Removed the $dir variable, made one function return true (the pre-existing
true; line likely did nothing), moved one hard-coded English string into
the i18n file, updated/added function documentation, added a meaningful
version number into extension credits.
Change-Id: I2d7255fb3c44853c45c2ed5b3cee8a2e7b16f897
---
M BayesianFilter.Body.php
M BayesianFilter.DBHandler.php
M BayesianFilter.Hooks.php
M BayesianFilter.PageView.php
M BayesianFilter.Tokenizer.php
M BayesianFilter.php
M i18n/en.json
M i18n/qqq.json
8 files changed, 288 insertions(+), 331 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BayesianFilter.Body.php b/BayesianFilter.Body.php
index 6d5ed92..f886626 100644
--- a/BayesianFilter.Body.php
+++ b/BayesianFilter.Body.php
@@ -2,28 +2,26 @@
class BayesianFilter {
- public function __construct()
- {
+ public function __construct() {
// this is written here instead of autoloader, cause
// tokenizer is written in a way it can be reused by
// other scripts which are not neccesarily part of mediawiki
- if( !class_exists( 'BayesianFilterTokenizer' ) )
- {
+ if ( !class_exists( 'BayesianFilterTokenizer' ) ) {
include( __DIR__ . '/BayesianFilter.Tokenizer.php' );
}
}
/**
- * This function users $wgParser and returns the external links
- * in the content of the page. As of now it is not used anywhere
- * but in the later releases links would have a very big role to
- * play in spam detection
- * @text content of the page which we are inspecting
- * return an array of links
- */
-
- public function getLinks( $text, $title )
- {
+* This function users $wgParser and returns the external links
+* in the content of the page.
+* As of now it is not used anywhere but in the later releases links
would
+* have a very big role to play in spam detection.
+*
+* @param string $text Content of the page which we are inspecting
+* @param Title $title
+* @return array An array of links
+*/
+ public function getLinks( $text, $title ) {
global $wgParser, $wgUser;
$options = new ParserOptions();
$modifiedText = $wgParser-preSaveTransform( $text, $title,
$wgUser, $options );
@@ -33,15 +31,14 @@
}
/**
- * This function contains the main logic for spam detection
- * it evaulated whether content of a WikiPage is
- * spam or not.
- * @text content of the page which we are inspecting
- * returns true if the content is spam, false otherwise
- */
-
- public function checkSpam( $text, $title )
- {
+* This function contains the main logic for spam detection.
+* It evaluates whether the content of a WikiPage is spam or not.
+*
+* @param string $text Content of the page which we are inspecting
+* @param Title $title
+* @return bool True if the content is spam, false otherwise
+*/
+ public function checkSpam( $text, $title ) {
$links = $this-getLinks( $text, $title );
$tokenizer = new BayesianFilterTokenizer;
@@ -50,18 +47,18 @@
$words = array();
$token = $tokenizer-tokenize( $text );
- while( $token )
- {
+ while ( $token ) {
$token = strtolower( $token );
- if( !$tokenizer-isStopWord( $token ) )
+ if ( !$tokenizer-isStopWord( $token ) ) {
$words[] = $tokenizer-stem( $token );
+ }
$token = $tokenizer-tokenize();
}
$filterDbHandler = new BayesianFilterDBHandler;
global $wgBayesianFilterWordsChunkSize;
$wordsFrequency;
- $wordsFrequency = $filterDbHandler-getFrequency( $words ,
$wgBayesianFilterWordsChunkSize );
+ $wordsFrequency = $filterDbHandler-getFrequency( $words,
$wgBayesianFilterWordsChunkSize );
$probMsgGivenSpam = 1.0;
$probMsgGivenHam = 1.0;
@@ -69,12 +66,10 @@
$hamCount = isset( $wordsFrequency['ham_count'] ) ?
$wordsFrequency['ham_count'] : 0;
$wordCount = count( $words );
- foreach ($words as $word )
- {
- if( isset( $wordsFrequency[$word] ) )
- {
- $probMsgGivenSpam = $probMsgGivenSpam * (
[MediaWiki-commits] [Gerrit] Backport of jQuery UI bugfix for ui-helper-clearfix class - change (mediawiki/core)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164521
Change subject: Backport of jQuery UI bugfix for ui-helper-clearfix class
..
Backport of jQuery UI bugfix for ui-helper-clearfix class
See http://bugs.jqueryui.com/ticket/8442
This fix is needed to fix the currently broken display of the
media player in the Listen template on en.wiki.
Bug: 71601
Change-Id: Ib3e0fc577c3f617955d6d12335a333587c6ddaa8
---
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/164521/1
diff --git a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
index 2e088ca..d4f7db3 100644
--- a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
+++ b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
@@ -14,7 +14,7 @@
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px;
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height:
1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ; display:
table; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ; display:
table; border-collapse: collapse; }
.ui-helper-clearfix:after { clear: both; }
.ui-helper-clearfix { zoom: 1; }
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
--
To view, visit https://gerrit.wikimedia.org/r/164521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e0fc577c3f617955d6d12335a333587c6ddaa8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove deprecated GlobalVarConfig::set() - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164522
Change subject: Remove deprecated GlobalVarConfig::set()
..
Remove deprecated GlobalVarConfig::set()
Was deprecated in 1.24.
Change-Id: Iead2c8ba14c0524cba9585b5d4c29f2f806cfc15
---
M includes/config/GlobalVarConfig.php
M tests/phpunit/includes/config/GlobalVarConfigTest.php
2 files changed, 0 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/164522/1
diff --git a/includes/config/GlobalVarConfig.php
b/includes/config/GlobalVarConfig.php
index 39d6e8e..589f7d3 100644
--- a/includes/config/GlobalVarConfig.php
+++ b/includes/config/GlobalVarConfig.php
@@ -63,15 +63,6 @@
}
/**
-* @see MutableConfig::set
-* @deprecated since 1.24
-*/
- public function set( $name, $value ) {
- wfDeprecated( __METHOD__, '1.24' );
- $this-setWithPrefix( $this-prefix, $name, $value );
- }
-
- /**
* Get a variable with a given prefix, if not the defaults.
*
* @param string $prefix Prefix to use on the variable, if one.
@@ -92,17 +83,5 @@
protected function hasWithPrefix( $prefix, $name ) {
$var = $prefix . $name;
return array_key_exists( $var, $GLOBALS );
- }
-
- /**
-* Get a variable with a given prefix, if not the defaults.
-*
-* @param string $prefix Prefix to use on the variable
-* @param string $name Variable name without prefix
-* @param mixed $value Value to set
-* @deprecated since 1.24
-*/
- protected function setWithPrefix( $prefix, $name, $value ) {
- $GLOBALS[$prefix . $name] = $value;
}
}
diff --git a/tests/phpunit/includes/config/GlobalVarConfigTest.php
b/tests/phpunit/includes/config/GlobalVarConfigTest.php
index 70b9e68..28068d5 100644
--- a/tests/phpunit/includes/config/GlobalVarConfigTest.php
+++ b/tests/phpunit/includes/config/GlobalVarConfigTest.php
@@ -87,34 +87,10 @@
$this-assertEquals( $config-get( $name ), $expected );
}
- public static function provideSet() {
- return array(
- array( 'Foo', 'wg', 'wgFoo' ),
- array( 'SomethingRandom', 'wg', 'wgSomethingRandom' ),
- array( 'FromAnExtension', 'eg', 'egFromAnExtension' ),
- array( 'NoPrefixHere', '', 'NoPrefixHere' ),
- );
- }
-
private function maybeStashGlobal( $var ) {
if ( array_key_exists( $var, $GLOBALS ) ) {
// Will be reset after this test is over
$this-stashMwGlobals( $var );
}
- }
-
- /**
-* @dataProvider provideSet
-* @covers GlobalVarConfig::set
-* @covers GlobalVarConfig::setWithPrefix
-*/
- public function testSet( $name, $prefix, $var ) {
- $this-hideDeprecated( 'GlobalVarConfig::set' );
- $this-maybeStashGlobal( $var );
- $config = new GlobalVarConfig( $prefix );
- $random = wfRandomString();
- $config-set( $name, $random );
- $this-assertArrayHasKey( $var, $GLOBALS );
- $this-assertEquals( $random, $GLOBALS[$var] );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/164522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iead2c8ba14c0524cba9585b5d4c29f2f806cfc15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] syslog-ng: filter out swift noise - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164524
Change subject: syslog-ng: filter out swift noise
..
syslog-ng: filter out swift noise
namely the spammy handoff requested (fixed in newer upstream) and GET/HEAD
requests which don't change state
Change-Id: Ida16acf1de0e2c182bec9e9d5fb37f60464667d8
---
M templates/syslog-ng/syslog-ng.conf.nfs.erb
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/164524/1
diff --git a/templates/syslog-ng/syslog-ng.conf.nfs.erb
b/templates/syslog-ng/syslog-ng.conf.nfs.erb
index ea98fd9..fada207 100644
--- a/templates/syslog-ng/syslog-ng.conf.nfs.erb
+++ b/templates/syslog-ng/syslog-ng.conf.nfs.erb
@@ -394,6 +394,14 @@
;
};
+filter f_nojunk_swift {
+ not (
+ match(Handoff requested value(MESSAGE)) or
+ match(GET / value(MESSAGE)) or
+ match(HEAD / value(MESSAGE))
+ );
+};
+
# Remote syslog
log {
source(s_remote);
@@ -406,6 +414,7 @@
# OpenSwift related
log {
source(s_remote);
+ filter(f_nojunk_swift);
filter(f_swift);
destination(df_swift);
};
@@ -413,6 +422,7 @@
log {
source(s_remote);
filter(f_nojunk);
+ filter(f_nojunk_swift);
destination(df_remote);
flags(fallback, final);
};
--
To view, visit https://gerrit.wikimedia.org/r/164524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida16acf1de0e2c182bec9e9d5fb37f60464667d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] syslog-ng: update to trusty - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164523
Change subject: syslog-ng: update to trusty
..
syslog-ng: update to trusty
change syslog-ng config syntax to 3.5 (trusty's version) and install
syslog-ng-core too, otherwise syslog-ng installation fails
Change-Id: Ib140ef22413959afc3f0c926f840fbc84babac6e
---
M manifests/misc/logging.pp
M templates/syslog-ng/syslog-ng.conf.nfs.erb
2 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/164523/1
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index 09f6502..aeb6fc7 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -17,7 +17,7 @@
$archivepath = $basepath/archive
-package { 'syslog-ng':
+package { ['syslog-ng', 'syslog-ng-core']:
ensure = latest,
}
diff --git a/templates/syslog-ng/syslog-ng.conf.nfs.erb
b/templates/syslog-ng/syslog-ng.conf.nfs.erb
index 6ff736b..ea98fd9 100644
--- a/templates/syslog-ng/syslog-ng.conf.nfs.erb
+++ b/templates/syslog-ng/syslog-ng.conf.nfs.erb
@@ -14,6 +14,7 @@
# the none priority found in the original syslogd configuration is
# only used in internal messages created by syslogd
+@version: 3.5
##
# options
@@ -21,7 +22,7 @@
options {
# disable the chained hostname format in logs
# (default is enabled)
-chain_hostnames(0);
+chain_hostnames(no);
# the time to wait before a died connection is re-established
# (default is 60)
@@ -39,7 +40,7 @@
#sync(0);
# the number of lines fitting in the output queue
-log_fifo_size(2048);
+log_fifo_size(1);
# enable or disable directory creation for destination files
create_dirs(no);
@@ -92,7 +93,7 @@
# function to send logs to)
unix-stream(/dev/log);
# messages from the kernel
-file(/proc/kmsg log_prefix(kernel: ));
+file(/proc/kmsg program_override(kernel: ));
# use the following line if you want to receive remote UDP logging
messages
# (this is equivalent to the -r syslogd flag)
#udp();
@@ -376,9 +377,9 @@
filter f_nojunk {
not (
program(apache2) and
- match(File does not exist:) or
- match(File name too long:) or
- match(Directory index forbidden)
+ match(File does not exist: value(MESSAGE)) or
+ match(File name too long: value(MESSAGE)) or
+ match(Directory index forbidden value(MESSAGE))
);
};
--
To view, visit https://gerrit.wikimedia.org/r/164523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib140ef22413959afc3f0c926f840fbc84babac6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleaning up before doing anything in the build - change (analytics/dashiki)
Milimetric has submitted this change and it was merged.
Change subject: Cleaning up before doing anything in the build
..
Cleaning up before doing anything in the build
Change-Id: Icf36fc1e5f26c36d004056ff6ef4339a28dde824
---
M gulpfile.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/gulpfile.js b/gulpfile.js
index 307338c..4725bf6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -74,7 +74,7 @@
});
// Discovers all AMD dependencies, concatenates together all required .js
files, minifies them
-gulp.task('js', function () {
+gulp.task('js', ['clean'], function () {
return rjs(requireJsOptimizerConfig)
.pipe(uglify({
preserveComments: 'some'
@@ -87,7 +87,7 @@
});
-gulp.task('css', function () {
+gulp.task('css', ['clean'], function () {
return gulp.src(['src/css/*.css'])
.pipe(concat('style.css')).pipe(rev()).pipe(gulp.dest('./dist/'))
// Add rev-manifest.json as a new src to prevent rev'ing
rev-manifest.json
@@ -99,7 +99,7 @@
/** Copies semantic fonts where the css expects them to be**/
-gulp.task('fonts', function () {
+gulp.task('fonts', ['clean'], function () {
var semantic_fonts = 'src/fonts';
return gulp.src([semantic_fonts + '/icons.svg', semantic_fonts +
'/icons.ttf', semantic_fonts + '/icons.woff'])
.pipe(gulp.dest('./fonts/'));
@@ -170,7 +170,7 @@
], callback);
});
-gulp.task('default', ['clean', 'replace', 'lint', 'fonts'], function
(callback) {
+gulp.task('default', ['replace', 'lint', 'fonts'], function (callback) {
callback();
console.log('\nPlaced optimized files in ' + chalk.magenta('dist/\n'));
console.log('\nPlaced font files in ' + chalk.magenta('fonts/\n'));
--
To view, visit https://gerrit.wikimedia.org/r/164254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf36fc1e5f26c36d004056ff6ef4339a28dde824
Gerrit-PatchSet: 2
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Nuria nu...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bootstrapping from url. Keeping state. - change (analytics/dashiki)
Milimetric has submitted this change and it was merged.
Change subject: Bootstrapping from url. Keeping state.
..
Bootstrapping from url. Keeping state.
Dashboard is able to bootstrap itself from a url like:
http://dashiki.com/something#project=enwiki,dewiki/metric=newlyregister,rollingactive
Changes on selection are published to url
Testing is required some contortions to avoid access
to window.location via URI.js
Bug: 70887
Change-Id: I454de470fa39d59ace9e95255856b27f4fb4b3ac
---
M src/app/require.config.js
M src/components/wikimetrics-layout/wikimetrics-layout.js
M src/lib/logger.js
A src/lib/stateManager.js
A src/lib/window.js
M test/SpecRunner.browser.js
M test/SpecRunner.karma.js
A test/lib/state-manager.js
A test/mocks/URIProxy/URI.js
A test/mocks/window.js
M test/require.config.js
11 files changed, 419 insertions(+), 27 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/src/app/require.config.js b/src/app/require.config.js
index a0728c0..701e912 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -5,27 +5,29 @@
var require = {
baseUrl: '.',
paths: {
-'jquery': 'bower_modules/jquery/dist/jquery',
+'jquery': 'bower_modules/jquery/dist/jquery',
// NOTE: the minified ko build is broken in 3.2.0
// (Issue reported https://github.com/knockout/knockout/issues/1528)
-'knockout' : 'bower_modules/knockout/dist/knockout.debug',
-'knockout-projections' :
'bower_modules/knockout-projections/dist/knockout-projections',
-'text' : 'bower_modules/requirejs-text/text',
-'d3': 'bower_modules/d3/d3',
-'vega' : 'bower_modules/vega/vega',
-'topojson' : 'bower_modules/topojson/topojson',
-'moment': 'bower_modules/moment/moment',
-'semantic-dropdown' :
'bower_modules/semantic/build/uncompressed/modules/dropdown',
+'knockout': 'bower_modules/knockout/dist/knockout.debug',
+'knockout-projections':
'bower_modules/knockout-projections/dist/knockout-projections',
+'text': 'bower_modules/requirejs-text/text',
+'d3': 'bower_modules/d3/d3',
+'vega': 'bower_modules/vega/vega',
+'topojson': 'bower_modules/topojson/topojson',
+'moment': 'bower_modules/moment/moment',
+'semantic-dropdown':
'bower_modules/semantic/build/uncompressed/modules/dropdown',
// NOTE: if you want functions like uri.expand, you must include both
// URI and URITemplate like define(['uri/URI', 'uri/URITemplate'] ...
// because URITemplate modifies URI when it's parsed
-'uri' : 'bower_modules/URIjs/src',
-'config': 'app/config',
-'logger': 'lib/logger',
-'wikimetricsApi': 'app/apis/wikimetrics',
-'typeahead' :
'bower_modules/typeahead.js/dist/typeahead.bundle',
-'ajaxWrapper' : 'lib/ajaxWrapper',
-'utils' : 'lib/utils'
+'uri': 'bower_modules/URIjs/src',
+'config': 'app/config',
+'logger': 'lib/logger',
+'wikimetricsApi': 'app/apis/wikimetrics',
+'typeahead': 'bower_modules/typeahead.js/dist/typeahead.bundle',
+'ajaxWrapper': 'lib/ajaxWrapper',
+'utils': 'lib/utils',
+'window': 'lib/window',
+'stateManager': 'lib/stateManager'
},
shim: {
'ajaxWrapper': {
diff --git a/src/components/wikimetrics-layout/wikimetrics-layout.js
b/src/components/wikimetrics-layout/wikimetrics-layout.js
index a407234..ac1e6fc 100644
--- a/src/components/wikimetrics-layout/wikimetrics-layout.js
+++ b/src/components/wikimetrics-layout/wikimetrics-layout.js
@@ -1,4 +1,4 @@
-define(['knockout', 'text!./wikimetrics-layout.html', 'wikimetricsApi'],
function (ko, templateMarkup, wikimetricsApi) {
+define(['knockout', 'text!./wikimetrics-layout.html', 'wikimetricsApi',
'stateManager'], function (ko, templateMarkup, wikimetricsApi,
stateManagerFactory) {
'use strict';
function WikimetricsLayout() {
@@ -23,10 +23,12 @@
self.reverseLookup(config.reverseLookup);
});
-wikimetricsApi.getDefaultDashboard(function (config) {
-self.defaultProjects(config.defaultProjects);
-self.defaultMetrics(config.defaultMetrics);
-});
+
+// state manager should be observing the selections of project and
metric
+// returns a statemanager obj if you need it
+stateManagerFactory.getManager(this.selectedProjects,
this.selectedMetric,
+this.defaultProjects, this.defaultMetrics);
+
wikimetricsApi.getCategorizedMetrics(function (config) {
self.metrics(config.categorizedMetrics);
diff --git
[MediaWiki-commits] [Gerrit] [DONOTMERGE] Test test - change (mediawiki...BayesianFilter)
Lewis Cawte has uploaded a new change for review. https://gerrit.wikimedia.org/r/164525 Change subject: [DONOTMERGE] Test test .. [DONOTMERGE] Test test Test to see if the mwext-BayesianFilter-testextension will work. Change-Id: Ie2161c0f0653e05bd1e3173f88123fe2f27b987c --- M db_patches/word_frequency.sql 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BayesianFilter refs/changes/25/164525/1 diff --git a/db_patches/word_frequency.sql b/db_patches/word_frequency.sql index f5ebe48..3a29aac 100644 --- a/db_patches/word_frequency.sql +++ b/db_patches/word_frequency.sql @@ -1,11 +1,11 @@ DROP TABLE IF EXISTS /*_*/word_frequency; CREATE TABLE /*_*/word_frequency ( - `wf_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `wf_id` int unsigned not null primary key auto_increment, `wf_word` varchar(100) DEFAULT NULL, `wf_spam` int(10) unsigned NOT NULL, `wf_ham` int(10) unsigned NOT NULL, PRIMARY KEY (`wf_id`) ) /*$wgDBTableOptions*/; -CREATE INDEX /*i*/word_frequency_word ON /*_*/word_frequency(wf_word); \ No newline at end of file +CREATE INDEX /*i*/word_frequency_word ON /*_*/word_frequency(wf_word); -- To view, visit https://gerrit.wikimedia.org/r/164525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2161c0f0653e05bd1e3173f88123fe2f27b987c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BayesianFilter Gerrit-Branch: master Gerrit-Owner: Lewis Cawte le...@lewiscawte.me ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only load ext.ajaxpoll on pages that need it - change (mediawiki...AJAXPoll)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164526
Change subject: Only load ext.ajaxpoll on pages that need it
..
Only load ext.ajaxpoll on pages that need it
Change-Id: I0e989b3c059b7aaf049476c8bb847bebf9ef4089
---
M AJAXPoll_body.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll
refs/changes/26/164526/1
diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php
index 45cb1df..0220ecf 100644
--- a/AJAXPoll_body.php
+++ b/AJAXPoll_body.php
@@ -22,9 +22,7 @@
* @return Boolean: true
*/
static function onParserInit( $parser ) {
- global $wgOut;
$parser-setHook( 'poll', array( __CLASS__, 'AJAXPollRender' )
);
- $wgOut-addModules( 'ext.ajaxpoll' );
return true;
}
@@ -34,6 +32,7 @@
$parser-disableCache();
$parser-addTrackingCategory( 'ajaxpoll-tracking-category' );
+ $parser-getOutput()-addModules( 'ext.ajaxpoll' );
if ( $wgUser-getName() == '' ) {
$userName = $wgRequest-getIP();
--
To view, visit https://gerrit.wikimedia.org/r/164526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e989b3c059b7aaf049476c8bb847bebf9ef4089
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: use fully-qualified vars - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164528
Change subject: swift: use fully-qualified vars
..
swift: use fully-qualified vars
also add more memcache servers to codfw
Change-Id: If629e52db6aed7beda2b4afc3f14898d18704911
---
M hieradata/codfw.yaml
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/dispersion.pp
3 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/164528/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 0dae043..ab23e31 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -30,12 +30,18 @@
swift_new::hash_path_suffix: 'de4227064232ed08'
swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet'
-swift_new::proxy::memcached_servers: ['ms-fe2001.eqiad.wmnet:11211']
swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet'
swift_new::proxy::backend_url_format: 'sitelang'
swift_new::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet'
swift_new::proxy::dispersion_account: 'dispersion'
swift_new::proxy::rewrite_account:'mw_media'
+swift_new::proxy::memcached_servers: [
+ 'ms-fe2001.codfw.wmnet:11211',
+ 'ms-fe2002.codfw.wmnet:11211',
+ 'ms-fe2003.codfw.wmnet:11211',
+ 'ms-fe2004.codfw.wmnet:11211'
+# no trailing comma!
+]
swift_new::proxy::shard_container_list: [
'global-data-math-render',
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index 1a13d5f..e2ba2bb 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -1,9 +1,9 @@
class swift_new::stats::accounts(
-$swift_cluster = $swift_new::params::swift_cluster,
-$accounts = $swift_new::params::accounts,
-$credentials = $swift_new::params::account_keys,
+$swift_cluster = $::swift_new::params::swift_cluster,
+$accounts = $::swift_new::params::accounts,
+$credentials = $::swift_new::params::account_keys,
$statsd_host = 'statsd.eqiad.wmnet',
-$statsd_prefix = swift.${swift_cluster}.stats,
+$statsd_prefix = swift.${::swift_new::params::swift_cluster}.stats,
) {
$required_packages = [
Package['python-swiftclient'],
diff --git a/modules/swift_new/manifests/stats/dispersion.pp
b/modules/swift_new/manifests/stats/dispersion.pp
index a0938a1..c7a5cc7 100644
--- a/modules/swift_new/manifests/stats/dispersion.pp
+++ b/modules/swift_new/manifests/stats/dispersion.pp
@@ -1,7 +1,7 @@
class swift_new::stats::dispersion(
$swift_cluster = $::swift_new::params::swift_cluster,
$statsd_host = 'statsd.eqiad.wmnet',
-$statsd_prefix = swift.${swift_cluster}.dispersion,
+$statsd_prefix = swift.${::swift_new::params::swift_cluster}.dispersion,
) {
$required_packages = [
Package['python-swiftclient'],
--
To view, visit https://gerrit.wikimedia.org/r/164528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If629e52db6aed7beda2b4afc3f14898d18704911
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix system::role description - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164527
Change subject: swift: fix system::role description
..
swift: fix system::role description
Change-Id: I9d6215d97c8a5d2d37be775330ba03ac598f500f
---
M manifests/role/swift.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/164527/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 9547217..e899075 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -360,7 +360,7 @@
class role::swift::storage {
-system::role { 'role::swift::proxy':
+system::role { 'role::swift::storage':
description = 'swift storage brick',
}
--
To view, visit https://gerrit.wikimedia.org/r/164527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d6215d97c8a5d2d37be775330ba03ac598f500f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix system::role description - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: fix system::role description
..
swift: fix system::role description
Change-Id: I9d6215d97c8a5d2d37be775330ba03ac598f500f
---
M manifests/role/swift.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 9547217..e899075 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -360,7 +360,7 @@
class role::swift::storage {
-system::role { 'role::swift::proxy':
+system::role { 'role::swift::storage':
description = 'swift storage brick',
}
--
To view, visit https://gerrit.wikimedia.org/r/164527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d6215d97c8a5d2d37be775330ba03ac598f500f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] First initialize sitelinklistview, then attach events - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: First initialize sitelinklistview, then attach events
..
First initialize sitelinklistview, then attach events
This improves performance substantially with a lot of sitelinks.
Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 18 insertions(+), 18 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Aude: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 435fdd7..753f1ff 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -122,6 +122,23 @@
// Encapsulate sitelinkviews by suppressing their events:
this.$listview
+ .listview( {
+ listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
+ listItemWidget: listItemWidget,
+ listItemWidgetValueAccessor: 'value',
+ newItemOptionsFn: function( value ) {
+ return {
+ value: value,
+ getAllowedSiteIds: function() {
+ return
self._getUnusedAllowedSiteIds();
+ },
+ entityStore:
self.options.entityStore
+ };
+ }
+ } ),
+ value: self.options.value || null,
+ listItemNodeName: 'TR'
+ } )
.on( prefix + 'change.' + this.widgetName, function( event ) {
event.stopPropagation();
self._trigger( 'change' );
@@ -179,24 +196,7 @@
self._refreshTableHeader();
self._trigger( 'change' );
}
- )
- .listview( {
- listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
- listItemWidget: listItemWidget,
- listItemWidgetValueAccessor: 'value',
- newItemOptionsFn: function( value ) {
- return {
- value: value,
- getAllowedSiteIds: function() {
- return
self._getUnusedAllowedSiteIds();
- },
- entityStore:
self.options.entityStore
- };
- }
- } ),
- value: self.options.value || null,
- listItemNodeName: 'TR'
- } );
+ );
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/164300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift_new: include role::swift::base - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: swift_new: include role::swift::base
..
swift_new: include role::swift::base
The new swift roles did not include role::swift::base, which includes
the standard base class. This moves the inclusion there instead than in
in site.pp
Change-Id: I58ae101dc806c806b1f721bba7ef2bc67c66427c
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/swift.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index e899075..4024770 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -322,6 +322,8 @@
# initially only codfw, to be followed by esams and eqiad
class role::swift::stats_reporter {
+include role::swift::base
+
system::role { 'role::swift::stats_reporter':
description = 'swift statistics reporter',
}
@@ -332,6 +334,8 @@
}
class role::swift::proxy {
+include role::swift::base
+
system::role { 'role::swift::proxy':
description = 'swift frontend proxy',
}
@@ -360,6 +364,8 @@
class role::swift::storage {
+include role::swift::base
+
system::role { 'role::swift::storage':
description = 'swift storage brick',
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 0f7f58d..75fccad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2024,7 +2024,6 @@
node /^ms-fe200[1-4]\.codfw\.wmnet$/ {
include admin
-include standard
$cluster = 'swift'
$nagios_group = 'swift'
@@ -2043,7 +2042,6 @@
node /^ms-be20[0-9][0-9]\.codfw\.wmnet$/ {
include admin
-include standard
$cluster = 'swift'
$nagios_group = 'swift'
--
To view, visit https://gerrit.wikimedia.org/r/163809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58ae101dc806c806b1f721bba7ef2bc67c66427c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace $wgConf-localVHosts by $wgLocalVirtualHosts - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace $wgConf-localVHosts by $wgLocalVirtualHosts
..
Replace $wgConf-localVHosts by $wgLocalVirtualHosts
The former is independent of the remaining of the SiteConfiguration
class, and as thus makes more sense to be defined as an explicit
configuration setting rather that being hidden in $wgConf.
Change-Id: I25204d37c5cfffb6953fe53e14316dc3df5b5b10
---
M RELEASE-NOTES-1.25
M includes/DefaultSettings.php
M includes/HttpFunctions.php
M includes/SiteConfiguration.php
4 files changed, 22 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index a21b684..db4c124 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -10,6 +10,7 @@
=== Configuration changes in 1.25 ===
* $wgPageShowWatchingUsers was removed.
+* $wgLocalVirtualHosts has been added to replace $wgConf-localVHosts.
=== New features in 1.25 ===
* (bug 58139) ResourceLoaderFileModule now supports language fallback
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 510c1dd..c6e91cf 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7084,6 +7084,18 @@
$wgHTTPProxy = false;
/**
+ * Local virtual hosts.
+ *
+ * This lists domains that are configured as virtual hosts on the same machine.
+ * If a request is to be made to a domain listed here, or any subdomain
thereof,
+ * then no proxy will be used.
+ * Command-line scripts are not affected by this setting and will always use
+ * proxy if it is configured.
+ * @since 1.25
+ */
+$wgLocalVirtualHosts = array();
+
+/**
* Timeout for connections done internally (in seconds)
* Only works for curl
*/
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 8302124..f9ee14b 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -114,7 +114,7 @@
* @return bool
*/
public static function isLocalURL( $url ) {
- global $wgCommandLineMode, $wgConf;
+ global $wgCommandLineMode, $wgLocalVirtualHosts, $wgConf;
if ( $wgCommandLineMode ) {
return false;
@@ -126,7 +126,7 @@
$host = $matches[1];
// Split up dotwise
$domainParts = explode( '.', $host );
- // Check if this domain or any superdomain is listed in
$wgConf as a local virtual host
+ // Check if this domain or any superdomain is listed as
a local virtual host
$domainParts = array_reverse( $domainParts );
$domain = '';
@@ -139,7 +139,9 @@
$domain = $domainPart . '.' . $domain;
}
- if ( $wgConf-isLocalVHost( $domain ) ) {
+ if ( in_array( $domain, $wgLocalVirtualHosts )
+ || $wgConf-isLocalVHost( $domain )
+ ) {
return true;
}
}
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 8c1f26b..c3b1a6a 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -133,6 +133,8 @@
/**
* Array of domains that are local and can be handled by the same server
+*
+* @deprecated since 1.25; use $wgLocalVirtualHosts instead.
*/
public $localVHosts = array();
@@ -565,6 +567,8 @@
/**
* Returns true if the given vhost is handled locally.
+*
+* @deprecated since 1.25; check if the host is in $wgLocalVirtualHosts
instead.
* @param string $vhost
* @return bool
*/
--
To view, visit https://gerrit.wikimedia.org/r/157712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25204d37c5cfffb6953fe53e14316dc3df5b5b10
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove Tampa db's from site and dsh - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: remove Tampa db's from site and dsh
..
remove Tampa db's from site and dsh
Change-Id: I9b74b1778733aff5e8b4506d8c99c8c4381144da
---
M manifests/site.pp
M modules/dsh/files/group/db
2 files changed, 0 insertions(+), 14 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 75fccad..f309550 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -708,13 +708,6 @@
include role::download::wikimedia
}
-## imminent decomission/reclaim from pmtpa
-node /^db[67][0-9]\.pmtpa\.wmnet/{
-
-include admin
-include standard
-}
-
# eqiad dbs
node /^db10(51|52|55|61|65|66)\.eqiad\.wmnet/ {
diff --git a/modules/dsh/files/group/db b/modules/dsh/files/group/db
index c3dd2f8..a98e08c 100644
--- a/modules/dsh/files/group/db
+++ b/modules/dsh/files/group/db
@@ -38,10 +38,3 @@
db1047
db1048
-db60
-db68
-db69
-db71
-db72
-db73
-db74
--
To view, visit https://gerrit.wikimedia.org/r/164253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b74b1778733aff5e8b4506d8c99c8c4381144da
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove Tampa db and es servers from DHCP - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: remove Tampa db and es servers from DHCP
..
remove Tampa db and es servers from DHCP
Change-Id: I6046a79687e57c301d7cb748f8c0fd5a6f7fef29
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 50 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index f7cb91b..fc47023 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -817,41 +817,6 @@
fixed-address dataset1001.wikimedia.org;
}
-host db60 {
- hardware ethernet d4:ae:52:65:8c:1e;
- fixed-address db60.pmtpa.wmnet;
-}
-
-host db68 {
- hardware ethernet d4:ae:52:8b:eb:2e;
- fixed-address db68.pmtpa.wmnet;
-}
-
-host db69 {
- hardware ethernet d4:ae:52:90:3e:dc;
- fixed-address db69.pmtpa.wmnet;
-}
-
-host db71 {
- hardware ethernet d4:ae:52:8d:c1:1a;
- fixed-address db71.pmtpa.wmnet;
-}
-
-host db72 {
- hardware ethernet d4:ae:52:90:3a:de;
- fixed-address db72.pmtpa.wmnet;
-}
-
-host db73 {
- hardware ethernet d4:ae:52:8b:a4:ea;
- fixed-address db73.pmtpa.wmnet;
-}
-
-host db74 {
- hardware ethernet d4:ae:52:90:3b:5c;
- fixed-address db74.pmtpa.wmnet;
-}
-
host db1001 {
hardware ethernet 78:2b:cb:03:68:61;
fixed-address db1001.eqiad.wmnet;
@@ -1484,21 +1449,6 @@
host elastic1019 {
hardware ethernet 90:B1:1C:23:36:1D;
fixed-address elastic1019.eqiad.wmnet;
-}
-
-host es4 {
- hardware ethernet 78:2b:cb:60:34:26;
- fixed-address es4.pmtpa.wmnet;
-}
-
-host es7 {
- hardware ethernet d4:ae:52:8b:d2:0a;
- fixed-address es7.pmtpa.wmnet;
-}
-
-host es10 {
- hardware ethernet d4:ae:52:b0:3a:ca;
- fixed-address es10.pmtpa.wmnet;
}
host es1001 {
--
To view, visit https://gerrit.wikimedia.org/r/164249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6046a79687e57c301d7cb748f8c0fd5a6f7fef29
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Cog icon mw.ui styling for expand button - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164529
Change subject: [WIP] Cog icon mw.ui styling for expand button
..
[WIP] Cog icon mw.ui styling for expand button
TODO: open config menu on cog click once that click exists.
Change-Id: I2e7405e694af96e8eca4fcc839b60306232ead01
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/719
---
A resources/mmv/img/gear_gray.svg
M resources/mmv/mmv.bootstrap.js
M resources/mmv/mmv.bootstrap.less
3 files changed, 80 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/29/164529/1
diff --git a/resources/mmv/img/gear_gray.svg b/resources/mmv/img/gear_gray.svg
new file mode 100644
index 000..1573468
--- /dev/null
+++ b/resources/mmv/img/gear_gray.svg
@@ -0,0 +1,11 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+viewBox=0 0 96 96 enable-background=new 0 0 96 96
xml:space=preserve
+path fill=#77
d=M96,56.8V39.2l-10.8-1.8c-0.8-2.9-2-5.7-3.4-8.2l6.3-8.9L75.7,7.8l-8.9,6.3c-2.6-1.4-5.3-2.6-8.2-3.4L56.8,0
+
H39.2l-1.8,10.8c-2.9,0.8-5.7,2-8.2,3.4l-8.9-6.3L7.8,20.3l6.3,8.9c-1.4,2.6-2.6,5.3-3.4,8.3L0,39.2v17.6l10.7,1.8
+
c0.8,2.9,2,5.7,3.4,8.3l-6.3,8.9l12.4,12.4l8.9-6.3c2.6,1.4,5.3,2.6,8.3,3.4L39.2,96h17.6l1.8-10.8c2.9-0.8,5.7-2,8.2-3.4l8.9,6.3
+ l12.4-12.4l-6.3-8.9c1.4-2.6,2.6-5.3,3.4-8.3L96,56.8z
M48,66.4c-10.2,0-18.4-8.3-18.4-18.4c0-10.2,8.3-18.4,18.4-18.4
+ S66.4,37.8,66.4,48C66.4,58.2,58.2,66.4,48,66.4z/
+/svg
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 5024dbf..872f0a6 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -179,7 +179,6 @@
*/
MMVB.processThumb = function ( thumb ) {
var bs = this,
- alwaysOpen = false,
$thumb = $( thumb ),
$link = $thumb.closest( 'a.image' ),
$thumbContain = $link.closest( '.thumb' ),
@@ -213,22 +212,9 @@
}
if ( $thumb.closest( '#file' ).length 0 ) {
- // This is a file page. Make adjustments.
- link = $thumb.closest( 'a' ).prop( 'href' );
-
- $( 'p' )
- .append(
- $link = $( 'a' )
- // It won't matter because we
catch the click event anyway, but
- // give the user some URL to
see.
- .prop( 'href', $thumb.closest(
'a' ).prop( 'href' ) )
- .addClass(
'mw-mmv-view-expanded' )
- .text( mw.message(
'multimediaviewer-view-expanded' ).text() )
- )
- .appendTo( $( '.fullMedia' ) );
-
- // Ignore the preference, open anyway
- alwaysOpen = true;
+ // main thumbnail of a file page
+ this.processFilePageThumb( $thumb, title );
+ return;
}
// This is the data that will be passed onto the mmv
@@ -240,7 +226,56 @@
caption : this.findCaption( $thumbContain, $link ) } );
$link.add( $enlarge ).click( function ( e ) {
- return bs.click( this, e, title, alwaysOpen );
+ return bs.click( this, e, title );
+ } );
+ };
+
+ /**
+* Processes the main thumbnail of a file page.
+* @param {jQuery} $thumb
+* @param {mw.Title} title
+*/
+ MMVB.processFilePageThumb = function ( $thumb, title ) {
+ var $link,
+ $configLink,
+ bs = this,
+ link = $thumb.closest( 'a' ).prop( 'href' );
+
+ $link = $( 'a' )
+ // It won't matter because we catch the click event
anyway, but
+ // give the user some URL to see.
+ .prop( 'href', link )
+ .addClass( 'mw-mmv-view-expanded mw-ui-button' )
+ .text( mw.message( 'multimediaviewer-view-expanded'
).text() );
+
+ $configLink = $( 'a' )
+ .prop( 'href', $thumb.closest( 'a' ).prop( 'href' ) )
+
[MediaWiki-commits] [Gerrit] [WIP] Show popup when the user visits a file page the first ... - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164530
Change subject: [WIP] Show popup when the user visits a file page the first
time after disabling MMV
..
[WIP] Show popup when the user visits a file page the first time after
disabling MMV
TODO: use mw-ui popup style
Change-Id: Id2b121c930115373a8a81dc1091c4124807db053
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/719
---
M MultimediaViewer.php
A resources/mmv/img/x_gray.svg
M resources/mmv/mmv.Config.js
M resources/mmv/mmv.bootstrap.js
M resources/mmv/mmv.bootstrap.less
M tests/qunit/mmv/mmv.Config.test.js
M tests/qunit/mmv/mmv.bootstrap.test.js
M tests/qunit/mmv/mmv.testhelpers.js
8 files changed, 191 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/30/164530/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 6c57ea9..3dfdca5 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -857,6 +857,7 @@
'mmv.HtmlUtils',
'mmv.logging.DurationLogger',
'jquery.scrollTo',
+ 'jquery.tipsy',
),
'messages' = array(
diff --git a/resources/mmv/img/x_gray.svg b/resources/mmv/img/x_gray.svg
new file mode 100644
index 000..9dc00fe
--- /dev/null
+++ b/resources/mmv/img/x_gray.svg
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+viewBox=0 0 612 792 enable-background=new 0 0 612 792
xml:space=preserve
+polygon fill=#77 points=612,179.2 522.8,90 306,306.8 89.2,90 0,179.2
216.8,396 0,612.8 89.2,702 306,485.2 522.8,702
+ 612,612.8 395.2,396 /
+/svg
diff --git a/resources/mmv/mmv.Config.js b/resources/mmv/mmv.Config.js
index e7f47db..3a87b16 100644
--- a/resources/mmv/mmv.Config.js
+++ b/resources/mmv/mmv.Config.js
@@ -140,7 +140,8 @@
* @return {jQuery.Promise} a deferred which resolves/rejects on
success/failure respectively
*/
CP.setMediaViewerEnabledOnClick = function ( enabled ) {
- var newPrefValue,
+ var deferred,
+ newPrefValue,
defaultPrefValue = this.mwConfig.get(
'wgMediaViewerEnabledByDefault' ),
config = this,
success = true;
@@ -152,11 +153,9 @@
success = this.removeFromLocalStorage(
'wgMediaViewerOnClick' );
}
if ( success ) {
- // make the change work without a reload
- config.mwConfig.set( 'wgMediaViewerOnClick',
enabled );
- return $.Deferred().resolve();
+ deferred = $.Deferred().resolve();
} else {
- return $.Deferred().reject();
+ deferred = $.Deferred().reject();
}
} else {
// Simulate changing the option in Special:Preferences.
Turns out this is quite hard (bug 69942):
@@ -170,10 +169,17 @@
// which in turn will cause the options API to
delete the row and revert the pref to default
newPrefValue = enabled ? '1' : undefined;
}
- return this.setUserPreference(
'multimediaviewer-enable', newPrefValue ).then( function () {
- config.mwConfig.set( 'wgMediaViewerOnClick',
enabled );
- } );
+ deferred = this.setUserPreference(
'multimediaviewer-enable', newPrefValue );
}
+
+ return deferred.done( function () {
+ // make the change work without a reload
+ config.mwConfig.set( 'wgMediaViewerOnClick', enabled );
+ if ( !enabled ) {
+ // set flag for showing a popup if this was a
first-time disable
+ config.maybeEnableStatusInfo();
+ }
+ } );
};
/**
@@ -184,5 +190,33 @@
return !this.mwUser.isAnon() || !!this.localStorage;
};
+
+ /**
+* True if info about enable/disable status should be displayed (mingle
#719).
+* @returns {boolean}
+*/
+ CP.shouldShowStatusInfo = function () {
+ return
[MediaWiki-commits] [Gerrit] Split mediawiki.toolbar from mediawiki.action.edit - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Split mediawiki.toolbar from mediawiki.action.edit
..
Split mediawiki.toolbar from mediawiki.action.edit
Follows-up 285c52039bf4d2f9b.
Get rid of mediawiki.mediawiki.action.toolbar. Not keeping a
backwards-compat alias since this module is not supposed to be used
publicly in its current form.
Change-Id: I403216c6916e1f4d29216a55c3fe6c92eb68400b
---
M includes/EditPage.php
M maintenance/jsduck/config.json
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.js
R resources/src/mediawiki.toolbar/images/ar/button_bold.png
R resources/src/mediawiki.toolbar/images/ar/button_headline.png
R resources/src/mediawiki.toolbar/images/ar/button_italic.png
R resources/src/mediawiki.toolbar/images/ar/button_link.png
R resources/src/mediawiki.toolbar/images/ar/button_nowiki.png
R resources/src/mediawiki.toolbar/images/be-tarask/button_bold.png
R resources/src/mediawiki.toolbar/images/be-tarask/button_italic.png
R resources/src/mediawiki.toolbar/images/be-tarask/button_link.png
R resources/src/mediawiki.toolbar/images/de/button_bold.png
R resources/src/mediawiki.toolbar/images/de/button_italic.png
R resources/src/mediawiki.toolbar/images/en/button_bold.png
R resources/src/mediawiki.toolbar/images/en/button_extlink.png
R resources/src/mediawiki.toolbar/images/en/button_headline.png
R resources/src/mediawiki.toolbar/images/en/button_hr.png
R resources/src/mediawiki.toolbar/images/en/button_image.png
R resources/src/mediawiki.toolbar/images/en/button_italic.png
R resources/src/mediawiki.toolbar/images/en/button_link.png
R resources/src/mediawiki.toolbar/images/en/button_media.png
R resources/src/mediawiki.toolbar/images/en/button_nowiki.png
R resources/src/mediawiki.toolbar/images/en/button_sig.png
R resources/src/mediawiki.toolbar/images/fa/button_bold.png
R resources/src/mediawiki.toolbar/images/fa/button_headline.png
R resources/src/mediawiki.toolbar/images/fa/button_italic.png
R resources/src/mediawiki.toolbar/images/fa/button_link.png
R resources/src/mediawiki.toolbar/images/fa/button_nowiki.png
R resources/src/mediawiki.toolbar/images/ksh/LICENSE
R resources/src/mediawiki.toolbar/images/ksh/button_italic.png
R resources/src/mediawiki.toolbar/images/ru/LICENSE
R resources/src/mediawiki.toolbar/images/ru/button_bold.png
R resources/src/mediawiki.toolbar/images/ru/button_italic.png
R resources/src/mediawiki.toolbar/images/ru/button_link.png
A resources/src/mediawiki.toolbar/toolbar.js
R resources/src/mediawiki.toolbar/toolbar.less
37 files changed, 211 insertions(+), 199 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8a55b1d..fab5c14 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3636,7 +3636,7 @@
)
);
- $script = 'mw.loader.using(mediawiki.action.edit, function()
{';
+ $script = 'mw.loader.using(mediawiki.toolbar, function () {';
foreach ( $toolarray as $tool ) {
if ( !$tool ) {
continue;
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index e97f292..3a74804 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -17,6 +17,7 @@
../../resources/src/mediawiki.language,
../../resources/src/mediawiki.page,
../../resources/src/mediawiki.special,
+ ../../resources/src/mediawiki.toolbar,
../../resources/src/jquery/jquery.accessKeyLabel.js,
../../resources/src/jquery/jquery.arrowSteps.js,
../../resources/src/jquery/jquery.autoEllipsis.js,
diff --git a/resources/Resources.php b/resources/Resources.php
index 28be1df..4b3e356 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -985,6 +985,11 @@
'jquery.cookie',
),
),
+ 'mediawiki.toolbar' = array(
+ 'class' = 'ResourceLoaderEditToolbarModule',
+ 'scripts' = 'resources/src/mediawiki.toolbar/toolbar.js',
+ 'styles' = 'resources/src/mediawiki.toolbar/toolbar.less',
+ ),
/* MediaWiki Action */
@@ -993,7 +998,7 @@
'styles' =
'resources/src/mediawiki.action/mediawiki.action.edit.css',
'dependencies' = array(
'mediawiki.action.edit.styles',
- 'mediawiki.action.edit.toolbar',
+ 'mediawiki.toolbar',
'jquery.textSelection',
'jquery.byteLimit',
),
@@ -1002,10 +1007,6 @@
'mediawiki.action.edit.styles' = array(
'styles' =
[MediaWiki-commits] [Gerrit] Add support for ULS - change (mediawiki...CleanChanges)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164531
Change subject: Add support for ULS
..
Add support for ULS
Adapt more standard way to do resources
Change-Id: I317219819b8720c13654a031294bb3e0283ec0a2
---
M CleanChanges.php
M CleanChanges_body.php
A Resources.php
R resources/cleanchanges.js
A resources/cleanchanges.uls.css
A resources/cleanchanges.uls.js
6 files changed, 106 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CleanChanges
refs/changes/31/164531/1
diff --git a/CleanChanges.php b/CleanChanges.php
index 19e503d..6f93f0d 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -18,6 +18,8 @@
$wgExtensionMessagesFiles['CleanChanges'] = $dir/CleanChanges.i18n.php;
$wgAutoloadClasses['NCL'] = $dir/CleanChanges_body.php;
+require_once __DIR__ . '/Resources.php';
+
/* Hook into code */
$wgHooks['FetchChangesList'][] = 'NCL::hook';
$wgHooks['MakeGlobalVariablesScript'][] = 'NCL::addScriptVariables';
@@ -50,13 +52,3 @@
$wgHooks['SpecialRecentChangesPanel'][] =
'CCFilters::trailerForm';
}
}
-
-$resourcePaths = array(
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'CleanChanges'
-);
-
-// Client-side resource modules
-$wgResourceModules['ext.cleanchanges'] = array(
- 'scripts' = 'cleanchanges.js',
-) + $resourcePaths;
diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index e178445..0580661 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -10,6 +10,10 @@
public static function hook( User $user, Skin $skin, $list ) {
$list = null;
+ if ( defined( 'ULS_VERSION' ) ) {
+ $skin-getOutput()-addModules( 'ext.cleanchanges.uls'
);
+ }
+
/* allow override */
$request = $skin-getRequest();
if ( $request-getBool( 'cleanrc' ) ) {
diff --git a/Resources.php b/Resources.php
new file mode 100644
index 000..2a8b36c
--- /dev/null
+++ b/Resources.php
@@ -0,0 +1,17 @@
+?php
+
+global $wgResourceModules;
+
+$resourcePaths = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'CleanChanges'
+);
+
+$wgResourceModules['ext.cleanchanges'] = array(
+ 'scripts' = 'resources/cleanchanges.js',
+) + $resourcePaths;
+
+$wgResourceModules['ext.cleanchanges.uls'] = array(
+ 'scripts' = 'resources/cleanchanges.uls.js',
+ 'styles' = 'resources/cleanchanges.uls.css',
+) + $resourcePaths;
diff --git a/cleanchanges.js b/resources/cleanchanges.js
similarity index 100%
rename from cleanchanges.js
rename to resources/cleanchanges.js
diff --git a/resources/cleanchanges.uls.css b/resources/cleanchanges.uls.css
new file mode 100644
index 000..3e902cc
--- /dev/null
+++ b/resources/cleanchanges.uls.css
@@ -0,0 +1,24 @@
+.ext-cc-language-selector__trigger {
+ color: #0645AD;
+ cursor: pointer;
+}
+
+.ext-cc-language-selector__trigger:after {
+ margin-left: 4px;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ border-top: 4px solid #0645AD;
+ content: ;
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.ext-cc-language-selector__clear {
+ padding-left: 10px;
+ font-weight: bold;
+ cursor: pointer;
+}
+
+.ext-cc-language-selector {
+ padding-right: 50px;
+}
diff --git a/resources/cleanchanges.uls.js b/resources/cleanchanges.uls.js
new file mode 100644
index 000..eaf44d7
--- /dev/null
+++ b/resources/cleanchanges.uls.js
@@ -0,0 +1,59 @@
+/**
+ *
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ */
+( function ( $, mw ) {
+ 'use strict';
+
+ function useULS( $trigger ) {
+ var update, $selected, $clear, $button = $( 'span' );
+
+ $button
+ .addClass( 'ext-cc-language-selector__trigger' );
+
+ $clear = $( 'span' )
+ .text( 'X' )
+ .addClass( 'ext-cc-language-selector__clear' );
+
+
+ $trigger.hide().after(
+ $( 'span' )
+ .addClass( 'ext-cc-language-selector' )
+ .append( $button, $clear )
+ );
+
+ update = function ( value ) {
+ $selected = $trigger.children( ':selected' );
+ if ( value === '' ) {
+ $button.text( $selected.text() );
+ $clear.hide();
+ } else {
+ $button.text( $.uls.data.getAutonym( value ) );
+ $clear.show();
+ }
+ }
+
+ update( $trigger.val().replace( '/', '' ) );
+
+ $clear.on( 'click', function () {
+
[MediaWiki-commits] [Gerrit] Enable EducationProgram extension on cawiki - change (operations/mediawiki-config)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/164532 Change subject: Enable EducationProgram extension on cawiki .. Enable EducationProgram extension on cawiki Bug: 71381 Change-Id: I9dbf758feabf432b238d30ea23f63513c5b9ba28 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/32/164532/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8a8891c..ced58d2 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13111,6 +13111,7 @@ 'wmgUseEducationProgram' = array( 'default' = false, 'arwiki' = true, // bug 57729 + 'cawiki' = true, // bug 71381 'cswiki' = true, // bug 54223 'dewikiversity' = true, 'elwiki' = true, // bug 56771 -- To view, visit https://gerrit.wikimedia.org/r/164532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9dbf758feabf432b238d30ea23f63513c5b9ba28 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:ExpandTemplates: Use MediaWiki UI - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164533
Change subject: Special:ExpandTemplates: Use MediaWiki UI
..
Special:ExpandTemplates: Use MediaWiki UI
Bug: 71433
Change-Id: Ibe965741734bb911813084dad132ece179cc0362
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 42 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/164533/1
diff --git a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index 269dff6..9b6eb60 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -60,6 +60,9 @@
$request = $this-getRequest();
$titleStr = $request-getText( 'wpContextTitle' );
$title = Title::newFromText( $titleStr );
+ $this-getOutput()-addModuleStyles( array(
+ 'mediawiki.ui', 'mediawiki.ui.button',
'mediawiki.ui.input', 'mediawiki.ui.checkbox'
+ ) );
if ( !$title ) {
$title = $this-getPageTitle();
@@ -151,7 +154,7 @@
'contexttitle',
60,
$title,
- array( 'autofocus' = true )
+ array( 'autofocus' = true, 'class' =
'mw-ui-input-inline' )
) . '/p';
$form .= 'p' . Xml::label(
$this-msg( 'expand_templates_input' )-text(),
@@ -162,36 +165,52 @@
$input,
10,
10,
- array( 'id' = 'input' )
+ array( 'id' = 'input', 'class' = 'mw-ui-input' )
);
- $form .= 'p' . Xml::checkLabel(
- $this-msg( 'expand_templates_remove_comments'
)-text(),
- 'wpRemoveComments',
- 'removecomments',
- $this-removeComments
+ $form .= 'p' . Html::rawElement(
+ 'div',
+ array( 'class' = 'mw-ui-checkbox' ),
+ Xml::checkLabel(
+ $this-msg( 'expand_templates_remove_comments'
)-text(),
+ 'wpRemoveComments',
+ 'removecomments',
+ $this-removeComments
+ )
) . '/p';
- $form .= 'p' . Xml::checkLabel(
- $this-msg( 'expand_templates_remove_nowiki' )-text(),
- 'wpRemoveNowiki',
- 'removenowiki',
- $this-removeNowiki
+ $form .= 'p' . Html::rawElement(
+ 'div',
+ array( 'class' = 'mw-ui-checkbox' ),
+ Xml::checkLabel(
+ $this-msg( 'expand_templates_remove_nowiki'
)-text(),
+ 'wpRemoveNowiki',
+ 'removenowiki',
+ $this-removeNowiki
+ )
) . '/p';
- $form .= 'p' . Xml::checkLabel(
- $this-msg( 'expand_templates_generate_xml' )-text(),
- 'wpGenerateXml',
- 'generate_xml',
- $this-generateXML
+ $form .= 'p' . Html::rawElement(
+ 'div',
+ array( 'class' = 'mw-ui-checkbox' ),
+ Xml::checkLabel(
+ $this-msg( 'expand_templates_generate_xml'
)-text(),
+ 'wpGenerateXml',
+ 'generate_xml',
+ $this-generateXML
+ )
) . '/p';
- $form .= 'p' . Xml::checkLabel(
- $this-msg( 'expand_templates_generate_rawhtml'
)-text(),
- 'wpGenerateRawHtml',
- 'generate_rawhtml',
- $this-generateRawHtml
+ $form .= 'p' . Html::rawElement(
+ 'div',
+ array( 'class' = 'mw-ui-checkbox' ),
+ Xml::checkLabel(
+ $this-msg( 'expand_templates_generate_rawhtml'
)-text(),
+ 'wpGenerateRawHtml',
+ 'generate_rawhtml',
+ $this-generateRawHtml
+ )
) . '/p';
$form .= 'p' . Xml::submitButton(
$this-msg( 'expand_templates_ok' )-text(),
- array( 'accesskey' = 's' )
+
[MediaWiki-commits] [Gerrit] Update interwiki cache - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/164534 Change subject: Update interwiki cache .. Update interwiki cache Change-Id: I617b47dbcf7b8c166c3e8ae94862fd639e8b86a8 --- M wmf-config/interwiki.cdb 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/34/164534/1 diff --git a/wmf-config/interwiki.cdb b/wmf-config/interwiki.cdb index 35e1b9f..b830065 100644 --- a/wmf-config/interwiki.cdb +++ b/wmf-config/interwiki.cdb Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/164534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I617b47dbcf7b8c166c3e8ae94862fd639e8b86a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update interwiki cache - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Update interwiki cache .. Update interwiki cache Change-Id: I617b47dbcf7b8c166c3e8ae94862fd639e8b86a8 --- M wmf-config/interwiki.cdb 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/interwiki.cdb b/wmf-config/interwiki.cdb index 35e1b9f..b830065 100644 --- a/wmf-config/interwiki.cdb +++ b/wmf-config/interwiki.cdb Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/164534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I617b47dbcf7b8c166c3e8ae94862fd639e8b86a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow numbers in tag names - change (mediawiki...Scribunto)
Jackmcbarn has uploaded a new change for review. https://gerrit.wikimedia.org/r/164535 Change subject: Allow numbers in tag names .. Allow numbers in tag names HTML tags can contain numbers, like h2. Bug: 71594 Change-Id: I3b7bbfa3aa8f41a28f8ce64086e4066ffda948b2 --- M engines/LuaCommon/lualib/mw.html.lua 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/35/164535/1 diff --git a/engines/LuaCommon/lualib/mw.html.lua b/engines/LuaCommon/lualib/mw.html.lua index 0d8bf26..26b8034 100644 --- a/engines/LuaCommon/lualib/mw.html.lua +++ b/engines/LuaCommon/lualib/mw.html.lua @@ -75,7 +75,7 @@ -- -- @param s local function isValidTag( s ) - return s:match( '^[a-zA-Z]+$' ) + return s:match( '^[a-zA-Z0-9]+$' ) end -- Escape a value, for use in HTML -- To view, visit https://gerrit.wikimedia.org/r/164535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b7bbfa3aa8f41a28f8ce64086e4066ffda948b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.util: Clean up nextnode logic - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.util: Clean up nextnode logic
..
mediawiki.util: Clean up nextnode logic
Change-Id: I21469a765002897f03caca97628ad36264d49c83
---
M resources/src/mediawiki/mediawiki.util.js
M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
2 files changed, 22 insertions(+), 18 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.util.js
b/resources/src/mediawiki/mediawiki.util.js
index 2662913..fe5f2b2 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -290,26 +290,30 @@
}
if ( nextnode ) {
+ // Case: nextnode is a DOM element (was the
only option before MW 1.17, in wikibits.js)
+ // Case: nextnode is a CSS selector for jQuery
if ( nextnode.nodeType || typeof nextnode ===
'string' ) {
- // nextnode is a DOM element (was the
only option before MW 1.17, in wikibits.js)
- // or nextnode is a CSS selector for
jQuery
nextnode = $ul.find( nextnode );
- } else if ( !nextnode.jquery || (
nextnode.length nextnode[0].parentNode !== $ul[0] ) ) {
- // Fallback
- $ul.append( $item );
- return $item[0];
+ } else if ( !nextnode.jquery ) {
+ // Error: Invalid nextnode
+ nextnode = undefined;
}
- if ( nextnode.length === 1 ) {
- // nextnode is a jQuery object that
represents exactly one element
- nextnode.before( $item );
- return $item[0];
+ if ( nextnode ( nextnode.length !== 1 ||
nextnode[0].parentNode !== $ul[0] ) ) {
+ // Error: nextnode must resolve to a
single node
+ // Error: nextnode must have the
associated ul as its parent
+ nextnode = undefined;
}
}
- // Fallback (this is the default behavior)
- $ul.append( $item );
- return $item[0];
+ // Case: nextnode is a jQuery-wrapped DOM element
+ if ( nextnode ) {
+ nextnode.before( $item );
+ } else {
+ // Fallback (this is the default behavior)
+ $ul.append( $item );
+ }
+ return $item[0];
},
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index 4401ead..9b620de 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -189,7 +189,7 @@
);
assert.equal( $tbMW.closest( '.portlet' ).attr( 'id' ),
'p-test-tb', 'Link was inserted within correct portlet' );
- assert.strictEqual( $tbMW.next()[0], tbRL, 'Link is in the
correct position (by passing nextnode)' );
+ assert.strictEqual( $tbMW.next()[0], tbRL, 'Link is in the
correct position (nextnode as Node object)' );
cuQuux = mw.util.addPortletLink( 'p-test-custom', '#', 'Quux',
null, 'Example [shift-x]', 'q' );
$cuQuux = $( cuQuux );
@@ -205,7 +205,7 @@
tbRLDM = mw.util.addPortletLink( 'p-test-tb',
'//mediawiki.org/wiki/RL/DM',
'Default modules', 't-rldm', 'List of all default
modules ', 'd', '#t-rl' );
- assert.equal( $( tbRLDM ).next().attr( 'id' ), 't-rl', 'Link is
in the correct position (by passing CSS selector)' );
+ assert.strictEqual( $( tbRLDM ).next()[0], tbRL, 'Link is in
the correct position (CSS selector as nextnode)' );
caFoo = mw.util.addPortletLink( 'p-test-views', '#', 'Foo' );
@@ -213,19 +213,19 @@
assert.strictEqual( $( caFoo ).find( 'span' ).length, 1, 'A
span element should be added for porlets with vectorTabs class.' );
addedAfter = mw.util.addPortletLink( 'p-test-tb', '#', 'After
foo', 'post-foo', 'After foo', null, $(
[MediaWiki-commits] [Gerrit] mediawiki.util: Insert node before updating tooltip for acce... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.util: Insert node before updating tooltip for
accesskey
..
mediawiki.util: Insert node before updating tooltip for accesskey
updateTooltipAccessKeys() uses the native accessKeyLabel property which,
in Firefox, isn't available until after the node is inserted into the
document.
Bug: 67946
Change-Id: I3b80174e2f5df1c9082d30607dbe9b63ede6b5b5
---
M resources/src/mediawiki/mediawiki.util.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.util.js
b/resources/src/mediawiki/mediawiki.util.js
index fe5f2b2..3a06a02 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -286,7 +286,7 @@
}
if ( tooltip ) {
- $link.attr( 'title', tooltip
).updateTooltipAccessKeys();
+ $link.attr( 'title', tooltip );
}
if ( nextnode ) {
@@ -313,6 +313,10 @@
$ul.append( $item );
}
+ // Update tooltip for the access key after inserting
into DOM
+ // to get a localized access key label (bug 67946).
+ $link.updateTooltipAccessKeys();
+
return $item[0];
},
--
To view, visit https://gerrit.wikimedia.org/r/145889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b80174e2f5df1c9082d30607dbe9b63ede6b5b5
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: He7d3r he7...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style color swatches square and borderless - change (analytics/dashiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164537
Change subject: Style color swatches square and borderless
..
Style color swatches square and borderless
Change-Id: If00bb31661569c674315ffb3360f433b11040847
---
M src/components/project-selector/project-selector.html
M src/css/styles.css
2 files changed, 4 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/37/164537/1
diff --git a/src/components/project-selector/project-selector.html
b/src/components/project-selector/project-selector.html
index dc29490..6c2e959 100644
--- a/src/components/project-selector/project-selector.html
+++ b/src/components/project-selector/project-selector.html
@@ -53,7 +53,7 @@
!-- ko foreach: languages --
div class=item
span
-i class=swatch data-bind=style: {color: color}/i
+i class=swatch data-bind=style: {'background-color':
color}/i
a data-bind=text: name/a
/span
a data-bind=click: $parents[1].removeProject.bind($parents[1])
diff --git a/src/css/styles.css b/src/css/styles.css
index 0572407..bba66ac 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -83,28 +83,12 @@
padding: 0;
}
.colored i.swatch {
-font-size: 1.5em;
-vertical-align: middle;
-
+vertical-align: bottom;
display: inline-block;
margin: 0 .35em 0 0;
-/*width: 1.23em;*/
-height: 1.03em;
-font-family: Icons;
-font-style: normal;
-line-height: 0.89em;
-font-weight: 400;
-text-decoration: inherit;
-text-align: center;
-speak: none;
-box-sizing: border-box;
-
-border: 2px solid white;
-border-radius: 4px;
+width: 20px;
+height: 20px;
opacity: 1;
-}
-.colored i.swatch:before {
-content: \f0c8;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/164537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If00bb31661569c674315ffb3360f433b11040847
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style metric selector button and popover - change (analytics/dashiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164538
Change subject: Style metric selector button and popover
..
Style metric selector button and popover
Change-Id: Ie70c48c1dcadfcf8fcfcdebbeea141119494c733
---
M src/components/metric-selector/metric-selector.html
M src/css/styles.css
2 files changed, 60 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/38/164538/1
diff --git a/src/components/metric-selector/metric-selector.html
b/src/components/metric-selector/metric-selector.html
index 5b0f1f9..b095166 100644
--- a/src/components/metric-selector/metric-selector.html
+++ b/src/components/metric-selector/metric-selector.html
@@ -1,36 +1,36 @@
div class=ui dropdown navy label data-bind=toggle: 'open'
i class=add sign box icon/i
-!-- ko ifnot: selectedMetric --
-div class=text data-bind=text: open() ? 'Close' : 'Add Metric'/div
-!-- /ko --
+div class=textAdd Metric/div
i class=dropdown icon vertically data-bind=css: {flipped: open}/i
/div
-div class=ui two column grid target data-bind=css: {open: open}
-div class=column
-div class=ui vertical pointing black menu
-!-- ko foreach: categories --
-a class=item data-bind=
-css: {active: name === $parent.selectedCategory().name},
-text: name,
-click: $parent.selectCategory
-/a
-!-- /ko --
-/div
-/div
-div class=column
-div class=ui vertical menu
-!-- ko if: selectedCategory --
-!-- ko foreach: categories --
-!-- ko if: $parent.selectedCategory().name !== 'All metrics'
-(name === 'All metrics' || name
$parent.selectedCategory().name) --
-div class=itemnbsp;/div
+div class=ui pointing white offset above label categories target
data-bind=css: {open: open}
+div class=ui two column grid
+div class=column
+div class=ui vertical pointing black menu
+!-- ko foreach: categories --
+a class=item data-bind=
+css: {active: name === $parent.selectedCategory().name},
+text: name,
+click: $parent.selectCategory
+/a
!-- /ko --
-!-- /ko --
-!-- ko foreach: selectedCategory().metrics --
-a class=item data-bind=metricName: $data, click:
$parent.addMetric/a
-!-- /ko --
-!-- /ko --
+/div
+/div
+div class=column
+div class=ui vertical menu
+!-- ko if: selectedCategory --
+!-- ko foreach: categories --
+!-- ko if: $parent.selectedCategory().name !== 'All metrics'
+(name === 'All metrics' || name
$parent.selectedCategory().name) --
+div class=itemnbsp;/div
+!-- /ko --
+!-- /ko --
+!-- ko foreach: selectedCategory().metrics --
+a class=item data-bind=metricName: $data, click:
$parent.addMetric/a
+!-- /ko --
+!-- /ko --
+/div
/div
/div
/div
diff --git a/src/css/styles.css b/src/css/styles.css
index bba66ac..37136d3 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -27,23 +27,47 @@
.item:hover .icon.faded {
opacity: 1;
}
-.target {
-position: absolute!important;
-z-index: 100!important;
-display: none!important;
-margin-top: -6px!important;
-}
-.target.open {
-display: block!important;
-}
.ui.dropdown.label {
height: 30.75px;
}
.separate.icon {
margin: 0 -4px 0 4px;
}
+.ui.pointing.offset.above.label:before {
+left: 11%!important;
+top: -0.41em;
+}
/* our styles */
+.target {
+position: absolute!important;
+z-index: 100!important;
+display: none!important;
+}
+.target.open {
+display: block!important;
+}
+.categories.target.label {
+padding: 1px;
+margin-top: 7px!important;
+}
+.ui.pointing.white.label {
+background-color: white;
+border: 2px solid #E5E5E5;
+}
+.ui.pointing.white.label:before {
+background-color: white;
+border: 2px solid #E5E5E5;
+border-bottom: none;
+border-right: none;
+}
+.target.label .grid {
+margin: 0px;
+}
+.target.label .grid .column {
+padding: 0px;
+margin: 0px;
+}
input.typeahead {
color: white!important;
}
--
To view, visit https://gerrit.wikimedia.org/r/164538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie70c48c1dcadfcf8fcfcdebbeea141119494c733
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Style layout to fill page - change (analytics/dashiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164536
Change subject: Style layout to fill page
..
Style layout to fill page
Change-Id: I15d7cbdeffa973b9d26d2a1ef778ea82577a4236
---
M src/components/wikimetrics-layout/wikimetrics-layout.html
M src/css/styles.css
2 files changed, 23 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/36/164536/1
diff --git a/src/components/wikimetrics-layout/wikimetrics-layout.html
b/src/components/wikimetrics-layout/wikimetrics-layout.html
index 64f172d..edc7f4f 100644
--- a/src/components/wikimetrics-layout/wikimetrics-layout.html
+++ b/src/components/wikimetrics-layout/wikimetrics-layout.html
@@ -1,6 +1,6 @@
-section class=ui six column celled page grid
-div class=row
-section class=column projects-container
+section
+div
+section class=page column projects
project-selector params=projectOptions:projectOptions,
languageOptions:languageOptions,
defaultProjects: defaultProjects,
@@ -9,7 +9,7 @@
/project-selector
/section
-section class=five wide column main-container
+section class=page column main
div class=ui segment
metric-selector params=selectedMetric: selectedMetric,
metrics: metrics,
diff --git a/src/css/styles.css b/src/css/styles.css
index a6a4331..0572407 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -1,5 +1,8 @@
/* site-wide styles */
body {
+padding: 0;
+margin: 0;
+height: 100vh;
font-family: Nimbus Sans L,Liberation Sans,Helvetica
Neue,Helvetica,Arial,sans-serif;
}
@@ -51,14 +54,26 @@
a.header:hover {
text-decoration: underline;
}
-section.projects-container {
+section.page.column {
+position: absolute;
+top: 0;
+bottom: 0;
+padding: 10px;
+}
+section.projects {
background-color: #6D6D6D;
-min-width: 254px;
+width: 300px;
}
-section.main-container {
+section.main {
background-color: #EE;
+right: 0;
+left: 300px;
}
-.graph .parent-of-resizable{
+.graph {
+height: 90vh;
+}
+.graph .parent-of-resizable {
+height: 100%;
min-height: 600px;
min-width: 800px;
}
--
To view, visit https://gerrit.wikimedia.org/r/164536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15d7cbdeffa973b9d26d2a1ef778ea82577a4236
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style border radii and project list - change (analytics/dashiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164539
Change subject: Style border radii and project list
..
Style border radii and project list
Change-Id: I3e7faefa1d2d77416246f52341376f7c395e532a
---
M src/components/project-selector/project-selector.html
M src/components/project-selector/project-selector.js
M src/css/styles.css
3 files changed, 36 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/39/164539/1
diff --git a/src/components/project-selector/project-selector.html
b/src/components/project-selector/project-selector.html
index 6c2e959..4758a62 100644
--- a/src/components/project-selector/project-selector.html
+++ b/src/components/project-selector/project-selector.html
@@ -54,10 +54,11 @@
div class=item
span
i class=swatch data-bind=style: {'background-color':
color}/i
-a data-bind=text: name/a
+span data-bind=text: name/span
+span class=subtext data-bind=text: shortName/span
/span
a data-bind=click: $parents[1].removeProject.bind($parents[1])
-i class=faded delete icon/i
+i class=faded destructive delete icon/i
/a
/div
!-- /ko --
diff --git a/src/components/project-selector/project-selector.js
b/src/components/project-selector/project-selector.js
index edface4..2a0cf78 100644
--- a/src/components/project-selector/project-selector.js
+++ b/src/components/project-selector/project-selector.js
@@ -75,6 +75,7 @@
projects[info.project.code].languages.push({
name: info.language.name,
database: info.database,
+shortName: info.language.shortName,
color: info.color
});
});
diff --git a/src/css/styles.css b/src/css/styles.css
index 37136d3..62442b6 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -21,12 +21,6 @@
background-color: #7C7C7C;
color: #232323;
}
-.icon.faded {
-opacity: 0.1;
-}
-.item:hover .icon.faded {
-opacity: 1;
-}
.ui.dropdown.label {
height: 30.75px;
}
@@ -37,8 +31,24 @@
left: 11%!important;
top: -0.41em;
}
+.ui.label,
+.ui.input input {
+border-radius: 2px;
+}
/* our styles */
+.subtext {
+color: #929292;
+font-size: xx-small;
+text-transform: uppercase;
+margin-left: 8px;
+}
+.icon.faded {
+opacity: 0.1;
+}
+.item:hover .icon.faded {
+opacity: 1;
+}
.target {
position: absolute!important;
z-index: 100!important;
@@ -70,6 +80,7 @@
}
input.typeahead {
color: white!important;
+width: 280px!important;
}
a.header {
color: #112233;
@@ -114,6 +125,15 @@
height: 20px;
opacity: 1;
}
+.destructive:hover {
+color: #D42E2A;
+}
+project-selector hr {
+margin-right: 20px;
+}
+project-selector .menu {
+margin-right: 20px;
+}
/**
* Twitter typeahead stuff
@@ -126,7 +146,7 @@
font-size: 24px;
line-height: 30px;
border: 2px solid #ccc;
-border-radius: 8px;
+border-radius: 2px;
outline: none;
}
.tt-query {
@@ -137,12 +157,12 @@
}
.tt-dropdown-menu {
width: 300px;
-margin-top: 4px;
+margin: 1px 0 0 1px;
padding: 8px 0;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2);
-border-radius: 8px;
+border-radius: 2px;
box-shadow: 0 5px 10px rgba(0,0,0,.2);
max-height: 24em;
overflow-y: scroll;
@@ -151,7 +171,7 @@
.tt-suggestion {
padding: 3px 20px;
font-size: 16px;
-line-height: 24px;
+line-height: 30px;
border-bottom: #ccc 1px solid;
}
.tt-suggestion .footnote {
@@ -164,14 +184,14 @@
}
.tt-suggestion:hover {
-font-weight:bold;
+font-weight: bold;
cursor: pointer;
}
.tt-suggestion p {
margin: 0;
}
.tt-back:hover{
-font-weight:bold;
+font-weight: bold;
}
.tt-dropdown-menu {
display: none;
--
To view, visit https://gerrit.wikimedia.org/r/164539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e7faefa1d2d77416246f52341376f7c395e532a
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow numbers in tag names - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged. Change subject: Allow numbers in tag names .. Allow numbers in tag names HTML tags can contain numbers, like h2. Bug: 71594 Change-Id: I3b7bbfa3aa8f41a28f8ce64086e4066ffda948b2 --- M engines/LuaCommon/lualib/mw.html.lua 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/engines/LuaCommon/lualib/mw.html.lua b/engines/LuaCommon/lualib/mw.html.lua index 0d8bf26..26b8034 100644 --- a/engines/LuaCommon/lualib/mw.html.lua +++ b/engines/LuaCommon/lualib/mw.html.lua @@ -75,7 +75,7 @@ -- -- @param s local function isValidTag( s ) - return s:match( '^[a-zA-Z]+$' ) + return s:match( '^[a-zA-Z0-9]+$' ) end -- Escape a value, for use in HTML -- To view, visit https://gerrit.wikimedia.org/r/164535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b7bbfa3aa8f41a28f8ce64086e4066ffda948b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix editing of properties, once again - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164540
Change subject: Fix editing of properties, once again
..
Fix editing of properties, once again
the better solution would be to properly split the entityview
into a propertyview and itemview, but that is too much for
something we want to backport.
Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/40/164540/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index f323c34..1272bd6 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -366,15 +366,20 @@
if( this.$fingerprints ) {
this.$fingerprints.data( 'fingerprintgroupview'
)[state]();
}
- this.$claims.data( 'claimgrouplistview' )[state]();
- // TODO: Resolve integration of referenceviews
- this.$claims.find( '.wb-statement-references' ).each(
function() {
- var $listview = $( this ).children(
':wikibase-listview' );
- if( $listview.length ) {
- $listview.data( 'listview' )[state]();
- }
- } );
- if( this.$siteLinks.length 0 ) {
+
+ // horrible, horrible hack until we have proper item and
property views
+ if( this.$claims ) {
+ this.$claims.data( 'claimgrouplistview' )[state]();
+ // TODO: Resolve integration of referenceviews
+ this.$claims.find( '.wb-statement-references' ).each(
function() {
+ var $listview = $( this ).children(
':wikibase-listview' );
+ if( $listview.length ) {
+ $listview.data( 'listview' )[state]();
+ }
+ } );
+ }
+
+ if( this.$siteLinks this.$siteLinks.length 0 ) {
this.$siteLinks.data( 'sitelinkgrouplistview'
)[state]();
}
},
--
To view, visit https://gerrit.wikimedia.org/r/164540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10b6024094d6a72ea5e7c3a3f94882c77df1aec0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: use fully-qualified vars - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: use fully-qualified vars
..
swift: use fully-qualified vars
also add more memcache servers to codfw
Change-Id: If629e52db6aed7beda2b4afc3f14898d18704911
---
M hieradata/codfw.yaml
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/dispersion.pp
3 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 0dae043..ab23e31 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -30,12 +30,18 @@
swift_new::hash_path_suffix: 'de4227064232ed08'
swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet'
-swift_new::proxy::memcached_servers: ['ms-fe2001.eqiad.wmnet:11211']
swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet'
swift_new::proxy::backend_url_format: 'sitelang'
swift_new::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet'
swift_new::proxy::dispersion_account: 'dispersion'
swift_new::proxy::rewrite_account:'mw_media'
+swift_new::proxy::memcached_servers: [
+ 'ms-fe2001.codfw.wmnet:11211',
+ 'ms-fe2002.codfw.wmnet:11211',
+ 'ms-fe2003.codfw.wmnet:11211',
+ 'ms-fe2004.codfw.wmnet:11211'
+# no trailing comma!
+]
swift_new::proxy::shard_container_list: [
'global-data-math-render',
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index 1a13d5f..e2ba2bb 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -1,9 +1,9 @@
class swift_new::stats::accounts(
-$swift_cluster = $swift_new::params::swift_cluster,
-$accounts = $swift_new::params::accounts,
-$credentials = $swift_new::params::account_keys,
+$swift_cluster = $::swift_new::params::swift_cluster,
+$accounts = $::swift_new::params::accounts,
+$credentials = $::swift_new::params::account_keys,
$statsd_host = 'statsd.eqiad.wmnet',
-$statsd_prefix = swift.${swift_cluster}.stats,
+$statsd_prefix = swift.${::swift_new::params::swift_cluster}.stats,
) {
$required_packages = [
Package['python-swiftclient'],
diff --git a/modules/swift_new/manifests/stats/dispersion.pp
b/modules/swift_new/manifests/stats/dispersion.pp
index a0938a1..c7a5cc7 100644
--- a/modules/swift_new/manifests/stats/dispersion.pp
+++ b/modules/swift_new/manifests/stats/dispersion.pp
@@ -1,7 +1,7 @@
class swift_new::stats::dispersion(
$swift_cluster = $::swift_new::params::swift_cluster,
$statsd_host = 'statsd.eqiad.wmnet',
-$statsd_prefix = swift.${swift_cluster}.dispersion,
+$statsd_prefix = swift.${::swift_new::params::swift_cluster}.dispersion,
) {
$required_packages = [
Package['python-swiftclient'],
--
To view, visit https://gerrit.wikimedia.org/r/164528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If629e52db6aed7beda2b4afc3f14898d18704911
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix knockout for firefox - change (analytics/dashiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164541
Change subject: Fix knockout for firefox
..
Fix knockout for firefox
Change-Id: Ifb1993dd9e44be655a5b12b0f487de9cd3cf707b
---
M src/components/project-selector/project-selector.html
M src/css/styles.css
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/41/164541/1
diff --git a/src/components/project-selector/project-selector.html
b/src/components/project-selector/project-selector.html
index 4758a62..a838755 100644
--- a/src/components/project-selector/project-selector.html
+++ b/src/components/project-selector/project-selector.html
@@ -53,7 +53,7 @@
!-- ko foreach: languages --
div class=item
span
-i class=swatch data-bind=style: {'background-color':
color}/i
+i class=swatch data-bind=style: {backgroundColor:
color}/i
span data-bind=text: name/span
span class=subtext data-bind=text: shortName/span
/span
diff --git a/src/css/styles.css b/src/css/styles.css
index 553b635..90afbd8 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -39,7 +39,7 @@
/* our styles */
.subtext {
color: #929292;
-font-size: xx-small;
+font-size: x-small;
text-transform: uppercase;
margin-left: 8px;
}
--
To view, visit https://gerrit.wikimedia.org/r/164541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb1993dd9e44be655a5b12b0f487de9cd3cf707b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a ferm service for ssh on all bastionhosts - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164542
Change subject: Add a ferm service for ssh on all bastionhosts
..
Add a ferm service for ssh on all bastionhosts
This is done to ensure continuous SSH access on all bastion hosts
Change-Id: I61f2f9fcb6392ea13276748926fdc7f058f3fc2d
---
A manifests/role/bastionhost.pp
M modules/bastionhost/manifests/init.pp
2 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/164542/1
diff --git a/manifests/role/bastionhost.pp b/manifests/role/bastionhost.pp
new file mode 100644
index 000..dbce132
--- /dev/null
+++ b/manifests/role/bastionhost.pp
@@ -0,0 +1,13 @@
+# bastion host role
+class role::bastionhost {
+system::role { 'bastionhost':
+description = 'Bastion',
+}
+
+include ::bastionhost
+
+ferm::service { 'bastion_ssh':
+proto = 'tcp',
+port = 'ssh',
+}
+}
diff --git a/modules/bastionhost/manifests/init.pp
b/modules/bastionhost/manifests/init.pp
index 5c4cf68..bc1078d 100644
--- a/modules/bastionhost/manifests/init.pp
+++ b/modules/bastionhost/manifests/init.pp
@@ -1,9 +1,5 @@
# bastion hosts
class bastionhost {
-system::role { 'bastionhost':
-description = 'Bastion',
-}
-
package { [ 'irssi', 'traceroute-nanog' ]:
ensure = absent,
}
--
To view, visit https://gerrit.wikimedia.org/r/164542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61f2f9fcb6392ea13276748926fdc7f058f3fc2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use less function to embed editor images - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164543
Change subject: Use less function to embed editor images
..
Use less function to embed editor images
Use .background-image() in editor.less, instead of embed images
directly.
Bug: 71608
Change-Id: I33e1b34bcada27f68c44eecded6f61867dd590eb
---
M less/modules/editor/editor.less
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/43/164543/1
diff --git a/less/modules/editor/editor.less b/less/modules/editor/editor.less
index 633a208..3bc055b 100644
--- a/less/modules/editor/editor.less
+++ b/less/modules/editor/editor.less
@@ -4,18 +4,18 @@
// no fallback mixin for those SVGs (VE doesn't work on browsers without SVG
// support anyway)
.icon-edit-source {
- background-image: embed( 'images/editSourceNormal.svg' );
+ .background-image( 'images/editSourceNormal.svg' );
.selected {
- background-image: embed( 'images/editSourceSelect.svg' );
+ .background-image( 'images/editSourceSelect.svg' );
}
}
.icon-edit-ve {
- background-image: embed( 'images/editVeNormal.svg' );
+ .background-image( 'images/editVeNormal.svg' );
.selected {
- background-image: embed( 'images/editVeSelect.svg' );
+ .background-image( 'images/editVeSelect.svg' );
}
}
@@ -56,12 +56,12 @@
.icon.editor-switcher {
margin: 0;
- background-image: embed( 'images/editToggle.svg' );
+ .background-image( 'images/editToggle.svg' );
background-size: 44px 32px;
margin-right: 1em;
.selected {
- background-image: embed(
'images/editToggleActive.svg' );
+ .background-image(
'images/editToggleActive.svg' );
}
}
@@ -96,11 +96,11 @@
}
.mw-ui-progressive .icon-edit-source {
- background-image: embed(
'images/editSourceToggle.svg' );
+ .background-image(
'images/editSourceToggle.svg' );
}
.mw-ui-progressive .icon-edit-ve {
- background-image: embed(
'images/editVeToggle.svg' );
+ .background-image(
'images/editVeToggle.svg' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/164543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33e1b34bcada27f68c44eecded6f61867dd590eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool es1004 for upgrade clone - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/164544 Change subject: depool es1004 for upgrade clone .. depool es1004 for upgrade clone Change-Id: I16f653ad67bd64e38b65d4c3409a63feffbf5f30 --- 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/44/164544/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 1e411c1..458b94e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -17,7 +17,7 @@ '10.64.0.25' = 1, # es1001 '10.64.16.40' = 1, # es1002 '10.64.16.41' = 1, # es1003 - '10.64.16.42' = 1, # es1004 + # maintenance '10.64.16.42' = 1, # es1004 ); $wgLBFactoryConf = array( -- To view, visit https://gerrit.wikimedia.org/r/164544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16f653ad67bd64e38b65d4c3409a63feffbf5f30 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool es1004 for upgrade clone - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: depool es1004 for upgrade clone .. depool es1004 for upgrade clone Change-Id: I16f653ad67bd64e38b65d4c3409a63feffbf5f30 --- 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 1e411c1..458b94e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -17,7 +17,7 @@ '10.64.0.25' = 1, # es1001 '10.64.16.40' = 1, # es1002 '10.64.16.41' = 1, # es1003 - '10.64.16.42' = 1, # es1004 + # maintenance '10.64.16.42' = 1, # es1004 ); $wgLBFactoryConf = array( -- To view, visit https://gerrit.wikimedia.org/r/164544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16f653ad67bd64e38b65d4c3409a63feffbf5f30 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update actions schema version and add new actions - change (analytics/multimedia)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/164545 Change subject: Update actions schema version and add new actions .. Update actions schema version and add new actions Change-Id: Ifd24a1154b34427169dc7ab86281de3ec7bb8a4a Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/934 --- M actions/template.sql 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia refs/changes/45/164545/1 diff --git a/actions/template.sql b/actions/template.sql index 1d27a18..1a6f44a 100644 --- a/actions/template.sql +++ b/actions/template.sql @@ -52,7 +52,9 @@ SUM(CASE WHEN event_action = 'embed-select-menu-html-small' THEN event_samplingFactor ELSE 0 END) AS 'embed-select-menu-html-small', SUM(CASE WHEN event_action = 'embed-select-menu-html-medium' THEN event_samplingFactor ELSE 0 END) AS 'embed-select-menu-html-medium', SUM(CASE WHEN event_action = 'embed-select-menu-html-large' THEN event_samplingFactor ELSE 0 END) AS 'embed-select-menu-html-large', - SUM(CASE WHEN event_action = 'use-this-file-close' THEN event_samplingFactor ELSE 0 END) AS 'use-this-file-close' + SUM(CASE WHEN event_action = 'use-this-file-close' THEN event_samplingFactor ELSE 0 END) AS 'use-this-file-close', + SUM(CASE WHEN event_action = 'download-open' THEN event_samplingFactor ELSE 0 END) AS 'download-open', + SUM(CASE WHEN event_action = 'download-close' THEN event_samplingFactor ELSE 0 END) AS 'download-close' FROM ( SELECT timestamp, event_action, 1 AS event_samplingFactor FROM MediaViewer_7670440 @@ -66,10 +68,13 @@ UNION ALL SELECT timestamp, event_action, event_samplingFactor FROM MediaViewer_8935662 WHERE %wiki% timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) - UNION ALL + UNION ALL SELECT timestamp, event_action, event_samplingFactor FROM MediaViewer_9792855 WHERE %wiki% timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) UNION ALL + SELECT timestamp, event_action, event_samplingFactor FROM MediaViewer_9989959 + WHERE %wiki% timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) + UNION ALL SELECT timestamp, (CASE WHEN event_value = 0 THEN 'pref-optout-loggedin' ELSE 'pref-optin-loggedin' END) AS event_action, 1 AS event_samplingFactor FROM PrefUpdate_5563398 WHERE event_property = 'multimediaviewer-enable' AND timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) ) AS MediaViewerUnioned -- To view, visit https://gerrit.wikimedia.org/r/164545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd24a1154b34427169dc7ab86281de3ec7bb8a4a Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update actions schema version and add new actions - change (analytics/multimedia)
jenkins-bot has submitted this change and it was merged. Change subject: Update actions schema version and add new actions .. Update actions schema version and add new actions Change-Id: Ifd24a1154b34427169dc7ab86281de3ec7bb8a4a Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/934 --- M actions/template.sql 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/actions/template.sql b/actions/template.sql index 1d27a18..1a6f44a 100644 --- a/actions/template.sql +++ b/actions/template.sql @@ -52,7 +52,9 @@ SUM(CASE WHEN event_action = 'embed-select-menu-html-small' THEN event_samplingFactor ELSE 0 END) AS 'embed-select-menu-html-small', SUM(CASE WHEN event_action = 'embed-select-menu-html-medium' THEN event_samplingFactor ELSE 0 END) AS 'embed-select-menu-html-medium', SUM(CASE WHEN event_action = 'embed-select-menu-html-large' THEN event_samplingFactor ELSE 0 END) AS 'embed-select-menu-html-large', - SUM(CASE WHEN event_action = 'use-this-file-close' THEN event_samplingFactor ELSE 0 END) AS 'use-this-file-close' + SUM(CASE WHEN event_action = 'use-this-file-close' THEN event_samplingFactor ELSE 0 END) AS 'use-this-file-close', + SUM(CASE WHEN event_action = 'download-open' THEN event_samplingFactor ELSE 0 END) AS 'download-open', + SUM(CASE WHEN event_action = 'download-close' THEN event_samplingFactor ELSE 0 END) AS 'download-close' FROM ( SELECT timestamp, event_action, 1 AS event_samplingFactor FROM MediaViewer_7670440 @@ -66,10 +68,13 @@ UNION ALL SELECT timestamp, event_action, event_samplingFactor FROM MediaViewer_8935662 WHERE %wiki% timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) - UNION ALL + UNION ALL SELECT timestamp, event_action, event_samplingFactor FROM MediaViewer_9792855 WHERE %wiki% timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) UNION ALL + SELECT timestamp, event_action, event_samplingFactor FROM MediaViewer_9989959 + WHERE %wiki% timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) + UNION ALL SELECT timestamp, (CASE WHEN event_value = 0 THEN 'pref-optout-loggedin' ELSE 'pref-optin-loggedin' END) AS event_action, 1 AS event_samplingFactor FROM PrefUpdate_5563398 WHERE event_property = 'multimediaviewer-enable' AND timestamp TIMESTAMP(CURDATE()) AND timestamp = TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY)) ) AS MediaViewerUnioned -- To view, visit https://gerrit.wikimedia.org/r/164545 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd24a1154b34427169dc7ab86281de3ec7bb8a4a Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new actions for download popup - change (analytics...config)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164546
Change subject: Add new actions for download popup
..
Add new actions for download popup
Change-Id: Ie64c4eab4c0116c8d17c40794175180659b584bf
Refs: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/934
---
M datasources/mmv_actions_template.json
M graphs/mmv_actions_template.json
2 files changed, 33 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia/config
refs/changes/46/164546/1
diff --git a/datasources/mmv_actions_template.json
b/datasources/mmv_actions_template.json
index d67daf6..a07a9f6 100644
--- a/datasources/mmv_actions_template.json
+++ b/datasources/mmv_actions_template.json
@@ -271,6 +271,16 @@
id: use-this-file-close,
label: use this file closed,
type: Number
+},
+{
+id: download-open,
+label: download opened,
+type: Number
+},
+{
+id: download-close,
+label: download closed,
+type: Number
}
]
}
\ No newline at end of file
diff --git a/graphs/mmv_actions_template.json b/graphs/mmv_actions_template.json
index b6ed757..89beda8 100644
--- a/graphs/mmv_actions_template.json
+++ b/graphs/mmv_actions_template.json
@@ -1,7 +1,7 @@
{
graph_version: 0.6.0,
id: mmv_actions_%wiki%,
-desc: bthumbnail click/b how many times users clicked on a
thumbnail which opened media viewerbrbenlarge click/b how many times
users clicked on the \enlarge\ icon next to the thumbnail which opened media
viewerbrbfullscreen/b how many times users went into fullscreen
modebrbdefullscreen/b how many times users exited fullscreen
modebrbclose/b how many times users closed media viewerbrbview
original file/b how many times users clicked on the icon to view the original
filebrbfile description page/b how many times users visited that image's
File: pagebrbfile description page (above fold)/b how many times users
visited that image's File: page using the above-the-fold iconbrbuse this
file open/b how many times users opened \use this file\brbimage
view/b how many times users viewed an imagebrbmetadata open/b how many
times users opened the metadata panelbrbmetadata close/b how many times
users closed the metadata panelbrbnext image/b how many times users
navigated to the next imagebrbprev image/b how many times users navigated
to the previous imagebrbterms open/b how many times users opened the
usage termsbrblicense page/b how many times users visited that image's
license pagebrbauthor/b how many times users visited that image's author
pagebrbsource page/b how many times users visited that image's source
pagebrbabout page/b how many times users visited the about
pagebrbdiscuss page/b how many times users visited the discuss
pagebrbhelp page/b how many times users visited the help
pagebrblocation page/b how many times users visited that image's location
pagebrbuploader page/b how many times users visited that image's uploader
pagebrbhash load/b how many times users opened Media Viewer through a
hash linkbrbhistory navigation/b how many times users navigated within
Media Viewer using their browser's historybr,
+desc: bthumbnail click/b how many times users clicked on a
thumbnail which opened media viewerbrbenlarge click/b how many times
users clicked on the \enlarge\ icon next to the thumbnail which opened media
viewerbrbfullscreen/b how many times users went into fullscreen
modebrbdefullscreen/b how many times users exited fullscreen
modebrbclose/b how many times users closed media viewerbrbview
original file/b how many times users clicked on the icon to view the original
filebrbfile description page/b how many times users visited that image's
File: pagebrbfile description page (above fold)/b how many times users
visited that image's File: page using the above-the-fold iconbrbuse this
file open/b how many times users opened \use this file\brbdownload
open/b how many times users opened the dialog to download this
filebrbdownload close/b how many times users closed the dialog to
download this filebrbimage view/b how many times users viewed an
imagebrbmetadata open/b how many times users opened the metadata
panelbrbmetadata close/b how many times users closed the metadata
panelbrbnext image/b how many times users navigated to the next
imagebrbprev image/b how many times users navigated to the previous
imagebrbterms open/b how many times users opened the usage
termsbrblicense page/b how many times users visited that image's license
pagebrbauthor/b how many times users visited that image's author
pagebrbsource page/b how many times users visited that image's source
pagebrbabout page/b how many times users visited the about
pagebrbdiscuss page/b how many times users visited the discuss
[MediaWiki-commits] [Gerrit] Add new actions for download popup - change (analytics...config)
Gilles has submitted this change and it was merged.
Change subject: Add new actions for download popup
..
Add new actions for download popup
Change-Id: Ie64c4eab4c0116c8d17c40794175180659b584bf
Refs: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/934
---
M datasources/mmv_actions_template.json
M graphs/mmv_actions_template.json
2 files changed, 33 insertions(+), 1 deletion(-)
Approvals:
Gilles: Verified; Looks good to me, approved
diff --git a/datasources/mmv_actions_template.json
b/datasources/mmv_actions_template.json
index d67daf6..a07a9f6 100644
--- a/datasources/mmv_actions_template.json
+++ b/datasources/mmv_actions_template.json
@@ -271,6 +271,16 @@
id: use-this-file-close,
label: use this file closed,
type: Number
+},
+{
+id: download-open,
+label: download opened,
+type: Number
+},
+{
+id: download-close,
+label: download closed,
+type: Number
}
]
}
\ No newline at end of file
diff --git a/graphs/mmv_actions_template.json b/graphs/mmv_actions_template.json
index b6ed757..89beda8 100644
--- a/graphs/mmv_actions_template.json
+++ b/graphs/mmv_actions_template.json
@@ -1,7 +1,7 @@
{
graph_version: 0.6.0,
id: mmv_actions_%wiki%,
-desc: bthumbnail click/b how many times users clicked on a
thumbnail which opened media viewerbrbenlarge click/b how many times
users clicked on the \enlarge\ icon next to the thumbnail which opened media
viewerbrbfullscreen/b how many times users went into fullscreen
modebrbdefullscreen/b how many times users exited fullscreen
modebrbclose/b how many times users closed media viewerbrbview
original file/b how many times users clicked on the icon to view the original
filebrbfile description page/b how many times users visited that image's
File: pagebrbfile description page (above fold)/b how many times users
visited that image's File: page using the above-the-fold iconbrbuse this
file open/b how many times users opened \use this file\brbimage
view/b how many times users viewed an imagebrbmetadata open/b how many
times users opened the metadata panelbrbmetadata close/b how many times
users closed the metadata panelbrbnext image/b how many times users
navigated to the next imagebrbprev image/b how many times users navigated
to the previous imagebrbterms open/b how many times users opened the
usage termsbrblicense page/b how many times users visited that image's
license pagebrbauthor/b how many times users visited that image's author
pagebrbsource page/b how many times users visited that image's source
pagebrbabout page/b how many times users visited the about
pagebrbdiscuss page/b how many times users visited the discuss
pagebrbhelp page/b how many times users visited the help
pagebrblocation page/b how many times users visited that image's location
pagebrbuploader page/b how many times users visited that image's uploader
pagebrbhash load/b how many times users opened Media Viewer through a
hash linkbrbhistory navigation/b how many times users navigated within
Media Viewer using their browser's historybr,
+desc: bthumbnail click/b how many times users clicked on a
thumbnail which opened media viewerbrbenlarge click/b how many times
users clicked on the \enlarge\ icon next to the thumbnail which opened media
viewerbrbfullscreen/b how many times users went into fullscreen
modebrbdefullscreen/b how many times users exited fullscreen
modebrbclose/b how many times users closed media viewerbrbview
original file/b how many times users clicked on the icon to view the original
filebrbfile description page/b how many times users visited that image's
File: pagebrbfile description page (above fold)/b how many times users
visited that image's File: page using the above-the-fold iconbrbuse this
file open/b how many times users opened \use this file\brbdownload
open/b how many times users opened the dialog to download this
filebrbdownload close/b how many times users closed the dialog to
download this filebrbimage view/b how many times users viewed an
imagebrbmetadata open/b how many times users opened the metadata
panelbrbmetadata close/b how many times users closed the metadata
panelbrbnext image/b how many times users navigated to the next
imagebrbprev image/b how many times users navigated to the previous
imagebrbterms open/b how many times users opened the usage
termsbrblicense page/b how many times users visited that image's license
pagebrbauthor/b how many times users visited that image's author
pagebrbsource page/b how many times users visited that image's source
pagebrbabout page/b how many times users visited the about
pagebrbdiscuss page/b how many times users visited the discuss
pagebrbhelp page/b how many times users visited the help
pagebrblocation page/b
[MediaWiki-commits] [Gerrit] remove old pmtpa es nodes - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164547
Change subject: remove old pmtpa es nodes
..
remove old pmtpa es nodes
Change-Id: I93b0ba64b97494e21b7bcdad2613a5503f8910ce
---
M manifests/site.pp
1 file changed, 0 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/164547/1
diff --git a/manifests/site.pp b/manifests/site.pp
index f309550..1abea91 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1157,33 +1157,6 @@
}
}
-node /es4\.pmtpa\.wmnet/ {
-include admin
-$cluster = 'mysql'
-include role::coredb::es1
-}
-
-# es2-3
-node /es7\.pmtpa\.wmnet/ {
-include admin
-$cluster = 'mysql'
-class { 'role::coredb::es2':
-mariadb = true,
-}
-}
-
-node /es8\.pmtpa\.wmnet/ {
-include admin
-$cluster = 'mysql'
-include role::coredb::es3
-}
-
-## imminent decomission/reclaim from pmtpa pending 12th floor reorg
-node /^es([569]|10)\.pmtpa\.wmnet/{
-include admin
-include standard
-}
-
node /es100[67]\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/164547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93b0ba64b97494e21b7bcdad2613a5503f8910ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove old pmtpa es nodes - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: remove old pmtpa es nodes
..
remove old pmtpa es nodes
Change-Id: I93b0ba64b97494e21b7bcdad2613a5503f8910ce
---
M manifests/site.pp
1 file changed, 0 insertions(+), 27 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index f309550..1abea91 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1157,33 +1157,6 @@
}
}
-node /es4\.pmtpa\.wmnet/ {
-include admin
-$cluster = 'mysql'
-include role::coredb::es1
-}
-
-# es2-3
-node /es7\.pmtpa\.wmnet/ {
-include admin
-$cluster = 'mysql'
-class { 'role::coredb::es2':
-mariadb = true,
-}
-}
-
-node /es8\.pmtpa\.wmnet/ {
-include admin
-$cluster = 'mysql'
-include role::coredb::es3
-}
-
-## imminent decomission/reclaim from pmtpa pending 12th floor reorg
-node /^es([569]|10)\.pmtpa\.wmnet/{
-include admin
-include standard
-}
-
node /es100[67]\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/164547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93b0ba64b97494e21b7bcdad2613a5503f8910ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] network.pp - remove fenari - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: network.pp - remove fenari
..
network.pp - remove fenari
Change-Id: I9a185aaa670507fee2e3e10fa6fce286e83a36d6
RT: 6145
---
M manifests/network.pp
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/network.pp b/manifests/network.pp
index 867bfb2..53c6ab2 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -25,13 +25,10 @@
$special_hosts = {
'production' = {
'bastion_hosts' = [
-'208.80.152.165', # fenari.wikimedia.org
'208.80.154.149', # bast1001.wikimedia.org
'91.198.174.113', # hooft.esams.wikimedia.org
'198.35.26.5', # bast4001.wikimedia.org
'208.80.154.151', # iron.wikimedia.org
-'2620:0:860:2:208:80:152:165', # fenari.wikimedia.org
-'2620:0:860:2:21e:c9ff:feea:ab95', # fenari.wikimedia.org
SLAAC
'2620:0:861:2:208:80:154:149', # bast1001.wikimedia.org
'2620:0:861:2:7a2b:cbff:fe09:11ba', #
bast1001.wikimedia.org SLAAC
'2620:0:862:1:91:198:174:113', # hooft.esams.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/164154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a185aaa670507fee2e3e10fa6fce286e83a36d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert ve.ce.Surface: Magic workaround for broken Firefox c... - change (VisualEditor/VisualEditor)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164548
Change subject: Revert ve.ce.Surface: Magic workaround for broken Firefox
cursoring
..
Revert ve.ce.Surface: Magic workaround for broken Firefox cursoring
Causes ugly-looking NS_ERROR_FAILURE exceptions in some cases.
This reverts commit 0d7eaf51767c4061b478610a035a3bc387c0973a.
Bug: 71580
Change-Id: Ief5c5369311e20a0fa8d6af5780c68bb6f5b9e2e
---
M src/ce/ve.ce.Surface.js
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/48/164548/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index a37cbb4..de4e4d8 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2328,8 +2328,6 @@
} else {
nativeRange.setStart( rangeSelection.start.node,
rangeSelection.start.offset );
this.nativeSelection.addRange( nativeRange );
- // Magic workaround for broken Firefox cursoring (bug 70724 /
Mozilla bug 1075901)
- this.nativeSelection.collapseToStart();
}
// Setting a range doesn't give focus in all browsers so make sure this
happens
// Also set focus after range to prevent scrolling to top
--
To view, visit https://gerrit.wikimedia.org/r/164548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief5c5369311e20a0fa8d6af5780c68bb6f5b9e2e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only load ext.ajaxpoll on pages that need it - change (mediawiki...AJAXPoll)
jenkins-bot has submitted this change and it was merged.
Change subject: Only load ext.ajaxpoll on pages that need it
..
Only load ext.ajaxpoll on pages that need it
Change-Id: I0e989b3c059b7aaf049476c8bb847bebf9ef4089
---
M AJAXPoll_body.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Jack Phoenix: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php
index 45cb1df..0220ecf 100644
--- a/AJAXPoll_body.php
+++ b/AJAXPoll_body.php
@@ -22,9 +22,7 @@
* @return Boolean: true
*/
static function onParserInit( $parser ) {
- global $wgOut;
$parser-setHook( 'poll', array( __CLASS__, 'AJAXPollRender' )
);
- $wgOut-addModules( 'ext.ajaxpoll' );
return true;
}
@@ -34,6 +32,7 @@
$parser-disableCache();
$parser-addTrackingCategory( 'ajaxpoll-tracking-category' );
+ $parser-getOutput()-addModules( 'ext.ajaxpoll' );
if ( $wgUser-getName() == '' ) {
$userName = $wgRequest-getIP();
--
To view, visit https://gerrit.wikimedia.org/r/164526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e989b3c059b7aaf049476c8bb847bebf9ef4089
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix auth url usage - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164549
Change subject: swift: fix auth url usage
..
swift: fix auth url usage
Change-Id: I7ce81e013fe2ee1b80ed7d6f8784c59caf9ae95a
---
M hieradata/codfw.yaml
M modules/swift_new/manifests/stats/stats_account.pp
M modules/swift_new/templates/dispersion.conf.erb
M modules/swift_new/templates/proxy-server.conf.erb
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/164549/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index ab23e31..1e7a7a8 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -3,22 +3,22 @@
super_admin:
access: '.admin .reseller_admin'
account_name: 'AUTH_admin'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'admin:admin'
mw_media:
access: '.admin'
account_name: 'AUTH_mw'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'mw:media'
dispersion:
access: '.admin'
account_name: 'AUTH_dispersion'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'swift:dispersion'
search_backup:
access: '.admin'
account_name: 'AUTH_search'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'search:backup'
# keys are to be defined in private repo, e.g.:
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index bcc99bf..5a04c3f 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -17,7 +17,7 @@
owner = 'root',
group = 'root',
mode= '0440',
-content = export ST_AUTH=${auth_url}\nexport ST_USER=${user}\nexport
ST_KEY=${key}\n
+content = export ST_AUTH=${auth_url}/auth/v1.0\nexport
ST_USER=${user}\nexport ST_KEY=${key}\n
}
cron { swift-account-stats_${user}:
diff --git a/modules/swift_new/templates/dispersion.conf.erb
b/modules/swift_new/templates/dispersion.conf.erb
index 0d937e9..4cc0160 100644
--- a/modules/swift_new/templates/dispersion.conf.erb
+++ b/modules/swift_new/templates/dispersion.conf.erb
@@ -1,7 +1,7 @@
# This file is managed by Puppet!
[dispersion]
-auth_url = %= @accounts[@dispersion_account]['auth'] %
+auth_url = %= @proxy_address %/auth/v1.0
auth_user = %= @accounts[@dispersion_account]['user'] %
auth_key = %= @credentials[@dispersion_account] %
-swift_dir = '/etc/swift'
+swift_dir = /etc/swift
diff --git a/modules/swift_new/templates/proxy-server.conf.erb
b/modules/swift_new/templates/proxy-server.conf.erb
index 441f2c9..7127271 100644
--- a/modules/swift_new/templates/proxy-server.conf.erb
+++ b/modules/swift_new/templates/proxy-server.conf.erb
@@ -29,7 +29,7 @@
token_life = 604800
% @accounts.each_pair do |name, info| -%
% key = @credentials[name] -%
-%= user_#{info['user'].gsub(':', '_')} = #{key} #{info['access']}
#{info['auth']} %
+%= user_#{info['user'].gsub(':', '_')} = #{key} #{info['access']}
#{info['auth']}/v1/#{info['account_name']} %
% end -%
[filter:healthcheck]
--
To view, visit https://gerrit.wikimedia.org/r/164549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ce81e013fe2ee1b80ed7d6f8784c59caf9ae95a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix auth url usage - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: fix auth url usage
..
swift: fix auth url usage
Change-Id: I7ce81e013fe2ee1b80ed7d6f8784c59caf9ae95a
---
M hieradata/codfw.yaml
M modules/swift_new/manifests/stats/stats_account.pp
M modules/swift_new/templates/dispersion.conf.erb
M modules/swift_new/templates/proxy-server.conf.erb
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index ab23e31..1e7a7a8 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -3,22 +3,22 @@
super_admin:
access: '.admin .reseller_admin'
account_name: 'AUTH_admin'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'admin:admin'
mw_media:
access: '.admin'
account_name: 'AUTH_mw'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'mw:media'
dispersion:
access: '.admin'
account_name: 'AUTH_dispersion'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'swift:dispersion'
search_backup:
access: '.admin'
account_name: 'AUTH_search'
-auth: 'http://ms-fe.svc.codfw.wmnet/auth/v1.0'
+auth: 'http://ms-fe.svc.codfw.wmnet'
user: 'search:backup'
# keys are to be defined in private repo, e.g.:
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index bcc99bf..5a04c3f 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -17,7 +17,7 @@
owner = 'root',
group = 'root',
mode= '0440',
-content = export ST_AUTH=${auth_url}\nexport ST_USER=${user}\nexport
ST_KEY=${key}\n
+content = export ST_AUTH=${auth_url}/auth/v1.0\nexport
ST_USER=${user}\nexport ST_KEY=${key}\n
}
cron { swift-account-stats_${user}:
diff --git a/modules/swift_new/templates/dispersion.conf.erb
b/modules/swift_new/templates/dispersion.conf.erb
index 0d937e9..4cc0160 100644
--- a/modules/swift_new/templates/dispersion.conf.erb
+++ b/modules/swift_new/templates/dispersion.conf.erb
@@ -1,7 +1,7 @@
# This file is managed by Puppet!
[dispersion]
-auth_url = %= @accounts[@dispersion_account]['auth'] %
+auth_url = %= @proxy_address %/auth/v1.0
auth_user = %= @accounts[@dispersion_account]['user'] %
auth_key = %= @credentials[@dispersion_account] %
-swift_dir = '/etc/swift'
+swift_dir = /etc/swift
diff --git a/modules/swift_new/templates/proxy-server.conf.erb
b/modules/swift_new/templates/proxy-server.conf.erb
index 441f2c9..7127271 100644
--- a/modules/swift_new/templates/proxy-server.conf.erb
+++ b/modules/swift_new/templates/proxy-server.conf.erb
@@ -29,7 +29,7 @@
token_life = 604800
% @accounts.each_pair do |name, info| -%
% key = @credentials[name] -%
-%= user_#{info['user'].gsub(':', '_')} = #{key} #{info['access']}
#{info['auth']} %
+%= user_#{info['user'].gsub(':', '_')} = #{key} #{info['access']}
#{info['auth']}/v1/#{info['account_name']} %
% end -%
[filter:healthcheck]
--
To view, visit https://gerrit.wikimedia.org/r/164549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ce81e013fe2ee1b80ed7d6f8784c59caf9ae95a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Fabian Kaelin to researchers group - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/164550 Change subject: Add Fabian Kaelin to researchers group .. Add Fabian Kaelin to researchers group RT 8473 Change-Id: I3946b5f4fe027a092238b03e43c9b382f3300d50 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/50/164550/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index c16f2f6..475fe70 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -85,7 +85,7 @@ researchers: gid: 714 description: users with access to research db -members: [dartar, jzerebecki, dduvall, nettrom] +members: [dartar, jzerebecki, dduvall, nettrom, declerambaul] ldap-admins: gid: 715 description: ldap admins -- To view, visit https://gerrit.wikimedia.org/r/164550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3946b5f4fe027a092238b03e43c9b382f3300d50 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Fabian Kaelin to researchers group - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Add Fabian Kaelin to researchers group .. Add Fabian Kaelin to researchers group RT 8473 Change-Id: I3946b5f4fe027a092238b03e43c9b382f3300d50 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index c16f2f6..475fe70 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -85,7 +85,7 @@ researchers: gid: 714 description: users with access to research db -members: [dartar, jzerebecki, dduvall, nettrom] +members: [dartar, jzerebecki, dduvall, nettrom, declerambaul] ldap-admins: gid: 715 description: ldap admins -- To view, visit https://gerrit.wikimedia.org/r/164550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3946b5f4fe027a092238b03e43c9b382f3300d50 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for ngram accelerated regexes - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164551
Change subject: Add support for ngram accelerated regexes
..
Add support for ngram accelerated regexes
Its disabled by default because it requires the wikimedia/extra elasticsearch
plugin and casual installers won't have it. It must be enabled in two stages:
1. build
2. use
In the build stage when the index is rebuilt the source text is analyzed
with an additional analyzer that is required for regex acceleration. It
does not require the wikimedia/extra plugin to be installed on Elasticsearch.
In the use stage the newly analyzed field is used to accelerate regular
expressions. If the field isn't yet built all regular expressions will
return no return no results. If the wikimedia/extra plugin isn't installed
in Elasticsearch this will cause all regular expression searches to fail.
Change-Id: If9fcb6a03c23e8abaf59b5ddfadab051263dac33
DEPLOYMENT: Lots of notes. Read commit message.
---
M CirrusSearch.php
M includes/ElasticsearchIntermediary.php
A includes/Extra/Filter/SourceRegex.php
M includes/Maintenance/AnalysisConfigBuilder.php
M includes/Maintenance/MappingConfigBuilder.php
M includes/Searcher.php
M tests/browser/features/insource.feature
M tests/jenkins/Jenkins.php
8 files changed, 225 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/51/164551/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index f30e39b..8973c91 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -81,6 +81,21 @@
// and off - it has to stay on.
$wgCirrusSearchOptimizeIndexForExperimentalHighlighter = false;
+// Should CirrusSearch try to use the wikimedia/extra plugin? An empty array
+// means don't use it at all.
+$wgCirrusSearchWikimediaExtraPlugin = array();
+// Here is an example to enable faster regex matching:
+// $wgCirrusSearchWikimediaExtraPlugin = array(
+// 'regex' = array( 'build', 'use', 'max_inspect' = 1 ),
+// );
+// The 'build' value instructs Cirrus to build the index required to speed up
+// regex queries. The 'use' value instructs Cirrus to use it to power regular
+// expression queries. If 'use' is added before the index is rebuilt with
+// 'build' in the array then regex will fail to find anything. The value of
+// the 'max_inspect' key is the maximum number of pages to recheck the regex
+// against. It defaults to 1 which seems like a reasonable compromize
+// to keep regexes fast while still producing good results.
+
// By default, Cirrus will organize pages into one of two indexes (general or
// content) based on whether a page is in a content namespace. This should
// suffice for most wikis. This setting allows individual namespaces to be
@@ -502,6 +517,7 @@
$includes = __DIR__ . /includes/;
$apiDir = $includes . 'Api/';
$buildDocument = $includes . 'BuildDocument/';
+$extraFilterDir = $includes . 'Extra/Filter/';
$jobsDir = $includes . 'Job/';
$maintenanceDir = $includes . 'Maintenance/';
$sanity = $includes . 'Sanity/';
@@ -523,6 +539,7 @@
$wgAutoloadClasses['CirrusSearch\Connection'] = $includes . 'Connection.php';
$wgAutoloadClasses['CirrusSearch\Dump'] = $includes . 'Dump.php';
$wgAutoloadClasses['CirrusSearch\ElasticsearchIntermediary'] = $includes .
'ElasticsearchIntermediary.php';
+$wgAutoloadClasses['CirrusSearch\Extra\Filter\SourceRegex'] = $extraFilterDir
. 'SourceRegex.php';
$wgAutoloadClasses['CirrusSearch\ForceSearchIndex'] = __DIR__ .
'/maintenance/forceSearchIndex.php';
$wgAutoloadClasses['CirrusSearch\Hooks'] = $includes . 'Hooks.php';
$wgAutoloadClasses['CirrusSearch\InterwikiSearcher'] = $includes .
'InterwikiSearcher.php';
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index c9f1b3d..b08b51e 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -196,6 +196,8 @@
// what else would have automatons and illegal argument
exceptions. Just looking
// for the exception won't suffice because other weird things
could cause it.
$seemsToUseRegexes = strpos( $message, 'import
org.apache.lucene.util.automaton.*' ) !== false;
+ $usesExtraRegex = strpos( $message,
'org.wikimedia.search.extra.regex.SourceRegexFilter' ) !== false;
+ $seemsToUseRegexes |= $usesExtraRegex;
$marker = 'IllegalArgumentException[';
$markerLocation = strpos( $message, $marker );
if ( $seemsToUseRegexes $markerLocation !== false ) {
@@ -207,8 +209,14 @@
$matches = array();
if ( preg_match( '/(.+) at position ([0-9]+)/',
$syntaxError, $matches ) ) {
$errorMessage = $matches[ 1 ];
- // The 3 below offsets the .*( in
[MediaWiki-commits] [Gerrit] lvs: add swift in codfw - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164552
Change subject: lvs: add swift in codfw
..
lvs: add swift in codfw
plus icinga monitoring and deprecate pmtpa
Change-Id: I4d9729d20efd97fb192783fe9f3cb245bff02cc5
---
M modules/lvs/manifests/configuration.pp
M modules/lvs/manifests/monitor.pp
2 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/164552/1
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index f37faf8..f3b8d20 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -208,6 +208,7 @@
},
'swift' = {
'eqiad' = 10.2.2.27,
+'codfw' = 10.2.1.27,
},
'dns_rec' = {
'eqiad' = { 'dns_rec' = 208.80.154.239, 'dns_rec6' =
2620:0:861:ed1a::f },
@@ -285,7 +286,6 @@
# ms emulator set in July 2013. Beta does not have Swift yet.
# instance is an unpuppetized hack with nginx proxy.
'eqiad' = '10.68.16.189', # deployment-upload.eqiad.wmflabs
-'pmtpa' = '10.4.1.103', # deployment-upload.pmtpa.wmflabs
},
'upload' = {
'pmtpa' = {
@@ -782,7 +782,7 @@
swift = {
'description' = Swift/Ceph media storage,
'class' = low-traffic,
-'sites' = [ pmtpa, eqiad ],
+'sites' = [ codfw, eqiad ],
'ip' = $service_ips['swift'][$::site],
'bgp' = yes,
'depool-threshold' = .5,
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 2471d13..6a7fc5d 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -5,7 +5,7 @@
$ip = $lvs::configuration::lvs_service_ips['production']
-# INTERNAL
+# INTERNAL EQIAD
lvs::monitor_service_http { appservers.svc.eqiad.wmnet: ip_address =
10.2.2.1, check_command = check_http_lvs!en.wikipedia.org!/wiki/Main_Page }
lvs::monitor_service_http { hhvm-appservers.svc.eqiad.wmnet: ip_address
= 10.2.2.2, check_command =
check_http_lvs!en.wikipedia.org!/wiki/Main_Page }
@@ -24,6 +24,11 @@
lvs::monitor_service_custom { search-pool5.svc.eqiad.wmnet: ip_address
= 10.2.2.16, port = 8123, description = LVS Lucene, check_command =
check_lucene }
lvs::monitor_service_custom { search-prefix.svc.eqiad.wmnet: ip_address
= 10.2.2.15, port = 8123, description = LVS Lucene, check_command =
check_lucene }
+# INTERNAL CODFW
+
+lvs::monitor_service_http { ms-fe.svc.codfw.wmnet: ip_address =
10.2.1.27, check_command =
check_http_lvs!ms-fe.svc.codfw.wmnet!/monitoring/backend }
+
+
# EQIAD
lvs::monitor_service_http_https {
'text-lb.eqiad.wikimedia.org':
--
To view, visit https://gerrit.wikimedia.org/r/164552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d9729d20efd97fb192783fe9f3cb245bff02cc5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Beta] Have Cirrus build index for regexes - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/164553 Change subject: [Beta] Have Cirrus build index for regexes .. [Beta] Have Cirrus build index for regexes This causes Cirrus to build a trigram index on the page source to accelerate the insource:// operator. Its a noop before If9fcb6a03c23e8abaf59b5ddfadab051263dac33 is merged. Change-Id: Ia9ee3ddc7d591a6a85b644627c912b7ffdcc5b6e --- M wmf-config/CirrusSearch-labs.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/53/164553/1 diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php index acd86df..f3e4ff1 100644 --- a/wmf-config/CirrusSearch-labs.php +++ b/wmf-config/CirrusSearch-labs.php @@ -34,3 +34,9 @@ $wgSearchTypeAlternatives = array(); $wgCirrusSearchAllFields = array( 'build' = true, 'use' = true ); +$wgCirrusSearchWikimediaExtraPlugin = array( + 'regex' = array( + 'build', + // 'use', Comes once we release and deploy the wikimedia/extra plugin. + ), +); -- To view, visit https://gerrit.wikimedia.org/r/164553 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9ee3ddc7d591a6a85b644627c912b7ffdcc5b6e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for ngram accelerated regexes - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Add support for ngram accelerated regexes
..
Add support for ngram accelerated regexes
Its disabled by default because it requires the wikimedia/extra elasticsearch
plugin and casual installers won't have it. It must be enabled in two stages:
1. build
2. use
In the build stage when the index is rebuilt the source text is analyzed
with an additional analyzer that is required for regex acceleration. It
does not require the wikimedia/extra plugin to be installed on Elasticsearch.
In the use stage the newly analyzed field is used to accelerate regular
expressions. If the field isn't yet built all regular expressions will
return no return no results. If the wikimedia/extra plugin isn't installed
in Elasticsearch this will cause all regular expression searches to fail.
Change-Id: If9fcb6a03c23e8abaf59b5ddfadab051263dac33
DEPLOYMENT: Lots of notes. Read commit message.
---
M CirrusSearch.php
M includes/ElasticsearchIntermediary.php
A includes/Extra/Filter/SourceRegex.php
M includes/Maintenance/AnalysisConfigBuilder.php
M includes/Maintenance/MappingConfigBuilder.php
M includes/Searcher.php
M tests/browser/features/insource.feature
M tests/jenkins/Jenkins.php
8 files changed, 225 insertions(+), 27 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index f30e39b..8973c91 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -81,6 +81,21 @@
// and off - it has to stay on.
$wgCirrusSearchOptimizeIndexForExperimentalHighlighter = false;
+// Should CirrusSearch try to use the wikimedia/extra plugin? An empty array
+// means don't use it at all.
+$wgCirrusSearchWikimediaExtraPlugin = array();
+// Here is an example to enable faster regex matching:
+// $wgCirrusSearchWikimediaExtraPlugin = array(
+// 'regex' = array( 'build', 'use', 'max_inspect' = 1 ),
+// );
+// The 'build' value instructs Cirrus to build the index required to speed up
+// regex queries. The 'use' value instructs Cirrus to use it to power regular
+// expression queries. If 'use' is added before the index is rebuilt with
+// 'build' in the array then regex will fail to find anything. The value of
+// the 'max_inspect' key is the maximum number of pages to recheck the regex
+// against. It defaults to 1 which seems like a reasonable compromize
+// to keep regexes fast while still producing good results.
+
// By default, Cirrus will organize pages into one of two indexes (general or
// content) based on whether a page is in a content namespace. This should
// suffice for most wikis. This setting allows individual namespaces to be
@@ -502,6 +517,7 @@
$includes = __DIR__ . /includes/;
$apiDir = $includes . 'Api/';
$buildDocument = $includes . 'BuildDocument/';
+$extraFilterDir = $includes . 'Extra/Filter/';
$jobsDir = $includes . 'Job/';
$maintenanceDir = $includes . 'Maintenance/';
$sanity = $includes . 'Sanity/';
@@ -523,6 +539,7 @@
$wgAutoloadClasses['CirrusSearch\Connection'] = $includes . 'Connection.php';
$wgAutoloadClasses['CirrusSearch\Dump'] = $includes . 'Dump.php';
$wgAutoloadClasses['CirrusSearch\ElasticsearchIntermediary'] = $includes .
'ElasticsearchIntermediary.php';
+$wgAutoloadClasses['CirrusSearch\Extra\Filter\SourceRegex'] = $extraFilterDir
. 'SourceRegex.php';
$wgAutoloadClasses['CirrusSearch\ForceSearchIndex'] = __DIR__ .
'/maintenance/forceSearchIndex.php';
$wgAutoloadClasses['CirrusSearch\Hooks'] = $includes . 'Hooks.php';
$wgAutoloadClasses['CirrusSearch\InterwikiSearcher'] = $includes .
'InterwikiSearcher.php';
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index c9f1b3d..b08b51e 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -196,6 +196,8 @@
// what else would have automatons and illegal argument
exceptions. Just looking
// for the exception won't suffice because other weird things
could cause it.
$seemsToUseRegexes = strpos( $message, 'import
org.apache.lucene.util.automaton.*' ) !== false;
+ $usesExtraRegex = strpos( $message,
'org.wikimedia.search.extra.regex.SourceRegexFilter' ) !== false;
+ $seemsToUseRegexes |= $usesExtraRegex;
$marker = 'IllegalArgumentException[';
$markerLocation = strpos( $message, $marker );
if ( $seemsToUseRegexes $markerLocation !== false ) {
@@ -207,8 +209,14 @@
$matches = array();
if ( preg_match( '/(.+) at position ([0-9]+)/',
$syntaxError, $matches ) ) {
$errorMessage = $matches[ 1 ];
- // The 3 below offsets the .*( in front of the
user pattern to make it unanchored.
-
[MediaWiki-commits] [Gerrit] Allow for dynamically-loaded PHP libraries - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow for dynamically-loaded PHP libraries
..
Allow for dynamically-loaded PHP libraries
Scribunto currently supports libraries with PHP callbacks that are
loaded on startup, and pure-Lua libraries that may be loaded from the
module with require().
This change allows for libraries with PHP callbacks to also be loaded
with require().
Change-Id: Ibdc1f4ef51b1c8644c3d4c98d57755b5c06447a5
---
M common/Base.php
M engines/LuaCommon/HtmlLibrary.php
M engines/LuaCommon/LanguageLibrary.php
M engines/LuaCommon/LibraryBase.php
M engines/LuaCommon/LuaCommon.php
M engines/LuaCommon/MessageLibrary.php
M engines/LuaCommon/SiteLibrary.php
M engines/LuaCommon/TextLibrary.php
M engines/LuaCommon/TitleLibrary.php
M engines/LuaCommon/UriLibrary.php
M engines/LuaCommon/UstringLibrary.php
M engines/LuaCommon/lualib/mw.lua
M tests/engines/LuaCommon/CommonTest.php
A tests/engines/LuaCommon/CommonTests-lib.lua
14 files changed, 255 insertions(+), 19 deletions(-)
Approvals:
Jackmcbarn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/common/Base.php b/common/Base.php
index 3de0ce8..c5ad0b6 100644
--- a/common/Base.php
+++ b/common/Base.php
@@ -201,6 +201,13 @@
/**
* Load a list of all libraries supported by this engine
*
+* The return value is an array with keys being the library name seen by
+* the module and values being either a PHP class name or an array with
the
+* following elements:
+* - class: (string) Class to load (required)
+* - deferLoad: (bool) Library should not be loaded at startup; modules
+* needing the library must request it (e.g. via 'require' in Lua)
+*
* @param $engine String script engine we're using (eg: lua)
* @param $coreLibraries Array of core libraries we support
* @return array
diff --git a/engines/LuaCommon/HtmlLibrary.php
b/engines/LuaCommon/HtmlLibrary.php
index 50fe15e..5b413d8 100644
--- a/engines/LuaCommon/HtmlLibrary.php
+++ b/engines/LuaCommon/HtmlLibrary.php
@@ -2,6 +2,6 @@
class Scribunto_LuaHtmlLibrary extends Scribunto_LuaLibraryBase {
function register() {
- $this-getEngine()-registerInterface( 'mw.html.lua', array() );
+ return $this-getEngine()-registerInterface( 'mw.html.lua',
array() );
}
}
diff --git a/engines/LuaCommon/LanguageLibrary.php
b/engines/LuaCommon/LanguageLibrary.php
index 5a4ad5b..4926f8e 100644
--- a/engines/LuaCommon/LanguageLibrary.php
+++ b/engines/LuaCommon/LanguageLibrary.php
@@ -48,7 +48,7 @@
return $ths-languageMethod( $name, $args );
};
}
- $this-getEngine()-registerInterface( 'mw.language.lua', $lib
);
+ return $this-getEngine()-registerInterface(
'mw.language.lua', $lib );
}
function getContLangCode() {
diff --git a/engines/LuaCommon/LibraryBase.php
b/engines/LuaCommon/LibraryBase.php
index ae8ed27..339b958 100644
--- a/engines/LuaCommon/LibraryBase.php
+++ b/engines/LuaCommon/LibraryBase.php
@@ -40,9 +40,11 @@
/**
* Called to register the library.
*
-* This should do any necessary setup and then call
$this-getEngine()-registerInterface()
+* This should do any necessary setup and then call
$this-getEngine()-registerInterface().
+* The value returned by that call should be returned from this
function,
+* and must be for 'deferLoad' libraries to work right.
*
-* @return void
+* @return Lua package
*/
abstract function register();
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index cd55585..a9d6aee 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -3,7 +3,7 @@
abstract class Scribunto_LuaEngine extends ScribuntoEngineBase {
/**
* Libraries to load. See also the 'ScribuntoExternalLibraries' hook.
-* @var array Maps module names to PHP classes
+* @var array Maps module names to PHP classes or definition arrays
*/
protected static $libraryClasses = array(
'mw.site' = 'Scribunto_LuaSiteLibrary',
@@ -37,6 +37,7 @@
protected $mw;
protected $currentFrames = array();
protected $expandCache = array();
+ protected $availableLibraries = array();
protected $loadedLibraries = array();
const MAX_EXPAND_CACHE_SIZE = 100;
@@ -88,6 +89,7 @@
$funcs = array(
'loadPackage',
+ 'loadPHPLibrary',
'frameExists',
'newChildFrame',
'getExpandedArgument',
@@ -110,10 +112,9 @@
[MediaWiki-commits] [Gerrit] replace sanger, sfo-aaa1 with ldap1/ldap2.corp - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: replace sanger,sfo-aaa1 with ldap1/ldap2.corp
..
replace sanger,sfo-aaa1 with ldap1/ldap2.corp
use new server names for corp LDAP
sanger should be replaced
RT: 6163
Change-Id: Id33b4c5d1a9a9003542882ac02753d48cb887eb1
---
M modules/ldap/manifests/role/config.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ldap/manifests/role/config.pp
b/modules/ldap/manifests/role/config.pp
index 56cc0a3..d48ff00 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -70,7 +70,7 @@
include passwords::ldap::corp
$basedn = 'dc=corp,dc=wikimedia,dc=org'
-$servernames = [ 'sanger.wikimedia.org', 'sfo-aaa1.corp.wikimedia.org' ]
+$servernames = [ 'ldap1.corp.wikimedia.org', 'ldap2.corp.wikimedia.org' ]
$sudobasedn = ou=sudoers,${basedn}
$ldapconfig = {
'servernames' = $servernames,
--
To view, visit https://gerrit.wikimedia.org/r/164139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id33b4c5d1a9a9003542882ac02753d48cb887eb1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Jkrauska jkrau...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix credentials variable - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164554
Change subject: swift: fix credentials variable
..
swift: fix credentials variable
Change-Id: Ia8d180dab92b2c5a5a17b19e6e55a9d86443c619
---
M modules/swift_new/manifests/stats/stats_account.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/164554/1
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index 5a04c3f..b79786f 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -7,7 +7,7 @@
$account_info = $accounts[$name]
$auth_url = $account_info[auth]
$user = $account_info[user]
-$key = $credentials[$user]
+$key = $credentials[user]
$account_name = $account_info[account_name]
$account_file = /etc/swift/account_${account_name}.env
--
To view, visit https://gerrit.wikimedia.org/r/164554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8d180dab92b2c5a5a17b19e6e55a9d86443c619
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lvs: add swift in codfw - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: lvs: add swift in codfw
..
lvs: add swift in codfw
plus icinga monitoring and deprecate pmtpa
Change-Id: I4d9729d20efd97fb192783fe9f3cb245bff02cc5
---
M modules/lvs/manifests/configuration.pp
M modules/lvs/manifests/monitor.pp
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index f37faf8..f3b8d20 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -208,6 +208,7 @@
},
'swift' = {
'eqiad' = 10.2.2.27,
+'codfw' = 10.2.1.27,
},
'dns_rec' = {
'eqiad' = { 'dns_rec' = 208.80.154.239, 'dns_rec6' =
2620:0:861:ed1a::f },
@@ -285,7 +286,6 @@
# ms emulator set in July 2013. Beta does not have Swift yet.
# instance is an unpuppetized hack with nginx proxy.
'eqiad' = '10.68.16.189', # deployment-upload.eqiad.wmflabs
-'pmtpa' = '10.4.1.103', # deployment-upload.pmtpa.wmflabs
},
'upload' = {
'pmtpa' = {
@@ -782,7 +782,7 @@
swift = {
'description' = Swift/Ceph media storage,
'class' = low-traffic,
-'sites' = [ pmtpa, eqiad ],
+'sites' = [ codfw, eqiad ],
'ip' = $service_ips['swift'][$::site],
'bgp' = yes,
'depool-threshold' = .5,
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 2471d13..6a7fc5d 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -5,7 +5,7 @@
$ip = $lvs::configuration::lvs_service_ips['production']
-# INTERNAL
+# INTERNAL EQIAD
lvs::monitor_service_http { appservers.svc.eqiad.wmnet: ip_address =
10.2.2.1, check_command = check_http_lvs!en.wikipedia.org!/wiki/Main_Page }
lvs::monitor_service_http { hhvm-appservers.svc.eqiad.wmnet: ip_address
= 10.2.2.2, check_command =
check_http_lvs!en.wikipedia.org!/wiki/Main_Page }
@@ -24,6 +24,11 @@
lvs::monitor_service_custom { search-pool5.svc.eqiad.wmnet: ip_address
= 10.2.2.16, port = 8123, description = LVS Lucene, check_command =
check_lucene }
lvs::monitor_service_custom { search-prefix.svc.eqiad.wmnet: ip_address
= 10.2.2.15, port = 8123, description = LVS Lucene, check_command =
check_lucene }
+# INTERNAL CODFW
+
+lvs::monitor_service_http { ms-fe.svc.codfw.wmnet: ip_address =
10.2.1.27, check_command =
check_http_lvs!ms-fe.svc.codfw.wmnet!/monitoring/backend }
+
+
# EQIAD
lvs::monitor_service_http_https {
'text-lb.eqiad.wikimedia.org':
--
To view, visit https://gerrit.wikimedia.org/r/164552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d9729d20efd97fb192783fe9f3cb245bff02cc5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix credentials variable - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: fix credentials variable
..
swift: fix credentials variable
Change-Id: Ia8d180dab92b2c5a5a17b19e6e55a9d86443c619
---
M modules/swift_new/manifests/stats/stats_account.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index 5a04c3f..b79786f 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -7,7 +7,7 @@
$account_info = $accounts[$name]
$auth_url = $account_info[auth]
$user = $account_info[user]
-$key = $credentials[$user]
+$key = $credentials[user]
$account_name = $account_info[account_name]
$account_file = /etc/swift/account_${account_name}.env
--
To view, visit https://gerrit.wikimedia.org/r/164554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d180dab92b2c5a5a17b19e6e55a9d86443c619
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mistake with accelerated regex plugin config - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164555
Change subject: Fix mistake with accelerated regex plugin config
..
Fix mistake with accelerated regex plugin config
Change-Id: I2bedee88fc1c6337cb1d1cbf6240d9de3e3b5059
---
M includes/Searcher.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/55/164555/1
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 2c773b5..cbe6718 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -442,7 +442,7 @@
);
}
if ( isset(
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ] )
- in_array( 'build',
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ] ) ) {
+ in_array( 'use',
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ] ) ) {
$filter = new SourceRegex( $matches[
'pattern' ], 'source_text', 'source_text.trigram' );
if ( isset(
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ][ 'max_inspect'] ) ) {
$filter-setMaxInspect(
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ][ 'max_inspect'] );
--
To view, visit https://gerrit.wikimedia.org/r/164555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bedee88fc1c6337cb1d1cbf6240d9de3e3b5059
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add url parameter to enable accelerated regexes - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164556
Change subject: Add url parameter to enable accelerated regexes
..
Add url parameter to enable accelerated regexes
This is going to be nice for testing. The paremeter is cirrusAccelerateRegex.
Change-Id: Iff42e32bfd5d6805173c1793eaee2b5712efec58
---
M includes/Hooks.php
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/56/164556/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index c65413b..75535f4 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -112,6 +112,7 @@
self::overrideYesNo( $wgCirrusSearchBoostLinks,
$request, 'cirrusBoostLinks' );
self::overrideYesNo( $wgCirrusSearchAllFields[ 'use' ],
$request, 'cirrusUseAllFields' );
self::overrideYesNo(
$wgCirrusSearchAllFieldsForRescore, $request, 'cirrusUseAllFieldsForRescore' );
+ self::overrideUseExtraPluginForRegex( $request );
}
}
@@ -139,6 +140,24 @@
}
}
+ private static function overrideUseExtraPluginForRegex( $request ) {
+ global $wgCirrusSearchWikimediaExtraPlugin;
+
+ $val = $request-getVal( 'cirrusAccelerateRegex' );
+ if ( $val !== null ) {
+ if ( $val === 'yes' ) {
+ $wgCirrusSearchWikimediaExtraPlugin[ 'regex'
][] = 'use';
+ } elseif( $val = 'no' ) {
+ if ( isset(
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ] ) ) {
+ $useLocation = array_search( 'use',
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ] );
+ if ( $useLocation !== false ) {
+ unset(
$wgCirrusSearchWikimediaExtraPlugin[ 'regex' ][ $useLocation ] );
+ }
+ }
+ }
+ }
+ }
+
/**
* Hook to call before an article is deleted
* @param WikiPage $page The page we're deleting
--
To view, visit https://gerrit.wikimedia.org/r/164556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff42e32bfd5d6805173c1793eaee2b5712efec58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use codfw LVS-based recdns - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Use codfw LVS-based recdns
..
Use codfw LVS-based recdns
(also, replace nameservers_prefix with nameservers_override,
so that lvs[12]00[25] never try to fall back to their own
unreachable recdns IPs)
Change-Id: I305c4a377e96388f2f85b73bf093b284999b3c9f
---
M manifests/realm.pp
M manifests/site.pp
M modules/base/templates/resolv.conf.erb
M modules/install-server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-a-codfw.cfg
M modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-b-codfw.cfg
M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-c-codfw.cfg
M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-d-codfw.cfg
M modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg
M modules/install-server/files/autoinstall/subnets/public1-a-codfw.cfg
M modules/install-server/files/autoinstall/subnets/public1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-b-codfw.cfg
M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-c-codfw.cfg
M modules/install-server/files/autoinstall/subnets/public1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-d-codfw.cfg
M modules/install-server/files/autoinstall/subnets/public1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/public1-ulsfo.cfg
M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
M modules/install-server/files/dhcpd/dhcpd.conf
32 files changed, 48 insertions(+), 42 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index bcb246d..8ef3ee8 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -50,14 +50,13 @@
# TODO: create hash of all LVS service IPs
# Set some basic variables
-# TODO: update after codfw gets its nameservers
$nameservers = $site ? {
-'esams' = [ '91.198.174.6', '208.80.154.239' ], # esams - esams
(nescio), eqiad (LVS)
-default = [ '208.80.154.239', '91.198.174.6' ], #
pmtpa+eqiad+ulsfo+codfw - eqiad (LVS), esams (nescio)
+'eqiad' = [ '208.80.154.239', '208.80.153.254' ], # eqiad - eqiad, codfw
+'codfw' = [ '208.80.153.254', '208.80.154.239' ], # codfw - codfw, eqiad
+'ulsfo' = [ '208.80.154.239', '208.80.153.254' ], # ulsfo - eqiad, codfw
+'esams' = [ '91.198.174.6', '208.80.154.239' ], # esams - esams
(nescio, not LVS), eqiad
+default = [ '208.80.154.239', '208.80.153.254' ], # pmtpa? - eqiad, codfw
}
-
-# Allow per-server nameserver prefixes
-$nameservers_prefix = []
$domain_search = $domain
# TODO: SMTP settings
diff --git a/manifests/site.pp b/manifests/site.pp
index 1abea91..d01bb90 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1524,9 +1524,9 @@
# lvs100[25] are LVS balancers for the eqiad recursive DNS IP,
# so they need to use the recursive DNS backends directly
-# (chromium and hydrogen)
+# (chromium and hydrogen) with fallback to codfw
if $::hostname =~ /^lvs100[25]$/ {
-$nameservers_prefix = [ '208.80.154.157', '208.80.154.50' ]
+$nameservers_override = [ '208.80.154.157', '208.80.154.50',
'208.80.153.254' ]
}
$cluster = 'lvs'
include admin
@@ -1624,12 +1624,16 @@
# codfw lvs
node /lvs200[1-6]\.codfw\.wmnet/ {
-# XXX will need $nameservers_prefix hack eventually (see eqiad above)
-
if $::hostname =~ /^lvs200[12]$/ {
$ganglia_aggregator = true
}
+# lvs200[25] are LVS balancers for the codfw recursive DNS IP,
+# so they need to use the recursive DNS backends directly
+# (acamar and achernar) with fallback to eqiad
+if $::hostname =~ /^lvs200[25]$/ {
+$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.239' ]
+}
$cluster = 'lvs'
include admin
include role::lvs::balancer
diff --git
[MediaWiki-commits] [Gerrit] [Beta] Have Cirrus build index for regexes - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: [Beta] Have Cirrus build index for regexes .. [Beta] Have Cirrus build index for regexes This causes Cirrus to build a trigram index on the page source to accelerate the insource:// operator. Its a noop before If9fcb6a03c23e8abaf59b5ddfadab051263dac33 is merged. Change-Id: Ia9ee3ddc7d591a6a85b644627c912b7ffdcc5b6e --- M wmf-config/CirrusSearch-labs.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php index acd86df..988acce 100644 --- a/wmf-config/CirrusSearch-labs.php +++ b/wmf-config/CirrusSearch-labs.php @@ -34,3 +34,9 @@ $wgSearchTypeAlternatives = array(); $wgCirrusSearchAllFields = array( 'build' = true, 'use' = true ); +$wgCirrusSearchWikimediaExtraPlugin = array( + 'regex' = array( + 'build', + // 'use', Comes once we release and deploy the wikimedia-extra plugin. + ), +); -- To view, visit https://gerrit.wikimedia.org/r/164553 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9ee3ddc7d591a6a85b644627c912b7ffdcc5b6e Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix credentials #2 - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164557
Change subject: swift: fix credentials #2
..
swift: fix credentials #2
also write accounts in sorted order
Change-Id: I7f0b9cb5fc6cef641152a61442ff330e0c79066c
---
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/stats_account.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/164557/1
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index e2ba2bb..19b3b38 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -21,7 +21,7 @@
require = $required_packages,
}
-$account_names = keys($accounts)
+$account_names = sorted(keys($accounts))
swift_new::stats::stats_account { $account_names:
accounts = $accounts,
statsd_prefix = $statsd_prefix,
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index b79786f..b8c994b 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -7,7 +7,7 @@
$account_info = $accounts[$name]
$auth_url = $account_info[auth]
$user = $account_info[user]
-$key = $credentials[user]
+$key = $credentials[$name]
$account_name = $account_info[account_name]
$account_file = /etc/swift/account_${account_name}.env
--
To view, visit https://gerrit.wikimedia.org/r/164557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f0b9cb5fc6cef641152a61442ff330e0c79066c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: fix credentials #2 - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: fix credentials #2
..
swift: fix credentials #2
also write accounts in sorted order
Change-Id: I7f0b9cb5fc6cef641152a61442ff330e0c79066c
---
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/stats_account.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index e2ba2bb..19b3b38 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -21,7 +21,7 @@
require = $required_packages,
}
-$account_names = keys($accounts)
+$account_names = sorted(keys($accounts))
swift_new::stats::stats_account { $account_names:
accounts = $accounts,
statsd_prefix = $statsd_prefix,
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index b79786f..b8c994b 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -7,7 +7,7 @@
$account_info = $accounts[$name]
$auth_url = $account_info[auth]
$user = $account_info[user]
-$key = $credentials[user]
+$key = $credentials[$name]
$account_name = $account_info[account_name]
$account_file = /etc/swift/account_${account_name}.env
--
To view, visit https://gerrit.wikimedia.org/r/164557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f0b9cb5fc6cef641152a61442ff330e0c79066c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: this isn't python, sorted vs sort - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164558
Change subject: swift: this isn't python, sorted vs sort
..
swift: this isn't python, sorted vs sort
Change-Id: I8abdecff0d71b35e3c7544cf1072ed39b58b9919
---
M modules/swift_new/manifests/stats/accounts.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/164558/1
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index 19b3b38..e06d721 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -21,7 +21,7 @@
require = $required_packages,
}
-$account_names = sorted(keys($accounts))
+$account_names = sort(keys($accounts))
swift_new::stats::stats_account { $account_names:
accounts = $accounts,
statsd_prefix = $statsd_prefix,
--
To view, visit https://gerrit.wikimedia.org/r/164558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8abdecff0d71b35e3c7544cf1072ed39b58b9919
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: this isn't python, sorted vs sort - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: this isn't python, sorted vs sort
..
swift: this isn't python, sorted vs sort
Change-Id: I8abdecff0d71b35e3c7544cf1072ed39b58b9919
---
M modules/swift_new/manifests/stats/accounts.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index 19b3b38..e06d721 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -21,7 +21,7 @@
require = $required_packages,
}
-$account_names = sorted(keys($accounts))
+$account_names = sort(keys($accounts))
swift_new::stats::stats_account { $account_names:
accounts = $accounts,
statsd_prefix = $statsd_prefix,
--
To view, visit https://gerrit.wikimedia.org/r/164558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8abdecff0d71b35e3c7544cf1072ed39b58b9919
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] No-op change for authdns-update test - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/164559 Change subject: No-op change for authdns-update test .. No-op change for authdns-update test Change-Id: I4a822d1dd45a5fc542e95a34006da34fde946912 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/59/164559/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index b7554fb..0f4c1f8 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -826,7 +826,7 @@ br1-knams.ipmi 1H IN A10.21.0.101 scs-oe11-esams 1H IN A10.21.0.102 -; Round robin records +; Round robin record text-lb 600 IN DYNA geoip!text-addrs/esams login-lb 600 IN DYNA geoip!login-addrs/esams bits-lb 600 IN DYNA geoip!bits-addrs/esams -- To view, visit https://gerrit.wikimedia.org/r/164559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a822d1dd45a5fc542e95a34006da34fde946912 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] No-op change for authdns-update test - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: No-op change for authdns-update test .. No-op change for authdns-update test Change-Id: I4a822d1dd45a5fc542e95a34006da34fde946912 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index b7554fb..0f4c1f8 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -826,7 +826,7 @@ br1-knams.ipmi 1H IN A10.21.0.101 scs-oe11-esams 1H IN A10.21.0.102 -; Round robin records +; Round robin record text-lb 600 IN DYNA geoip!text-addrs/esams login-lb 600 IN DYNA geoip!login-addrs/esams bits-lb 600 IN DYNA geoip!bits-addrs/esams -- To view, visit https://gerrit.wikimedia.org/r/164559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a822d1dd45a5fc542e95a34006da34fde946912 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert Capiunto to a delayed-load module - change (mediawiki...Capiunto)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164560
Change subject: Convert Capiunto to a delayed-load module
..
Convert Capiunto to a delayed-load module
Instead of storing Capiunto inside mw, let it be loaded via
require('capiunto'). Also, fold _render into it now that there's no reason
for it to be separate.
Change-Id: I23083cddb638a294aae96dc9f43f2d4f70457eb7
---
M Capiunto.hooks.php
M Capiunto.php
M includes/LuaLibrary.php
M includes/lua/Infobox.lua
D includes/lua/InfoboxRender.lua
M tests/phpunit/includes/lua/InfoboxRenderTests.lua
M tests/phpunit/includes/lua/InfoboxTests.lua
M tests/phpunit/output/BasicRowTest.lua
M tests/phpunit/output/BasicTest.lua
9 files changed, 354 insertions(+), 393 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Capiunto
refs/changes/60/164560/1
diff --git a/Capiunto.hooks.php b/Capiunto.hooks.php
index 70bd562..905fe1f 100644
--- a/Capiunto.hooks.php
+++ b/Capiunto.hooks.php
@@ -47,13 +47,10 @@
* @return bool
*/
public static function registerScribuntoLibraries( $engine, array
$extraLibraries ) {
- if ( $engine !== 'lua' ) {
- return true;
+ if ( $engine === 'lua' ) {
+ $extraLibraries['capiunto'] = array(
+ 'class' = '\Capiunto\LuaLibrary', 'deferLoad'
= true );
}
-
- $extraLibraries['mw.capiunto.Infobox'] = '\Capiunto\LuaLibrary';
- $extraLibraries['mw.capiunto.Infobox._render'] =
'\Capiunto\LuaLibrary';
-
return true;
}
diff --git a/Capiunto.php b/Capiunto.php
index b4b4128..f626253 100644
--- a/Capiunto.php
+++ b/Capiunto.php
@@ -28,7 +28,6 @@
$wgAutoloadClasses['Capiunto\Test\InfoboxModuleTest'] = __DIR__ .
'/tests/phpunit/includes/lua/InfoboxTest.php';
$wgHooks['UnitTestsList'][]=
'\Capiunto\CapiuntoHooks::registerUnitTests';
-# XXX: Rather use ScribuntoExternalLibraryPaths ?
$wgHooks['ScribuntoExternalLibraries'][] =
'\Capiunto\CapiuntoHooks::registerScribuntoLibraries';
$wgHooks['BeforePageDisplay'][]=
'\Capiunto\CapiuntoHooks::onBeforePageDisplay';
diff --git a/includes/LuaLibrary.php b/includes/LuaLibrary.php
index 0ff7575..6308269 100644
--- a/includes/LuaLibrary.php
+++ b/includes/LuaLibrary.php
@@ -17,8 +17,7 @@
* Register the library
*/
public function register() {
- $this-getEngine()-registerInterface( __DIR__ .
'/lua/Infobox.lua', array(), array() );
- $this-getEngine()-registerInterface( __DIR__ .
'/lua/InfoboxRender.lua', array(), array() );
+ return $this-getEngine()-registerInterface( __DIR__ .
'/lua/Infobox.lua', array(), array() );
}
}
diff --git a/includes/lua/Infobox.lua b/includes/lua/Infobox.lua
index 60997d6..14b51e6 100644
--- a/includes/lua/Infobox.lua
+++ b/includes/lua/Infobox.lua
@@ -12,7 +12,8 @@
@author Marius Hoch h...@online.de
]]
-local infobox = {}
+local render = {}
+local infobox = { _render = render }
local metatable = {}
local methodtable = {}
@@ -48,11 +49,281 @@
end
end
+-- Renders the outer wrapper for an infobox.
+-- Returns the mw.html object for the new infobox
+--
+-- @param html
+-- @param args
+function render.renderWrapper( html, args )
+ if not args.isChild then
+ local table = html
+ :tag( 'table' )
+ :addClass( 'mw-capiunto-infobox' )
+ :attr( 'cellspacing', 3 )
+ :css( 'border-spacing', '3px' )
+
+ if args.bodyClass then
+ table
+ :addClass( args.bodyClass )
+ end
+
+ if args.isSubbox then
+ table
+ :addClass( 'mw-capiunto-infobox-subbox' )
+ else
+ table
+ :css( 'width', '22em' )
+ end
+
+ if args.bodyStyle then
+ table
+ :cssText( args.bodyStyle )
+ end
+
+ return table
+ else
+ html
+ :wikitext( args.title )
+
+ return html
+ end
+end
+
+-- Adds a header to html
+--
+-- @param html
+-- @param args
+-- @param header
+-- @param class
+function render.renderHeader( html, args, header, class )
+ local th = html:tag( 'tr' )
+ :tag( 'th' )
+ :attr( 'colspan', 2 )
+ :css( 'text-align', 'center' )
+ :wikitext( header )
+
+ if class then
+ th:addClass( class )
+ end
+
+ if args.headerStyle then
[MediaWiki-commits] [Gerrit] Return registerInterface() per Ibdc1f4ef - change (mediawiki...ParserFunctions)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164561
Change subject: Return registerInterface() per Ibdc1f4ef
..
Return registerInterface() per Ibdc1f4ef
Change-Id: I8106ccc03f1bd64afe6dacd45263d400e342c0be
---
M ParserFunctions.library.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserFunctions
refs/changes/61/164561/1
diff --git a/ParserFunctions.library.php b/ParserFunctions.library.php
index 7f92140..d07838d 100644
--- a/ParserFunctions.library.php
+++ b/ParserFunctions.library.php
@@ -6,7 +6,7 @@
'expr' = array( $this, 'expr' ),
);
- $this-getEngine()-registerInterface( __DIR__ .
'/mw.ext.ParserFunctions.lua', $lib, array() );
+ return $this-getEngine()-registerInterface( __DIR__ .
'/mw.ext.ParserFunctions.lua', $lib, array() );
}
public function expr( $expression = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/164561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8106ccc03f1bd64afe6dacd45263d400e342c0be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return registerInterface() per Ibdc1f4ef - change (mediawiki...TitleBlacklist)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164562
Change subject: Return registerInterface() per Ibdc1f4ef
..
Return registerInterface() per Ibdc1f4ef
Change-Id: Ib8d5776cc83ff34c68093c43146218c4a470939d
---
M TitleBlacklist.library.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist
refs/changes/62/164562/1
diff --git a/TitleBlacklist.library.php b/TitleBlacklist.library.php
index 0c2a599..fd767d1 100644
--- a/TitleBlacklist.library.php
+++ b/TitleBlacklist.library.php
@@ -6,7 +6,7 @@
'test' = array( $this, 'test' ),
);
- $this-getEngine()-registerInterface( __DIR__ .
'/mw.ext.TitleBlacklist.lua', $lib, array() );
+ return $this-getEngine()-registerInterface( __DIR__ .
'/mw.ext.TitleBlacklist.lua', $lib, array() );
}
public function test( $action = null, $title = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/164562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8d5776cc83ff34c68093c43146218c4a470939d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleBlacklist
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add swift to codfw LVS balancers - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/164563 Change subject: Add swift to codfw LVS balancers .. Add swift to codfw LVS balancers Change-Id: I64860fc435f651f2430481bf5561279d22c7bd5f --- M manifests/role/lvs.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/164563/1 diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp index 6455b04..cdd10e4 100644 --- a/manifests/role/lvs.pp +++ b/manifests/role/lvs.pp @@ -60,6 +60,7 @@ $sip['dns_rec'][$::site], ], /^(lvs200[36])$/ = [ +$sip['swift'][$::site], ], # esams + ulsfo -- To view, visit https://gerrit.wikimedia.org/r/164563 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64860fc435f651f2430481bf5561279d22c7bd5f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add swift to codfw LVS balancers - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: Add swift to codfw LVS balancers .. Add swift to codfw LVS balancers Change-Id: I64860fc435f651f2430481bf5561279d22c7bd5f --- M manifests/role/lvs.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp index 6455b04..cdd10e4 100644 --- a/manifests/role/lvs.pp +++ b/manifests/role/lvs.pp @@ -60,6 +60,7 @@ $sip['dns_rec'][$::site], ], /^(lvs200[36])$/ = [ +$sip['swift'][$::site], ], # esams + ulsfo -- To view, visit https://gerrit.wikimedia.org/r/164563 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64860fc435f651f2430481bf5561279d22c7bd5f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move misplaced test - change (search/extra)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/164564 Change subject: Move misplaced test .. Move misplaced test Change-Id: I0f1e8b5f62112b24e8ed6d5ecc1588105307af3d --- R src/test/java/org/wikimedia/search/extra/regex/SourceRegexFilterTest.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/search/extra refs/changes/64/164564/1 diff --git a/src/test/java/org/wikimedia/search/extra/SourceRegexFilterTest.java b/src/test/java/org/wikimedia/search/extra/regex/SourceRegexFilterTest.java similarity index 99% rename from src/test/java/org/wikimedia/search/extra/SourceRegexFilterTest.java rename to src/test/java/org/wikimedia/search/extra/regex/SourceRegexFilterTest.java index b300e5c..4108342 100644 --- a/src/test/java/org/wikimedia/search/extra/SourceRegexFilterTest.java +++ b/src/test/java/org/wikimedia/search/extra/regex/SourceRegexFilterTest.java @@ -1,4 +1,4 @@ -package org.wikimedia.search.extra; +package org.wikimedia.search.extra.regex; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; -- To view, visit https://gerrit.wikimedia.org/r/164564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f1e8b5f62112b24e8ed6d5ecc1588105307af3d Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix installation instructions - change (search/extra)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/164565 Change subject: Fix installation instructions .. Fix installation instructions Change-Id: Iea158b9c6b06dfacb477135fe22718e9dfc36e77 --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/extra refs/changes/65/164565/1 diff --git a/README.md b/README.md index bedf845..6d8a4e3 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ | Extra Queries and Filters Plugin | ElasticSearch | |--|-| -| 0.0.1 - master | 1.3.2 - master | +| master | 1.3.2 - master | Install it like so: ```bash -./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/0.0.11 +./bin/plugin --install org.wikimedia.search/extra/0.0.1 ``` -- To view, visit https://gerrit.wikimedia.org/r/164565 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea158b9c6b06dfacb477135fe22718e9dfc36e77 Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add remaining GuidedTour engineers and designers to author list - change (mediawiki...GuidedTour)
jenkins-bot has submitted this change and it was merged.
Change subject: Add remaining GuidedTour engineers and designers to author list
..
Add remaining GuidedTour engineers and designers to author list
* Remove separate author list for file (avoiding duplicate
maintenence work).
* Update version to 2.0. It was 1.0 since the beginning, then it was
updated to 1.1.0 for the i18n format change (1109f6a1a).
I think the new API (fc9de92a6) merits an update, and why not a major
version?
Change-Id: Iecde3787d9f7cecfb1c26a37018ce6d0fb6a97a2
---
M GuidedTour.php
1 file changed, 14 insertions(+), 6 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GuidedTour.php b/GuidedTour.php
index 4309ba6..2c55d79 100644
--- a/GuidedTour.php
+++ b/GuidedTour.php
@@ -6,10 +6,6 @@
* There have also been further changes to Guiders in conjunction with this
extension.
*
* @file
- * @author Terry Chay tc...@wikimedia.org
- * @author Matthew Flaschen mflasc...@wikimedia.org
- * @author Luke Welling lwell...@wikimedia.org
- *
*/
/**
@@ -43,10 +39,22 @@
$wgExtensionCredits['other'][] = array(
'path' = __FILE__,
'name' = 'GuidedTour',
- 'author' = array('Terry Chay', 'Matthew Flaschen', 'Luke Welling',),
+ 'author' = array(
+ // Alphabetical
+ 'Munaf Assaf',
+ 'Terry Chay',
+ 'Matthew Flaschen',
+ 'Pau Giner',
+ 'Ori Livneh',
+ 'Rob Moen',
+ 'S Page',
+ 'Sam Smith',
+ 'Moiz Syed',
+ 'Luke Welling',
+ ),
'url' = 'https://www.mediawiki.org/wiki/Extension:GuidedTour',
'descriptionmsg' = 'guidedtour-desc',
- 'version' = '1.1.0',
+ 'version' = '2.0',
);
// Schemas
--
To view, visit https://gerrit.wikimedia.org/r/164505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecde3787d9f7cecfb1c26a37018ce6d0fb6a97a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add remaining engineers and designers to author list - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged. Change subject: Add remaining engineers and designers to author list .. Add remaining engineers and designers to author list Change-Id: Ic49d47b10a033ae8ad5115aecb3d5aa7e18b6b72 --- M GettingStarted.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/GettingStarted.php b/GettingStarted.php index b2fe1c4..c8f68b6 100644 --- a/GettingStarted.php +++ b/GettingStarted.php @@ -9,9 +9,12 @@ 'Munaf Assaf', 'Matt Flaschen', 'Pau Giner', + 'Kaity Hammerstein', 'Ori Livneh', + 'Rob Moen', 'S Page', 'Sam Smith', + 'Moiz Syed', ), 'url' = 'https://www.mediawiki.org/wiki/Extension:GettingStarted', 'descriptionmsg' = 'gettingstarted-desc', -- To view, visit https://gerrit.wikimedia.org/r/164502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic49d47b10a033ae8ad5115aecb3d5aa7e18b6b72 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GettingStarted Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: KHammerstein khammerst...@wikimedia.org Gerrit-Reviewer: MSyed ms...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: Robmoen rm...@wikimedia.org Gerrit-Reviewer: Swalling swall...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made upload jobs avoid using the user session - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Made upload jobs avoid using the user session
..
Made upload jobs avoid using the user session
* This causes problems with some session handlers and it is
also trickier to deal with in non CLI script without leaking
cookie headers.
Change-Id: Iaf2a57f9299e42a5f68bf85115e62e88fa0f8ed6
---
M includes/api/ApiUpload.php
M includes/jobqueue/jobs/AssembleUploadChunksJob.php
M includes/jobqueue/jobs/PublishStashedFileJob.php
M includes/upload/UploadBase.php
4 files changed, 36 insertions(+), 40 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 657181b..2770bdc 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -223,11 +223,12 @@
// Check we added the last chunk:
if ( $this-mParams['offset'] + $chunkSize ==
$this-mParams['filesize'] ) {
if ( $this-mParams['async'] ) {
- $progress = UploadBase::getSessionStatus(
$filekey );
+ $progress = UploadBase::getSessionStatus(
$this-getUser(), $filekey );
if ( $progress $progress['result'] ===
'Poll' ) {
$this-dieUsage( Chunk assembly
already in progress., 'stashfailed' );
}
UploadBase::setSessionStatus(
+ $this-getUser(),
$filekey,
array( 'result' = 'Poll',
'stage' = 'queued', 'status'
= Status::newGood() )
@@ -327,7 +328,7 @@
// Status report for upload to stash/upload from stash
if ( $this-mParams['filekey'] $this-mParams['checkstatus']
) {
- $progress = UploadBase::getSessionStatus(
$this-mParams['filekey'] );
+ $progress = UploadBase::getSessionStatus(
$this-getUser(), $this-mParams['filekey'] );
if ( !$progress ) {
$this-dieUsage( 'No result in status data',
'missingresult' );
} elseif ( !$progress['status']-isGood() ) {
@@ -612,11 +613,12 @@
// No errors, no warnings: do the upload
if ( $this-mParams['async'] ) {
- $progress = UploadBase::getSessionStatus(
$this-mParams['filekey'] );
+ $progress = UploadBase::getSessionStatus(
$this-getUser(), $this-mParams['filekey'] );
if ( $progress $progress['result'] === 'Poll' ) {
$this-dieUsage( Upload from stash already in
progress., 'publishfailed' );
}
UploadBase::setSessionStatus(
+ $this-getUser(),
$this-mParams['filekey'],
array( 'result' = 'Poll', 'stage' = 'queued',
'status' = Status::newGood() )
);
diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index 9e9bda6..cc28a01 100644
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -35,26 +35,16 @@
public function run() {
$scope = RequestContext::importScopedSession(
$this-params['session'] );
$context = RequestContext::getMain();
+ $user = $context-getUser();
try {
- $user = $context-getUser();
if ( !$user-isLoggedIn() ) {
$this-setLastError( Could not load the author
user from session. );
return false;
}
- if ( count( $_SESSION ) === 0 ) {
- // Empty session probably indicates that we
didn't associate
- // with the session correctly. Note that being
able to load
- // the user does not necessarily mean the
session was loaded.
- // Most likely cause by suhosin.session.encrypt
= On.
- $this-setLastError( Error associating with
user session. .
- Try setting suhosin.session.encrypt =
Off );
-
- return false;
- }
-
UploadBase::setSessionStatus(
+ $user,
$this-params['filekey'],
array( 'result' =
[MediaWiki-commits] [Gerrit] hiera: use hiera to lookup the cluster - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164567
Change subject: hiera: use hiera to lookup the cluster
..
hiera: use hiera to lookup the cluster
We now set $cluster at top-scope level by looking it up on hiera (with
the default being set to 'misc' as before).
Change-Id: I7c94516b645b089b3914bb6f2ccc491d824235ff
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/164567/1
diff --git a/manifests/site.pp b/manifests/site.pp
index de251b6..91fd539 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@
# Default variables. this way, they work with an ENC (as in labs) as well.
if $cluster == undef {
-$cluster = 'misc'
+$cluster = hiera('cluster', 'misc')
}
if $puppet_version == undef {
$puppet_version = '3'
@@ -2048,7 +2048,6 @@
node /^mw10(1[7-9]|[2-4][0-9]|5[0-2])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = hiera('cluster')
if $::hostname =~ /^mw101[78]$/ {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/164567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c94516b645b089b3914bb6f2ccc491d824235ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet: drop global variable $puppet_version - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164568
Change subject: puppet: drop global variable $puppet_version
..
puppet: drop global variable $puppet_version
It's time to ditch puppet 2.7 supoport altoghether, most of our
present-day modules aren't compatible with it anyway.
Change-Id: I0de8237c543cae60b07de2872a1918dfa5bc6688
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/site.pp
M modules/apt/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
D modules/puppet/templates/fileserver-self.conf.3.erb
M modules/puppet/templates/fileserver-self.conf.erb
M modules/puppetmaster/manifests/config.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/templates/fileserver.conf.erb
D modules/puppetmaster/templates/fileserver.conf.puppet3.erb
9 files changed, 49 insertions(+), 157 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/164568/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 91fd539..a0039ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,9 +50,6 @@
if $cluster == undef {
$cluster = hiera('cluster', 'misc')
}
-if $puppet_version == undef {
-$puppet_version = '3'
-}
# Node definitions (alphabetic order)
diff --git a/modules/apt/manifests/puppet.pp b/modules/apt/manifests/puppet.pp
index 3fa8e42..7c3b71b 100644
--- a/modules/apt/manifests/puppet.pp
+++ b/modules/apt/manifests/puppet.pp
@@ -1,35 +1,22 @@
define apt::puppet (
-$version = $puppet_version,
$packages = 'puppet puppet-common facter'
) {
-if ($version == '2.7') {
-# For precise, we just need to tell apt to use ubuntu provided
packages,
-# with an higher priority than the general rule preferring wikimedia
-# packages
-if $::lsbdistcodename == 'precise' {
-apt::pin { puppet_${title}_${version}.pref:
-package = $packages,
-pin = 'release o=Ubuntu',
-priority = 1002
-}
+# For trusty, ubuntu packages are puppet 3
+if $::lsbdistcodename == 'trusty' {
+apt::pin { $title:
+package = $packages,
+pin = 'release o=Ubuntu',
+priority = 1002
}
-} else {
-# For trusty, ubuntu packages are puppet 3
-if $::lsbdistcodename == 'trusty' {
-apt::pin { $title:
-package = $packages,
-pin = 'release o=Ubuntu',
-priority = 1002
-}
-} elsif $::lsbdistcodename == 'precise' {
-# Ensure the pref file is not there in this case,
-# so that puppet gets updated.
+}
+elsif $::lsbdistcodename == 'precise' {
+# Ensure the pref file is not there in this case,
+# so that puppet gets updated.
apt::pin { puppet_${title}_2.7.pref:
-ensure = 'absent',
-priority = 0,
-pin = 'release o=Ubuntu'
-}
+ensure = 'absent',
+priority = 0,
+pin = 'release o=Ubuntu'
}
}
}
diff --git a/modules/puppet/manifests/self/config.pp
b/modules/puppet/manifests/self/config.pp
index bd313bc..345dd9d 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -83,24 +83,19 @@
default = absent,
}
-# Temporary, while we complete labs transition to puppet 3
-if $puppet_version == '2.7' {
-$fileserver_template = 'puppet/fileserver-self.conf.erb'
- } else {
-$fileserver_template = 'puppet/fileserver-self.conf.3.erb'
-file {'/etc/puppet/auth.conf':
-ensure = 'present',
-owner = 'root',
-group = 'root',
-mode= '0444',
-content = template('puppet/auth-self.conf.erb')
-}
+file { '/etc/puppet/auth.conf':
+ensure = 'present',
+owner = 'root',
+group = 'root',
+mode= '0444',
+content = template('puppet/auth-self.conf.erb')
}
+
file { '/etc/puppet/fileserver.conf':
-ensure = $puppetmaster_status,
-owner= 'root',
-group= 'root',
-mode = '0444',
-content = template($fileserver_template),
+ensure = $puppetmaster_status,
+owner = 'root',
+group = 'root',
+mode= '0444',
+content = template('puppet/fileserver-self.conf.erb'),
}
}
diff --git a/modules/puppet/templates/fileserver-self.conf.3.erb
b/modules/puppet/templates/fileserver-self.conf.3.erb
deleted file mode 100644
index 5e2098f..000
--- a/modules/puppet/templates/fileserver-self.conf.3.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file consists of arbitrarily named sections/modules
[MediaWiki-commits] [Gerrit] swift: clean up - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164566
Change subject: swift: clean up
..
swift: clean up
Change-Id: I3a996a5f62e205aa68c0332baec9fadaf970fb3f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A hieradata/hosts/ms-fe2001.yaml
A hieradata/hosts/ms-fe2002.yaml
A hieradata/hosts/ms-fe2003.yaml
A hieradata/hosts/ms-fe2004.yaml
A hieradata/mainrole/swift_proxy_codfw.yaml
M manifests/site.pp
6 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/164566/1
diff --git a/hieradata/hosts/ms-fe2001.yaml b/hieradata/hosts/ms-fe2001.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2001.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/hosts/ms-fe2002.yaml b/hieradata/hosts/ms-fe2002.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2002.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/hosts/ms-fe2003.yaml b/hieradata/hosts/ms-fe2003.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2003.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/hosts/ms-fe2004.yaml b/hieradata/hosts/ms-fe2004.yaml
new file mode 100644
index 000..35175b5
--- /dev/null
+++ b/hieradata/hosts/ms-fe2004.yaml
@@ -0,0 +1 @@
+mainrole: swift_proxy_codfw
diff --git a/hieradata/mainrole/swift_proxy_codfw.yaml
b/hieradata/mainrole/swift_proxy_codfw.yaml
new file mode 100644
index 000..1a0ed89
--- /dev/null
+++ b/hieradata/mainrole/swift_proxy_codfw.yaml
@@ -0,0 +1,4 @@
+cluster: swift
+nagios_group: swift
+lvs::realserver::realserver_ips:
+ - '10.2.1.27'
diff --git a/manifests/site.pp b/manifests/site.pp
index d01bb90..de251b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2005,8 +2005,7 @@
include role::swift::stats_reporter
}
-class { 'lvs::realserver': realserver_ips = [ '10.2.1.27' ] }
-
+include ::lvs::realserver
include role::swift::proxy
}
--
To view, visit https://gerrit.wikimedia.org/r/164566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a996a5f62e205aa68c0332baec9fadaf970fb3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to verify XML well-formedness for partial SVG uploads - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164569
Change subject: Don't try to verify XML well-formedness for partial SVG uploads
..
Don't try to verify XML well-formedness for partial SVG uploads
Chunked uploads of SVGs are currently failing with invalid XML errors
because UploadBase::detectScriptInSvg() requires the full file but is
being called from UploadBase::verifyPartialFile().
So let's do the check twice: once in UploadBase::verifyPartialFile()
where it will pass if non-well-formed, and once in
UploadBase::verifyFile() where it will fail if non-well-formed.
Bug: 65724
Change-Id: I6126e185eb4b183c31946f13c576521f1ed19c16
---
M includes/upload/UploadBase.php
1 file changed, 18 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/69/164569/1
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index b3404dc..808b323 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -424,7 +424,7 @@
* @return mixed True of the file is verified, array otherwise.
*/
protected function verifyFile() {
- global $wgVerifyMimeType;
+ global $wgVerifyMimeType, $wgDisableUploadScriptChecks;
wfProfileIn( __METHOD__ );
$status = $this-verifyPartialFile();
@@ -443,6 +443,18 @@
wfProfileOut( __METHOD__ );
return array( 'filetype-mime-mismatch',
$this-mFinalExtension, $mime );
+ }
+ }
+
+ # check for htmlish code and javascript
+ if ( !$wgDisableUploadScriptChecks ) {
+ if ( $this-mFinalExtension == 'svg' || $mime ==
'image/svg+xml' ) {
+ $svgStatus = $this-detectScriptInSvg(
$this-mTempPath, false );
+ if ( $svgStatus !== false ) {
+ wfProfileOut( __METHOD__ );
+
+ return $svgStatus;
+ }
}
}
@@ -504,7 +516,7 @@
return array( 'uploadscripted' );
}
if ( $this-mFinalExtension == 'svg' || $mime ==
'image/svg+xml' ) {
- $svgStatus = $this-detectScriptInSvg(
$this-mTempPath );
+ $svgStatus = $this-detectScriptInSvg(
$this-mTempPath, true );
if ( $svgStatus !== false ) {
wfProfileOut( __METHOD__ );
@@ -1274,9 +1286,10 @@
/**
* @param string $filename
+* @param bool $partial
* @return mixed False of the file is verified (does not contain
scripts), array otherwise.
*/
- protected function detectScriptInSvg( $filename ) {
+ protected function detectScriptInSvg( $filename, $partial ) {
$this-mSVGNSError = false;
$check = new XmlTypeCheck(
$filename,
@@ -1286,7 +1299,8 @@
);
if ( $check-wellFormed !== true ) {
// Invalid xml (bug 58553)
- return array( 'uploadinvalidxml' );
+ // But only when non-partial (bug 65724)
+ return $partial ? false : array( 'uploadinvalidxml' );
} elseif ( $check-filterMatch ) {
if ( $this-mSVGNSError ) {
return array( 'uploadscriptednamespace',
$this-mSVGNSError );
--
To view, visit https://gerrit.wikimedia.org/r/164569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6126e185eb4b183c31946f13c576521f1ed19c16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style color swatches square and borderless - change (analytics/dashiki)
Nuria has submitted this change and it was merged.
Change subject: Style color swatches square and borderless
..
Style color swatches square and borderless
Change-Id: If00bb31661569c674315ffb3360f433b11040847
---
M src/components/project-selector/project-selector.html
M src/css/styles.css
2 files changed, 4 insertions(+), 20 deletions(-)
Approvals:
Nuria: Verified; Looks good to me, approved
diff --git a/src/components/project-selector/project-selector.html
b/src/components/project-selector/project-selector.html
index dc29490..6c2e959 100644
--- a/src/components/project-selector/project-selector.html
+++ b/src/components/project-selector/project-selector.html
@@ -53,7 +53,7 @@
!-- ko foreach: languages --
div class=item
span
-i class=swatch data-bind=style: {color: color}/i
+i class=swatch data-bind=style: {'background-color':
color}/i
a data-bind=text: name/a
/span
a data-bind=click: $parents[1].removeProject.bind($parents[1])
diff --git a/src/css/styles.css b/src/css/styles.css
index 0572407..bba66ac 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -83,28 +83,12 @@
padding: 0;
}
.colored i.swatch {
-font-size: 1.5em;
-vertical-align: middle;
-
+vertical-align: bottom;
display: inline-block;
margin: 0 .35em 0 0;
-/*width: 1.23em;*/
-height: 1.03em;
-font-family: Icons;
-font-style: normal;
-line-height: 0.89em;
-font-weight: 400;
-text-decoration: inherit;
-text-align: center;
-speak: none;
-box-sizing: border-box;
-
-border: 2px solid white;
-border-radius: 4px;
+width: 20px;
+height: 20px;
opacity: 1;
-}
-.colored i.swatch:before {
-content: \f0c8;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/164537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If00bb31661569c674315ffb3360f433b11040847
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Nuria nu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style border radii and project list - change (analytics/dashiki)
Nuria has submitted this change and it was merged.
Change subject: Style border radii and project list
..
Style border radii and project list
Change-Id: I3e7faefa1d2d77416246f52341376f7c395e532a
---
M src/components/project-selector/project-selector.html
M src/components/project-selector/project-selector.js
M src/css/styles.css
3 files changed, 36 insertions(+), 14 deletions(-)
Approvals:
Nuria: Verified; Looks good to me, approved
diff --git a/src/components/project-selector/project-selector.html
b/src/components/project-selector/project-selector.html
index 6c2e959..4758a62 100644
--- a/src/components/project-selector/project-selector.html
+++ b/src/components/project-selector/project-selector.html
@@ -54,10 +54,11 @@
div class=item
span
i class=swatch data-bind=style: {'background-color':
color}/i
-a data-bind=text: name/a
+span data-bind=text: name/span
+span class=subtext data-bind=text: shortName/span
/span
a data-bind=click: $parents[1].removeProject.bind($parents[1])
-i class=faded delete icon/i
+i class=faded destructive delete icon/i
/a
/div
!-- /ko --
diff --git a/src/components/project-selector/project-selector.js
b/src/components/project-selector/project-selector.js
index edface4..2a0cf78 100644
--- a/src/components/project-selector/project-selector.js
+++ b/src/components/project-selector/project-selector.js
@@ -75,6 +75,7 @@
projects[info.project.code].languages.push({
name: info.language.name,
database: info.database,
+shortName: info.language.shortName,
color: info.color
});
});
diff --git a/src/css/styles.css b/src/css/styles.css
index 37136d3..553b635 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -21,12 +21,6 @@
background-color: #7C7C7C;
color: #232323;
}
-.icon.faded {
-opacity: 0.1;
-}
-.item:hover .icon.faded {
-opacity: 1;
-}
.ui.dropdown.label {
height: 30.75px;
}
@@ -37,8 +31,24 @@
left: 11%!important;
top: -0.41em;
}
+.ui.label,
+.ui.input input {
+border-radius: 2px;
+}
/* our styles */
+.subtext {
+color: #929292;
+font-size: xx-small;
+text-transform: uppercase;
+margin-left: 8px;
+}
+.icon.faded {
+opacity: 0.1;
+}
+.item:hover .icon.faded {
+opacity: 1;
+}
.target {
position: absolute!important;
z-index: 100!important;
@@ -70,6 +80,7 @@
}
input.typeahead {
color: white!important;
+width: 280px!important;
}
a.header {
color: #112233;
@@ -114,6 +125,15 @@
height: 20px;
opacity: 1;
}
+.destructive:hover {
+color: #D42E2A;
+}
+project-selector hr {
+margin-right: 20px;
+}
+project-selector .ui.vertical.menu.fluid {
+width: 94%!important;
+}
/**
* Twitter typeahead stuff
@@ -126,7 +146,7 @@
font-size: 24px;
line-height: 30px;
border: 2px solid #ccc;
-border-radius: 8px;
+border-radius: 2px;
outline: none;
}
.tt-query {
@@ -137,12 +157,12 @@
}
.tt-dropdown-menu {
width: 300px;
-margin-top: 4px;
+margin: 1px 0 0 1px;
padding: 8px 0;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2);
-border-radius: 8px;
+border-radius: 2px;
box-shadow: 0 5px 10px rgba(0,0,0,.2);
max-height: 24em;
overflow-y: scroll;
@@ -151,7 +171,7 @@
.tt-suggestion {
padding: 3px 20px;
font-size: 16px;
-line-height: 24px;
+line-height: 30px;
border-bottom: #ccc 1px solid;
}
.tt-suggestion .footnote {
@@ -164,14 +184,14 @@
}
.tt-suggestion:hover {
-font-weight:bold;
+font-weight: bold;
cursor: pointer;
}
.tt-suggestion p {
margin: 0;
}
.tt-back:hover{
-font-weight:bold;
+font-weight: bold;
}
.tt-dropdown-menu {
display: none;
--
To view, visit https://gerrit.wikimedia.org/r/164539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e7faefa1d2d77416246f52341376f7c395e532a
Gerrit-PatchSet: 2
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Nuria nu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style layout to fill page - change (analytics/dashiki)
Nuria has submitted this change and it was merged.
Change subject: Style layout to fill page
..
Style layout to fill page
Change-Id: I15d7cbdeffa973b9d26d2a1ef778ea82577a4236
---
M src/components/wikimetrics-layout/wikimetrics-layout.html
M src/css/styles.css
2 files changed, 23 insertions(+), 8 deletions(-)
Approvals:
Nuria: Verified; Looks good to me, approved
diff --git a/src/components/wikimetrics-layout/wikimetrics-layout.html
b/src/components/wikimetrics-layout/wikimetrics-layout.html
index 64f172d..edc7f4f 100644
--- a/src/components/wikimetrics-layout/wikimetrics-layout.html
+++ b/src/components/wikimetrics-layout/wikimetrics-layout.html
@@ -1,6 +1,6 @@
-section class=ui six column celled page grid
-div class=row
-section class=column projects-container
+section
+div
+section class=page column projects
project-selector params=projectOptions:projectOptions,
languageOptions:languageOptions,
defaultProjects: defaultProjects,
@@ -9,7 +9,7 @@
/project-selector
/section
-section class=five wide column main-container
+section class=page column main
div class=ui segment
metric-selector params=selectedMetric: selectedMetric,
metrics: metrics,
diff --git a/src/css/styles.css b/src/css/styles.css
index a6a4331..0572407 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -1,5 +1,8 @@
/* site-wide styles */
body {
+padding: 0;
+margin: 0;
+height: 100vh;
font-family: Nimbus Sans L,Liberation Sans,Helvetica
Neue,Helvetica,Arial,sans-serif;
}
@@ -51,14 +54,26 @@
a.header:hover {
text-decoration: underline;
}
-section.projects-container {
+section.page.column {
+position: absolute;
+top: 0;
+bottom: 0;
+padding: 10px;
+}
+section.projects {
background-color: #6D6D6D;
-min-width: 254px;
+width: 300px;
}
-section.main-container {
+section.main {
background-color: #EE;
+right: 0;
+left: 300px;
}
-.graph .parent-of-resizable{
+.graph {
+height: 90vh;
+}
+.graph .parent-of-resizable {
+height: 100%;
min-height: 600px;
min-width: 800px;
}
--
To view, visit https://gerrit.wikimedia.org/r/164536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15d7cbdeffa973b9d26d2a1ef778ea82577a4236
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Nuria nu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Style metric selector button and popover - change (analytics/dashiki)
Nuria has submitted this change and it was merged.
Change subject: Style metric selector button and popover
..
Style metric selector button and popover
Change-Id: Ie70c48c1dcadfcf8fcfcdebbeea141119494c733
---
M src/components/metric-selector/metric-selector.html
M src/css/styles.css
2 files changed, 60 insertions(+), 36 deletions(-)
Approvals:
Nuria: Verified; Looks good to me, approved
diff --git a/src/components/metric-selector/metric-selector.html
b/src/components/metric-selector/metric-selector.html
index 5b0f1f9..b095166 100644
--- a/src/components/metric-selector/metric-selector.html
+++ b/src/components/metric-selector/metric-selector.html
@@ -1,36 +1,36 @@
div class=ui dropdown navy label data-bind=toggle: 'open'
i class=add sign box icon/i
-!-- ko ifnot: selectedMetric --
-div class=text data-bind=text: open() ? 'Close' : 'Add Metric'/div
-!-- /ko --
+div class=textAdd Metric/div
i class=dropdown icon vertically data-bind=css: {flipped: open}/i
/div
-div class=ui two column grid target data-bind=css: {open: open}
-div class=column
-div class=ui vertical pointing black menu
-!-- ko foreach: categories --
-a class=item data-bind=
-css: {active: name === $parent.selectedCategory().name},
-text: name,
-click: $parent.selectCategory
-/a
-!-- /ko --
-/div
-/div
-div class=column
-div class=ui vertical menu
-!-- ko if: selectedCategory --
-!-- ko foreach: categories --
-!-- ko if: $parent.selectedCategory().name !== 'All metrics'
-(name === 'All metrics' || name
$parent.selectedCategory().name) --
-div class=itemnbsp;/div
+div class=ui pointing white offset above label categories target
data-bind=css: {open: open}
+div class=ui two column grid
+div class=column
+div class=ui vertical pointing black menu
+!-- ko foreach: categories --
+a class=item data-bind=
+css: {active: name === $parent.selectedCategory().name},
+text: name,
+click: $parent.selectCategory
+/a
!-- /ko --
-!-- /ko --
-!-- ko foreach: selectedCategory().metrics --
-a class=item data-bind=metricName: $data, click:
$parent.addMetric/a
-!-- /ko --
-!-- /ko --
+/div
+/div
+div class=column
+div class=ui vertical menu
+!-- ko if: selectedCategory --
+!-- ko foreach: categories --
+!-- ko if: $parent.selectedCategory().name !== 'All metrics'
+(name === 'All metrics' || name
$parent.selectedCategory().name) --
+div class=itemnbsp;/div
+!-- /ko --
+!-- /ko --
+!-- ko foreach: selectedCategory().metrics --
+a class=item data-bind=metricName: $data, click:
$parent.addMetric/a
+!-- /ko --
+!-- /ko --
+/div
/div
/div
/div
diff --git a/src/css/styles.css b/src/css/styles.css
index bba66ac..37136d3 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -27,23 +27,47 @@
.item:hover .icon.faded {
opacity: 1;
}
-.target {
-position: absolute!important;
-z-index: 100!important;
-display: none!important;
-margin-top: -6px!important;
-}
-.target.open {
-display: block!important;
-}
.ui.dropdown.label {
height: 30.75px;
}
.separate.icon {
margin: 0 -4px 0 4px;
}
+.ui.pointing.offset.above.label:before {
+left: 11%!important;
+top: -0.41em;
+}
/* our styles */
+.target {
+position: absolute!important;
+z-index: 100!important;
+display: none!important;
+}
+.target.open {
+display: block!important;
+}
+.categories.target.label {
+padding: 1px;
+margin-top: 7px!important;
+}
+.ui.pointing.white.label {
+background-color: white;
+border: 2px solid #E5E5E5;
+}
+.ui.pointing.white.label:before {
+background-color: white;
+border: 2px solid #E5E5E5;
+border-bottom: none;
+border-right: none;
+}
+.target.label .grid {
+margin: 0px;
+}
+.target.label .grid .column {
+padding: 0px;
+margin: 0px;
+}
input.typeahead {
color: white!important;
}
--
To view, visit https://gerrit.wikimedia.org/r/164538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie70c48c1dcadfcf8fcfcdebbeea141119494c733
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Nuria nu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Fix Status serialization with cleanupCallback as Closure - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164570
Change subject: Fix Status serialization with cleanupCallback as Closure
..
Fix Status serialization with cleanupCallback as Closure
We already have Status objects throw away the cleanupCallback in
__wakeup. Why not also implement __sleep to not save it in the first
place?
The immediate motivation here is that cleanupCallback could be a
Closure, which causes an exception when serialization is attempted (e.g.
when trying to save the Status if an AssembleUploadChunks job fails
verification).
Note this leaves __wakeup intact, in case of old objects where
cleanupCallback is still present in the serialized representation.
Change-Id: I3aa756cd4eb5553ce0b95e7088b929b2f529abfe
---
M includes/Status.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/164570/1
diff --git a/includes/Status.php b/includes/Status.php
index 2a9d173..0a8062c 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -160,6 +160,15 @@
}
/**
+* Don't save the callback when serializing, because Closures can't be
+* serialized and we're going to clear it in __wakeup anyway.
+*/
+ public function __sleep() {
+ $keys = array_keys( get_object_vars( $this ) );
+ return array_diff( $keys, array( 'cleanCallback' ) );
+ }
+
+ /**
* Sanitize the callback parameter on wakeup, to avoid arbitrary
execution.
*/
public function __wakeup() {
--
To view, visit https://gerrit.wikimedia.org/r/164570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aa756cd4eb5553ce0b95e7088b929b2f529abfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid attempting to prerender thumbnails that will fail - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164571
Change subject: Avoid attempting to prerender thumbnails that will fail
..
Avoid attempting to prerender thumbnails that will fail
For non-vectorial content, requesting a thumbnail larger than
the original results in a 500. Prerendering in its current form
introduces an increase in 500s that dilutes the real problematic
500s, making troubleshooting harder than it needs to be.
Change-Id: I9418dee7653ad7954c3788ecdd350fc8772edd32
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/301
---
M includes/upload/UploadBase.php
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/164571/1
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index eb54e58..db0239c 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -768,13 +768,20 @@
$sizes = $wgUploadThumbnailRenderMap;
rsort( $sizes );
+ $file = $this-getLocalFile();
+
foreach ( $sizes as $size ) {
- $jobs[] = new ThumbnailRenderJob(
$this-getLocalFile()-getTitle(), array(
- 'transformParams' = array( 'width' = $size ),
- ) );
+ if ( $file-isVectorized()
+ || $file-getWidth() $size ) {
+ $jobs[] = new ThumbnailRenderJob(
$file-getTitle(), array(
+ 'transformParams' = array(
'width' = $size ),
+ ) );
+ }
}
- JobQueueGroup::singleton()-push( $jobs );
+ if ( $jobs ) {
+ JobQueueGroup::singleton()-push( $jobs );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/164571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9418dee7653ad7954c3788ecdd350fc8772edd32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return registerInterface() per Ibdc1f4ef - change (mediawiki...ParserFunctions)
jenkins-bot has submitted this change and it was merged.
Change subject: Return registerInterface() per Ibdc1f4ef
..
Return registerInterface() per Ibdc1f4ef
Change-Id: I8106ccc03f1bd64afe6dacd45263d400e342c0be
---
M ParserFunctions.library.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ParserFunctions.library.php b/ParserFunctions.library.php
index 7f92140..d07838d 100644
--- a/ParserFunctions.library.php
+++ b/ParserFunctions.library.php
@@ -6,7 +6,7 @@
'expr' = array( $this, 'expr' ),
);
- $this-getEngine()-registerInterface( __DIR__ .
'/mw.ext.ParserFunctions.lua', $lib, array() );
+ return $this-getEngine()-registerInterface( __DIR__ .
'/mw.ext.ParserFunctions.lua', $lib, array() );
}
public function expr( $expression = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/164561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8106ccc03f1bd64afe6dacd45263d400e342c0be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
