[MediaWiki-commits] [Gerrit] Update ULS config - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Update ULS config
..
Update ULS config
* Remove redundant labs config
* Add new configuration variable to disable web fonts by default
Change-Id: Ib325d4aa955122bfb0bc51cf3a9ccd49079c63a5
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 8 insertions(+), 5 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index dec5ba9..8b528e7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2469,12 +2469,14 @@
$wgULSAnonCanChangeLanguage = false;
$wgULSPosition = $wmgULSPosition;
$wgULSIMEEnabled = $wmgULSIMEEnabled;
+ $wgULSWebfontsEnabled = $wmgULSWebfontsEnabled;
// Temporary for bug 58374
$wgULSNoWebfontsSelectors = array( '.autonym' );
if ( $wmgUseCodeEditorForCore || $wmgUseScribunto ||
$wmgUseZeroNamespace ) {
$wgULSNoImeSelectors[] = '.ace_editor textarea';
}
+ // Remove after ULS is re-deployed
if ( $wmgUniversalLanguageSelectorDefault ) {
$wgDefaultUserOptions['uls-enable'] = 1;
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index bc6dc98..92db5c0 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -241,11 +241,6 @@
'default' = true,
),
- # ULS predeployment testing 2013-05
- 'wmgUseUniversalLanguageSelector' = array(
- 'default' = true,
- ),
-
'wmgULSPosition' = array(
# Beta-specific
'ee-prototype' = 'personal',
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6bfe1d8..f2262ba 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12495,6 +12495,7 @@
),
// Should ULS be enabled for users by default
+// Remove this block after ULS is re-deployed
'wmgUniversalLanguageSelectorDefault' = array(
'default' = false,
'testwiki' = true,
@@ -12515,6 +12516,11 @@
'enwiki' = false,
),
+// Whether web fonts are enabled *by default*
+'wmgULSWebfontsEnabled' = array(
+ 'default' = false,
+),
+
'wmgULSEventLogging' = array(
'default' = true,
),
--
To view, visit https://gerrit.wikimedia.org/r/112435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib325d4aa955122bfb0bc51cf3a9ccd49079c63a5
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
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] [ArticleFeedbackv5] Disabled on Wikimedia projects - change (translatewiki)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112645 Change subject: [ArticleFeedbackv5] Disabled on Wikimedia projects .. [ArticleFeedbackv5] Disabled on Wikimedia projects Merge referably after Ief22aa5fa6ec19dbe368f79392c74a507945e02a Change-Id: I79d3f1bff180cfe9a9c6b7ebf1d2076dfdfca14b --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/45/112645/1 diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 86cb309..28710e7 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -13,7 +13,6 @@ - ext-accountaudit # cedda98d6dd46cccfb88bdb32597feb0d8a6ca6b - ext-antibot # anti spam and such (usually all wikis) - ext-apisandbox # r104698, enabled on all wikis - - ext-articlefeedbackv5 - ext-betafeatures # Change id ecfa294d4b158aa5c44c166fa883d8ceef7d357d - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage - ext-charinsert -- To view, visit https://gerrit.wikimedia.org/r/112645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79d3f1bff180cfe9a9c6b7ebf1d2076dfdfca14b Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] It's 2014 already - change (mediawiki...UniversalLanguageSelector)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112646 Change subject: It's 2014 already .. It's 2014 already Change-Id: Ic6564ccdd897ee2f9449eac62d086de607943cdf --- M UniversalLanguageSelector.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/46/112646/1 diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 38944cd..f5c8edb 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -107,7 +107,7 @@ /** * Enable the webfonts feature for all users by default. * Can be controlled by the user. - * @since 2013.01 + * @since 2014.01 */ $GLOBALS['wgULSWebfontsEnabled'] = true; -- To view, visit https://gerrit.wikimedia.org/r/112646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6564ccdd897ee2f9449eac62d086de607943cdf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent JSON parsing errors - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Prevent JSON parsing errors
..
Prevent JSON parsing errors
Bug: 61137
Change-Id: I2df6b6108bb7834b927205d3b6afa69354cecaf7
---
M resources/js/ext.uls.preferences.js
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.preferences.js
b/resources/js/ext.uls.preferences.js
index f4f99ff..cebc20e 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -180,8 +180,15 @@
this.preferences = preferenceStore().get(
this.preferenceName );
} else {
var options = mw.user.options.get(
this.preferenceName );
- this.preferences = JSON.parse( options );
+
+ // Try to parse JSON
+ try {
+ this.preferences = JSON.parse( options
);
+ } catch ( e ) {
+ this.preferences = {};
+ }
}
+
this.preferences = this.preferences || {};
},
--
To view, visit https://gerrit.wikimedia.org/r/112444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2df6b6108bb7834b927205d3b6afa69354cecaf7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] It's 2014 already - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: It's 2014 already .. It's 2014 already Change-Id: Ic6564ccdd897ee2f9449eac62d086de607943cdf --- M UniversalLanguageSelector.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 38944cd..1375c72 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -107,7 +107,7 @@ /** * Enable the webfonts feature for all users by default. * Can be controlled by the user. - * @since 2013.01 + * @since 2014.02 */ $GLOBALS['wgULSWebfontsEnabled'] = true; -- To view, visit https://gerrit.wikimedia.org/r/112646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6564ccdd897ee2f9449eac62d086de607943cdf Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it 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] Log serialization times to StatsD - change (mediawiki...parsoid)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112647
Change subject: Log serialization times to StatsD
..
Log serialization times to StatsD
- Get rid of awkward getPerformanceHeader method
- Add a new class, Util.Timer, that provides start / stop methods for
measuring the time between any two points in the code.
- Util.Timer reports to StatsD, if parsoidConfig.statsdHost is set.
Change-Id: Ib7f06928624e1ad3ca0205a8e5dda4d7f90f9aeb
---
M api/ParsoidService.js
M lib/mediawiki.Util.js
M lib/mediawiki.parser.environment.js
3 files changed, 44 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/47/112647/1
diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 349bb60..f1cb431 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -596,7 +596,7 @@
out.push( chunk );
}, function () {
res.setHeader( 'Content-Type',
'text/x-mediawiki; charset=UTF-8' );
- res.setHeader(
'X-Parsoid-Performance', env.getPerformanceHeader() );
+ res.setHeader(
'X-Parsoid-Performance', 'duration=' + env.timer.stop( 'serialize' ) );
res.end( out.join( '' ) );
} );
} catch ( e ) {
@@ -719,11 +719,11 @@
tpr.once( 'src', tmpCb );
function sendRes( doc ) {
- var out = DU.serializeNode( doc );
- res.setHeader( 'X-Parsoid-Performance',
env.getPerformanceHeader() );
+ var out = DU.serializeNode( doc ), duration =
env.timer.stop( 'serialize' );
+ res.setHeader( 'X-Parsoid-Performance', 'duration=' +
duration );
res.setHeader( 'Content-Type', 'text/html;
charset=UTF-8' );
res.end( out );
- console.warn( completed parsing of + prefix + ':' +
target + in + env.performance.duration + ms );
+ console.warn( completed parsing of + prefix + ':' +
target + in + duration + ms );
}
}
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index 76f2f3a..1ff5cc0 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -7,6 +7,7 @@
require('./core-upgrade.js');
var async = require('async'),
+ dgram = require( 'dgram' ),
request = require( 'request' ),
jsDiff = require( 'diff' ),
entities = require( 'entities' ),
@@ -1463,6 +1464,43 @@
};
+/**
+ * Timer that can report to StatsD
+ *
+ * @class
+ * @param {string} [statsdHost] StatsD host in host:port format.
+ */
+Util.Timer = function ( statsdHost ) {
+ var host, port, timers = {};
+
+ statsdHost = /([A-Z0-9.]+):(\d+)/i.exec( statsdHost );
+ if ( statsdHost ) {
+ host = statsdHost[1];
+ port = Number( statsdHost[2] );
+ }
+
+ function send( name, ms ) {
+ name = name.replace( /[\W_]+/g, '.' );
+ var buf = new Buffer( 'parsoid.' + name + ':' + Math.round( ms
) + '|ms' ),
+ sock = dgram.createSocket( 'udp4' );
+ sock.send( buf, 0, buf.length, port, host, sock.close.bind(
sock ) );
+ }
+
+ this.start = function ( name ) {
+ timers[name] = process.hrtime();
+ }
+
+ this.stop = function ( name ) {
+ var delta = process.hrtime( timers[name] ),
+ ms = ( delta[0] * 1000 ) + ( delta[1] * 0.01 );
+ if ( port ) {
+ send( name, ms );
+ }
+ return ms;
+ }
+}
+
+
if (typeof module === object) {
module.exports.Util = Util;
}
diff --git a/lib/mediawiki.parser.environment.js
b/lib/mediawiki.parser.environment.js
index 72fbfa8..94a6aee 100644
--- a/lib/mediawiki.parser.environment.js
+++ b/lib/mediawiki.parser.environment.js
@@ -64,7 +64,7 @@
this.conf.wiki = wikiConfig;
this.conf.parsoid = parsoidConfig;
- this.performance = {};
+ this.timer = new Util.Timer( parsoidConfig.statsdHost );
this.reset( this.page.name );
@@ -206,7 +206,7 @@
// protocols.
this.page.relativeLinkPrefix = './';
}
- this.performance.start = new Date().getTime();
+ this.timer.start( 'serialize' );
};
MWParserEnvironment.prototype.getVariable = function( varname, options ) {
@@ -257,22 +257,6 @@
} );
};
-/**
- * Build a string representing a set of parameters, suitable for use
- * as the value of an HTTP header. Performs no escaping.
-
[MediaWiki-commits] [Gerrit] Remove unused variable - change (mediawiki...MassMessage)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused variable
..
Remove unused variable
Change-Id: I12c8a1a500fb6b0afceea0bd52281decbffd8c62
---
M SpecialMassMessage.php
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialMassMessage.php b/SpecialMassMessage.php
index 01253dc..63b1c3d 100644
--- a/SpecialMassMessage.php
+++ b/SpecialMassMessage.php
@@ -109,7 +109,6 @@
*/
protected function createForm() {
$request = $this-getRequest();
- $context = $this-getContext();
$m = array();
// Who to send to
$m['spamlist'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/112644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12c8a1a500fb6b0afceea0bd52281decbffd8c62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update icon on Beta Preferences - change (mediawiki...Popups)
Yuvipanda has submitted this change and it was merged. Change subject: Update icon on Beta Preferences .. Update icon on Beta Preferences Change-Id: Ife948a8f497508f965f4275c74f73a9d9960366d --- M popups.svg 1 file changed, 26 insertions(+), 22 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/popups.svg b/popups.svg index 5e769f4..778c334 100644 --- a/popups.svg +++ b/popups.svg @@ -3,7 +3,8 @@ titleNavigationPopups_BetaFeaturesIcon/title descriptionCreated with Sketch (http://www.bohemiancoding.com/sketch)/description defs -filter x=-20% y=-20% width=140% height=140% filterUnits=objectBoundingBox id=filter-1 +path id=path-1 d=M254,43 L216,43 L216,156.18 L223.551,162 L237.362,152 L251.253,162 L254,159.95 L254,43 Z/path +filter x=-20% y=-20% width=140% height=140% filterUnits=objectBoundingBox id=filter-2 feOffset dx=1 dy=1 in=SourceAlpha result=shadowOffsetOuter1/feOffset feGaussianBlur stdDeviation=0 in=shadowOffsetOuter1 result=shadowBlurOuter1/feGaussianBlur feColorMatrix values=0 0 0 0 0.831438303 0 0 0 0 0.831319273 0 0 0 0 0.831478775 0 0 0 0.7 0 in=shadowBlurOuter1 type=matrix result=shadowMatrixOuter1/feColorMatrix @@ -18,9 +19,12 @@ path d=M24.833,151.362 L13.366,161.357 L0.5,151.749 L0.5,0.5 L263.5,0.5 L263.5,152.249 L254.5,158.954 L254.5,42.5 L215.5,42.5 L215.5,155.1 L211.107,151.369 L203.5,156.699 L203.5,42.5 L48.5,42.5 L48.5,153.349 L38.749,161.38 L24.833,151.362 Z id=Shape fill=#FF sketch:type=MSShapeGroup/path path d=M263,1 L263,151.998 L255,157.958 L255,43 L255,42 L254,42 L216,42 L215,42 L215,43 L215,154.019 L211.726,151.24 L211.137,150.741 L210.504,151.181 L204,155.738 L204,43 L204,42 L203,42 L49,42 L48,42 L48,43 L48,153.099 L38.743,160.76 L25.448,151.191 L24.804,150.726 L24.206,151.247 L13.342,160.717 L1,151.499 L1,1 L263,1 L263,1 Z M264,0 L0,0 L0,152 L13.391,162 L24.864,152 L38.755,162 L49,153.6 L49,43 L203,43 L203,157.66 L211.078,152 L216,156.18 L216,43 L254,43 L254,159.95 L264,152.5 L264,0 L264,0 L264,0 L264,0 Z id=Shape fill=#E5E5E5 sketch:type=MSShapeGroup/path /g -path d=M203,43 L49,43 L49,153.6 L51.145,152 L63.7,162 L77.509,152 L91.738,162 L104.71,152 L117.683,162 L131.494,152 L143.63,162 L157.021,152 L171.25,162 L184.222,152 L197.196,162 L203,157.66 L203,43 Z id=Shape fill=#F7F7F7 sketch:type=MSShapeGroup/path +path d=M203,43 L49,43 L49,153.6 L51.145,152 L63.7,162 L77.509,152 L91.738,162 L104.71,152 L117.683,162 L131.494,152 L143.63,162 L157.021,152 L171.25,162 L184.222,152 L197.196,162 L203,157.66 L203,43 Z id=Shape fill=#E5E5E5 sketch:type=MSShapeGroup/path path d=M11,36 C11,28.268 17.268,22 25,22 C32.732,22 39,28.268 39,36 C39,43.732 32.732,50 25,50 C17.268,50 11,43.732 11,36 C11,36 11,43.732 11,36 L11,36 L11,36 Z id=Ellipse fill=#E5E5E5 sketch:type=MSShapeGroup/path -path d=M254,159.95 L254,43 L216,43 L216,156.18 L223.551,162 L237.362,152 L251.253,162 L254,159.95 L254,159.95 L254,159.95 L254,159.95 Z id=Shape fill=#F7F7F7 sketch:type=MSShapeGroup/path +g id=Shape opacity=0.5 +use fill=#E5E5E5 fill-rule=evenodd sketch:type=MSShapeGroup xlink:href=#path-1/use +use fill=none xlink:href=#path-1/use +/g path d=M38,107 L38,72 L13,72 L13,107 L38,107 L38,107 L38,107 L38,107 Z id=Shape fill=#E5E5E5 sketch:type=MSShapeGroup/path path d=M232.51,5 L258.51,5 L258.51,11 L232.51,11 L232.51,5 L232.51,5 L232.51,5 L232.51,5 Z id=Shape fill=#E5E5E5 sketch:type=MSShapeGroup/path rect id=Rectangle fill=#E5E5E5 sketch:type=MSShapeGroup x=208.51 y=5 width=22 height=6/rect @@ -33,29 +37,29 @@ path d=M2,14.5 L262,14.5 id=Shape stroke=#E5E5E5 fill=#E5E5E5 sketch:type=MSShapeGroup/path rect id=Rectangle fill=#E5E5E5 sketch:type=MSShapeGroup x=52 y=7 width=2 height=2/rect path d=M38,59 L38,54 L13,54 L13,59 L38,59 L38,59 L38,59 L38,59 Z id=Shape fill=#E5E5E5 sketch:type=MSShapeGroup/path -g id=Group sketch:type=MSLayerGroup transform=translate(91.01, 88.00) -path d=M37.8857143,0 L11,0 L11,5.48571429 L37.8857143,5.48571429 L37.8857143,0 Z id=Shape-copy fill=#9B9B9B sketch:type=MSShapeGroup/path -path d=M77.8757143,24.6857143 L77.8757143,18.5142857 L42.0571429,18.5142857 L42.0571429,24.6857143 L77.8757143,24.6857143 L77.8757143,24.6857143 L77.8757143,24.6857143 L77.8757143,24.6857143 Z id=Shape-copy-2 fill=#9B9B9B sketch:type=MSShapeGroup/path -path d=M14.6285714,8.91428571 L-0.0571428571,8.91428571 L-0.0571428571,15 L14.6285714,15 L14.6285714,8.91428571 Z id=Shape-copy-2 fill=#9B9B9B sketch:type=MSShapeGroup/path -path d=M84.0857143,14.4 L84.0857143,8.91428571 L57.5142857,8.91428571 L57.5142857,14.4 L78.0857143,14.4 L84.0857143,14.4 Z
[MediaWiki-commits] [Gerrit] Disable UndefinedFunctionCheck - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Disable UndefinedFunctionCheck
..
Disable UndefinedFunctionCheck
It is broken for constructors of classes in namespaces. See
https://github.com/facebook/phpsh/issues/53
Change-Id: I5c7e023584f36993c9b4a37fe2674e5719bd02b2
---
A puppet/modules/mediawiki/files/phpsh/config
M puppet/modules/mediawiki/manifests/phpsh.pp
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/files/phpsh/config
b/puppet/modules/mediawiki/files/phpsh/config
new file mode 100644
index 000..89d7631
--- /dev/null
+++ b/puppet/modules/mediawiki/files/phpsh/config
@@ -0,0 +1,3 @@
+[General]
+
+UndefinedFunctionCheck: no
diff --git a/puppet/modules/mediawiki/manifests/phpsh.pp
b/puppet/modules/mediawiki/manifests/phpsh.pp
index ca4df30..734dbef 100644
--- a/puppet/modules/mediawiki/manifests/phpsh.pp
+++ b/puppet/modules/mediawiki/manifests/phpsh.pp
@@ -21,6 +21,11 @@
ensure = directory,
}
+file { '/etc/phpsh/config':
+ensure = present,
+source = 'puppet:///modules/mediawiki/phpsh/config'
+}
+
file { '/etc/phpsh/rc.php':
require = Package['phpsh'],
content = template('mediawiki/rc.php.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/112638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c7e023584f36993c9b4a37fe2674e5719bd02b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Registering GlobalUserrights Popups - change (mediawiki/extensions)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/112648 Change subject: Registering GlobalUserrights Popups .. Registering GlobalUserrights Popups Change-Id: I1c794f7ca3facee34405469fab77b8372b92476b --- M .gitmodules A GlobalUserrights A Popups 3 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/48/112648/1 diff --git a/.gitmodules b/.gitmodules index 7e659fb..43c69bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -822,6 +822,10 @@ path = GlobalUserGroups url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GlobalUserGroups.git branch = . +[submodule GlobalUserrights] + path = GlobalUserrights + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GlobalUserrights.git + branch = . [submodule GoogleAdSense] path = GoogleAdSense url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GoogleAdSense.git @@ -1602,6 +1606,10 @@ path = PopupPages url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PopupPages.git branch = . +[submodule Popups] + path = Popups + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Popups.git + branch = . [submodule PostEdit] path = PostEdit url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PostEdit.git diff --git a/GlobalUserrights b/GlobalUserrights new file mode 16 index 000..b70c8c9 --- /dev/null +++ b/GlobalUserrights +Subproject commit b70c8c923f224f31e48fedf25fb62b4e4a2b5800 diff --git a/Popups b/Popups new file mode 16 index 000..4075898 --- /dev/null +++ b/Popups +Subproject commit 4075898b9d50b0480be0b48dced60629e0e1d253 -- To view, visit https://gerrit.wikimedia.org/r/112648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c794f7ca3facee34405469fab77b8372b92476b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master 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] Registering GlobalUserrights Popups - change (mediawiki/extensions)
Hashar has submitted this change and it was merged. Change subject: Registering GlobalUserrights Popups .. Registering GlobalUserrights Popups Change-Id: I1c794f7ca3facee34405469fab77b8372b92476b --- M .gitmodules A GlobalUserrights A Popups 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index 7e659fb..43c69bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -822,6 +822,10 @@ path = GlobalUserGroups url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GlobalUserGroups.git branch = . +[submodule GlobalUserrights] + path = GlobalUserrights + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GlobalUserrights.git + branch = . [submodule GoogleAdSense] path = GoogleAdSense url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GoogleAdSense.git @@ -1602,6 +1606,10 @@ path = PopupPages url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PopupPages.git branch = . +[submodule Popups] + path = Popups + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Popups.git + branch = . [submodule PostEdit] path = PostEdit url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PostEdit.git diff --git a/GlobalUserrights b/GlobalUserrights new file mode 16 index 000..b70c8c9 --- /dev/null +++ b/GlobalUserrights +Subproject commit b70c8c923f224f31e48fedf25fb62b4e4a2b5800 diff --git a/Popups b/Popups new file mode 16 index 000..4075898 --- /dev/null +++ b/Popups +Subproject commit 4075898b9d50b0480be0b48dced60629e0e1d253 -- To view, visit https://gerrit.wikimedia.org/r/112648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c794f7ca3facee34405469fab77b8372b92476b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Sphinx function documentation for deploy module - change (operations/puppet)
Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112649
Change subject: Add Sphinx function documentation for deploy module
..
Add Sphinx function documentation for deploy module
This change adds basic Sphinx documentation to the deploy module.
Change-Id: Ia8f04c8bc95ef521192e1ea9fa1a176b4bd58b8a
---
M modules/deployment/files/modules/deploy.py
1 file changed, 152 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/112649/1
diff --git a/modules/deployment/files/modules/deploy.py
b/modules/deployment/files/modules/deploy.py
index c024c07..13848d1 100644
--- a/modules/deployment/files/modules/deploy.py
+++ b/modules/deployment/files/modules/deploy.py
@@ -12,6 +12,8 @@
def _get_redis_serv():
'''
Return a redis server object
+
+:rtype: A Redis object
'''
deployment_config = __pillar__.get('deployment_config')
deploy_redis = deployment_config['redis']
@@ -22,6 +24,16 @@
def _check_in(function, repo):
+
+Private function used for reporting that a function has started.
+Writes to redis with basic status information.
+
+:param function: The function being reported on.
+:type function: str
+:param repo: The repository being acted on.
+:type repo: str
+:rtype: None
+
serv = _get_redis_serv()
minion = __grains__.get('id')
timestamp = time.time()
@@ -39,6 +51,16 @@
def _map_args(repo, args):
+
+Maps a set of arguments to a predefined set of values. Currently only
+__REPO__ is support and will be replaced with the repository name.
+
+:param repo: The repo name used for mapping.
+:type repo: str
+:param args: An array of arguments to map.
+:type args: list
+:rtype: list
+
arg_map = {'__REPO__': repo}
mapped_args = []
for arg in args:
@@ -47,6 +69,14 @@
def get_config(repo):
+
+Fetches the configuration for this repo from the pillars and returns
+a hash with the munged configuration (with defaults and helper config).
+
+:param repo: The specific repo for which to return config data.
+:type repo: str
+:rtype: hash
+
deployment_config = __pillar__.get('deployment_config')
config = __pillar__.get('repo_config')
config = config[repo]
@@ -90,6 +120,14 @@
def deployment_server_init():
+
+Initializes a set of repositories on the deployment server. This
+function will only run on the deployment server and will initialize
+any repository defined in the pillar configuration. This function is
+safe to call at any point.
+
+:rtype: int
+
serv = _get_redis_serv()
is_deployment_server = __grains__.get('deployment_server')
hook_dir = __grains__.get('deployment_global_hook_dir')
@@ -134,11 +172,20 @@
def sync_all():
'''
-Sync all repositories. If a repo doesn't exist on target, clone as well.
+Sync all repositories for this minion. If a repo doesn't exist on target,
+clone it as well. This function will ensure all repositories for the
+minion are at the current tag as defined by the master and is
+be safe to call at any point.
-CLI Example::
+CLI Example (from the master):
-salt -G 'cluster:appservers' deploy.sync_all
+salt -G 'deployment_target:test' deploy.sync_all
+
+CLI Example (from a minion):
+
+salt-call deploy.sync_all
+
+:rtype: hash
'''
repo_config = __pillar__.get('repo_config')
deployment_target = __grains__.get('deployment_target')
@@ -157,6 +204,23 @@
def _update_gitmodules(config, location, shadow=False):
+
+Finds all .gitmodules in a repository, changes all submodules within them
+to point to the correct submodule on the deployment server, then runs
+a submodule sync. This function is in support of recursive submodules.
+
+In the case we need to update a shadow reference repo, the .gitmodules
+files will have their submodules point to the reference clone.
+
+:param config: The config hash for the repo (as pulled from get_config).
+:type config: hash
+:param location: The location on the filesystem to find the .gitmodules
+ files.
+:type location: str
+:param shadow: Defines whether or not this is a shadow reference repo.
+:type shadow: bool
+:rtype: int
+
gitmodules_list = __salt__['file.find'](location, name='.gitmodules')
for gitmodules in gitmodules_list:
gitmodules_dir = os.path.dirname(gitmodules)
@@ -203,6 +267,21 @@
def _clone(config, location, tag, shadow=False):
+
+Perform a clone of a repo at a specified location, and
+do a fetch and checkout of the repo to ensure it's at the
+current deployment tag.
+
+:param config: Config hash as fetched from get_config
+:type config: hash
+:param location: The
[MediaWiki-commits] [Gerrit] Update VisualEditor groups - change (translatewiki)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/112650 Change subject: Update VisualEditor groups .. Update VisualEditor groups * Add all VisualEditor groups to Extensions used by Wikimedia Main. * Rename the Wikia VisualEditor extension. Change-Id: Ie0f82be80d052eee97031005e1f0e40bf81a8493 --- M groups/MediaWiki/WikimediaMainAgg.yaml M groups/Wikia/extensions.txt 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/50/112650/1 diff --git a/groups/MediaWiki/WikimediaMainAgg.yaml b/groups/MediaWiki/WikimediaMainAgg.yaml index 98c5822..ec4280a 100644 --- a/groups/MediaWiki/WikimediaMainAgg.yaml +++ b/groups/MediaWiki/WikimediaMainAgg.yaml @@ -45,7 +45,10 @@ - ext-torblock - ext-universallanguageselector # change-id: b78d96d69d820c13ed262d5558d8c6e0ba5a6b2a - ext-uploadwizard - - ext-visualeditor # r106062 + - ext-visualeditor-oojs-ui + - ext-visualeditor-ve + - ext-visualeditor-ve-mw + - ext-visualeditor-ve-wmf - ext-wikibase-client # change-id: 5f4c990f3a102f8ae51e4d7bd3f6cf15550a2bf4 - ext-wikibase-lib # change-id: 5f4c990f3a102f8ae51e4d7bd3f6cf15550a2bf4 - ext-wikibase-repo # change-id: 5f4c990f3a102f8ae51e4d7bd3f6cf15550a2bf4 diff --git a/groups/Wikia/extensions.txt b/groups/Wikia/extensions.txt index c415b36..338dce0 100644 --- a/groups/Wikia/extensions.txt +++ b/groups/Wikia/extensions.txt @@ -293,7 +293,7 @@ #Video Handlers #file = VideoHandlers/VideoHandlers.i18n.php -Visual Editor +Visual Editor (Wikia) file = ../VisualEditor/wikia/VisualEditor.i18n.php Wall -- To view, visit https://gerrit.wikimedia.org/r/112650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0f82be80d052eee97031005e1f0e40bf81a8493 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hourly logrot for parsoid for now - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112651
Change subject: hourly logrot for parsoid for now
..
hourly logrot for parsoid for now
Change-Id: I61fc3142ac7a553402f992295ccfaf880eb9159e
---
M manifests/role/parsoid.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/112651/1
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 3197d3b..45fe445 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -102,6 +102,15 @@
content = template('misc/parsoid.logrotate.erb'),
}
+cron { 'parsoid-hourly-logrot':
+ensure = present,
+command = '/usr/sbin/logrotate /etc/logrotate.d/parsoid'
+user= 'root',
+hour= '*',
+minute = '12',
+ require = File['/etc/logrotate.d/parsoid'],
+}
+
# Still using the old init script for now
service { 'parsoid':
ensure = running,
--
To view, visit https://gerrit.wikimedia.org/r/112651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61fc3142ac7a553402f992295ccfaf880eb9159e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hourly logrot for parsoid for now - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: hourly logrot for parsoid for now
..
hourly logrot for parsoid for now
Change-Id: I61fc3142ac7a553402f992295ccfaf880eb9159e
---
M manifests/role/parsoid.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 3197d3b..ec5372f 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -102,6 +102,15 @@
content = template('misc/parsoid.logrotate.erb'),
}
+cron { 'parsoid-hourly-logrot':
+ensure = present,
+command = '/usr/sbin/logrotate /etc/logrotate.d/parsoid',
+user= 'root',
+hour= '*',
+minute = '12',
+ require = File['/etc/logrotate.d/parsoid'],
+}
+
# Still using the old init script for now
service { 'parsoid':
ensure = running,
--
To view, visit https://gerrit.wikimedia.org/r/112651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61fc3142ac7a553402f992295ccfaf880eb9159e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@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: Add a group description for a VisualEditor aggregate group - change (mediawiki...Translate)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/112653 Change subject: WIP: Add a group description for a VisualEditor aggregate group .. WIP: Add a group description for a VisualEditor aggregate group Change-Id: I9f344ce8bfc9f73f312e95fc55e4cbc472b1 --- M i18n/groupdescriptions/en.json 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/53/112653/1 diff --git a/i18n/groupdescriptions/en.json b/i18n/groupdescriptions/en.json index c961b3f..81308e7 100644 --- a/i18n/groupdescriptions/en.json +++ b/i18n/groupdescriptions/en.json @@ -12,6 +12,7 @@ translate-group-desc-readerfeedback: Meta message group containing all messages for the MediaWiki extension [http://www.mediawiki.org/wiki/Extension:ReaderFeedback ReaderFeedback], translate-group-desc-semantic: Meta message group containing all messages for all [http://semantic-mediawiki.org/ Semantic MediaWiki] extensions, translate-group-desc-translate: Meta message group containing all messages for the MediaWiki extension [http://www.mediawiki.org/wiki/Extension:Translate Translate]; please familiarize yourself with its [//www.mediawiki.org/wiki/Help:Extension:Translate/Glossary glossary], +translate-group-desc-visualeditor: Meta message group containing all messages for the MediaWiki extension [http://www.mediawiki.org/wiki/Extension:VisualEditor VisualEditor] and related software packages, translate-group-desc-wikiaextensions: Meta message group containing all messages for supported MediaWiki extensions used by [http://www.wikia.com Wikia], translate-group-desc-wikimediaextensions: Meta message group containing all messages for supported MediaWiki extensions used by the [http://wikimedia.org/ Wikimedia Foundation], translate-group-desc-wikimediaextensions-main: Meta message group containing all messages for supported MediaWiki extensions required to be translated for the Wikimedia [http://meta.wikimedia.org/wiki/Language_committee Language committee], @@ -51,4 +52,4 @@ translate-group-desc-waymarked-trails-help: The help pages of the Waymarked Trails web sites: http://waymarkedtrails.org/help/about;, translate-group-desc-etherpad-lite: [[Translating:Etherpad lite|Etherpad lite]] is a really-real time collaborative editor, translate-group-desc-mathjax: [[Translating:MathJax|MathJax]] is a cross-browser JavaScript library that displays mathematical notation in web browsers -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/112653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f344ce8bfc9f73f312e95fc55e4cbc472b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] browsertests: replace -p ciwmf with --tags @clean - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/112654 Change subject: browsertests: replace -p ciwmf with --tags @clean .. browsertests: replace -p ciwmf with --tags @clean The ciwmf cucumber profile has been removed from the repositories, instead QA would like to whitelist scenario using the @clean tag for features that works on a freshly installed wiki. Update jobs: mwext-browsertests-MobileFrontend-phantomjs mwext-browsertests-Translatewiki-phantomjs mwext-browsertests-UniversalLanguageSelector-phantomjs mwext-browsertests-VisualEditor-phantomjs Change-Id: Ib4e874bdbefdd9730c582020a42548a5036d5a73 --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/54/112654/1 diff --git a/macro.yaml b/macro.yaml index 2e967a3..f13ce0b 100644 --- a/macro.yaml +++ b/macro.yaml @@ -109,7 +109,7 @@ export MEDIAWIKI_USER=WikiAdmin export MEDIAWIKI_PASSWORD=testpass /srv/deployment/integration/slave-scripts/tools/bundler/bundle exec cucumber --color \ --p ciwmf \ +--tags @clean \ --format pretty \ --format junit --out $WORKSPACE/log \ --format html --out $WORKSPACE/log/report.html -- To view, visit https://gerrit.wikimedia.org/r/112654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4e874bdbefdd9730c582020a42548a5036d5a73 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master 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] Rename the Wikia VisualEditor group - change (translatewiki)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/112655 Change subject: Rename the Wikia VisualEditor group .. Rename the Wikia VisualEditor group To avoid confusion with the WMF VisualEditor. Change-Id: I0d0ed3e3456895ab46cf652de16887267d8e9445 --- M groups/Wikia/extensions.txt 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/55/112655/1 diff --git a/groups/Wikia/extensions.txt b/groups/Wikia/extensions.txt index c415b36..0f992ab 100644 --- a/groups/Wikia/extensions.txt +++ b/groups/Wikia/extensions.txt @@ -293,8 +293,9 @@ #Video Handlers #file = VideoHandlers/VideoHandlers.i18n.php -Visual Editor +Visual Editor (Wikia) file = ../VisualEditor/wikia/VisualEditor.i18n.php +id = wikia-visualeditor Wall optional = wall-history-username-full, wall-history-username-short, mail-notification-subject, mail-notification-html-footer-line3 -- To view, visit https://gerrit.wikimedia.org/r/112655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d0ed3e3456895ab46cf652de16887267d8e9445 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] browsertests: replace -p ciwmf with --tags @clean - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: browsertests: replace -p ciwmf with --tags @clean .. browsertests: replace -p ciwmf with --tags @clean The ciwmf cucumber profile has been removed from the repositories, instead QA would like to whitelist scenario using the @clean tag for features that works on a freshly installed wiki. Update jobs: mwext-browsertests-MobileFrontend-phantomjs mwext-browsertests-Translatewiki-phantomjs mwext-browsertests-UniversalLanguageSelector-phantomjs mwext-browsertests-VisualEditor-phantomjs Change-Id: Ib4e874bdbefdd9730c582020a42548a5036d5a73 --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index 2e967a3..f13ce0b 100644 --- a/macro.yaml +++ b/macro.yaml @@ -109,7 +109,7 @@ export MEDIAWIKI_USER=WikiAdmin export MEDIAWIKI_PASSWORD=testpass /srv/deployment/integration/slave-scripts/tools/bundler/bundle exec cucumber --color \ --p ciwmf \ +--tags @clean \ --format pretty \ --format junit --out $WORKSPACE/log \ --format html --out $WORKSPACE/log/report.html -- To view, visit https://gerrit.wikimedia.org/r/112654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4e874bdbefdd9730c582020a42548a5036d5a73 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Jhall jh...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@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] Create Wikibase URL if it's a Wikibase item. - change (mediawiki...PubSubHubbub)
Nik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112656
Change subject: Create Wikibase URL if it's a Wikibase item.
..
Create Wikibase URL if it's a Wikibase item.
Change-Id: I58204b4cfa72b843795a79f985da922a44feee62
---
M PubSubHubbub.body.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PubSubHubbub
refs/changes/56/112656/1
diff --git a/PubSubHubbub.body.php b/PubSubHubbub.body.php
index 134317c..499259c 100644
--- a/PubSubHubbub.body.php
+++ b/PubSubHubbub.body.php
@@ -39,6 +39,14 @@
}
public static function getPageURL( $title ) {
+ if ( defined( 'WB_VERSION' ) ) {
+ // Wikibase extension is installed
+ if ( \Wikibase\NamespaceUtils::isEntityNamespace(
$title-getNamespace() ) ) {
+ $specialTitle = Title::makeTitle( -1,
'EntityData' );
+ return $specialTitle-getCanonicalURL() . / .
$title-getBaseText() . '.json';
+ }
+ }
+
return $title-getCanonicalURL( array(
'action' = 'raw'
) );
--
To view, visit https://gerrit.wikimedia.org/r/112656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58204b4cfa72b843795a79f985da922a44feee62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PubSubHubbub
Gerrit-Branch: master
Gerrit-Owner: Nik sebastian.brueck...@student.hpi.uni-potsdam.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] browsertests: set API_URL to api.php - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/112657 Change subject: browsertests: set API_URL to api.php .. browsertests: set API_URL to api.php Change-Id: I90a1e30f1ad69c5e4fa54c7851697366443b83aa --- M macro.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/57/112657/1 diff --git a/macro.yaml b/macro.yaml index f13ce0b..134700a 100644 --- a/macro.yaml +++ b/macro.yaml @@ -106,6 +106,7 @@ /srv/deployment/integration/slave-scripts/tools/bundler/bundle install --path vendor export BROWSER_LABEL=phantomjs export MEDIAWIKI_URL=http://localhost:9413/$TEST_ID/index.php?title=; +export API_URL=http://localhost:9413/$TEST_ID/api.php; export MEDIAWIKI_USER=WikiAdmin export MEDIAWIKI_PASSWORD=testpass /srv/deployment/integration/slave-scripts/tools/bundler/bundle exec cucumber --color \ -- To view, visit https://gerrit.wikimedia.org/r/112657 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90a1e30f1ad69c5e4fa54c7851697366443b83aa Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master 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] browsertests: set API_URL to api.php - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: browsertests: set API_URL to api.php .. browsertests: set API_URL to api.php Change-Id: I90a1e30f1ad69c5e4fa54c7851697366443b83aa --- M macro.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index f13ce0b..134700a 100644 --- a/macro.yaml +++ b/macro.yaml @@ -106,6 +106,7 @@ /srv/deployment/integration/slave-scripts/tools/bundler/bundle install --path vendor export BROWSER_LABEL=phantomjs export MEDIAWIKI_URL=http://localhost:9413/$TEST_ID/index.php?title=; +export API_URL=http://localhost:9413/$TEST_ID/api.php; export MEDIAWIKI_USER=WikiAdmin export MEDIAWIKI_PASSWORD=testpass /srv/deployment/integration/slave-scripts/tools/bundler/bundle exec cucumber --color \ -- To view, visit https://gerrit.wikimedia.org/r/112657 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90a1e30f1ad69c5e4fa54c7851697366443b83aa Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Browser test] @clean the Basic Edit feature - change (mediawiki...VisualEditor)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/112659 Change subject: [Browser test] @clean the Basic Edit feature .. [Browser test] @clean the Basic Edit feature Merely for testing the browser test Jenkins job. Change-Id: I425af4bd2f6e709252931dc49d64bb4f47539710 --- M modules/ve-mw/test/browser/features/anon.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/59/112659/1 diff --git a/modules/ve-mw/test/browser/features/anon.feature b/modules/ve-mw/test/browser/features/anon.feature index 387abc3..51ceff8 100644 --- a/modules/ve-mw/test/browser/features/anon.feature +++ b/modules/ve-mw/test/browser/features/anon.feature @@ -1,4 +1,4 @@ -@ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org +@clean @ie6-bug @ie7-bug @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org Feature: VisualEditor @login -- To view, visit https://gerrit.wikimedia.org/r/112659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I425af4bd2f6e709252931dc49d64bb4f47539710 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master 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] [WIP] Add EventLogging [WIP] - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112661
Change subject: [WIP] Add EventLogging [WIP]
..
[WIP] Add EventLogging [WIP]
Schema: https://meta.wikimedia.org/wiki/Schema:Popups
Change-Id: Id17e81794561f022e004e18cf3595c3ffd6f3fd0
---
M Popups.hooks.php
M Popups.php
M resources/ext.popups.core.js
3 files changed, 25 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/61/112661/1
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 07e62cb..0bd8e8d 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -40,6 +40,7 @@
class_exists( 'ApiQueryPageImages' )
) {
$out-addModules( array( 'ext.popups' ) );
+ $out-addModules( array( 'schema.Popups' ) );
}
}
}
diff --git a/Popups.php b/Popups.php
index 3faafaa..2ff3831 100644
--- a/Popups.php
+++ b/Popups.php
@@ -34,7 +34,7 @@
$remoteExtPath = 'Popups';
$wgResourceModules = array_merge( $wgResourceModules, array(
- ext.popups = array(
+ 'ext.popups' = array(
'scripts' = 'resources/ext.popups.core.js',
'styles' = array(
'resources/ext.popups.core.less',
@@ -46,8 +46,15 @@
'remoteExtPath' = $remoteExtPath,
'localBasePath' = $localBasePath,
),
+
+ 'schema.Popups' = array(
+ 'class' = 'ResourceLoaderSchemaModule',
+ 'schema' = 'Popups',
+ 'revision' = 7446823,
+ ),
) );
+
$wgAutoloadClasses['PopupsHooks'] = __DIR__ . '/Popups.hooks.php';
$wgExtensionMessagesFiles['Popups'] = __DIR__ . '/Popups.i18n.php';
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index 8b8c91a..e74d7c2 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -9,6 +9,8 @@
var closeTimer, // The timer use to delay `closeBox`
openTimer, // The timer used to delay sending the API
request/opening the popup form cache
+ elTime, // EL: UNIX timestamp of when the popup was
rendered
+ elDuration, // EL: How long was the popup open in
milliseconds
currentLink, // DOM element of the current anchor tag
cache = {},
curRequest, // Current API request
@@ -91,6 +93,7 @@
var bar = cache[ href ],
offsetTop = $el.offset().top + $el.height() + 5,
offsetLeft = $el.offset().left;
+ elTime = +new Date();
$box
.children()
.detach()
@@ -141,6 +144,9 @@
* `currentLink` to undefined.
*/
function closeBox () {
+ var now = +new Date();
+ elDuration = now - elTime;
+
$( currentLink ).removeClass( 'mwe-popups-anchor-hover'
).off( 'mouseleave', leaveActive );
$box
@@ -158,9 +164,19 @@
if ( closeTimer ){
clearTimeout( closeTimer );
}
+
+ logEvent();
currentLink = closeTimer = undefined;
}
+ function logEvent () {
+ mw.eventLog.logEvent( 'Popups', {
+ page: mw.config.get( 'wgTitle' ),
+ duration: elDuration,
+ wasClicked: false
+ } );
+ }
+
// Remove title attribute to remove the default yellow tooltip
// Put the title back after the hover
$( '#mw-content-text a' )
--
To view, visit https://gerrit.wikimedia.org/r/112661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id17e81794561f022e004e18cf3595c3ffd6f3fd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove gradients, minor cleanup - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove gradients, minor cleanup
..
Remove gradients, minor cleanup
Fix formatting and grammar and duplicate selectors. Due to the
duplication, one of the gradients was not taking effect previously
anyway. Also, the new core buttons do not use gradients, so this
moves us a step closer.
Change-Id: Ifc69ee714be897f02964c82e54b765d48849a45f
---
M resources/ext.gettingstarted.return.css
1 file changed, 8 insertions(+), 22 deletions(-)
Approvals:
Pginer: Looks good to me, but someone else must approve
Swalling: Looks good to me, but someone else must approve
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gettingstarted.return.css
b/resources/ext.gettingstarted.return.css
index ed4ed39..5db9604 100644
--- a/resources/ext.gettingstarted.return.css
+++ b/resources/ext.gettingstarted.return.css
@@ -15,7 +15,7 @@
#mw-gettingstarted-editable-main-edit-page {
/*
Can use min-width here to avoid bad wrapping (e.g. text
- different on line from icon), since it is not intended
+ is on a different line from icon), since it is not intended
to wrap.
*/
min-width: 210px;
@@ -100,28 +100,14 @@
}
.mw-ui-button.mw-gettingstarted-cta-secondary:hover {
-/*
- TODO (mattflaschen, 2013-10-03): This is inconsistent with
- normal mw.ui secondary buttons. We should make them match.
-*/
-background-color: #fbfbfb;
-border-color: #cc;
-background-image: -webkit-gradient(linear, 50% 0%, 50% 100%,
color-stop(0%, #fbfbfb), color-stop(100%, #f8f8f8));
-background-image: -webkit-linear-gradient(top, #fbfbfb, #f8f8f8);
-background-image: -moz-linear-gradient(top, #fbfbfb, #f8f8f8);
-background-image: -o-linear-gradient(top, #fbfbfb, #f8f8f8);
-background-image: linear-gradient(top, #fbfbfb, #f8f8f8);
+ /*
+ TODO (mattflaschen, 2013-10-03): This is inconsistent with
+ normal mw.ui secondary buttons. We should make them match.
+ */
+ background-color: #fbfbfb;
+ border-color: #cc;
}
.mw-ui-button.mw-gettingstarted-cta-secondary {
-background-image: -webkit-gradient(linear, 50% 0%, 50% 100%,
color-stop(0%, #f8f8f8), color-stop(100%, #f0f0f0));
-background-image: -webkit-linear-gradient(top, #f8f8f8, #f0f0f0);
-background-image: -moz-linear-gradient(top, #f8f8f8, #f0f0f0);
-background-image: -o-linear-gradient(top, #f8f8f8, #f0f0f0);
-background-image: linear-gradient(top, #f8f8f8, #f0f0f0);
- }
-
-.mw-ui-button.mw-gettingstarted-cta-secondary {
- background-image: none;
background-color: #F5F5F5;
border: 1px solid #D3D3D3;
color: #44;
@@ -149,4 +135,4 @@
clear: both;
margin-top: 20px;
font-size: 0.8em;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/44
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc69ee714be897f02964c82e54b765d48849a45f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
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] New Wikidata Build - change (mediawiki...Wikidata)
wikidata-servi...@wikimedia.de has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112662
Change subject: New Wikidata Build
..
New Wikidata Build
Change-Id: Ia50f98acf4372cd70a203d32f525a90c137a9bdd
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.i18n.php
M extensions/Wikibase/client/includes/modules/SiteModule.php
M
extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
M extensions/Wikibase/lib/WikibaseLib.i18n.php
M extensions/Wikibase/repo/Wikibase.i18n.php
M extensions/Wikibase/repo/includes/api/FormatSnakValue.php
M extensions/Wikibase/repo/includes/api/ParseValue.php
M extensions/Wikibase/repo/includes/api/SetSiteLink.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
13 files changed, 84 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/62/112662/1
diff --git a/composer.lock b/composer.lock
index 47b4583..14fe936 100644
--- a/composer.lock
+++ b/composer.lock
@@ -46,7 +46,7 @@
{
name: Kyle Robinson Young,
email: k...@dontkry.com,
-homepage: https://github.com/shama;,
+homepage: http://dontkry.com;,
role: Developer
}
],
@@ -848,12 +848,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: c4062fdfe5c4349411092a8baf4486454b0a5d59
+reference: e16fb2d35599e010f0745237f11034b5b8e3fc32
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c4062fdfe5c4349411092a8baf4486454b0a5d59;,
-reference: c4062fdfe5c4349411092a8baf4486454b0a5d59,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e16fb2d35599e010f0745237f11034b5b8e3fc32;,
+reference: e16fb2d35599e010f0745237f11034b5b8e3fc32,
shasum:
},
require: {
@@ -912,7 +912,7 @@
wikibaserepo,
wikidata
],
-time: 2014-02-09 20:18:22
+time: 2014-02-10 20:51:00
}
],
packages-dev: [
diff --git a/extensions/Wikibase/client/WikibaseClient.i18n.php
b/extensions/Wikibase/client/WikibaseClient.i18n.php
index a74f0b2..44f37d1 100644
--- a/extensions/Wikibase/client/WikibaseClient.i18n.php
+++ b/extensions/Wikibase/client/WikibaseClient.i18n.php
@@ -326,6 +326,7 @@
/** Arabic (العربية)
* @author Abanima
* @author Ali1
+ * @author Asaifm
* @author Basharh
* @author Meno25
* @author OsamaK
@@ -366,6 +367,7 @@
'wikibase-rc-hide-wikidata' = '$1 ويكيبيانات',
'wikibase-rc-show-wikidata-pref' = 'إظهار تعديلات ويكي بيانات في صفحة
أحدث التغييرات',
'wikibase-rc-wikibase-edit-letter' = 'د',
+ 'wikibase-unconnectedpages-submit' = 'اذهب',
);
/** Aramaic (ܐܪܡܝܐ)
@@ -2651,6 +2653,7 @@
*/
$messages['lrc'] = array(
'wikibase-comment-sitelink-add' = 'هوم پیوند زون اضاف بیه:$1',
+ 'wikibase-comment-sitelink-change' = 'هوم پیوند زون د $1 تا $2 آلشت
بی',
'wikibase-comment-sitelink-remove' = 'هوم پیوند زون ورداشته بیه:$1',
'wikibase-linkitem-selectlink' = 'لطفن یه گل سیلجا و بلگه که شما
میهایت د ای بلگه هوم پیوند با انتخاو بکید.',
'wikibase-linkitem-input-site' = 'زون:',
diff --git a/extensions/Wikibase/client/includes/modules/SiteModule.php
b/extensions/Wikibase/client/includes/modules/SiteModule.php
index c07915a..e2933cb 100644
--- a/extensions/Wikibase/client/includes/modules/SiteModule.php
+++ b/extensions/Wikibase/client/includes/modules/SiteModule.php
@@ -5,7 +5,7 @@
use ResourceLoaderModule;
use ResourceLoaderContext;
use MediaWikiSite;
-use Sites;
+use SiteSQLStore;
use Wikibase\Client\WikibaseClient;
/**
@@ -32,14 +32,11 @@
/**
* @var MediaWikiSite $site
*/
- $site = Sites::singleton()-getSite( Settings::get(
'siteGlobalID' ) );
+ $site = SiteSQLStore::newInstance()-getSite( Settings::get(
'siteGlobalID' ) );
$currentSite = array();
if ( $site ) {
- $languageName = Utils::fetchLanguageName(
$site-getLanguageCode() );
$currentSite = array(
- 'shortName' = $languageName,
- 'name' = $languageName,
'globalSiteId' = $site-getGlobalId(),
'languageCode' = $site-getLanguageCode(),
[MediaWiki-commits] [Gerrit] mediawiki.api.test: Use sinon sandbox for unit tests - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.api.test: Use sinon sandbox for unit tests
..
mediawiki.api.test: Use sinon sandbox for unit tests
Make the unit tests faster and more standalone:
* Don't make a request to the actual API, instead provide the
response via the fake server and purely test the mw.Api interface.
* No need for promise aggregration since the process is now
synchronous.
* No arbitrary delays for async or animations etc. as sinon
artificially fast-forwards setTimeout, Date and others for us.
Also:
* Move assertion for API error handling to separate test.
Change-Id: I20b17f256bc5114c6c2c3185653973076c15bc02
---
M tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
1 file changed, 50 insertions(+), 27 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index 9eda75c..c903193 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -1,61 +1,84 @@
( function ( mw ) {
- QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment() );
+ QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment( {
+ setup: function () {
+ this.clock = this.sandbox.useFakeTimers();
+ this.server = this.sandbox.useFakeServer();
+ },
+ teardown: function () {
+ this.clock.tick( 1 );
+ }
+ }) );
- QUnit.asyncTest( 'Basic functionality', function ( assert ) {
- var api, d1, d2, d3;
- QUnit.expect( 3 );
+ QUnit.test( 'Basic functionality', function ( assert ) {
+ QUnit.expect( 2 );
- api = new mw.Api();
+ var api = new mw.Api();
- d1 = api.get( {} )
+ api.get( {} )
.done( function ( data ) {
assert.deepEqual( data, [], 'If request
succeeds without errors, resolve deferred' );
} );
- d2 = api.get( {
- action: 'doesntexist'
- } )
- .fail( function ( errorCode ) {
- assert.equal( errorCode, 'unknown_action', 'API
error (e.g. unknown_action) should reject the deferred' );
- } );
-
- d3 = api.post( {} )
+ api.post( {} )
.done( function ( data ) {
assert.deepEqual( data, [], 'Simple POST
request' );
} );
- // After all are completed, continue the test suite.
- QUnit.whenPromisesComplete( d1, d2, d3 ).always( function () {
- QUnit.start();
+ this.server.respond( function ( request ) {
+ request.respond( 200, { 'Content-Type':
'application/json' }, '[]' );
} );
} );
- QUnit.asyncTest( 'Deprecated callback methods', function ( assert ) {
- var api, d1, d2, d3;
+
+ QUnit.test( 'API error', function ( assert ) {
+ QUnit.expect( 1 );
+
+ var api = new mw.Api();
+
+ api.get( { action: 'doesntexist' } )
+ .fail( function ( errorCode ) {
+ assert.equal( errorCode, 'unknown_action', 'API
error should reject the deferred' );
+ } );
+
+ this.server.respond( function ( request ) {
+ request.respond( 200, { 'Content-Type':
'application/json' },
+ '{ error: { code: unknown_action } }'
+ );
+ } );
+ } );
+
+ QUnit.test( 'Deprecated callback methods', function ( assert ) {
QUnit.expect( 3 );
- api = new mw.Api();
+ var api = new mw.Api();
- d1 = api.get( {}, function () {
+ api.get( {}, function () {
assert.ok( true, 'Function argument treated as success
callback.' );
} );
- d2 = api.get( {}, {
+ api.get( {}, {
ok: function () {
assert.ok( true, 'ok property treated as
success callback.' );
}
} );
- d3 = api.get( {
- action: 'doesntexist'
- }, {
+ api.get( { action: 'doesntexist' }, {
err: function () {
assert.ok( true, 'err property treated as
error
[MediaWiki-commits] [Gerrit] New Wikidata Build - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build
..
New Wikidata Build
Change-Id: Ia50f98acf4372cd70a203d32f525a90c137a9bdd
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.i18n.php
M extensions/Wikibase/client/includes/modules/SiteModule.php
M
extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
M extensions/Wikibase/lib/WikibaseLib.i18n.php
M extensions/Wikibase/repo/Wikibase.i18n.php
M extensions/Wikibase/repo/includes/api/FormatSnakValue.php
M extensions/Wikibase/repo/includes/api/ParseValue.php
M extensions/Wikibase/repo/includes/api/SetSiteLink.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
13 files changed, 84 insertions(+), 53 deletions(-)
Approvals:
WikidataJenkins: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 47b4583..14fe936 100644
--- a/composer.lock
+++ b/composer.lock
@@ -46,7 +46,7 @@
{
name: Kyle Robinson Young,
email: k...@dontkry.com,
-homepage: https://github.com/shama;,
+homepage: http://dontkry.com;,
role: Developer
}
],
@@ -848,12 +848,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: c4062fdfe5c4349411092a8baf4486454b0a5d59
+reference: e16fb2d35599e010f0745237f11034b5b8e3fc32
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c4062fdfe5c4349411092a8baf4486454b0a5d59;,
-reference: c4062fdfe5c4349411092a8baf4486454b0a5d59,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e16fb2d35599e010f0745237f11034b5b8e3fc32;,
+reference: e16fb2d35599e010f0745237f11034b5b8e3fc32,
shasum:
},
require: {
@@ -912,7 +912,7 @@
wikibaserepo,
wikidata
],
-time: 2014-02-09 20:18:22
+time: 2014-02-10 20:51:00
}
],
packages-dev: [
diff --git a/extensions/Wikibase/client/WikibaseClient.i18n.php
b/extensions/Wikibase/client/WikibaseClient.i18n.php
index a74f0b2..44f37d1 100644
--- a/extensions/Wikibase/client/WikibaseClient.i18n.php
+++ b/extensions/Wikibase/client/WikibaseClient.i18n.php
@@ -326,6 +326,7 @@
/** Arabic (العربية)
* @author Abanima
* @author Ali1
+ * @author Asaifm
* @author Basharh
* @author Meno25
* @author OsamaK
@@ -366,6 +367,7 @@
'wikibase-rc-hide-wikidata' = '$1 ويكيبيانات',
'wikibase-rc-show-wikidata-pref' = 'إظهار تعديلات ويكي بيانات في صفحة
أحدث التغييرات',
'wikibase-rc-wikibase-edit-letter' = 'د',
+ 'wikibase-unconnectedpages-submit' = 'اذهب',
);
/** Aramaic (ܐܪܡܝܐ)
@@ -2651,6 +2653,7 @@
*/
$messages['lrc'] = array(
'wikibase-comment-sitelink-add' = 'هوم پیوند زون اضاف بیه:$1',
+ 'wikibase-comment-sitelink-change' = 'هوم پیوند زون د $1 تا $2 آلشت
بی',
'wikibase-comment-sitelink-remove' = 'هوم پیوند زون ورداشته بیه:$1',
'wikibase-linkitem-selectlink' = 'لطفن یه گل سیلجا و بلگه که شما
میهایت د ای بلگه هوم پیوند با انتخاو بکید.',
'wikibase-linkitem-input-site' = 'زون:',
diff --git a/extensions/Wikibase/client/includes/modules/SiteModule.php
b/extensions/Wikibase/client/includes/modules/SiteModule.php
index c07915a..e2933cb 100644
--- a/extensions/Wikibase/client/includes/modules/SiteModule.php
+++ b/extensions/Wikibase/client/includes/modules/SiteModule.php
@@ -5,7 +5,7 @@
use ResourceLoaderModule;
use ResourceLoaderContext;
use MediaWikiSite;
-use Sites;
+use SiteSQLStore;
use Wikibase\Client\WikibaseClient;
/**
@@ -32,14 +32,11 @@
/**
* @var MediaWikiSite $site
*/
- $site = Sites::singleton()-getSite( Settings::get(
'siteGlobalID' ) );
+ $site = SiteSQLStore::newInstance()-getSite( Settings::get(
'siteGlobalID' ) );
$currentSite = array();
if ( $site ) {
- $languageName = Utils::fetchLanguageName(
$site-getLanguageCode() );
$currentSite = array(
- 'shortName' = $languageName,
- 'name' = $languageName,
'globalSiteId' = $site-getGlobalId(),
'languageCode' = $site-getLanguageCode(),
'langLinkSiteGroup' =
[MediaWiki-commits] [Gerrit] Make language of messages depend on site - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Make language of messages depend on site .. Make language of messages depend on site Language of messages queried from allmessages depends on bot's setting (see bug: 61119). However, APISite.mediawiki_messages() depends on site object. This patch therefore makes mediawiki_messages() retrieve the correct language. Change-Id: I9c5a0b5b549822731247374140e44a79f09f33a5 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index bdf6618..3d85c6b 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1011,6 +1011,7 @@ site=self, meta=allmessages, ammessages='|'.join(keys), +amlang=self.lang, ) # Return all messages -- To view, visit https://gerrit.wikimedia.org/r/112604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c5a0b5b549822731247374140e44a79f09f33a5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Nullzero nullzero.f...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Nullzero nullzero.f...@gmail.com Gerrit-Reviewer: Pyfisch pyfi...@gmail.com Gerrit-Reviewer: Xqt i...@gno.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] Improve search - change (mediawiki...WikimediaIncubator)
SPQRobin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112663
Change subject: Improve search
..
Improve search
When suggesting a page title to create when searching, do not add a prefix if
the search term already contains one
Secondly, if the prefix is of an existing wiki, link to that (similar to when
viewing the page itself)
Change-Id: I078eff25f37ddda7fffa4ab22072dea96df500ae
---
M WikimediaIncubator.class.php
1 file changed, 13 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator
refs/changes/63/112663/1
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index 17da13f..33cbd5f 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -843,12 +843,24 @@
$newNs = $title-getNamespace();
$newTitle = $title-getText();
+ $newTitle2 = self::analyzePrefix( $newTitle, false, true );
if ( !in_array( $title-getNamespace(),
$wmincTestWikiNamespaces ) ) {
# namespace not affected by the prefix system: show
normal msg
return true;
} elseif ( $prefix == $wmincProjectSite['short'] ) {
$newNs = NS_PROJECT;
- } else {
+ } elseif ( self::getDBState( $newTitle2 ) == 'existing' ) {
+ # the wiki already exists
+ $link = self::getSubdomain(
+ $newTitle2['lang'], $newTitle2['project'],
+ ( $title-getNsText() ? $title-getNsText() .
':' : '' ) .
+ str_replace( ' ', '_', $newTitle2['realtitle'] )
+ );
+ $params[0] = 'wminc-error-wiki-exists';
+ $params[1] = [$link . self::makeExternalLinkText(
$link ) . ];
+ return true;
+ } elseif ( $newTitle2['error'] ) {
+ # only add a prefix to the title if there is no prefix
('error' by analyzePrefix)
$newTitle = $prefix . '/' . $newTitle;
}
--
To view, visit https://gerrit.wikimedia.org/r/112663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I078eff25f37ddda7fffa4ab22072dea96df500ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: SPQRobin robinp.1...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change toolbar button to mw-ui-progressive. - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Change toolbar button to mw-ui-progressive.
..
Change toolbar button to mw-ui-progressive.
* mw-ui-primary is deprecated.
* mw-ui-progressive is semantically correct since it starts a flow
rather than finishing a process (i.e. click and done).
* Coincidentally, this looks the same as primary.
Change-Id: I4d484fe297a316a34e5250986356964b3d3a33d8
---
M resources/ext.gettingstarted.taskToolbar.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Swalling: Looks good to me, but someone else must approve
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gettingstarted.taskToolbar.js
b/resources/ext.gettingstarted.taskToolbar.js
index a232d2b..1e781b5 100644
--- a/resources/ext.gettingstarted.taskToolbar.js
+++ b/resources/ext.gettingstarted.taskToolbar.js
@@ -51,7 +51,7 @@
} ).text( mw.message( toolbarInfo.description ).text() );
$showGuide = $( 'a' ).attr( {
- 'class': 'mw-ui-button mw-ui-primary
mw-gettingstarted-toolbar-show-guiders',
+ 'class': 'mw-ui-button mw-ui-progressive
mw-gettingstarted-toolbar-show-guiders',
title: mw.message(
'gettingstarted-task-toolbar-editing-help-title' ).text()
} ).text( mw.message(
'gettingstarted-task-toolbar-editing-help-text' ).text() )
.click( function ( evt ) {
--
To view, visit https://gerrit.wikimedia.org/r/111345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d484fe297a316a34e5250986356964b3d3a33d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
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] Check if directory exists in a better manner - change (mediawiki...UniversalLanguageSelector)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112664
Change subject: Check if directory exists in a better manner
..
Check if directory exists in a better manner
* This avoids warnings like: line 8: cd: /tmp/jquery.ime:
No such file or directory.
* Formatting fixes.
Change-Id: Icbc3f6f80314cae3ea9b5dfdc3e66c59af225621
---
M scripts/update-jquery-i18n.sh
M scripts/update-jquery-ime.sh
M scripts/update-jquery-uls.sh
M scripts/update-jquery-webfonts.sh
4 files changed, 32 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/64/112664/1
diff --git a/scripts/update-jquery-i18n.sh b/scripts/update-jquery-i18n.sh
index 4e53c18..321e124 100755
--- a/scripts/update-jquery-i18n.sh
+++ b/scripts/update-jquery-i18n.sh
@@ -4,7 +4,14 @@
CLONEDIR=/tmp/jquery.i18n;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.i18n.git;;
+
echo -e Getting latest jquery.i18n from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $HERE;
cp -rf $CLONEDIR/src/* $DEST
diff --git a/scripts/update-jquery-ime.sh b/scripts/update-jquery-ime.sh
index c39f642..1c01347 100755
--- a/scripts/update-jquery-ime.sh
+++ b/scripts/update-jquery-ime.sh
@@ -4,8 +4,15 @@
CLONEDIR=/tmp/jquery.ime;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.ime.git;;
+
echo -e Getting latest jquery.ime from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $CLONEDIR;
npm install;
grunt copy concat;
diff --git a/scripts/update-jquery-uls.sh b/scripts/update-jquery-uls.sh
index bff030b..bf6282c 100755
--- a/scripts/update-jquery-uls.sh
+++ b/scripts/update-jquery-uls.sh
@@ -4,7 +4,14 @@
CLONEDIR=/tmp/jquery.uls;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.uls.git;;
+
echo -e Getting latest jquery.uls from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $HERE;
cp -rf $CLONEDIR/{images,css,src,i18n} $DEST
diff --git a/scripts/update-jquery-webfonts.sh
b/scripts/update-jquery-webfonts.sh
index 32f4818..c2c1e65 100755
--- a/scripts/update-jquery-webfonts.sh
+++ b/scripts/update-jquery-webfonts.sh
@@ -4,7 +4,14 @@
CLONEDIR=/tmp/jquery.webfonts;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.webfonts.git;;
+
echo -e Getting latest jquery.webfonts from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $HERE;
cp -rf $CLONEDIR/src/* $DEST
--
To view, visit https://gerrit.wikimedia.org/r/112664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbc3f6f80314cae3ea9b5dfdc3e66c59af225621
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.ime from upstream - change (mediawiki...UniversalLanguageSelector)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112665
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
Upstream: https://github.com/wikimedia/jquery.ime
Changes:
* Bug 53695: For languages with no input methods, set
use native keyboard by default.
* Add Venetian input method.
* Drop -moz-linear-gradient
* Apply /* @embed */ pragma to all images, not just the topmost in each
block.
* Validate the input method id in load method.
Change-Id: I05f8350003227e150948670caf919f05a2b00f88
---
M lib/jquery.ime/css/jquery.ime.css
M lib/jquery.ime/jquery.ime.js
A lib/jquery.ime/rules/vec/vec-GVU.js
3 files changed, 50 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/65/112665/1
diff --git a/lib/jquery.ime/css/jquery.ime.css
b/lib/jquery.ime/css/jquery.ime.css
index e3fb957..e15d353 100644
--- a/lib/jquery.ime/css/jquery.ime.css
+++ b/lib/jquery.ime/css/jquery.ime.css
@@ -5,8 +5,6 @@
/* @embed */
background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/ime-active.svg');
/* @embed */
- background-image: -moz-linear-gradient(transparent, transparent),
url('../images/ime-active.svg');
- /* @embed */
background-image: linear-gradient(transparent, transparent),
url('../images/ime-active.svg');
background-color: rgba(255,255,255,0.75);
background-position: left 3px center;
@@ -175,8 +173,6 @@
background: url(../images/tick.png) no-repeat left center;
/* @embed */
background-image: -webkit-linear-gradient(transparent, transparent),
url('../images/tick.svg');
- /* @embed */
- background-image: -moz-linear-gradient(transparent, transparent),
url('../images/tick.svg');
/* @embed */
background-image: linear-gradient(transparent, transparent),
url('../images/tick.svg');
background-position: left 4px center;
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 7663347..c87b26b 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,6 +1,6 @@
-/*! jquery.ime - v0.1.0+20131123
+/*! jquery.ime - v0.1.0+20140211
* https://github.com/wikimedia/jquery.ime
-* Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
+* Copyright (c) 2014 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
'use strict';
@@ -303,6 +303,11 @@
return deferred.resolve();
}
+ // Validate the input method id.
+ if ( !$.ime.sources[inputmethodId] ) {
+ return deferred.reject();
+ }
+
dependency = $.ime.sources[inputmethodId].depends;
if ( dependency !$.ime.inputmethods[dependency] ) {
ime.load( dependency ).done( function () {
@@ -337,7 +342,7 @@
/**
* Set the caret position in the div.
-* @param {jQuery} element The content editable div element
+* @param {jQuery} $element The content editable div element
* @param {Object} position An object with start and end
properties.
* @return {Array} If the cursor could not be placed at given
position, how
* many characters had to go back to place the cursor
@@ -665,6 +670,7 @@
/**
* Set the caret position in the div.
* @param {Element} element The content editable div element
+* @param position
*/
function setDivCaretPosition( element, position ) {
var nextCharIndex,
@@ -1384,6 +1390,7 @@
'class': 'ime-disable-link',
'data-i18n': 'jquery-ime-disable-text'
} )
+ .addClass( 'ime-checked' )
.text( 'System input method' ),
$( 'span' )
.addClass( 'ime-disable-shortcut' )
@@ -2117,6 +2124,10 @@
'uz-kbd': {
name: 'Uzbek kbd',
source: 'rules/uz/uz-kbd.js'
+ },
+ 'vec-GVU': {
+ name: 'Venetian',
+ source: 'rules/vec/vec-GVU.js'
}
} );
@@ -2448,6 +2459,10 @@
'uz': {
autonym: 'Oʻzbekcha',
inputmethods: [ 'uz-kbd' ]
+ },
+ 'vec': {
+ autonym: 'Venetian',
+ inputmethods: [ 'vec-GVU' ]
}
} );
diff --git a/lib
[MediaWiki-commits] [Gerrit] Use hasOwnProperty() instead of !== undefined - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Use hasOwnProperty() instead of !== undefined .. Use hasOwnProperty() instead of !== undefined This prevents conflicts with predefined object methods. Change-Id: I3804d3c7c1439d0818a01c03b5fb5b0328c953a4 --- M repo/resources/wikibase.ui.initTermBox.js 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: WikidataJenkins: Verified Adrian Lang: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/resources/wikibase.ui.initTermBox.js b/repo/resources/wikibase.ui.initTermBox.js index 79ced99..0093a3f 100644 --- a/repo/resources/wikibase.ui.initTermBox.js +++ b/repo/resources/wikibase.ui.initTermBox.js @@ -131,8 +131,8 @@ languageCode, alternatingClass, $.uls.data.getAutonym( languageCode ), - ( labels[languageCode] !== undefined ) ? labels[languageCode] : '', - ( descriptions[languageCode] !== undefined ) ? descriptions[languageCode] : '', + labels.hasOwnProperty( languageCode ) ? labels[languageCode] : '', + descriptions.hasOwnProperty( languageCode ) ? descriptions[languageCode] : '', '', '', '', -- To view, visit https://gerrit.wikimedia.org/r/112349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3804d3c7c1439d0818a01c03b5fb5b0328c953a4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Work around missing LDAP sudo rules - change (operations/puppet)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112666
Change subject: Tools: Work around missing LDAP sudo rules
..
Tools: Work around missing LDAP sudo rules
Some service groups don't have sudo rules in LDAP. To work around
this, we create them locally.
/etc/sudoers.d/tools-ldap-fix is a hot fix that is replaced by this
change.
Bug: 60937
Change-Id: Id5c13b3b50ba495724923f0a392616d04e1da0d5
---
M modules/toollabs/manifests/init.pp
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/112666/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 244ce54..48bd167 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -125,4 +125,19 @@
force = true,
target = ${store}/mail,
}
+
+# FIXME: Some tools don't have sudo rules in LDAP at the moment.
+define tools_sudo_ldap_fix ($tool = $title, $ensure = 'present') {
+sudo_group { local-${tool}:
+ensure = $ensure,
+group = local-${tool},
+privileges = [ALL=(local-${tool}) NOPASSWD: ALL];
+}
+}
+tools_sudo_ldap_fix { ['afcbot', 'anagrimes', 'csbot', 'daahbot', 'ftl',
+ 'legobot', 'matilda', 'wiktioutils']:
+}
+file { '/etc/sudoers.d/tools-ldap-fix':
+ensure = absent;
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/112666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5c13b3b50ba495724923f0a392616d04e1da0d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add shell account for phuedx and add to mortals - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: add shell account for phuedx and add to mortals
..
add shell account for phuedx and add to mortals
RT #6785
username: phuedx
real name: Sam Smith
email: samsmith@wm
labs user/IRC user: phuedx
UID: 3926 matching LDAP
team: Growth
requested: tin, deploy mediawiki-config,
extensions/GettingStarted
extensions/GuidedTours deployment
works with: Matt Flaschen
manager/approved: Terry Chay
Change-Id: I42075d6828f287ec51a9b36588e2702a48f95ece
key:
https://office.wikimedia.org/w/index.php?title=User:SDSmith_%28WMF%29oldid=106746
---
M manifests/admins.pp
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index fdc6a90..d39c23f 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3402,6 +3402,26 @@
}
}
+# RT 6785
+class phuedx inherits baseaccount {
+$username = 'phuedx'
+$realname = 'Sam Smith'
+$uid = 3926
+
+unixaccount { $realname: username = $username, uid = $uid, gid =
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require = Unixaccount[$realname] }
+
+ssh_authorized_key { 'samsm...@wikimedia.org':
+ensure = present,
+user = $username,
+type = 'ssh-rsa',
+key=
'B3NzaC1yc2EDAQABAAABAQC9+TJfrksUVwMxt5Oj6NZxacj3UyKQNN+J48r7nF2SSVoH3hOLpXLB5Vep09X2bxyH+1AsqGQKGLW8a5DSTcEhLQ5Rc01GmaV461e51lxJoRRlDtCI6+sqBJRstZVWUrxYeAjAhaif0CWmepySMWytrFrLJuTQ08L+R4XH9uXxWfE+qY6KBjrrOGKS+98E13vYlxegxpctz729ZC0jDrikSNX47lu5us5OTMotaYPOu/lFYO8RUmqQnGNMjoKJjKQJclDZUp9fV3YWPW9XtJR6z1CACJIqng0501bWulMsjw/nWySoJLrh4H99KeLUVSiEWibupoTI6FKO2PC0vrzF',
+}
+}
+}
+
# FIXME: not an admin. This is more like a system account.
class l10nupdate inherits baseaccount {
$username = l10nupdate
@@ -3508,6 +3528,7 @@
include accounts::olivneh # renamed to 'ori'
include accounts::pdhanda # access revoked
include accounts::pgehres
+ include accounts::phuedx # granted per RT 6785
include accounts::raindrift # access revoked per RT 3088
include accounts::reedy
include accounts::rmoen
--
To view, visit https://gerrit.wikimedia.org/r/112150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42075d6828f287ec51a9b36588e2702a48f95ece
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: coren mpellet...@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 streber from puppet, dsh, dhcpd - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112667
Change subject: remove streber from puppet,dsh,dhcpd
..
remove streber from puppet,dsh,dhcpd
RT #2186
can be decom'ed per mark
Change-Id: I546db3c0345a1ca503f550e08bac569c7d865163
---
M files/dsh/group/ALL
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
5 files changed, 0 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/112667/1
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 0d7120a..ecf0f50 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -67,7 +67,6 @@
srv255
srv256
srv257
-streber
cp1043
cp1044
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 7552d28..f71e4b2 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -22,7 +22,6 @@
sockpuppet
stafford
stat1
-streber
tarin
tingxi
tridge
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 106fc55..1a4791c 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -11,7 +11,6 @@
sanger
sockpuppet
stafford
-streber
tarin
tridge
db9
diff --git a/manifests/site.pp b/manifests/site.pp
index 02afcb2..71ec43b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2336,32 +2336,6 @@
include role::analytics::clients
}
-node streber.wikimedia.org {
-system::role { misc: description = network monitoring server }
-
-include passwords::root,
-base::resolving,
-base::sysctl,
-base::motd,
-base::vimconfig,
-base::standard-packages,
-base::monitoring::host,
-base::environment,
-base::platform,
-ssh,
-ganglia,
-ntp::client,
-role::salt::minions,
-admins::roots,
-# misc::torrus,
-misc::rancid,
-firewall::builder
-
-class { misc::syslog-server: config = network }
-
-install_certificate{ star.wikimedia.org: }
-}
-
node /^snapshot([1-4]\.pmtpa|100[1-4]\.eqiad)\.wmnet/ {
$gid=500
include base,
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 1d93727..86ef2a0 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -253,11 +253,6 @@
fixed-address srv257.pmtpa.wmnet;
}
-host streber {
- hardware ethernet 00:1E:C9:E2:74:03;
- fixed-address streber.wikimedia.org;
-}
-
host tarin {
hardware ethernet 00:26:B9:5C:42:FA;
fixed-address tarin.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/112667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I546db3c0345a1ca503f550e08bac569c7d865163
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve search - change (mediawiki...WikimediaIncubator)
SPQRobin has submitted this change and it was merged.
Change subject: Improve search
..
Improve search
When suggesting a page title to create when searching, do not add a prefix if
the search term already contains one
Secondly, if the prefix is of an existing wiki, link to that (similar to when
viewing the page itself)
Change-Id: I078eff25f37ddda7fffa4ab22072dea96df500ae
---
M WikimediaIncubator.class.php
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
SPQRobin: Verified; Looks good to me, approved
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index 17da13f..c7cbef5 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -843,12 +843,25 @@
$newNs = $title-getNamespace();
$newTitle = $title-getText();
+ $newTitleData = self::analyzePrefix( $newTitle, false, true );
if ( !in_array( $title-getNamespace(),
$wmincTestWikiNamespaces ) ) {
# namespace not affected by the prefix system: show
normal msg
return true;
} elseif ( $prefix == $wmincProjectSite['short'] ) {
$newNs = NS_PROJECT;
- } else {
+ } elseif ( self::getDBState( $newTitleData ) == 'existing' ) {
+ # the wiki already exists
+ $link = self::getSubdomain(
+ $newTitleData['lang'], $newTitleData['project'],
+ ( $title-getNsText() ? $title-getNsText() .
':' : '' ) .
+ str_replace( ' ', '_',
$newTitleData['realtitle'] )
+ );
+ $params[0] = 'wminc-error-wiki-exists';
+ $params[1] = [$link . self::makeExternalLinkText(
$link ) . ];
+ return true;
+ } elseif ( $newTitleData['error'] ) {
+ # only add a prefix to the title if there is no prefix
+ # ('error' by analyzePrefix)
$newTitle = $prefix . '/' . $newTitle;
}
--
To view, visit https://gerrit.wikimedia.org/r/112663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I078eff25f37ddda7fffa4ab22072dea96df500ae
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: SPQRobin robinp.1...@gmail.com
Gerrit-Reviewer: Ebe123 beauleetien...@gmail.com
Gerrit-Reviewer: MF-Warburg mfwarb...@googlemail.com
Gerrit-Reviewer: SPQRobin robinp.1...@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] Allow capital letters in insertable tvars - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112668
Change subject: Allow capital letters in insertable tvars
..
Allow capital letters in insertable tvars
Change-Id: I4d84161ef80b62ed7e23678db4e3bca3fe7f5829
---
M insertables/TranslatablePageInsertablesSuggester.php
M tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/68/112668/1
diff --git a/insertables/TranslatablePageInsertablesSuggester.php
b/insertables/TranslatablePageInsertablesSuggester.php
index 7acc35c..02a3ea7 100644
--- a/insertables/TranslatablePageInsertablesSuggester.php
+++ b/insertables/TranslatablePageInsertablesSuggester.php
@@ -17,7 +17,7 @@
// allowed in a variable name, but here we are stricter to
avoid too many
// false positives.
$matches = array();
- preg_match_all( '/\$([a-z0-9-])+/', $text, $matches,
PREG_SET_ORDER );
+ preg_match_all( '/\$([a-zA-Z0-9-])+/', $text, $matches,
PREG_SET_ORDER );
$new = array_map( function ( $match ) {
// Numerical ones are already handled by parent
if ( ctype_digit( $match[1] ) ) {
diff --git
a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
index 64d4713..81a5326 100644
--- a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
+++ b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
@@ -18,9 +18,11 @@
public function getInsertablesProvider() {
return array(
- array( 'Hi $1, I am $myname.', array(
+ array( 'Hi $1, I am $myname $my-middle-name
$myLastName.', array(
new Insertable( '$1', '$1', '' ),
new Insertable( '$myname', '$myname', '' ),
+ new Insertable( '$my-middle-name',
'$my-middle-name', '' ),
+ new Insertable( '$myLastName', '$myLastName',
'' ),
) ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/112668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d84161ef80b62ed7e23678db4e3bca3fe7f5829
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove streber from DNS - change (operations/dns)
Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/112669 Change subject: remove streber from DNS .. remove streber from DNS RT #2186 per Mark Change-Id: I7fd3bea5b327015f6104b8370b50e6aae0a7a333 --- M templates/10.in-addr.arpa M templates/152.80.208.in-addr.arpa M templates/wikimedia.org M templates/wmnet 4 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/69/112669/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 0a73711..cc8f5ba 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -520,7 +520,6 @@ 11 1H IN PTR nfs2.mgmt.pmtpa.wmnet. -14 1H IN PTR streber.mgmt.pmtpa.wmnet. 16 1H IN PTR amaranth.mgmt.pmtpa.wmnet. 17 1H IN PTR ts-array4a.mgmt.pmtpa.wmnet. 18 1H IN PTR ts-array4b.mgmt.pmtpa.wmnet. diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index c448697..0cc69ed 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -71,8 +71,6 @@ 1541H IN PTR pdf2.wikimedia.org. 1551H IN PTR pdf1.wikimedia.org. -1601H IN PTR streber.wikimedia.org. - 1651H IN PTR fenari.wikimedia.org. 1671H IN PTR linne.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e370fcb..1753612 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -222,7 +222,6 @@ stat1 1H IN A208.80.152.146 stat1001 1H IN A208.80.154.155 stat1001 1H IN 2620:0:861:2:208:80:154:155 -streber1H IN A208.80.152.160 tellurium 1H IN A208.80.155.9 thulium1H IN A208.80.155.12 tridge 1H IN A208.80.152.170 ; Cold Backup Server diff --git a/templates/wmnet b/templates/wmnet index b99d709..15bca37 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -422,7 +422,6 @@ ssl3 1H IN A10.1.7.43 ssl4 1H IN A10.1.7.44 stat1 1H IN A10.1.8.65 -streber1H IN A10.1.8.14 tarin 1H IN A10.1.8.35 wmf39301H IN A10.1.8.25 tridge 1H IN A10.1.252.170 -- To view, visit https://gerrit.wikimedia.org/r/112669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fd3bea5b327015f6104b8370b50e6aae0a7a333 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Matanya mata...@foss.co.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of lightboxHooks - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112670
Change subject: Get rid of lightboxHooks
..
Get rid of lightboxHooks
Delete lightboxHooks, since most of them
haven't proven to be useful.
Replace the useful ones by jQuery events.
Change-Id: I28f99ba85666ca15979feb5c637924b98bba27a8
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/176
---
M .jshintrc
M MultimediaViewer.php
M resources/mmv/mmv.js
M resources/mmv/mmv.logger.js
M resources/mmv/ui/mmv.ui.buttons.js
D resources/multilightbox/hooks.txt
M resources/multilightbox/lightboximage.js
M resources/multilightbox/lightboxinterface.js
M resources/multilightbox/multilightbox.js
M tests/qunit/mmv.testhelpers.js
10 files changed, 79 insertions(+), 280 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/70/112670/1
diff --git a/.jshintrc b/.jshintrc
index ac5b142..f5fe58d 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -36,7 +36,6 @@
jQuery,
QUnit,
OO,
- moment,
- lightboxHooks
+ moment
]
}
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 704a781..14b6cb1 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -350,6 +350,7 @@
'dependencies' = array(
'jquery',
'mediawiki',
+ 'mmv.base',
),
), $moduleInfo( 'mmv' ) );
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index c48487f..a1fa79f 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -16,7 +16,7 @@
*/
( function ( mw, $ ) {
- var MultiLightbox, lightboxHooks, MMVP,
+ var MultiLightbox, MMVP,
comingFromPopstate = false,
@@ -169,26 +169,6 @@
// Only if we find legit images, create a MultiLightbox object
this.lightbox = new mw.MultiLightbox( urls, 0,
mw.LightboxInterface, this );
-
- // Register various event hooks. TODO: Make this a function
that's only called once.
-
- lightboxHooks.register( 'closeInterface', function () {
- $( document.body ).removeClass( 'mw-mlb-lightbox-open'
);
- if ( comingFromPopstate === false ) {
- history.pushState( {}, '', '#' );
- } else {
- comingFromPopstate = false;
- }
-
- viewer.hasAnimatedMetadata = false;
- viewer.isOpen = false;
- } );
-
- lightboxHooks.register( 'imageResize', function () {
- var ui = this;
- viewer.resize( ui );
- return false;
- } );
this.setupEventHandlers();
}
@@ -472,27 +452,50 @@
}
};
+ /**
+* Opens the next image
+*/
MMVP.nextImage = function () {
this.loadIndex( this.lightbox.currentIndex + 1 );
};
+ /**
+* Opens the previous image
+*/
MMVP.prevImage = function () {
this.loadIndex( this.lightbox.currentIndex - 1 );
};
- MMVP.setupEventHandlers = function() {
- var viewer = this;
+ /**
+* Handles close event coming from the lightbox
+*/
+ MMVP.close = function () {
+ $( document.body ).removeClass( 'mw-mlb-lightbox-open' );
+ if ( comingFromPopstate === false ) {
+ history.pushState( {}, '', '#' );
+ } else {
+ comingFromPopstate = false;
+ }
- this.lightbox.iface.$imageWrapper.on( 'mmv-next', function () {
- viewer.nextImage();
- } );
-
- this.lightbox.iface.$imageWrapper.on( 'mmv-prev', function () {
- viewer.prevImage();
- } );
+ this.hasAnimatedMetadata = false;
+ this.isOpen = false;
};
- function handleHash() {
+ MMVP.setupEventHandlers = function () {
+ var viewer = this;
+
+ $( document ).on( 'mmv-close', function () {
+ viewer.close();
+ } ).on( 'mmv-next', function () {
+ viewer.nextImage();
+ } ).on( 'mmv-prev', function () {
+ viewer.prevImage();
+ } ).on( 'mmv-resize', function () {
+ viewer.resize( viewer.lightbox.iface );
+ });
+ };
+
+ function handleHash () {
var statedIndex,
$foundElement,
hash =
[MediaWiki-commits] [Gerrit] Tools: Remove SGE shadow master - change (operations/puppet)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112671
Change subject: Tools: Remove SGE shadow master
..
Tools: Remove SGE shadow master
We don't use tools-shadow in any meaningful way; it's apparently
neither set up to automatically take over nor, judging from past
experience, it's likely that we need some hot fail-over as most (all?)
SGE snafus so far were not related to a failure in tools-master, but
FS failures, a confused exec node, etc.
Bug: 61190
Change-Id: I85b272c90627f22d91590bb458ef4e50b4ea1c47
---
M manifests/role/labs.pp
M manifests/role/labsbeta.pp
D modules/gridengine/manifests/shadow_master.pp
M modules/toollabs/manifests/master.pp
D modules/toollabs/manifests/shadow.pp
5 files changed, 0 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/112671/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 5361eb5..0252005 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -38,13 +38,6 @@
class { 'toollabs::master': }
}
- class shadow inherits role::labs::tools::config {
-system::role { role::labs::tools::shadow: description = Tool Labs
gridengine shadow (backup) master }
-class { 'toollabs::shadow':
- gridmaster = $grid_master,
-}
- }
-
class webserver inherits role::labs::tools::config {
system::role { role::labs::tools::webserver: description = Tool Labs
webserver }
class { 'toollabs::webserver':
diff --git a/manifests/role/labsbeta.pp b/manifests/role/labsbeta.pp
index 290ba79..f9ae8ce 100644
--- a/manifests/role/labsbeta.pp
+++ b/manifests/role/labsbeta.pp
@@ -30,13 +30,6 @@
class { 'toollabs::master': }
}
- class shadow inherits role::labs::toolsbeta::config {
-system::role { role::labs::toolsbeta::shadow: description = Tool Labs
gridengine shadow (backup) master }
-class { 'toollabs::shadow':
- gridmaster = $grid_master,
-}
- }
-
class webserver inherits role::labs::toolsbeta::config {
system::role { role::labs::toolsbeta::webserver: description = Tool
Labs webserver }
class { 'toollabs::webserver':
diff --git a/modules/gridengine/manifests/shadow_master.pp
b/modules/gridengine/manifests/shadow_master.pp
deleted file mode 100644
index 1a77edb..000
--- a/modules/gridengine/manifests/shadow_master.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# gridengine.pp
-
-
-class gridengine::shadow_master($gridmaster = $grid_master) {
-class { 'gridengine':
-gridmaster = $gridmaster,
-}
-
-package { 'gridengine-master':
-ensure = latest,
-}
-
-# Not actually possible in the labs
-# @@sshkey { $fqdn:
-# ensure = present,
-# type = 'ssh-dss',
-# key = $sshdsakey,
-# tag = sshkey-$grid_master,
-# }
-}
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index 84c636c..6c7c416 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -16,7 +16,6 @@
toollabs::exec_environ
# TODO: Grid config
-# TODO: (conditional) shadow config
# TODO: project-local NFS (job queue)
diff --git a/modules/toollabs/manifests/shadow.pp
b/modules/toollabs/manifests/shadow.pp
deleted file mode 100644
index a0848d0..000
--- a/modules/toollabs/manifests/shadow.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Class: toollabs::shadow
-#
-# This role sets up a grid shadow master in the Tool Labs model.
-#
-# Parameters:
-# gridmaster = FQDN of the gridengine master
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class toollabs::shadow($gridmaster) inherits toollabs {
-include toollabs::infrastructure,
-toollabs::exec_environ
-
-class { 'gridengine::shadow_master':
-gridmaster = $gridmaster,
-}
-
-# TODO: grid setup
-# TODO: project-local NFS (job queue)
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/112671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85b272c90627f22d91590bb458ef4e50b4ea1c47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...CirrusSearch)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112672
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I5b3700173a5d2eda415a2187ee81f1f3cbe5aa3a
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/general_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
4 files changed, 2 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/72/112672/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 1a6578f..4539e75 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,7 +22,7 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.1)
+mediawiki_selenium (0.2.2)
cucumber (~ 1.3, = 1.3.10)
headless (~ 1.0, = 1.0.1)
json (~ 1.8, = 1.8.1)
@@ -34,7 +34,7 @@
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/step_definitions/general_steps.rb
b/tests/browser/features/step_definitions/general_steps.rb
index 86910d5..5058da0 100644
--- a/tests/browser/features/step_definitions/general_steps.rb
+++ b/tests/browser/features/step_definitions/general_steps.rb
@@ -1,7 +1,3 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
-
Given(/^I am at a random page.*$/) do
visit RandomPage
end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 54fc13e..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class LoginPage
- include PageObject
-
- page_url URL.url(Special:UserLogin)
-
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- text_field(:username, id: wpName1)
-
- def login_with(username, password)
-self.username = username
-self.password = password
-login
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/112672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b3700173a5d2eda415a2187ee81f1f3cbe5aa3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...ContentTranslation)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112673
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: Ibb279467bd9509bee3bc07f2f58263f87dab3327
---
M tests/browser/Gemfile.lock
D tests/browser/features/step_definitions/common_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
D tests/browser/features/support/pages/reset_preferences_page.rb
5 files changed, 10 insertions(+), 50 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/73/112673/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
deleted file mode 100644
index b8a11e0..000
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER],
ENV[MEDIAWIKI_PASSWORD])
-end
-
-Given(/^I have reset my preferences$/) do
- visit(ResetPreferencesPage).submit_element.click
-end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 8392044..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- text_field(:username, id: wpName1)
- text_field(:password, id: wpPassword1)
- button(:login, id: wpLoginAttempt)
-
- def login_with(username, password)
- self.username = username
- self.password = password
- login
- end
-end
diff --git a/tests/browser/features/support/pages/reset_preferences_page.rb
b/tests/browser/features/support/pages/reset_preferences_page.rb
deleted file mode 100644
index 37c6726..000
--- a/tests/browser/features/support/pages/reset_preferences_page.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ResetPreferencesPage
- include PageObject
- include URL
- page_url URL.url(Special:Preferences/reset)
-
- button(:submit, class: mw-htmlform-submit)
-end
--
To view, visit https://gerrit.wikimedia.org/r/112673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb279467bd9509bee3bc07f2f58263f87dab3327
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...Flow)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112674
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I7af61179ad5769252af48328cc36510dc3767edf
---
M tests/browser/Gemfile.lock
D tests/browser/features/step_definitions/common_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
4 files changed, 10 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/74/112674/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
deleted file mode 100644
index 6d4e24f..000
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index e4179e4..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- div(:feedback, class: errorbox)
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- a(:password_strength, text: password strength)
- a(:phishing, text: phishing)
- text_field(:username, id: wpName1)
- a(:username_displayed, title: /Your user page/)
-
- def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
- end
- def login_with(username, password)
-self.username = username
-self.password = password
-login
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/112674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7af61179ad5769252af48328cc36510dc3767edf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...MobileFrontend)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112675
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I94740e296429bdffd26f09139f47096417d4aac6
---
M tests/browser/Gemfile.lock
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
3 files changed, 11 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/75/112675/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index a51676e..1ddc40b 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -4,7 +4,7 @@
builder (3.2.2)
childprocess (0.4.0)
ffi (~ 1.0, = 1.0.11)
-chunky_png (1.2.9)
+chunky_png (1.3.0)
cucumber (1.3.10)
builder (= 2.1.2)
diff-lcs (= 1.1.3)
@@ -23,19 +23,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 56e4f81..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://127.0.0.1:80/w/index.php;
-end
-#{mediawiki_url}#{name}?useformat=mobile
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 1b3a404..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- div(:feedback, class: errorbox)
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- text_field(:signup_password, id:wpPassword2)
- text_field(:confirm_password, id:wpRetype)
- a(:phishing, text: phishing)
- a(:password_strength, text: password strength)
- text_field(:username, id: wpName1)
- a(:login_wl, class: button)
- button(:signup_submit, id:wpCreateaccount)
- a(:create_account_link, text: Create account)
- div(:message_box, class:headmsg)
- div(:warning_box, class:alert warning)
-
- def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
- end
- def login_with(username, password)
-# deal with autocomplete
-self.username_element.when_present.clear()
-self.username_element.when_present.send_keys(username)
-self.password_element.when_present.send_keys(password)
-login
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/112675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94740e296429bdffd26f09139f47096417d4aac6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...MultimediaViewer)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112676
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I126fe93ac511570594cfc1ba684b33bd2b356b34
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
4 files changed, 10 insertions(+), 46 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/76/112676/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git
a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
index dc467bf..4333101 100644
--- a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
+++ b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
@@ -3,10 +3,6 @@
on(LightboxDemoPage).image1_in_article_element.should be_visible
end
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
-
When(/^I click on the first image in the article$/) do
on(LightboxDemoPage) do |page|
page.image1_in_article
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 6a22f2a..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- text_field(:username, id: wpName1)
-
- def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
- end
- def login_with(username, password)
-self.username_element.when_present.send_keys(username)
-self.password_element.when_present.send_keys(password)
-login_element.fire_event(onfocus)
-login_element.when_present.click
- end
-end
-
-
--
To view, visit https://gerrit.wikimedia.org/r/112676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I126fe93ac511570594cfc1ba684b33bd2b356b34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...Translate)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112677
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: Ie4bb4690c72708a1616767463ff51b26c3a9c50b
---
M tests/browser/Gemfile.lock
D tests/browser/features/step_definitions/common_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
D tests/browser/features/support/pages/reset_preferences_page.rb
5 files changed, 10 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/77/112677/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
deleted file mode 100644
index b8a11e0..000
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER],
ENV[MEDIAWIKI_PASSWORD])
-end
-
-Given(/^I have reset my preferences$/) do
- visit(ResetPreferencesPage).submit_element.click
-end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 8392044..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- text_field(:username, id: wpName1)
- text_field(:password, id: wpPassword1)
- button(:login, id: wpLoginAttempt)
-
- def login_with(username, password)
- self.username = username
- self.password = password
- login
- end
-end
diff --git a/tests/browser/features/support/pages/reset_preferences_page.rb
b/tests/browser/features/support/pages/reset_preferences_page.rb
deleted file mode 100644
index 37c6726..000
--- a/tests/browser/features/support/pages/reset_preferences_page.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ResetPreferencesPage
- include PageObject
- include URL
- page_url URL.url(Special:Preferences/reset)
-
- button(:submit, class: mw-htmlform-submit)
-end
--
To view, visit https://gerrit.wikimedia.org/r/112677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4bb4690c72708a1616767463ff51b26c3a9c50b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Check if directory exists in a better manner - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Check if directory exists in a better manner
..
Check if directory exists in a better manner
* This avoids warnings like: line 8: cd: /tmp/jquery.ime:
No such file or directory.
* Formatting fixes.
Change-Id: Icbc3f6f80314cae3ea9b5dfdc3e66c59af225621
---
M scripts/update-jquery-i18n.sh
M scripts/update-jquery-ime.sh
M scripts/update-jquery-uls.sh
M scripts/update-jquery-webfonts.sh
4 files changed, 32 insertions(+), 4 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/update-jquery-i18n.sh b/scripts/update-jquery-i18n.sh
index 4e53c18..321e124 100755
--- a/scripts/update-jquery-i18n.sh
+++ b/scripts/update-jquery-i18n.sh
@@ -4,7 +4,14 @@
CLONEDIR=/tmp/jquery.i18n;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.i18n.git;;
+
echo -e Getting latest jquery.i18n from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $HERE;
cp -rf $CLONEDIR/src/* $DEST
diff --git a/scripts/update-jquery-ime.sh b/scripts/update-jquery-ime.sh
index c39f642..1c01347 100755
--- a/scripts/update-jquery-ime.sh
+++ b/scripts/update-jquery-ime.sh
@@ -4,8 +4,15 @@
CLONEDIR=/tmp/jquery.ime;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.ime.git;;
+
echo -e Getting latest jquery.ime from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $CLONEDIR;
npm install;
grunt copy concat;
diff --git a/scripts/update-jquery-uls.sh b/scripts/update-jquery-uls.sh
index bff030b..bf6282c 100755
--- a/scripts/update-jquery-uls.sh
+++ b/scripts/update-jquery-uls.sh
@@ -4,7 +4,14 @@
CLONEDIR=/tmp/jquery.uls;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.uls.git;;
+
echo -e Getting latest jquery.uls from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $HERE;
cp -rf $CLONEDIR/{images,css,src,i18n} $DEST
diff --git a/scripts/update-jquery-webfonts.sh
b/scripts/update-jquery-webfonts.sh
index 32f4818..c2c1e65 100755
--- a/scripts/update-jquery-webfonts.sh
+++ b/scripts/update-jquery-webfonts.sh
@@ -4,7 +4,14 @@
CLONEDIR=/tmp/jquery.webfonts;
HERE=`pwd`;
UPSTREAM=https://github.com/wikimedia/jquery.webfonts.git;;
+
echo -e Getting latest jquery.webfonts from $UPSTREAM\n;
-if cd $CLONEDIR; then git pull; else git clone $UPSTREAM $CLONEDIR; fi
+
+if [ -d $CLONEDIR ]; then
+git pull;
+else
+git clone $UPSTREAM $CLONEDIR;
+fi
+
cd $HERE;
cp -rf $CLONEDIR/src/* $DEST
--
To view, visit https://gerrit.wikimedia.org/r/112664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbc3f6f80314cae3ea9b5dfdc3e66c59af225621
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: SuchetaG sucheta.ghos...@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] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...TwnMainPage)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112678
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: Iaf33db440128c6be74bf47aecdf5e22bbe754b7a
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/common_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
D tests/browser/features/support/pages/reset_preferences_page.rb
5 files changed, 10 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage
refs/changes/78/112678/1
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index e26044b..7179317 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -1,10 +1,6 @@
Given(/^I am logged out$/) do
end
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER],
ENV[MEDIAWIKI_PASSWORD])
-end
-
Given(/^I am on the main page$/) do
visit MainPage
end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 764bd1a..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- text_field(:username, id: wpName1)
-
- def login_with(username, password)
-self.username = username
-self.password = password
-login
- end
-end
diff --git a/tests/browser/features/support/pages/reset_preferences_page.rb
b/tests/browser/features/support/pages/reset_preferences_page.rb
deleted file mode 100644
index 37c6726..000
--- a/tests/browser/features/support/pages/reset_preferences_page.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ResetPreferencesPage
- include PageObject
- include URL
- page_url URL.url(Special:Preferences/reset)
-
- button(:submit, class: mw-htmlform-submit)
-end
--
To view, visit https://gerrit.wikimedia.org/r/112678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf33db440128c6be74bf47aecdf5e22bbe754b7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [browser test] Moved Ruby code that multiple repositories us... - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112679
Change subject: [browser test] Moved Ruby code that multiple repositories use
to mediawiki_selenium Ruby gem
..
[browser test] Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I9fdfcf0f9df8f1bd9df3c358d2e1a7925fa5928d
---
M modules/ve-mw/test/browser/Gemfile.lock
D modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
D modules/ve-mw/test/browser/features/support/modules/url_module.rb
D modules/ve-mw/test/browser/features/support/pages/login_page.rb
4 files changed, 10 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/79/112679/1
diff --git a/modules/ve-mw/test/browser/Gemfile.lock
b/modules/ve-mw/test/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/modules/ve-mw/test/browser/Gemfile.lock
+++ b/modules/ve-mw/test/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
deleted file mode 100644
index 6d4e24f..000
--- a/modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
diff --git a/modules/ve-mw/test/browser/features/support/modules/url_module.rb
b/modules/ve-mw/test/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/modules/ve-mw/test/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/modules/ve-mw/test/browser/features/support/pages/login_page.rb
b/modules/ve-mw/test/browser/features/support/pages/login_page.rb
deleted file mode 100644
index e4179e4..000
--- a/modules/ve-mw/test/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- div(:feedback, class: errorbox)
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- a(:password_strength, text: password strength)
- a(:phishing, text: phishing)
- text_field(:username, id: wpName1)
- a(:username_displayed, title: /Your user page/)
-
- def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
- end
- def login_with(username, password)
-self.username = username
-self.password = password
-login
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/112679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fdfcf0f9df8f1bd9df3c358d2e1a7925fa5928d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add Compiler and Runtime times in LimitReport - change (mediawiki...PhpTags)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112680
Change subject: add Compiler and Runtime times in LimitReport
..
add Compiler and Runtime times in LimitReport
Change-Id: I661e5fbb5a2b3136702414c968365f465136fab8
---
M PhpTags.body.php
M PhpTags.i18n.php
M PhpTags.php
M includes/Runtime.php
4 files changed, 46 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags
refs/changes/80/112680/1
diff --git a/PhpTags.body.php b/PhpTags.body.php
index c1c27a4..045d7f1 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -11,7 +11,7 @@
class PhpTags {
static $DebugLoops = false;
- static $startTime = false;
+ static $compileTime = 0;
private static $frames=array();
private static $needInitRuntime = true;
@@ -23,7 +23,8 @@
* @param array $args
*/
public static function renderFunction( $parser, $frame, $args ) {
- self::$startTime = microtime(true);
+ global $wgPhpTagsTime;
+ $time = microtime(true);
$is_banned = self::isBanned($frame);
if ( $is_banned ) {
@@ -42,15 +43,17 @@
}
$command = echo $command ( . implode(',', $args) .
');';
}
- /*$result = \PhpTags\Interpreter::run(
- $command,
- array($frame-getTitle()-getPrefixedText()),
- self::getScope($frame)
- );*/
+
try {
- $result = \PhpTags\Runtime::runSource(
- $command,
- array_merge(
(array)$frame-getTitle()-getPrefixedText(), $frame-getArguments() ),
+ $titleText = $frame-getTitle()-getPrefixedText();
+ $compiler = new PhpTags\Compiler();
+ $bytecode = $compiler-compile($command, $titleText);
+
+ self::$compileTime += microtime(true) - $time;
+
+ $result = \PhpTags\Runtime::run(
+ $bytecode,
+ array_merge( (array)$titleText,
$frame-getArguments() ),
self::getScope( $frame ),
array(
PHPTAGS_TRANSIT_PARSER=$parser, PHPTAGS_TRANSIT_PPFRAME=$frame )
);
@@ -61,12 +64,13 @@
$return = $exc-getTraceAsString();
}
- \PhpTags\Runtime::$time += microtime(true) - self::$startTime;
+ $wgPhpTagsTime += microtime(true) - $time;
return \UtfNormal::cleanUp($return);
}
public static function render($input, array $args, Parser $parser,
PPFrame $frame) {
- self::$startTime = microtime(true);
+ global $wgPhpTagsTime;
+ $time = microtime(true);
$is_banned = self::isBanned($frame);
if ( $is_banned ) {
@@ -90,17 +94,23 @@
);*/
try {
- $result = \PhpTags\Runtime::runSource(
- $input,
- array_merge(
(array)$frame-getTitle()-getPrefixedText(), $frame-getArguments() ),
+ $titleText = $frame-getTitle()-getPrefixedText();
+ $compiler = new PhpTags\Compiler();
+ $bytecode = $compiler-compile($input, $titleText);
+
+ self::$compileTime += microtime(true) - $time;
+
+ $result = \PhpTags\Runtime::run(
+ $bytecode,
+ array_merge( (array)$titleText,
$frame-getArguments() ),
self::getScope( $frame ),
- array( 'Parser'=$parser,
'PPFrame'=$frame )
+ array(
PHPTAGS_TRANSIT_PARSER=$parser, PHPTAGS_TRANSIT_PPFRAME=$frame )
);
} catch ( \PhpTags\ExceptionPhpTags $exc ) {
- \PhpTags\Runtime::$time += microtime(true) -
self::$startTime;
+ $wgPhpTagsTime += microtime(true) - $time;
return (string) $exc;
} catch ( Exception $exc ) {
- \PhpTags\Runtime::$time += microtime(true) -
self::$startTime;
+ $wgPhpTagsTime += microtime(true) - $time;
return $exc-getTraceAsString();
}
@@ -117,7 +127,7 @@
$return .= self::insertGeneral(
[MediaWiki-commits] [Gerrit] Use current preference overriding for live preview - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use current preference overriding for live preview
..
Use current preference overriding for live preview
* debug: debug
* uselang: wgUserLanguage
* useskin: skin
Bug: 60036
Change-Id: I76cd4b76bfba50f387b2a9ef4988cd09eb2e0c43
---
M resources/mediawiki.action/mediawiki.action.edit.preview.js
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/mediawiki.action/mediawiki.action.edit.preview.js
index 43642d0..4c2fc3a 100644
--- a/resources/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.preview.js
@@ -60,6 +60,12 @@
$previewDataHolder = $( 'div' );
targetUrl = $editform.attr( 'action' );
+ targetUrl += targetUrl.indexOf( '?' ) !== -1 ? '' : '?';
+ targetUrl += $.param( {
+ debug: mw.config.get( 'debug' ),
+ uselang: mw.config.get( 'wgUserLanguage' ),
+ useskin: mw.config.get( 'skin' )
+ } );
// Gather all the data from the form
postData = $editform.formToArray();
--
To view, visit https://gerrit.wikimedia.org/r/107359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76cd4b76bfba50f387b2a9ef4988cd09eb2e0c43
Gerrit-PatchSet: 4
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: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Mattflaschen mflasc...@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] Indicator for menuForceShow in skin vector - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Indicator for menuForceShow in skin vector
..
Indicator for menuForceShow in skin vector
The actions menu with the down arrow has two events:
hover and click to toggle. Both opens the menu. For the click toggle
is no indicator because the menu is already open by hover.
Change-Id: Ie251ab0d4d573937e08314de18ee731f154003bd
---
M skins/vector/components/tabs.less
M skins/vector/vector.js
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skins/vector/components/tabs.less
b/skins/vector/components/tabs.less
index 43e77cd..596dff5 100644
--- a/skins/vector/components/tabs.less
+++ b/skins/vector/components/tabs.less
@@ -127,6 +127,11 @@
background-position: 100% 60%;
background-repeat: no-repeat;
cursor: pointer;
+ .transition(background-position 250ms);
+}
+
+div.vectorMenu.menuForceShow {
+ background-position: 100% 100%;
}
div.vectorMenuFocus {
@@ -212,7 +217,7 @@
/* Enable forcing showing of the menu for accessibility */
div.vectorMenu:hover div.menu,
-div.vectorMenu div.menuForceShow {
+div.vectorMenu.menuForceShow div.menu {
display: block;
}
diff --git a/skins/vector/vector.js b/skins/vector/vector.js
index aa64624..8420431 100644
--- a/skins/vector/vector.js
+++ b/skins/vector/vector.js
@@ -9,7 +9,7 @@
// For accessibility, show the menu when the h3 is
clicked (bug 24298/46486)
.on( 'click keypress', function ( e ) {
if( e.type === 'click' || e.which === 13 ) {
- $el.find( '.menu:first' ).toggleClass(
'menuForceShow' );
+ $el.toggleClass( 'menuForceShow' );
e.preventDefault();
}
} )
--
To view, visit https://gerrit.wikimedia.org/r/110584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie251ab0d4d573937e08314de18ee731f154003bd
Gerrit-PatchSet: 1
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: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Isarra zhoris...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: Waldir wal...@email.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] Continue on single repo failures for deployment server init - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Continue on single repo failures for deployment server init
..
Continue on single repo failures for deployment server init
Rather than failing immediately if a single repo is broken (for
instance if the upstream is listed incorrectly), continue on to
other non-broken repos.
Change-Id: I27add880f7f4b864f7357a298d42cd5c8bd7e8cd
---
M modules/deployment/files/modules/deploy.py
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/deployment/files/modules/deploy.py
b/modules/deployment/files/modules/deploy.py
index c024c07..6ea62cb 100644
--- a/modules/deployment/files/modules/deploy.py
+++ b/modules/deployment/files/modules/deploy.py
@@ -90,11 +90,12 @@
def deployment_server_init():
+ret_status = 0
serv = _get_redis_serv()
is_deployment_server = __grains__.get('deployment_server')
hook_dir = __grains__.get('deployment_global_hook_dir')
if not is_deployment_server:
-return 0
+return ret_status
deploy_user = __grains__.get('deployment_repo_user')
repo_config = __pillar__.get('repo_config')
for repo in repo_config:
@@ -120,7 +121,8 @@
status = __salt__['cmd.retcode'](cmd, runas=deploy_user,
umask=002)
if status != 0:
-return status
+ret_status = 1
+continue
# git clone does ignores umask and does explicit mkdir with 755
__salt__['file.set_mode'](config['location'], 2775)
# Set the repo name in the repo's config
@@ -128,8 +130,9 @@
status = __salt__['cmd.retcode'](cmd, cwd=config['location'],
runas=deploy_user, umask=002)
if status != 0:
-return status
-return 0
+ret_status = 1
+continue
+return ret_status
def sync_all():
--
To view, visit https://gerrit.wikimedia.org/r/112317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27add880f7f4b864f7357a298d42cd5c8bd7e8cd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Ori.livneh 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] Ensure submodules are checked out on the deployment server - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Ensure submodules are checked out on the deployment server .. Ensure submodules are checked out on the deployment server If checkout_submodules is enabled on minions at any point and the deployment server doesn't have the submodules checked out then the minions will enter an unrecoverable state after the initial deploy. This change always does a submodule recursive init for repos to ensure this condition can't happen. Change-Id: I125e9275d813dc34baed10878c19be94e4a0251e --- M modules/deployment/files/modules/deploy.py 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/deployment/files/modules/deploy.py b/modules/deployment/files/modules/deploy.py index 6ea62cb..21ad4d1 100644 --- a/modules/deployment/files/modules/deploy.py +++ b/modules/deployment/files/modules/deploy.py @@ -116,10 +116,25 @@ if config['upstream']: cmd = '/usr/bin/git clone %s/.git %s' % (config['upstream'], config['location']) +status = __salt__['cmd.retcode'](cmd, runas=deploy_user, + umask=002) +if status != 0: +ret_status = 1 +continue +# We don't check the checkout_submodules config flag here +# on purpose. The deployment server should always have a +# fully recursive clone and minions should decide whether +# or not they'll use the submodules. This avoids consistency +# issues in the case where submodules are later enabled, but +# someone forgets to check them out. +cmd = '/usr/bin/git submodule update --init --recursive' +status = __salt__['cmd.retcode'](cmd, runas=deploy_user, + umask=002, + cwd=config['location']) else: cmd = '/usr/bin/git init %s' % (config['location']) -status = __salt__['cmd.retcode'](cmd, runas=deploy_user, - umask=002) +status = __salt__['cmd.retcode'](cmd, runas=deploy_user, + umask=002) if status != 0: ret_status = 1 continue -- To view, visit https://gerrit.wikimedia.org/r/112319 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I125e9275d813dc34baed10878c19be94e4a0251e Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ryan Lane rl...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ryan Lane rl...@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 browsertests: replace -p ciwmf with --tags @clean - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/112681 Change subject: Revert browsertests: replace -p ciwmf with --tags @clean .. Revert browsertests: replace -p ciwmf with --tags @clean It causes all ULS tests to be skipped entirely :( This reverts commit 6807ed2250dc18d862b82645671ce01808e71e2b. Change-Id: Id1b0215c6f9b6248a0f52c116577a5f087700c89 --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/81/112681/1 diff --git a/macro.yaml b/macro.yaml index f13ce0b..2e967a3 100644 --- a/macro.yaml +++ b/macro.yaml @@ -109,7 +109,7 @@ export MEDIAWIKI_USER=WikiAdmin export MEDIAWIKI_PASSWORD=testpass /srv/deployment/integration/slave-scripts/tools/bundler/bundle exec cucumber --color \ ---tags @clean \ +-p ciwmf \ --format pretty \ --format junit --out $WORKSPACE/log \ --format html --out $WORKSPACE/log/report.html -- To view, visit https://gerrit.wikimedia.org/r/112681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1b0215c6f9b6248a0f52c116577a5f087700c89 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master 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] Revert browsertests: replace -p ciwmf with --tags @clean - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: Revert browsertests: replace -p ciwmf with --tags @clean .. Revert browsertests: replace -p ciwmf with --tags @clean It causes all ULS tests to be skipped entirely :( This reverts commit 6807ed2250dc18d862b82645671ce01808e71e2b. Change-Id: Id1b0215c6f9b6248a0f52c116577a5f087700c89 --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index 134700a..e0fdabc 100644 --- a/macro.yaml +++ b/macro.yaml @@ -110,7 +110,7 @@ export MEDIAWIKI_USER=WikiAdmin export MEDIAWIKI_PASSWORD=testpass /srv/deployment/integration/slave-scripts/tools/bundler/bundle exec cucumber --color \ ---tags @clean \ +-p ciwmf \ --format pretty \ --format junit --out $WORKSPACE/log \ --format html --out $WORKSPACE/log/report.html -- To view, visit https://gerrit.wikimedia.org/r/112681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1b0215c6f9b6248a0f52c116577a5f087700c89 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr 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 Sphinx function documentation for deploy module - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Add Sphinx function documentation for deploy module
..
Add Sphinx function documentation for deploy module
This change adds basic Sphinx documentation to the deploy module.
Change-Id: Ia8f04c8bc95ef521192e1ea9fa1a176b4bd58b8a
---
M modules/deployment/files/modules/deploy.py
1 file changed, 152 insertions(+), 9 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/deployment/files/modules/deploy.py
b/modules/deployment/files/modules/deploy.py
index 21ad4d1..d3ab312 100644
--- a/modules/deployment/files/modules/deploy.py
+++ b/modules/deployment/files/modules/deploy.py
@@ -12,6 +12,8 @@
def _get_redis_serv():
'''
Return a redis server object
+
+:rtype: A Redis object
'''
deployment_config = __pillar__.get('deployment_config')
deploy_redis = deployment_config['redis']
@@ -22,6 +24,16 @@
def _check_in(function, repo):
+
+Private function used for reporting that a function has started.
+Writes to redis with basic status information.
+
+:param function: The function being reported on.
+:type function: str
+:param repo: The repository being acted on.
+:type repo: str
+:rtype: None
+
serv = _get_redis_serv()
minion = __grains__.get('id')
timestamp = time.time()
@@ -39,6 +51,16 @@
def _map_args(repo, args):
+
+Maps a set of arguments to a predefined set of values. Currently only
+__REPO__ is support and will be replaced with the repository name.
+
+:param repo: The repo name used for mapping.
+:type repo: str
+:param args: An array of arguments to map.
+:type args: list
+:rtype: list
+
arg_map = {'__REPO__': repo}
mapped_args = []
for arg in args:
@@ -47,6 +69,14 @@
def get_config(repo):
+
+Fetches the configuration for this repo from the pillars and returns
+a hash with the munged configuration (with defaults and helper config).
+
+:param repo: The specific repo for which to return config data.
+:type repo: str
+:rtype: hash
+
deployment_config = __pillar__.get('deployment_config')
config = __pillar__.get('repo_config')
config = config[repo]
@@ -90,6 +120,14 @@
def deployment_server_init():
+
+Initializes a set of repositories on the deployment server. This
+function will only run on the deployment server and will initialize
+any repository defined in the pillar configuration. This function is
+safe to call at any point.
+
+:rtype: int
+
ret_status = 0
serv = _get_redis_serv()
is_deployment_server = __grains__.get('deployment_server')
@@ -152,11 +190,20 @@
def sync_all():
'''
-Sync all repositories. If a repo doesn't exist on target, clone as well.
+Sync all repositories for this minion. If a repo doesn't exist on target,
+clone it as well. This function will ensure all repositories for the
+minion are at the current tag as defined by the master and is
+be safe to call at any point.
-CLI Example::
+CLI Example (from the master):
-salt -G 'cluster:appservers' deploy.sync_all
+salt -G 'deployment_target:test' deploy.sync_all
+
+CLI Example (from a minion):
+
+salt-call deploy.sync_all
+
+:rtype: hash
'''
repo_config = __pillar__.get('repo_config')
deployment_target = __grains__.get('deployment_target')
@@ -175,6 +222,23 @@
def _update_gitmodules(config, location, shadow=False):
+
+Finds all .gitmodules in a repository, changes all submodules within them
+to point to the correct submodule on the deployment server, then runs
+a submodule sync. This function is in support of recursive submodules.
+
+In the case we need to update a shadow reference repo, the .gitmodules
+files will have their submodules point to the reference clone.
+
+:param config: The config hash for the repo (as pulled from get_config).
+:type config: hash
+:param location: The location on the filesystem to find the .gitmodules
+ files.
+:type location: str
+:param shadow: Defines whether or not this is a shadow reference repo.
+:type shadow: bool
+:rtype: int
+
gitmodules_list = __salt__['file.find'](location, name='.gitmodules')
for gitmodules in gitmodules_list:
gitmodules_dir = os.path.dirname(gitmodules)
@@ -221,6 +285,21 @@
def _clone(config, location, tag, shadow=False):
+
+Perform a clone of a repo at a specified location, and
+do a fetch and checkout of the repo to ensure it's at the
+current deployment tag.
+
+:param config: Config hash as fetched from get_config
+:type config: hash
+:param location: The location on the filesystem to clone this repo.
+:type location: str
+:param tag: The tag to
[MediaWiki-commits] [Gerrit] browsertests: bundle install gems in shared dir - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112682
Change subject: browsertests: bundle install gems in shared dir
..
browsertests: bundle install gems in shared dir
Save up time when running `bundle install` by using a shared directory
which is common to all jobs running on a slave.
Change-Id: Ia8898820040840b30e58cf07a27ccb4f02b8d1fa
Reference: https://github.com/bundler/bundler/issues/2856
---
M macro.yaml
1 file changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/82/112682/1
diff --git a/macro.yaml b/macro.yaml
index e0fdabc..c3e81e9 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -102,8 +102,12 @@
ln -s $WORKSPACE $DOCROOT/$TEST_ID
curl --location --include http://localhost:9413/$TEST_ID/; |head -n42
+# Shared cache of gems to avoid hitting rubygems all the time
+# See https://github.com/bundler/bundler/issues/2856
+export GEM_HOME=$WORKSPACE/../gems
+
cd {tests-path}
-/srv/deployment/integration/slave-scripts/tools/bundler/bundle
install --path vendor
+/srv/deployment/integration/slave-scripts/tools/bundler/bundle
install --path $GEM_HOME
export BROWSER_LABEL=phantomjs
export
MEDIAWIKI_URL=http://localhost:9413/$TEST_ID/index.php?title=;
export API_URL=http://localhost:9413/$TEST_ID/api.php;
--
To view, visit https://gerrit.wikimedia.org/r/112682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8898820040840b30e58cf07a27ccb4f02b8d1fa
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
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] browsertests: take screenshot on fail and archive them - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112683
Change subject: browsertests: take screenshot on fail and archive them
..
browsertests: take screenshot on fail and archive them
mediawiki-selenium 0.2.1 gems support taking screenshots.
Change-Id: Ic869b5c29214afbe69f25a4dee57f8ff7aa2
---
M macro.yaml
M mediawiki-extensions.yaml
2 files changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/83/112683/1
diff --git a/macro.yaml b/macro.yaml
index c3e81e9..e80b483 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -113,6 +113,8 @@
export API_URL=http://localhost:9413/$TEST_ID/api.php;
export MEDIAWIKI_USER=WikiAdmin
export MEDIAWIKI_PASSWORD=testpass
+export SCREENSHOT_FAILURES=true
+export SCREENSHOT_FAILURES_PATH=$WORKSPACE/log
/srv/deployment/integration/slave-scripts/tools/bundler/bundle
exec cucumber --color \
-p ciwmf \
--format pretty \
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 7cc354b..86b35a0 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -77,7 +77,7 @@
- junit:
pattern: 'log/*.xml'
- archive:
- artifacts: 'log/*.log, log/report.html'
+ artifacts: 'log/*.log, log/report.html, log/*.png'
- job-template:
name: '{name}-{ext-name}-npmtest'
--
To view, visit https://gerrit.wikimedia.org/r/112683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic869b5c29214afbe69f25a4dee57f8ff7aa2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
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] remove 'harmon' from DNS - change (operations/dns)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/112684 Change subject: remove 'harmon' from DNS .. remove 'harmon' from DNS RT #6267 removed it from puppet and shut it down RT #6807 in pmtpa will physically remove it also removed from dsh,partman,dhcp etc in Idc44f926f3bf1ccda9065e3fb685672fb051604a Change-Id: Ic6e248da8550d195324829687efc0009579510eb --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/84/112684/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 0a73711..49eda5d 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -29,7 +29,6 @@ 15 1H IN PTR vl2-eth0.lvs5.wikimedia.org. 16 1H IN PTR vl2-eth0.lvs6.wikimedia.org. -20 1H IN PTR harmon.pmtpa.wmnet. 21 1H IN PTR tarin.pmtpa.wmnet. 22 1H IN PTR ersch.pmtpa.wmnet. 24 1H IN PTR stafford.pmtpa.wmnet. @@ -542,7 +541,6 @@ 39 1H IN PTR ekrem.mgmt.pmtpa.wmnet. 40 1H IN PTR emery.mgmt.pmtpa.wmnet. -41 1H IN PTR harmon.mgmt.pmtpa.wmnet. 42 1H IN PTR WMF3916.mgmt.pmtpa.wmnet. 44 1H IN PTR WMF3914.mgmt.pmtpa.wmnet. 51 1H IN PTR WMF3848.mgmt.pmtpa.wmnet. diff --git a/templates/wmnet b/templates/wmnet index b99d709..1c17b55 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -93,7 +93,6 @@ es81H IN A10.0.0.237 es9 1H IN A10.0.0.220 es101H IN A10.0.0.224 -harmon 1H IN A10.0.0.20 projectstorage 1H IN A10.0.0.41 1H IN A10.0.0.42 labstore1 1H IN A10.0.0.41 @@ -351,7 +350,6 @@ es101H IN A10.1.7.20 fenari 1H IN A10.1.8.7 formey 1H IN A10.1.8.32 -harmon 1H IN A10.1.8.41 WMF39161H IN A10.1.8.42 hume 1H IN A10.1.252.190 stafford 1H IN A10.1.8.30 -- To view, visit https://gerrit.wikimedia.org/r/112684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6e248da8550d195324829687efc0009579510eb Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] browsertests: take screenshot on fail and archive them - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: browsertests: take screenshot on fail and archive them
..
browsertests: take screenshot on fail and archive them
mediawiki-selenium 0.2.1 gems support taking screenshots.
Change-Id: Ic869b5c29214afbe69f25a4dee57f8ff7aa2
---
M macro.yaml
M mediawiki-extensions.yaml
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index c3e81e9..e80b483 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -113,6 +113,8 @@
export API_URL=http://localhost:9413/$TEST_ID/api.php;
export MEDIAWIKI_USER=WikiAdmin
export MEDIAWIKI_PASSWORD=testpass
+export SCREENSHOT_FAILURES=true
+export SCREENSHOT_FAILURES_PATH=$WORKSPACE/log
/srv/deployment/integration/slave-scripts/tools/bundler/bundle
exec cucumber --color \
-p ciwmf \
--format pretty \
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 7cc354b..86b35a0 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -77,7 +77,7 @@
- junit:
pattern: 'log/*.xml'
- archive:
- artifacts: 'log/*.log, log/report.html'
+ artifacts: 'log/*.log, log/report.html, log/*.png'
- job-template:
name: '{name}-{ext-name}-npmtest'
--
To view, visit https://gerrit.wikimedia.org/r/112683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic869b5c29214afbe69f25a4dee57f8ff7aa2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] browsertests: bundle install gems in shared dir - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: browsertests: bundle install gems in shared dir
..
browsertests: bundle install gems in shared dir
Save up time when running `bundle install` by using a shared directory
which is common to all jobs running on a slave.
Change-Id: Ia8898820040840b30e58cf07a27ccb4f02b8d1fa
Reference: https://github.com/bundler/bundler/issues/2856
---
M macro.yaml
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index e0fdabc..c3e81e9 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -102,8 +102,12 @@
ln -s $WORKSPACE $DOCROOT/$TEST_ID
curl --location --include http://localhost:9413/$TEST_ID/; |head -n42
+# Shared cache of gems to avoid hitting rubygems all the time
+# See https://github.com/bundler/bundler/issues/2856
+export GEM_HOME=$WORKSPACE/../gems
+
cd {tests-path}
-/srv/deployment/integration/slave-scripts/tools/bundler/bundle
install --path vendor
+/srv/deployment/integration/slave-scripts/tools/bundler/bundle
install --path $GEM_HOME
export BROWSER_LABEL=phantomjs
export
MEDIAWIKI_URL=http://localhost:9413/$TEST_ID/index.php?title=;
export API_URL=http://localhost:9413/$TEST_ID/api.php;
--
To view, visit https://gerrit.wikimedia.org/r/112682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8898820040840b30e58cf07a27ccb4f02b8d1fa
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [DO NOT MERGE] Setting batch_num_messages to 6000 - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: [DO NOT MERGE] Setting batch_num_messages to 6000
..
[DO NOT MERGE] Setting batch_num_messages to 6000
Don't merge this yet. Magnus and are are trying to catch cp3019
misbehaving again, and we think that this setting might fix it.
Change-Id: I2243fc06f410a5bdf8a8ce489e3a3b1fe16ecb2c
---
M manifests/role/cache.pp
M modules/varnishkafka
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 70bd938..b2535bd 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -429,6 +429,10 @@
format =
%{fake_tag0@hostname?${::fqdn}}x %{@sequence!num?0}n %{%FT%T@dt}t
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q
%{Content-Type@content_type}o %{Referer@referer}i
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o,
message_send_max_retries = 3,
queue_buffering_max_messages = 200,
+# bits varnishes do about 6000 reqs / sec each.
+# We want to buffer for about max 1 second.
+batch_num_messages = 6000,
+
# large timeout to account for potential cross DC latencies
topic_request_timeout_ms = 3, # request ack timeout
# Write out stats to varnishkafka.stats.json
diff --git a/modules/varnishkafka b/modules/varnishkafka
index bab034a..04ece4f 16
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
-Subproject commit bab034a007f665303bc3c3fad48e34eccbb3648c
+Subproject commit 04ece4fb9de20929eaaad0c7a26100d424db22e4
--
To view, visit https://gerrit.wikimedia.org/r/111523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2243fc06f410a5bdf8a8ce489e3a3b1fe16ecb2c
Gerrit-PatchSet: 2
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] autoinstall: another trusty early_command fix - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112685 Change subject: autoinstall: another trusty early_command fix .. autoinstall: another trusty early_command fix killall.sh for killing DHCP was (rightfully) renamed to kill-all-dhcp to indicate its purpose in netcfg 1.86. wheezy has 1.108 trusty has 1.114 and are the first versions to have this change. Add support for in a backwards-compatible way and while at it, remove a useless true invocation. Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/112685/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index f7004db..a9cea29 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -4,6 +4,7 @@ set -x # redo network configuration statically + # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -13,7 +14,8 @@ echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg debconf-set-selections /tmp/static_net.cfg -killall.sh; netcfg; true +# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) +killall.sh || kill-all-dhcp; netcfg # Preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) -- To view, visit https://gerrit.wikimedia.org/r/112685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix stray '$' in a double-quoted string - change (mediawiki/core)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/112689 Change subject: Fix stray '$' in a double-quoted string .. Fix stray '$' in a double-quoted string Bug: 61210 Change-Id: I55d9222188f241758e2b02232913e79ebcf263f5 --- M includes/api/ApiParse.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/112689/1 diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php index f5c072a..16f7ed2 100644 --- a/includes/api/ApiParse.php +++ b/includes/api/ApiParse.php @@ -797,7 +797,7 @@ 'uselang' = 'Which language to parse the request in', 'section' = 'Only retrieve the content of this section number', 'disablepp' = 'Disable the PP Report from the parser output', - 'generatexml' = Generate XML parse tree (requires contentmodel=$wikitext), + 'generatexml' = Generate XML parse tree (requires contentmodel=wikitext), 'preview' = 'Parse in preview mode', 'sectionpreview' = 'Parse in section preview mode (enables preview mode too)', 'disabletoc' = 'Disable table of contents in output', -- To view, visit https://gerrit.wikimedia.org/r/112689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55d9222188f241758e2b02232913e79ebcf263f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Fix PHP warning in action=parse help output - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112690
Change subject: API: Fix PHP warning in action=parse help output
..
API: Fix PHP warning in action=parse help output
Change I0f41c837 removed a variable while it was still in use.
Bug: 61210
Change-Id: I91ad2e374a85e149303c6e8da7c3d94c1285a72a
---
M includes/api/ApiParse.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/112690/1
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index f5c072a..47ad80f 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -746,6 +746,7 @@
public function getParamDescription() {
$p = $this-getModulePrefix();
+ $wikitext = CONTENT_MODEL_WIKITEXT;
return array(
'text' = Text to parse. Use {$p}title or
{$p}contentmodel to control the content model,
--
To view, visit https://gerrit.wikimedia.org/r/112690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91ad2e374a85e149303c6e8da7c3d94c1285a72a
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] autoinstall: disable multiarch by default - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112687 Change subject: autoinstall: disable multiarch by default .. autoinstall: disable multiarch by default multiarch is set to i386 on amd64 systems by default since apt-setup 1:0.79, i.e. Ubuntu saucy. We don't need it, so disable it. Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/112687/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 0fda1f0..d8cf8ad 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -43,6 +43,9 @@ d-imirror/http/directory string /ubuntu/ d-imirror/http/proxy string +# disable multiarch, enabled by default in amd64 since saucy +d-iapt-setup/multiarch string + # Wikimedia's APT repository d-iapt-setup/local0/commentstring Wikimedia APT repository d-iapt-setup/local0/source boolean true -- To view, visit https://gerrit.wikimedia.org/r/112687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: set up apt pinning from early in d-i - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112688 Change subject: autoinstall: set up apt pinning from early in d-i .. autoinstall: set up apt pinning from early in d-i We currently have the need that we need to install a lower version of puppet (2.7 instead of 3.4) from our own apt repository in trusty, but we have no apt pinning set up while in the installer, and hence when both are set at 500, the highest version wins. Unfortunately, apt-setup does not support setting up apt pinning and both early_command late_command are unsuitable for doing so (the former runs before we have /target, the latter runs after apt-get update has been run). Work around this in a very hacky way, by having the early_command shell script install a shell script hook under base-installer's prehooks runpartsdir, which runs before the apt_update step. It also runs before the install_base_system step and there's no hook step between those two, but this should be okay as long as we mkdir /etc/apt/preferences.d ourselves. Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/112688/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 726c1be..6b080d2 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -29,3 +29,21 @@ SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg + +# apt-setup doesn't allow us to set up pinning and hence everything we install +# with apt-install bypasses pinning. hack around this by creating a +# base-installer early hook that does this right before apt-get update +cat /usr/lib/base-installer.d/10aptpinning EOF +#!/bin/sh +set -e + +APT_PREFDIR=/target/etc/apt/preferences.d +[ ! -d \$APT_PREFDIR ] mkdir -p \$APT_PREFDIR + +cat \$APT_PREFDIR/wikimedia EOT +Package: * +Pin: release o=Wikimedia +Pin-Priority: 1001 +EOT +EOF +chmod +x /usr/lib/base-installer.d/10aptpinning -- To view, visit https://gerrit.wikimedia.org/r/112688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: move disable_dhcp to early_command - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112686 Change subject: autoinstall: move disable_dhcp to early_command .. autoinstall: move disable_dhcp to early_command There is no reason for the disable_dhcp/disable_autoconfig boilerplate to be present in every single subnet definition where it can be moved in the place where we actually set the static IP address and call netcfg itself. This has the downside that it to a shell script, but it has the benefit of DRY, plus that we can document all netcfg exceptions. While at it, remove the netcfg/choose_interface setting from a couple of subnets, as it's defined in common.cfg anyway. Change-Id: I72681530ab76211e96a45ee46acb6e2b177e36e4 --- M modules/install-server/files/autoinstall/scripts/early_command 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/esams.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/pmtpa-internal.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-pub-svc2.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-squid.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg M modules/install-server/files/autoinstall/subnets/pmtpa.cfg M modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.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-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-ulsfo.cfg M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg 22 files changed, 13 insertions(+), 95 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/112686/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index a9cea29..726c1be 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -3,8 +3,7 @@ set -e set -x -# redo network configuration statically - +## redo network configuration statically # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -12,12 +11,21 @@ IP=$(ifconfig | grep inet addr | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) fi -echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg +# netcfg backwards-compatible notes: +# - disable_autoconfig is needed for = precise +# - disable_dhcp is supported but deprecated in favor of disable_autoconfig +# starting with netcfg 1.101 (wheezy/trusty) +# - kill-all-dhcp has replaced killall.sh since netcfg 1.86 (= wheezy/trusty) + +cat /tmp/static_net.cfg EOF +d-i netcfg/get_ipaddress string $IP +d-i netcfg/disable_dhcp boolean true +d-i netcfg/disable_autoconfig boolean true +EOF debconf-set-selections /tmp/static_net.cfg -# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) killall.sh || kill-all-dhcp; netcfg -# Preseed the correct wikimedia repository location +## preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg diff --git a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg index a93035b..9245bd6 100644 --- a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg +++ b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg @@ -3,10 +3,6 @@ # get_domain should be set, get_hostname is overwritten by DHCP d-inetcfg/get_domain string eqiad.wmnet -# disable_dhcp for lucid, disable_autoconfig for = precise -d-inetcfg/disable_dhcp boolean true -d-inetcfg/disable_autoconfig boolean true - # ip address is taken from DHCP, rest is set here d-inetcfg/get_netmask string 255.255.255.0 d-inetcfg/get_gateway
[MediaWiki-commits] [Gerrit] autoinstall: another trusty early_command fix - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: another trusty early_command fix .. autoinstall: another trusty early_command fix killall.sh for killing DHCP was (rightfully) renamed to kill-all-dhcp to indicate its purpose in netcfg 1.86. wheezy has 1.108 trusty has 1.114 and are the first versions to have this change. Add support for in a backwards-compatible way and while at it, remove a useless true invocation. Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index f7004db..a9cea29 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -4,6 +4,7 @@ set -x # redo network configuration statically + # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -13,7 +14,8 @@ echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg debconf-set-selections /tmp/static_net.cfg -killall.sh; netcfg; true +# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) +killall.sh || kill-all-dhcp; netcfg # Preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) -- To view, visit https://gerrit.wikimedia.org/r/112685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: disable multiarch by default - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: disable multiarch by default .. autoinstall: disable multiarch by default multiarch is set to i386 on amd64 systems by default since apt-setup 1:0.79, i.e. Ubuntu saucy. We don't need it, so disable it. Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 0fda1f0..d8cf8ad 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -43,6 +43,9 @@ d-imirror/http/directory string /ubuntu/ d-imirror/http/proxy string +# disable multiarch, enabled by default in amd64 since saucy +d-iapt-setup/multiarch string + # Wikimedia's APT repository d-iapt-setup/local0/commentstring Wikimedia APT repository d-iapt-setup/local0/source boolean true -- To view, visit https://gerrit.wikimedia.org/r/112687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: set up apt pinning from early in d-i - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: set up apt pinning from early in d-i .. autoinstall: set up apt pinning from early in d-i We currently have the need that we need to install a lower version of puppet (2.7 instead of 3.4) from our own apt repository in trusty, but we have no apt pinning set up while in the installer, and hence when both are set at 500, the highest version wins. Unfortunately, apt-setup does not support setting up apt pinning and both early_command late_command are unsuitable for doing so (the former runs before we have /target, the latter runs after apt-get update has been run). Work around this in a very hacky way, by having the early_command shell script install a shell script hook under base-installer's prehooks runpartsdir, which runs before the apt_update step. It also runs before the install_base_system step and there's no hook step between those two, but this should be okay as long as we mkdir /etc/apt/preferences.d ourselves. Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 726c1be..6b080d2 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -29,3 +29,21 @@ SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg + +# apt-setup doesn't allow us to set up pinning and hence everything we install +# with apt-install bypasses pinning. hack around this by creating a +# base-installer early hook that does this right before apt-get update +cat /usr/lib/base-installer.d/10aptpinning EOF +#!/bin/sh +set -e + +APT_PREFDIR=/target/etc/apt/preferences.d +[ ! -d \$APT_PREFDIR ] mkdir -p \$APT_PREFDIR + +cat \$APT_PREFDIR/wikimedia EOT +Package: * +Pin: release o=Wikimedia +Pin-Priority: 1001 +EOT +EOF +chmod +x /usr/lib/base-installer.d/10aptpinning -- To view, visit https://gerrit.wikimedia.org/r/112688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Fix PHP warning in action=parse help output - change (mediawiki/core)
Brion VIBBER has submitted this change and it was merged.
Change subject: API: Fix PHP warning in action=parse help output
..
API: Fix PHP warning in action=parse help output
Change I0f41c837 removed a variable while it was still in use.
Bug: 61210
Change-Id: I91ad2e374a85e149303c6e8da7c3d94c1285a72a
---
M includes/api/ApiParse.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index f5c072a..47ad80f 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -746,6 +746,7 @@
public function getParamDescription() {
$p = $this-getModulePrefix();
+ $wikitext = CONTENT_MODEL_WIKITEXT;
return array(
'text' = Text to parse. Use {$p}title or
{$p}contentmodel to control the content model,
--
To view, visit https://gerrit.wikimedia.org/r/112690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91ad2e374a85e149303c6e8da7c3d94c1285a72a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@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] autoinstall: move disable_dhcp to early_command - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: move disable_dhcp to early_command .. autoinstall: move disable_dhcp to early_command There is no reason for the disable_dhcp/disable_autoconfig boilerplate to be present in every single subnet definition where it can be moved in the place where we actually set the static IP address and call netcfg itself. This has the downside that it to a shell script, but it has the benefit of DRY, plus that we can document all netcfg exceptions. While at it, remove the netcfg/choose_interface setting from a couple of subnets, as it's defined in common.cfg anyway. Change-Id: I72681530ab76211e96a45ee46acb6e2b177e36e4 --- M modules/install-server/files/autoinstall/scripts/early_command 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/esams.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/pmtpa-internal.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-pub-svc2.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-squid.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg M modules/install-server/files/autoinstall/subnets/pmtpa.cfg M modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.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-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-ulsfo.cfg M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg 22 files changed, 13 insertions(+), 95 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index a9cea29..726c1be 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -3,8 +3,7 @@ set -e set -x -# redo network configuration statically - +## redo network configuration statically # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -12,12 +11,21 @@ IP=$(ifconfig | grep inet addr | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) fi -echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg +# netcfg backwards-compatible notes: +# - disable_autoconfig is needed for = precise +# - disable_dhcp is supported but deprecated in favor of disable_autoconfig +# starting with netcfg 1.101 (wheezy/trusty) +# - kill-all-dhcp has replaced killall.sh since netcfg 1.86 (= wheezy/trusty) + +cat /tmp/static_net.cfg EOF +d-i netcfg/get_ipaddress string $IP +d-i netcfg/disable_dhcp boolean true +d-i netcfg/disable_autoconfig boolean true +EOF debconf-set-selections /tmp/static_net.cfg -# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) killall.sh || kill-all-dhcp; netcfg -# Preseed the correct wikimedia repository location +## preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg diff --git a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg index a93035b..9245bd6 100644 --- a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg +++ b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg @@ -3,10 +3,6 @@ # get_domain should be set, get_hostname is overwritten by DHCP d-inetcfg/get_domain string eqiad.wmnet -# disable_dhcp for lucid, disable_autoconfig for = precise -d-inetcfg/disable_dhcp boolean true -d-inetcfg/disable_autoconfig boolean true - # ip address is taken from DHCP, rest is set here d-inetcfg/get_netmask string 255.255.255.0 d-inetcfg/get_gateway string 10.64.21.1 diff --git
[MediaWiki-commits] [Gerrit] [Browsertests] Fix ambigous step definition - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/112692 Change subject: [Browsertests] Fix ambigous step definition .. [Browsertests] Fix ambigous step definition Change-Id: I40ca88f99f95ccf5b647a8c31cad7e3da49cfdb4 --- M tests/browser/features/delete_item.feature M tests/browser/features/step_definitions/entity_steps.rb 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/92/112692/1 diff --git a/tests/browser/features/delete_item.feature b/tests/browser/features/delete_item.feature index ddef403..e9a0aaf 100644 --- a/tests/browser/features/delete_item.feature +++ b/tests/browser/features/delete_item.feature @@ -8,7 +8,7 @@ Feature: Delete item Scenario: Delete item - Given I am logged in + Given I am logged in to the repo And I am on an item page When I click the item delete button Then Page should be deleted diff --git a/tests/browser/features/step_definitions/entity_steps.rb b/tests/browser/features/step_definitions/entity_steps.rb index abaaa17..7377713 100644 --- a/tests/browser/features/step_definitions/entity_steps.rb +++ b/tests/browser/features/step_definitions/entity_steps.rb @@ -6,7 +6,7 @@ # # basic steps for entities -Given /^I am logged in$/ do +Given /^I am logged in to the repo$/ do visit(RepoLoginPage).login_with(ENV[WB_REPO_USERNAME], ENV[WB_REPO_PASSWORD]) end -- To view, visit https://gerrit.wikimedia.org/r/112692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40ca88f99f95ccf5b647a8c31cad7e3da49cfdb4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove 'harmon' from DNS - change (operations/dns)
Dzahn has submitted this change and it was merged. Change subject: remove 'harmon' from DNS .. remove 'harmon' from DNS RT #6267 removed it from puppet and shut it down RT #6807 in pmtpa will physically remove it also removed from dsh,partman,dhcp etc in Idc44f926f3bf1ccda9065e3fb685672fb051604a Change-Id: Ic6e248da8550d195324829687efc0009579510eb --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 0a73711..49eda5d 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -29,7 +29,6 @@ 15 1H IN PTR vl2-eth0.lvs5.wikimedia.org. 16 1H IN PTR vl2-eth0.lvs6.wikimedia.org. -20 1H IN PTR harmon.pmtpa.wmnet. 21 1H IN PTR tarin.pmtpa.wmnet. 22 1H IN PTR ersch.pmtpa.wmnet. 24 1H IN PTR stafford.pmtpa.wmnet. @@ -542,7 +541,6 @@ 39 1H IN PTR ekrem.mgmt.pmtpa.wmnet. 40 1H IN PTR emery.mgmt.pmtpa.wmnet. -41 1H IN PTR harmon.mgmt.pmtpa.wmnet. 42 1H IN PTR WMF3916.mgmt.pmtpa.wmnet. 44 1H IN PTR WMF3914.mgmt.pmtpa.wmnet. 51 1H IN PTR WMF3848.mgmt.pmtpa.wmnet. diff --git a/templates/wmnet b/templates/wmnet index b99d709..1c17b55 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -93,7 +93,6 @@ es81H IN A10.0.0.237 es9 1H IN A10.0.0.220 es101H IN A10.0.0.224 -harmon 1H IN A10.0.0.20 projectstorage 1H IN A10.0.0.41 1H IN A10.0.0.42 labstore1 1H IN A10.0.0.41 @@ -351,7 +350,6 @@ es101H IN A10.1.7.20 fenari 1H IN A10.1.8.7 formey 1H IN A10.1.8.32 -harmon 1H IN A10.1.8.41 WMF39161H IN A10.1.8.42 hume 1H IN A10.1.252.190 stafford 1H IN A10.1.8.30 -- To view, visit https://gerrit.wikimedia.org/r/112684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6e248da8550d195324829687efc0009579510eb Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vector: Consistently use lowercase in #rrggbb colors - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/112694 Change subject: Vector: Consistently use lowercase in #rrggbb colors .. Vector: Consistently use lowercase in #rrggbb colors Change-Id: I174781b199260790d18aac2a6c270282396f2812 --- M skins/vector/variables.less 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/94/112694/1 diff --git a/skins/vector/variables.less b/skins/vector/variables.less index 542ffe7..2af6389 100644 --- a/skins/vector/variables.less +++ b/skins/vector/variables.less @@ -36,8 +36,8 @@ @menu-personal-font-size: 0.75em; // Collapsible nav -@collapsible-nav-heading-color: #4D4D4D; -@collapsible-nav-heading-collapsed-color: #0645AD; +@collapsible-nav-heading-color: #4d4d4d; +@collapsible-nav-heading-collapsed-color: #0645ad; @collapsible-nav-heading-padding: 4px 0 3px 1.5em; @collapsible-nav-body-margin: 0 0 0 1.25em; -- To view, visit https://gerrit.wikimedia.org/r/112694 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I174781b199260790d18aac2a6c270282396f2812 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] Vector: Remove misleading comment - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112693
Change subject: Vector: Remove misleading comment
..
Vector: Remove misleading comment
What it says it's true, but it's now abstracted away in the mixin.
Change-Id: If4761b5b9c2153553cc293d7ecf4fdd5a28c47da
---
M skins/vector/components/tabs.less
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/93/112693/1
diff --git a/skins/vector/components/tabs.less
b/skins/vector/components/tabs.less
index 596dff5..7e24ae7 100644
--- a/skins/vector/components/tabs.less
+++ b/skins/vector/components/tabs.less
@@ -120,8 +120,6 @@
direction: ltr;
/* @noflip */
float: left;
- /* SVG support using a transparent gradient to guarantee cross-browser
-* compatibility (browsers able to understand gradient syntax support
also SVG) */
.background-image-svg('images/arrow-down-icon.svg',
'images/arrow-down-icon.png');
/* @noflip */
background-position: 100% 60%;
@@ -135,8 +133,6 @@
}
div.vectorMenuFocus {
- /* SVG support using a transparent gradient to guarantee cross-browser
-* compatibility (browsers able to understand gradient syntax support
also SVG) */
.background-image-svg('images/arrow-down-focus-icon.svg',
'images/arrow-down-focus-icon.png');
background-position: 100% 60%;
}
--
To view, visit https://gerrit.wikimedia.org/r/112693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4761b5b9c2153553cc293d7ecf4fdd5a28c47da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Canonicalize excluded category names - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Canonicalize excluded category names
..
Canonicalize excluded category names
The category names in the wgGettingStartedExcludedCategories
configuration variable need to be canonicalized like those in the
wgGettingStartedCategoriesForTaskTypes configuration variable (see
I2251eef7d0dddacc735aa5beb12f1045befa4b39).
Use Title::makeTitleSafe and then Title#getDBkey to canonicalize
category names in both PageFilter#getExcludedCategories and
RedisCategorySync::getCategories.
Change-Id: If3c0559cdb4a0bdb372d1fefc8477894005880e3
---
M PageFilter.php
M RedisCategorySync.php
2 files changed, 34 insertions(+), 10 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageFilter.php b/PageFilter.php
index 255ad33..76be851 100644
--- a/PageFilter.php
+++ b/PageFilter.php
@@ -16,6 +16,9 @@
/** @var Title */
protected $excludedTitle;
+ /** @var array: array of excluded categories */
+ protected static $excludedCategories;
+
/**
* Constructor.
*
@@ -28,12 +31,10 @@
}
protected function inExcludedCategories( Title $title ) {
- global $wgGettingStartedExcludedCategories;
-
$articleID = $title-getArticleID();
-
+ $excludedCategories = self::getExcludedCategories();
$dbr = wfGetDB( DB_SLAVE );
- foreach( $wgGettingStartedExcludedCategories as $cat ) {
+ foreach( $excludedCategories as $cat ) {
$res = $dbr-selectRow( 'categorylinks', '1', array(
'cl_from' = $articleID,
'cl_to' = $cat,
@@ -47,6 +48,28 @@
return false;
}
+ protected static function getExcludedCategories() {
+ global $wgGettingStartedExcludedCategories;
+
+ if ( self::$excludedCategories === null ) {
+ // TODO (phuedx 2014-02-010) Create a collection class
+ // for categories, which could be generalised in the
+ // future, i.e. CategoryCollection.
+ self::$excludedCategories = array();
+ foreach( $wgGettingStartedExcludedCategories as
$rawCategory ) {
+ // Canonicalize the category name.
+ $title = Title::makeTitleSafe( NS_CATEGORY,
$rawCategory );
+ if ( !$title ) {
+ continue;
+ }
+ $category = $title-getDBkey();
+ self::$excludedCategories[] = $category;
+ }
+ }
+
+ return self::$excludedCategories;
+ }
+
public function isAllowedPage( Title $title ) {
$length = $title-getLength();
$notExcludedTitle = $this-excludedTitle === null ||
diff --git a/RedisCategorySync.php b/RedisCategorySync.php
index 2375a39..2f52744 100644
--- a/RedisCategorySync.php
+++ b/RedisCategorySync.php
@@ -2,7 +2,7 @@
namespace GettingStarted;
-use Category, WikiPage;
+use Category, WikiPage, Title;
/**
* Maintains sets in redis representing page IDs of NS_MAIN pages in
@@ -63,13 +63,14 @@
if ( self::$categories === null ) {
self::$categories = array();
- foreach ($wgGettingStartedCategoriesForTaskTypes as
$categoryName) {
- $category = Category::newFromName(
$categoryName );
- if ( !$category) {
+ foreach ( $wgGettingStartedCategoriesForTaskTypes as
$rawCategory ) {
+ // Canonicalize the category name.
+ $title = Title::makeTitleSafe( NS_CATEGORY,
$rawCategory );
+ if ( !$title ) {
continue;
}
- // Canonicalize the category name.
- self::$categories[] = $category-getName();
+ $category = $title-getDBkey();
+ self::$categories[] = $category;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3c0559cdb4a0bdb372d1fefc8477894005880e3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer:
[MediaWiki-commits] [Gerrit] remove locke from puppet, dsh, dhcpd, ud2log filter - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: remove locke from puppet,dsh,dhcpd,ud2log filter
..
remove locke from puppet,dsh,dhcpd,ud2log filter
RT #6168
can be decom'ed anytime per ottomata
delete from dsh groups, ganglia comment, logging
role, site.pp, dhcpd and ...
Change-Id: I3fe32f4830289ad297a4335472db8137d09cd21a
---
M files/dsh/group/ALL
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/ganglia.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
6 files changed, 1 insertion(+), 27 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 0d7120a..4a03b22 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -12,7 +12,6 @@
lvs2
lvs3
lvs4
-locke
db9
db10
palladium
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 7552d28..7f12df8 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -9,7 +9,6 @@
hume
kaulen
linne
-locke
manutius
maurus
mchenry
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 106fc55..41c1676 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -6,7 +6,6 @@
hume
kaulen
linne
-locke
mchenry
sanger
sockpuppet
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index ad9a568..76653e4 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -612,7 +612,7 @@
# # You can describe the same graphs to add with $items.
# # $graphs is just a shortcut. aggregate_graphs in $items
# # are a bit overly verbose.
-# $host_regex = 'locke|emery|oxygen|gadolinium'
+# $host_regex = 'emery|oxygen|gadolinium'
# ganglia::view { 'udp2log':
# graphs = [
# {
diff --git a/manifests/site.pp b/manifests/site.pp
index 02afcb2..9054ac5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1037,24 +1037,6 @@
class { ganglia_new::monitor::aggregator: sites = [esams] }
}
-# base_analytics_logging_node is defined in role/logging.pp
-
-node locke.wikimedia.org inherits base_analytics_logging_node {
-include
-accounts::dsc,
-accounts::tstarling,
-accounts::datasets,
-accounts::milimetric,
-accounts::tnegrin, # RT 5391
-misc::udp2log::utilities,
-misc::udp2log
-
-sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
-
-# fundraising banner log pipeline (moved to gadolinium)
-#include misc::fundraising::udp2log_rotation
-}
-
node manutius.wikimedia.org {
$corerouters = [
cr1-sdtpa.wikimedia.org,
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 1d93727..601ea80 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -58,11 +58,6 @@
fixed-address linne.wikimedia.org;
}
-host locke {
- hardware ethernet 00:18:8b:44:6c:d0;
- fixed-address locke.wikimedia.org;
-}
-
host lvs1 {
hardware ethernet 00:1e:c9:ab:80:4e;
fixed-address lvs1.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/112587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fe32f4830289ad297a4335472db8137d09cd21a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@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] Make MVEL way faster - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112695
Change subject: Make MVEL way faster
..
Make MVEL way faster
Using .empty in MVEL is slow when fields are actually empty. Instead,
use .isEmpty(). Against enwiki I measure an order of magnitude performance
improvement on queries that hit lots and lots of results and can't push
the script scoring in the rescore. 3 seconds down to half a second.
Change-Id: Idd394ddc9477fced9130c0aab6f787eb2510f6dc
---
M includes/Searcher.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/95/112695/1
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 0ea12e2..62a10b7 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -1083,6 +1083,9 @@
private function installBoosts() {
global $wgCirrusSearchFunctionRescoreWindowSize;
+ // Quick note: At the moment .isEmpty() is _much_ faster
then .empty. Never
+ // use .empty. See
https://github.com/elasticsearch/elasticsearch/issues/5086
+
if ( $this-sort !== 'relevance' ) {
// Boosts are irrelevant if you aren't sorting by,
well, relevance
return;
@@ -1093,7 +1096,7 @@
// Customize score by boosting based on incoming links count
if ( $this-boostLinks ) {
- $incomingLinks = (doc['incoming_links'].empty ? 0 :
doc['incoming_links'].value);
+ $incomingLinks = (doc['incoming_links'].isEmpty() ? 0
: doc['incoming_links'].value);
$scoreBoostMvel = log10($incomingLinks + 2);
$functionScore-addScriptScoreFunction( new
\Elastica\Script( $scoreBoostMvel ) );
$useFunctionScore = true;
--
To view, visit https://gerrit.wikimedia.org/r/112695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd394ddc9477fced9130c0aab6f787eb2510f6dc
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] [browser test] Moved Ruby code that multiple repositories us... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [browser test] Moved Ruby code that multiple repositories use
to mediawiki_selenium Ruby gem
..
[browser test] Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I9fdfcf0f9df8f1bd9df3c358d2e1a7925fa5928d
---
M modules/ve-mw/test/browser/Gemfile.lock
D modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
D modules/ve-mw/test/browser/features/support/modules/url_module.rb
D modules/ve-mw/test/browser/features/support/pages/login_page.rb
4 files changed, 10 insertions(+), 46 deletions(-)
Approvals:
Jhall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/test/browser/Gemfile.lock
b/modules/ve-mw/test/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/modules/ve-mw/test/browser/Gemfile.lock
+++ b/modules/ve-mw/test/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
deleted file mode 100644
index 6d4e24f..000
--- a/modules/ve-mw/test/browser/features/step_definitions/common_steps.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
diff --git a/modules/ve-mw/test/browser/features/support/modules/url_module.rb
b/modules/ve-mw/test/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/modules/ve-mw/test/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/modules/ve-mw/test/browser/features/support/pages/login_page.rb
b/modules/ve-mw/test/browser/features/support/pages/login_page.rb
deleted file mode 100644
index e4179e4..000
--- a/modules/ve-mw/test/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- div(:feedback, class: errorbox)
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- a(:password_strength, text: password strength)
- a(:phishing, text: phishing)
- text_field(:username, id: wpName1)
- a(:username_displayed, title: /Your user page/)
-
- def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
- end
- def login_with(username, password)
-self.username = username
-self.password = password
-login
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/112679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fdfcf0f9df8f1bd9df3c358d2e1a7925fa5928d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8dd6239..0b1fcc2 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/112696 Change subject: Syncronize VisualEditor: 8dd6239..0b1fcc2 .. Syncronize VisualEditor: 8dd6239..0b1fcc2 Change-Id: I2e2dab284ffeb10997739e5fbaa9ce691f7875d8 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/96/112696/1 diff --git a/VisualEditor b/VisualEditor index 8dd6239..0b1fcc2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 8dd623901371c58264c34c01413922e6adbf8c44 +Subproject commit 0b1fcc2231b7697bee6bf910fc34f14c33867874 -- To view, visit https://gerrit.wikimedia.org/r/112696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e2dab284ffeb10997739e5fbaa9ce691f7875d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 8dd6239..0b1fcc2 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 8dd6239..0b1fcc2 .. Syncronize VisualEditor: 8dd6239..0b1fcc2 Change-Id: I2e2dab284ffeb10997739e5fbaa9ce691f7875d8 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 8dd6239..0b1fcc2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 8dd623901371c58264c34c01413922e6adbf8c44 +Subproject commit 0b1fcc2231b7697bee6bf910fc34f14c33867874 -- To view, visit https://gerrit.wikimedia.org/r/112696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e2dab284ffeb10997739e5fbaa9ce691f7875d8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved LoginPage class and URL module to the gem - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged.
Change subject: Moved LoginPage class and URL module to the gem
..
Moved LoginPage class and URL module to the gem
Bug: 56088
Change-Id: I2dc4e2fd005e1cee6503a6039c280e508d39f43f
---
M lib/mediawiki_selenium.rb
A lib/mediawiki_selenium/support/modules/url_module.rb
A lib/mediawiki_selenium/support/pages/login_page.rb
3 files changed, 61 insertions(+), 0 deletions(-)
Approvals:
Jhall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb
index 48b9b84..6a6ac57 100644
--- a/lib/mediawiki_selenium.rb
+++ b/lib/mediawiki_selenium.rb
@@ -14,3 +14,7 @@
require mediawiki_selenium/support/env
require mediawiki_selenium/support/hooks
require mediawiki_selenium/support/sauce
+
+require mediawiki_selenium/support/modules/url_module
+
+require mediawiki_selenium/support/pages/login_page
diff --git a/lib/mediawiki_selenium/support/modules/url_module.rb
b/lib/mediawiki_selenium/support/modules/url_module.rb
new file mode 100644
index 000..81f8e9d
--- /dev/null
+++ b/lib/mediawiki_selenium/support/modules/url_module.rb
@@ -0,0 +1,21 @@
+=begin
+This file is subject to the license terms in the LICENSE file found in the
+mediawiki-selenium top-level directory and at
+https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
+mediawiki-selenium, including this file, may be copied, modified, propagated,
or
+distributed except according to the terms contained in the LICENSE file.
+Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
+mediawiki-selenium top-level directory and at
+https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
+=end
+
+module URL
+ def self.url(name)
+if ENV[MEDIAWIKI_URL]
+ mediawiki_url = ENV[MEDIAWIKI_URL]
+else
+ mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
+end
+#{mediawiki_url}#{name}
+ end
+end
diff --git a/lib/mediawiki_selenium/support/pages/login_page.rb
b/lib/mediawiki_selenium/support/pages/login_page.rb
new file mode 100644
index 000..84cf50d
--- /dev/null
+++ b/lib/mediawiki_selenium/support/pages/login_page.rb
@@ -0,0 +1,36 @@
+=begin
+This file is subject to the license terms in the LICENSE file found in the
+mediawiki-selenium top-level directory and at
+https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of
+mediawiki-selenium, including this file, may be copied, modified, propagated,
or
+distributed except according to the terms contained in the LICENSE file.
+Copyright 2013 by the Mediawiki developers. See the CREDITS file in the
+mediawiki-selenium top-level directory and at
+https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS.
+=end
+
+class LoginPage
+ include PageObject
+
+ include URL
+ page_url URL.url(Special:UserLogin)
+
+ div(:feedback, class: errorbox)
+ button(:login, id: wpLoginAttempt)
+ a(:logout_link, text: Log out)
+ text_field(:password, id: wpPassword1)
+ a(:password_strength, text: password strength)
+ a(:phishing, text: phishing)
+ text_field(:username, id: wpName1)
+ a(:username_displayed, title: /Your user page/)
+
+ def logged_in_as_element
+@browser.div(id: mw-content-text).p.b
+ end
+ def login_with(username, password)
+self.username_element.when_present.send_keys(username)
+self.password_element.when_present.send_keys(password)
+login_element.fire_event(onfocus)
+login_element.when_present.click
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/112449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2dc4e2fd005e1cee6503a6039c280e508d39f43f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed remaining instances of mediawiki-selenium to mediawi... - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Renamed remaining instances of mediawiki-selenium to mediawiki_selenium .. Renamed remaining instances of mediawiki-selenium to mediawiki_selenium Bug: 60820 Change-Id: I00f90b8d0346efbc923a259dc483df2fb7c89832 --- M CREDITS M README.md M lib/mediawiki_selenium.rb M lib/mediawiki_selenium/support/env.rb M lib/mediawiki_selenium/support/hooks.rb M lib/mediawiki_selenium/support/modules/url_module.rb M lib/mediawiki_selenium/support/pages/login_page.rb M lib/mediawiki_selenium/support/sauce.rb M lib/mediawiki_selenium/version.rb 9 files changed, 23 insertions(+), 23 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/CREDITS b/CREDITS index 898b2f7..9651478 100644 --- a/CREDITS +++ b/CREDITS @@ -1,4 +1,4 @@ -mediawiki-selenium is a collaborative project released under the +mediawiki_selenium is a collaborative project released under the GNU General Public License v2. We would like to recognize the following names for their contribution to the product. diff --git a/README.md b/README.md index 9def686..60f3e3f 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ ## Links -mediawiki-selenium gem: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), [GitHub](https://github.com/wikimedia/mediawiki-selenium), [RubyGems](https://rubygems.org/gems/mediawiki-selenium), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium) +mediawiki_selenium gem: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), [GitHub](https://github.com/wikimedia/mediawiki-selenium), [RubyGems](https://rubygems.org/gems/mediawiki_selenium), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium) If not stated differently, Selenium tests are in `/tests/browser` folder. diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb index 6a6ac57..f54c3c4 100644 --- a/lib/mediawiki_selenium.rb +++ b/lib/mediawiki_selenium.rb @@ -1,11 +1,11 @@ =begin This file is subject to the license terms in the LICENSE file found in the -mediawiki-selenium top-level directory and at +mediawiki_selenium top-level directory and at https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of -mediawiki-selenium, including this file, may be copied, modified, propagated, or +mediawiki_selenium, including this file, may be copied, modified, propagated, or distributed except according to the terms contained in the LICENSE file. Copyright 2013 by the Mediawiki developers. See the CREDITS file in the -mediawiki-selenium top-level directory and at +mediawiki_selenium top-level directory and at https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS. =end diff --git a/lib/mediawiki_selenium/support/env.rb b/lib/mediawiki_selenium/support/env.rb index 2fe1338..2bd50d8 100644 --- a/lib/mediawiki_selenium/support/env.rb +++ b/lib/mediawiki_selenium/support/env.rb @@ -1,11 +1,11 @@ =begin This file is subject to the license terms in the LICENSE file found in the -mediawiki-selenium top-level directory and at +mediawiki_selenium top-level directory and at https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of -mediawiki-selenium, including this file, may be copied, modified, propagated, or +mediawiki_selenium, including this file, may be copied, modified, propagated, or distributed except according to the terms contained in the LICENSE file. Copyright 2013 by the Mediawiki developers. See the CREDITS file in the -mediawiki-selenium top-level directory and at +mediawiki_selenium top-level directory and at https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS. =end diff --git a/lib/mediawiki_selenium/support/hooks.rb b/lib/mediawiki_selenium/support/hooks.rb index a412bac..d5442b2 100644 --- a/lib/mediawiki_selenium/support/hooks.rb +++ b/lib/mediawiki_selenium/support/hooks.rb @@ -1,11 +1,11 @@ =begin This file is subject to the license terms in the LICENSE file found in the -mediawiki-selenium top-level directory and at +mediawiki_selenium top-level directory and at https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of -mediawiki-selenium, including this file, may be copied, modified, propagated, or +mediawiki_selenium, including this file, may be copied, modified, propagated, or distributed except according to the terms contained in the LICENSE file. Copyright 2013 by the Mediawiki developers. See the CREDITS file in the -mediawiki-selenium top-level directory and at +mediawiki_selenium top-level directory and at https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS. =end diff --git a/lib/mediawiki_selenium/support/modules/url_module.rb b/lib/mediawiki_selenium/support/modules/url_module.rb index 81f8e9d..d66d281 100644 ---
[MediaWiki-commits] [Gerrit] Moved Given(/^I am logged in$/) step to the gem - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Moved Given(/^I am logged in$/) step to the gem .. Moved Given(/^I am logged in$/) step to the gem Bug: 56088 Change-Id: I5b67cb1ac0004edfec3a34ea854e205867fcffc1 --- M lib/mediawiki_selenium.rb A lib/mediawiki_selenium/step_definitions/login_steps.rb 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, but someone else must approve Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb index f54c3c4..7486007 100644 --- a/lib/mediawiki_selenium.rb +++ b/lib/mediawiki_selenium.rb @@ -15,6 +15,8 @@ require mediawiki_selenium/support/hooks require mediawiki_selenium/support/sauce +require mediawiki_selenium/step_definitions/login_steps + require mediawiki_selenium/support/modules/url_module require mediawiki_selenium/support/pages/login_page diff --git a/lib/mediawiki_selenium/step_definitions/login_steps.rb b/lib/mediawiki_selenium/step_definitions/login_steps.rb new file mode 100644 index 000..6d4e24f --- /dev/null +++ b/lib/mediawiki_selenium/step_definitions/login_steps.rb @@ -0,0 +1,3 @@ +Given(/^I am logged in$/) do + visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]) +end -- To view, visit https://gerrit.wikimedia.org/r/112459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b67cb1ac0004edfec3a34ea854e205867fcffc1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Jhall jh...@wikimedia.org Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] base: remove initcwnd if-up.d hook for = oneiric - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112697
Change subject: base: remove initcwnd if-up.d hook for = oneiric
..
base: remove initcwnd if-up.d hook for = oneiric
We currently have an if-up.d hook to set the TCP initial congestion
window to 10*MSS on all boxes, but this is currently unneeded on all of
our recent boxes. Linux upstream made 10 the default with commit
442b9635c, which is included since 2.6.39, way before any of our precise
systems.
As checking for a running kernel is kind of evil, make the check
conditional to lsbdistcodename, and remove the if-up hook in everything
post-oneiric (natty = 2.6.38, oneiric = 3.0).
Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
---
M modules/base/manifests/init.pp
1 file changed, 18 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/112697/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 96c4b6d..d3e36f0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -360,18 +360,25 @@
class base::tcptweaks {
Class[base::puppet] - Class[base::tcptweaks]
-file { '/etc/network/if-up.d/initcwnd':
-ensure = present,
-content = template('base/initcwnd.erb'),
-mode= '0555',
-owner = 'root',
-group = 'root',
-}
+# unneeded since Linux 2.6.39, i.e. Ubuntu 11.10 Oneiric Ocelot
+if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10') 0
{
+file { '/etc/network/if-up.d/initcwnd':
+ensure = present,
+content = template('base/initcwnd.erb'),
+mode= '0555',
+owner = 'root',
+group = 'root',
+}
-exec { '/etc/network/if-up.d/initcwnd':
-require = File['/etc/network/if-up.d/initcwnd'],
-subscribe = File['/etc/network/if-up.d/initcwnd'],
-refreshonly = true,
+exec { '/etc/network/if-up.d/initcwnd':
+require = File['/etc/network/if-up.d/initcwnd'],
+subscribe = File['/etc/network/if-up.d/initcwnd'],
+refreshonly = true,
+}
+} else {
+file { '/etc/network/if-up.d/initcwnd':
+ensure = absent,
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bind nrpe to a primary address - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/112698 Change subject: Bind nrpe to a primary address .. Bind nrpe to a primary address It is undesirable that NRPE listens on multiple addresses a machine may have since these may be service IP addresses and should not accept connection there. Our monitoring systems should certainly never try to connect using NRPE to a service IP address. This change is intented to fill the gap while ferm is being rolled out and the gap where ferm (iptables really) is not an option due to performance issues. Change-Id: Iac69e572e0a851dc1246d06e5a40f90a8a7373ed --- M modules/nrpe/templates/nrpe_local.cfg.erb 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/112698/1 diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb b/modules/nrpe/templates/nrpe_local.cfg.erb index 2e44fb9..fb334d7 100644 --- a/modules/nrpe/templates/nrpe_local.cfg.erb +++ b/modules/nrpe/templates/nrpe_local.cfg.erb @@ -6,6 +6,12 @@ % else -% allowed_hosts=127.0.0.1 # Created by fallback. Check your puppet calls are ok % end -% +# Bind only to the primary (management) IP address and not one of the service addresses +# An assumption is made here that ipaddress fact will have the management address and not +# a service address +% if @ipaddress % +server_address=%= @ipaddress % +% end -% command[check_disk_5_2]=/usr/lib/nagios/plugins/check_disk -w 5% -c 2% -l -e command[check_disk_6_3]=/usr/lib/nagios/plugins/check_disk -w 6% -c 3% -l -e -- To view, visit https://gerrit.wikimedia.org/r/112698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac69e572e0a851dc1246d06e5a40f90a8a7373ed 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] base: remove initcwnd if-up.d hook for = oneiric - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: base: remove initcwnd if-up.d hook for = oneiric
..
base: remove initcwnd if-up.d hook for = oneiric
We currently have an if-up.d hook to set the TCP initial congestion
window to 10*MSS on all boxes, but this is currently unneeded on all of
our recent boxes. Linux upstream made 10 the default with commit
442b9635c, which is included since 2.6.39, way before any of our precise
systems.
As checking for a running kernel is kind of evil, make the check
conditional to lsbdistcodename, and remove the if-up hook in everything
post-oneiric (natty = 2.6.38, oneiric = 3.0).
Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
---
M modules/base/manifests/init.pp
1 file changed, 18 insertions(+), 11 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 96c4b6d..d3e36f0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -360,18 +360,25 @@
class base::tcptweaks {
Class[base::puppet] - Class[base::tcptweaks]
-file { '/etc/network/if-up.d/initcwnd':
-ensure = present,
-content = template('base/initcwnd.erb'),
-mode= '0555',
-owner = 'root',
-group = 'root',
-}
+# unneeded since Linux 2.6.39, i.e. Ubuntu 11.10 Oneiric Ocelot
+if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10') 0
{
+file { '/etc/network/if-up.d/initcwnd':
+ensure = present,
+content = template('base/initcwnd.erb'),
+mode= '0555',
+owner = 'root',
+group = 'root',
+}
-exec { '/etc/network/if-up.d/initcwnd':
-require = File['/etc/network/if-up.d/initcwnd'],
-subscribe = File['/etc/network/if-up.d/initcwnd'],
-refreshonly = true,
+exec { '/etc/network/if-up.d/initcwnd':
+require = File['/etc/network/if-up.d/initcwnd'],
+subscribe = File['/etc/network/if-up.d/initcwnd'],
+refreshonly = true,
+}
+} else {
+file { '/etc/network/if-up.d/initcwnd':
+ensure = absent,
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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 a PSR-3 based logging interface. - change (mediawiki/core)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112699 Change subject: Add a PSR-3 based logging interface. .. Add a PSR-3 based logging interface. This proof of concept implementation of the structured logging RFC introduces a PSR-3 based logging class. The MWLogger class is actually a thin wrapper around any PSR-3 LoggerInterface implementation. Named MWLogger instances can be obtained from the MWLogger::getInstance() static method. MWLogger expects a class implementing the MWLoggerSpi interface to act as a factory for new MWLogger instances. A concrete MWLoggerSpi implementation using the Monolog library is also provided. New classes introduced: ; MWLogger : PSR-3 compatible logger that wraps any \Psr\Log\LoggerInterface implementation ; MWLoggerSpi : Service provider interface for MWLogger factories ; MWLoggerMonologSpi : MWLoggerSpi for creating instances backed by the monolog logging library ; MwLogHandler : Monolog handler that replicates the udp2log and file logging functionality of wfErrorLog() New globals introduced: ; $wgUseMWLoggerForLegacyFunctions : Feature flag to enable use of PSR-3 logger for legacy global logging functions. ; $wgMWLoggerDefaultSpi : Default SPI to use with MWLogger ; $wgMWLoggerMonologSpiConfig : Configuration for MWLoggerMonologSpi describing how to configure the Monolog logger instances. The Psr\Log and Monolog libraries are included in the new libs directory which is managed using Composer. The includes/WebStart.php and maintenance/doMaintenance.php system entry points have been modified to require the lib/autoload.php class autoloader script generated by Composer. Change-Id: I1431b24221a1d06a76305385c88f77d66ccb64c6 --- M .gitignore M includes/AutoLoader.php M includes/DefaultSettings.php M includes/GlobalFunctions.php M includes/WebStart.php A includes/debug/Logger.php A includes/debug/LoggerSpi.php A includes/debug/monolog/MonologSpi.php A includes/debug/monolog/MwLogHandler.php A libs/autoload.php A libs/composer.json A libs/composer.lock A libs/composer/ClassLoader.php A libs/composer/autoload_classmap.php A libs/composer/autoload_namespaces.php A libs/composer/autoload_psr4.php A libs/composer/autoload_real.php A libs/composer/installed.json A libs/monolog/monolog/CHANGELOG.mdown A libs/monolog/monolog/LICENSE A libs/monolog/monolog/README.mdown A libs/monolog/monolog/composer.json A libs/monolog/monolog/doc/extending.md A libs/monolog/monolog/doc/sockets.md A libs/monolog/monolog/doc/usage.md A libs/monolog/monolog/phpunit.xml.dist A libs/monolog/monolog/src/Monolog/ErrorHandler.php A libs/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php A libs/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/LineFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php A libs/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php A libs/monolog/monolog/src/Monolog/Handler/AbstractHandler.php A libs/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php A libs/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php A libs/monolog/monolog/src/Monolog/Handler/AmqpHandler.php A libs/monolog/monolog/src/Monolog/Handler/BufferHandler.php A libs/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php A libs/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php A libs/monolog/monolog/src/Monolog/Handler/CubeHandler.php A libs/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php A libs/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php A libs/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php A libs/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php A libs/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php A libs/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php A libs/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php A libs/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php A libs/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php A libs/monolog/monolog/src/Monolog/Handler/GelfHandler.php A libs/monolog/monolog/src/Monolog/Handler/GroupHandler.php A libs/monolog/monolog/src/Monolog/Handler/HandlerInterface.php A libs/monolog/monolog/src/Monolog/Handler/HipChatHandler.php A libs/monolog/monolog/src/Monolog/Handler/LogglyHandler.php A libs/monolog/monolog/src/Monolog/Handler/MailHandler.php A libs/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php A
[MediaWiki-commits] [Gerrit] remove streber from puppet, dsh, dhcpd - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: remove streber from puppet,dsh,dhcpd
..
remove streber from puppet,dsh,dhcpd
RT #2186
can be decom'ed per mark
Change-Id: I546db3c0345a1ca503f550e08bac569c7d865163
---
M files/dsh/group/ALL
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
5 files changed, 0 insertions(+), 34 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index 4a03b22..1df52e3 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -66,7 +66,6 @@
srv255
srv256
srv257
-streber
cp1043
cp1044
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 7f12df8..77de1cd 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -21,7 +21,6 @@
sockpuppet
stafford
stat1
-streber
tarin
tingxi
tridge
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 41c1676..c0f75d1 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -10,7 +10,6 @@
sanger
sockpuppet
stafford
-streber
tarin
tridge
db9
diff --git a/manifests/site.pp b/manifests/site.pp
index 9054ac5..30093dc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2318,32 +2318,6 @@
include role::analytics::clients
}
-node streber.wikimedia.org {
-system::role { misc: description = network monitoring server }
-
-include passwords::root,
-base::resolving,
-base::sysctl,
-base::motd,
-base::vimconfig,
-base::standard-packages,
-base::monitoring::host,
-base::environment,
-base::platform,
-ssh,
-ganglia,
-ntp::client,
-role::salt::minions,
-admins::roots,
-# misc::torrus,
-misc::rancid,
-firewall::builder
-
-class { misc::syslog-server: config = network }
-
-install_certificate{ star.wikimedia.org: }
-}
-
node /^snapshot([1-4]\.pmtpa|100[1-4]\.eqiad)\.wmnet/ {
$gid=500
include base,
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index 601ea80..85b24b4 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -248,11 +248,6 @@
fixed-address srv257.pmtpa.wmnet;
}
-host streber {
- hardware ethernet 00:1E:C9:E2:74:03;
- fixed-address streber.wikimedia.org;
-}
-
host tarin {
hardware ethernet 00:26:B9:5C:42:FA;
fixed-address tarin.pmtpa.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/112667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I546db3c0345a1ca503f550e08bac569c7d865163
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rsyslog: use provider = 'upstart' - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112700 Change subject: rsyslog: use provider = 'upstart' .. rsyslog: use provider = 'upstart' Similarly to Ifb657c7, switch rsyslog to upstart as well, as it fails on trusty otherwise. Both this and the SSH one can be removed once we upgrade to a newer version of puppet, as puppet gained in a 2.7 point-release the line: defaultfor :operatingsystem = :ubuntu which we don't seem to have in precise's 2.7, nor do we have support for newer style upstart overrides. Change-Id: I688954780d0c642d9033a940d45584203c9c8369 --- M modules/base/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/00/112700/1 diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index d3e36f0..084a269 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -296,6 +296,7 @@ ensure= running, require = Package['rsyslog'], subscribe = File['/etc/rsyslog.d/30-remote-syslog.conf'], +provivder = 'upstart', } } } -- To view, visit https://gerrit.wikimedia.org/r/112700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I688954780d0c642d9033a940d45584203c9c8369 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rsyslog: use provider = 'upstart' - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: rsyslog: use provider = 'upstart' .. rsyslog: use provider = 'upstart' Similarly to Ifb657c7, switch rsyslog to upstart as well, as it fails on trusty otherwise. Both this and the SSH one can be removed once we upgrade to a newer version of puppet, as puppet gained in a 2.7 point-release the line: defaultfor :operatingsystem = :ubuntu which we don't seem to have in precise's 2.7, nor do we have support for newer style upstart overrides. Change-Id: I688954780d0c642d9033a940d45584203c9c8369 --- M modules/base/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index d3e36f0..4315acc 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -296,6 +296,7 @@ ensure= running, require = Package['rsyslog'], subscribe = File['/etc/rsyslog.d/30-remote-syslog.conf'], +provider = 'upstart', } } } -- To view, visit https://gerrit.wikimedia.org/r/112700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I688954780d0c642d9033a940d45584203c9c8369 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@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] Job mwext-browsertests-Flow-phantomjs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/112702 Change subject: Job mwext-browsertests-Flow-phantomjs .. Job mwext-browsertests-Flow-phantomjs Experimentation for now. Change-Id: Ia1b15e3ade8ffe3938e12f78f2fa8880afd76182 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/02/112702/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 86b35a0..fb46820 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -643,6 +643,7 @@ name: mwext-browsertests dependencies: '' ext-name: + - Flow - MobileFrontend - Translatewiki - UniversalLanguageSelector -- To view, visit https://gerrit.wikimedia.org/r/112702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1b15e3ade8ffe3938e12f78f2fa8880afd76182 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master 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] Job mwext-browsertests-Flow-phantomjs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Job mwext-browsertests-Flow-phantomjs .. Job mwext-browsertests-Flow-phantomjs Experimentation for now. Change-Id: Ia1b15e3ade8ffe3938e12f78f2fa8880afd76182 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 86b35a0..fb46820 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -643,6 +643,7 @@ name: mwext-browsertests dependencies: '' ext-name: + - Flow - MobileFrontend - Translatewiki - UniversalLanguageSelector -- To view, visit https://gerrit.wikimedia.org/r/112702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1b15e3ade8ffe3938e12f78f2fa8880afd76182 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved resetting preferences to the gem - change (mediawiki/selenium)
Cmcmahon has submitted this change and it was merged. Change subject: Moved resetting preferences to the gem .. Moved resetting preferences to the gem Also bumped patch version to 0.2.2, added missing file headers and added (empty) Gemfile.lock file. Bug: 56088 Change-Id: I7e476c6dbf5d58fa35fc6e043538074ab7720987 --- A Gemfile.lock M lib/mediawiki_selenium.rb M lib/mediawiki_selenium/step_definitions/login_steps.rb A lib/mediawiki_selenium/step_definitions/preferences_steps.rb A lib/mediawiki_selenium/support/pages/reset_preferences_page.rb M lib/mediawiki_selenium/version.rb 6 files changed, 53 insertions(+), 1 deletion(-) Approvals: Cmcmahon: Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000..83f331d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,7 @@ +GEM + specs: + +PLATFORMS + ruby + +DEPENDENCIES diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb index 7486007..1a5d556 100644 --- a/lib/mediawiki_selenium.rb +++ b/lib/mediawiki_selenium.rb @@ -16,7 +16,9 @@ require mediawiki_selenium/support/sauce require mediawiki_selenium/step_definitions/login_steps +require mediawiki_selenium/step_definitions/preferences_steps require mediawiki_selenium/support/modules/url_module require mediawiki_selenium/support/pages/login_page +require mediawiki_selenium/support/pages/reset_preferences_page diff --git a/lib/mediawiki_selenium/step_definitions/login_steps.rb b/lib/mediawiki_selenium/step_definitions/login_steps.rb index 6d4e24f..2224358 100644 --- a/lib/mediawiki_selenium/step_definitions/login_steps.rb +++ b/lib/mediawiki_selenium/step_definitions/login_steps.rb @@ -1,3 +1,14 @@ +=begin +This file is subject to the license terms in the LICENSE file found in the +mediawiki_selenium top-level directory and at +https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of +mediawiki_selenium, including this file, may be copied, modified, propagated, or +distributed except according to the terms contained in the LICENSE file. +Copyright 2013 by the Mediawiki developers. See the CREDITS file in the +mediawiki_selenium top-level directory and at +https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS. +=end + Given(/^I am logged in$/) do visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]) end diff --git a/lib/mediawiki_selenium/step_definitions/preferences_steps.rb b/lib/mediawiki_selenium/step_definitions/preferences_steps.rb new file mode 100644 index 000..0bbd6c7 --- /dev/null +++ b/lib/mediawiki_selenium/step_definitions/preferences_steps.rb @@ -0,0 +1,14 @@ +=begin +This file is subject to the license terms in the LICENSE file found in the +mediawiki_selenium top-level directory and at +https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of +mediawiki_selenium, including this file, may be copied, modified, propagated, or +distributed except according to the terms contained in the LICENSE file. +Copyright 2013 by the Mediawiki developers. See the CREDITS file in the +mediawiki_selenium top-level directory and at +https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS. +=end + +Given(/^I have reset my preferences$/) do + visit(ResetPreferencesPage).submit_element.click +end diff --git a/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb b/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb new file mode 100644 index 000..255c772 --- /dev/null +++ b/lib/mediawiki_selenium/support/pages/reset_preferences_page.rb @@ -0,0 +1,18 @@ +=begin +This file is subject to the license terms in the LICENSE file found in the +mediawiki_selenium top-level directory and at +https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/LICENSE. No part of +mediawiki_selenium, including this file, may be copied, modified, propagated, or +distributed except according to the terms contained in the LICENSE file. +Copyright 2013 by the Mediawiki developers. See the CREDITS file in the +mediawiki_selenium top-level directory and at +https://git.wikimedia.org/blob/mediawiki%2Fselenium/HEAD/CREDITS. +=end + +class ResetPreferencesPage + include PageObject + include URL + page_url URL.url(Special:Preferences/reset) + + button(:submit, class: mw-htmlform-submit) +end diff --git a/lib/mediawiki_selenium/version.rb b/lib/mediawiki_selenium/version.rb index 7e1263c..a6b2a45 100644 --- a/lib/mediawiki_selenium/version.rb +++ b/lib/mediawiki_selenium/version.rb @@ -10,5 +10,5 @@ =end module MediawikiSelenium - VERSION = 0.2.1 + VERSION = 0.2.2 end -- To view, visit https://gerrit.wikimedia.org/r/112474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e476c6dbf5d58fa35fc6e043538074ab7720987 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0b1fcc2..052b039 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0b1fcc2..052b039 .. Syncronize VisualEditor: 0b1fcc2..052b039 Change-Id: I4a9804e03741a26018d97112351097d4985d517d --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 0b1fcc2..052b039 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0b1fcc2231b7697bee6bf910fc34f14c33867874 +Subproject commit 052b039074be03aad508e37b889364374db1eef7 -- To view, visit https://gerrit.wikimedia.org/r/112703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a9804e03741a26018d97112351097d4985d517d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
