[MediaWiki-commits] [Gerrit] InstallDocFormatter: Hyperlink Phabricator task numbers - change (mediawiki/core)
PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174924
Change subject: InstallDocFormatter: Hyperlink Phabricator task numbers
..
InstallDocFormatter: Hyperlink Phabricator task numbers
Also removed the callback functions for the existing regexes. Nothing
has to be or is encoded or escaped at this time, so preg_replace()
can be used instead of preg_replace_callback().
Change-Id: I8c602dcf7b67b8f2b06149b6a0859c70342c
---
M includes/installer/InstallDocFormatter.php
M tests/phpunit/includes/installer/InstallDocFormatterTest.php
2 files changed, 34 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/174924/1
diff --git a/includes/installer/InstallDocFormatter.php
b/includes/installer/InstallDocFormatter.php
index 3250ff8..1964853 100644
--- a/includes/installer/InstallDocFormatter.php
+++ b/includes/installer/InstallDocFormatter.php
@@ -44,25 +44,30 @@
// Replace tab indents with colons
$text = preg_replace( '/^\t\t/m', '::', $text );
$text = preg_replace( '/^\t/m', ':', $text );
+
+ $linkStart = 'span class=config-plainlink[';
+ $linkEnd = ' $0]/span';
+
+ // turn (T) into links
+ $text = preg_replace( '/T\d+/',
+
{$linkStart}https://phabricator.wikimedia.org/$0{$linkEnd};,
+ $text
+ );
+
// turn (bug ) into links
- $text = preg_replace_callback( '/bug (\d+)/', array( $this,
'replaceBugLinks' ), $text );
+ $text = preg_replace(
+ '/bug (\d+)/',
+
{$linkStart}https://bugzilla.wikimedia.org/$1{$linkEnd};,
+ $text
+ );
+
// add links to manual to every global variable mentioned
- $text = preg_replace_callback(
- '/(\$wg[a-z0-9_]+)/i',
- array( $this, 'replaceConfigLinks' ),
+ $text = preg_replace(
+ '/\$wg[a-z0-9_]+/i',
+
{$linkStart}https://www.mediawiki.org/wiki/Manual:$0{$linkEnd};,
$text
);
return $text;
- }
-
- protected function replaceBugLinks( $matches ) {
- return 'span
class=config-plainlink[https://bugzilla.wikimedia.org/' .
- $matches[1] . ' bug ' . $matches[1] . ']/span';
- }
-
- protected function replaceConfigLinks( $matches ) {
- return 'span
class=config-plainlink[https://www.mediawiki.org/wiki/Manual:' .
- $matches[1] . ' ' . $matches[1] . ']/span';
}
}
diff --git a/tests/phpunit/includes/installer/InstallDocFormatterTest.php
b/tests/phpunit/includes/installer/InstallDocFormatterTest.php
index 064d518..724f0c8 100644
--- a/tests/phpunit/includes/installer/InstallDocFormatterTest.php
+++ b/tests/phpunit/includes/installer/InstallDocFormatterTest.php
@@ -34,6 +34,21 @@
array( ':One indentation', \tOne indentation,
'Replacing a single \t' ),
array( '::Two indentations', \t\tTwo indentations,
'Replacing 2 x \t' ),
+ # Transform 'T123' links
+ array(
+ 'span
class=config-plainlink[https://phabricator.wikimedia.org/T123 T123]/span',
+ 'T123', 'Testing T123 links' ),
+ array(
+ 'bug span
class=config-plainlink[https://phabricator.wikimedia.org/T123 T123]/span',
+ 'bug T123', 'Testing bug T123 links' ),
+ array(
+ '(span
class=config-plainlink[https://phabricator.wikimedia.org/T987654
T987654]/span)',
+ '(T987654)', 'Testing (T987654) links' ),
+
+ # Tabc shouldn't work
+ array( 'Tfoobar', 'Tfoobar', Don't match T followed by
non-digits ),
+ array( 'T!!fakefake!!', 'T!!fakefake!!', Don't match T
followed by non-digits ),
+
# Transform 'bug 123' links
array(
'span
class=config-plainlink[https://bugzilla.wikimedia.org/123 bug 123]/span',
--
To view, visit https://gerrit.wikimedia.org/r/174924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c602dcf7b67b8f2b06149b6a0859c70342c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand pleasest...@live.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Do not drop ttmserver index if it already exists - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not drop ttmserver index if it already exists
..
Do not drop ttmserver index if it already exists
Change-Id: Ib95110c7db36e10c2bb1c972b93a3a891b24a1b4
---
M ttmserver/ElasticSearchTTMServer.php
1 file changed, 10 insertions(+), 7 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ttmserver/ElasticSearchTTMServer.php
b/ttmserver/ElasticSearchTTMServer.php
index aa546d8..56401d2 100644
--- a/ttmserver/ElasticSearchTTMServer.php
+++ b/ttmserver/ElasticSearchTTMServer.php
@@ -249,13 +249,16 @@
public function beginBootstrap() {
$type = $this-getType();
- $type-getIndex()-create(
- array(
- 'number_of_shards' = $this-getShardCount(),
- 'number_of_replicas' =
$this-getReplicaCount(),
- ),
- true
- );
+
+ if ( !$type-getIndex()-exists() ) {
+ $type-getIndex()-create(
+ array(
+ 'number_of_shards' =
$this-getShardCount(),
+ 'number_of_replicas' =
$this-getReplicaCount(),
+ ),
+ false /* Do not drop the index if exists */
+ );
+ }
$settings = $type-getIndex()-getSettings();
$settings-setRefreshInterval( -1 );
--
To view, visit https://gerrit.wikimedia.org/r/174151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib95110c7db36e10c2bb1c972b93a3a891b24a1b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] HAT: create mediawiki::hhvm::housekeeping - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: HAT: create mediawiki::hhvm::housekeeping
..
HAT: create mediawiki::hhvm::housekeeping
This is done basically to avoid the chicken-and-egg problem on newly
installed servers
Change-Id: I606300f8aa304a34a7a2f73492f78affb3474b22
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/hhvm.pp
A modules/mediawiki/manifests/hhvm/housekeeping.pp
2 files changed, 18 insertions(+), 12 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/hhvm.pp
b/modules/mediawiki/manifests/hhvm.pp
index e1329c8..69ca841 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -10,7 +10,7 @@
include ::hhvm::debug
include ::mediawiki::users
-
+include ::mediawiki::hhvm::housekeeping
# Derive HHVM's thread count by dividing RAM by 120 MiB.
# This works out to be 100 threads on 12 GiB servers and
@@ -81,15 +81,4 @@
before = Service['hhvm'],
}
-
-# Ensure that jemalloc heap profiling is disabled. This means that
-# if you want to capture heap profiles, you have to disable Puppet.
-# But this way we can be sure we're not forgetting to turn it off.
-
-exec { 'ensure_jemalloc_prof_deactivated':
-command = '/usr/bin/curl -fs
http://localhost:9002/jemalloc-prof-deactivate',
-onlyif = '! /usr/bin/curl -fs
http://localhost:9002/jemalloc-stats-print | grep -Pq opt.prof(_active)?:
false',
-provider = 'shell',
-require = [Service['hhvm'],Service['apache2']],
-}
}
diff --git a/modules/mediawiki/manifests/hhvm/housekeeping.pp
b/modules/mediawiki/manifests/hhvm/housekeeping.pp
new file mode 100644
index 000..2d87599
--- /dev/null
+++ b/modules/mediawiki/manifests/hhvm/housekeeping.pp
@@ -0,0 +1,17 @@
+# === Class mediawiki::hhvm::housekeeping
+#
+# This class contains all crons and other housekeeping execs we may
+# want to run against hhvm or its admin port.
+class mediawiki::hhvm::housekeeping {
+# Ensure that jemalloc heap profiling is disabled. This means that
+# if you want to capture heap profiles, you have to disable Puppet.
+# But this way we can be sure we're not forgetting to turn it off.
+
+exec { 'ensure_jemalloc_prof_deactivated':
+command = '/usr/bin/curl -fs
http://localhost:9002/jemalloc-prof-deactivate',
+onlyif = '! /usr/bin/curl -fs
http://localhost:9002/jemalloc-stats-print | grep -Pq opt.prof(_active)?:
false',
+provider = 'shell',
+require = [Service['hhvm'],Service['apache2']],
+}
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/174926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I606300f8aa304a34a7a2f73492f78affb3474b22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UserManager: Added multi select features - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: UserManager: Added multi select features
..
UserManager: Added multi select features
* Added checkbox column
* Added multi group assginment
* Added custom expand mechanism for groups list
Change-Id: Ib8b840e8108ad0ba0be28e17342622a721515cd9
---
M UserManager/UserManager.class.php
M UserManager/UserManager.setup.php
M UserManager/i18n/de.json
M UserManager/i18n/en.json
M UserManager/i18n/qqq.json
R UserManager/resources/BS.UserManager/dialog/User.js
A UserManager/resources/BS.UserManager/dialog/UserGroups.js
R UserManager/resources/BS.UserManager/panel/Manager.js
M UserManager/resources/bluespice.userManager.js
9 files changed, 296 insertions(+), 58 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/UserManager/UserManager.class.php
b/UserManager/UserManager.class.php
index 3aef28d..96bfdbe 100644
--- a/UserManager/UserManager.class.php
+++ b/UserManager/UserManager.class.php
@@ -84,7 +84,7 @@
$sDirection = $oStoreParams-getDirection();
$aFilters = $oStoreParams-getFilter();
- $aSortingParams = json_decode( $sSort );
+ $aSortingParams = FormatJson::decode( $sSort );
if ( is_array( $aSortingParams ) ) {
$sSort = $aSortingParams[0]-property;
$sDirection = $aSortingParams[0]-direction;
@@ -155,7 +155,7 @@
$tmp = array();
$tmp['user_id']= $row-user_id;
$tmp['user_name'] = $row-user_name;
- $tmp['user_page'] = $oUserTitle-getLocalURL();
+ $tmp['user_page_link'] = Linker::link( $oUserTitle,
$row-user_name.' ' ); //The whitespace is to aviod automatic rewrite to
user_real_name by BSF
$tmp['user_real_name'] = $row-user_real_name;
$tmp['user_email'] = $row-user_email == null ? ''
: $row-user_email; //PW: Oracle returns null when field is emtpy
$tmp['groups'] = array();
@@ -179,7 +179,7 @@
$oUserManager = BsExtensionManager::getExtension( 'UserManager'
);
wfRunHooks( 'BSWikiAdminUserManagerBeforeUserListSend', array(
$oUserManager, $data ) );
- return json_encode( $data );
+ return FormatJson::encode( $data );
}
/**
@@ -190,7 +190,7 @@
public static function addUser( $sUsername, $sPassword, $sRePassword,
$sEmail, $sRealname, $aGroups = array() ) {
if ( wfReadOnly() ) {
global $wgReadOnly;
- return json_encode( array(
+ return FormatJson::encode( array(
'success' = false,
'message' = array( wfMessage( 'bs-readonly',
$wgReadOnly )-plain() )
) );
@@ -278,7 +278,7 @@
}
if ( !empty( $aResponse['errors'] ) ) { //In case that any
error occurred
- return json_encode( $aResponse );
+ return FormatJson::encode( $aResponse );
}
$oNewUser-addToDatabase();
@@ -338,7 +338,7 @@
)
);
- return json_encode( $aResponse );
+ return FormatJson::encode( $aResponse );
}
/**
@@ -354,7 +354,7 @@
public static function editUser( $sUsername, $sPassword, $sRePassword,
$sEmail, $sRealname, $aGroups = array() ) {
if ( wfReadOnly() ) {
global $wgReadOnly;
- return json_encode( array(
+ return FormatJson::encode( array(
'success' = false,
'message' = array( wfMessage( 'bs-readonly',
$wgReadOnly )-plain() )
) );
@@ -457,7 +457,7 @@
$aAnswer['message'][] = wfMessage(
'bs-usermanager-save-successful' )-plain();
}
- return json_encode( $aAnswer );
+ return FormatJson::encode( $aAnswer );
}
/**
@@ -467,21 +467,21 @@
* @return string json encoded response
*/
public static function deleteUser( $iUserId ) {
- if ( wfReadOnly() ) {
- global $wgReadOnly;
- return json_encode( array(
- 'success' = false,
- 'message' = array( wfMessage( 'bs-readonly',
$wgReadOnly )-plain() ),
- 'errors' = array(),
- ));
- }
- if (
[MediaWiki-commits] [Gerrit] Rename Performance to PerformanceLogger - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174928
Change subject: Rename Performance to PerformanceLogger
..
Rename Performance to PerformanceLogger
Change-Id: Iacfde35851cf8f617c4672d3ea466d4f0e2e448f
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M resources/mmv/logging/mmv.logging.Api.js
R resources/mmv/logging/mmv.logging.PerformanceLogger.js
M resources/mmv/provider/mmv.provider.Image.js
R tests/qunit/mmv/logging/mmv.logging.PerformanceLogger.test.js
6 files changed, 41 insertions(+), 41 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/28/174928/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index d6aea6f..7a47510 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -323,7 +323,7 @@
'mmv.model.Repo',
'mmv.model.Thumbnail',
'mmv.model.User',
- 'mmv.logging.Performance',
+ 'mmv.logging.PerformanceLogger',
'oojs',
),
),
@@ -849,9 +849,9 @@
),
),
- 'mmv.logging.Performance' = $wgMediaViewerResourceTemplate + array(
+ 'mmv.logging.PerformanceLogger' = $wgMediaViewerResourceTemplate +
array(
'scripts' = array(
- 'mmv/logging/mmv.logging.Performance.js',
+ 'mmv/logging/mmv.logging.PerformanceLogger.js',
),
'dependencies' = array(
@@ -1065,7 +1065,7 @@
if ( isset( $wgResourceModules['ext.eventLogging'] ) ) {
$wgResourceModules['mmv.logging.ActionLogger']['dependencies'][] =
'ext.eventLogging';
- $wgResourceModules['mmv.logging.Performance']['dependencies'][]
= 'ext.eventLogging';
+
$wgResourceModules['mmv.logging.PerformanceLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.DurationLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.AttributionLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.DimensionLogger']['dependencies'][] =
'ext.eventLogging';
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 55a9067..2d6eecd 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -198,7 +198,7 @@
'tests/qunit/mmv/mmv.Config.test.js',
'tests/qunit/mmv/mmv.HtmlUtils.test.js',
'tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js',
-
'tests/qunit/mmv/logging/mmv.logging.Performance.test.js',
+
'tests/qunit/mmv/logging/mmv.logging.PerformanceLogger.test.js',
'tests/qunit/mmv/logging/mmv.logging.ActionLogger.test.js',
'tests/qunit/mmv/logging/mmv.logging.AttributionLogger.test.js',
'tests/qunit/mmv/logging/mmv.logging.DimensionLogger.test.js',
diff --git a/resources/mmv/logging/mmv.logging.Api.js
b/resources/mmv/logging/mmv.logging.Api.js
index aa92f36..ff3d0c0 100644
--- a/resources/mmv/logging/mmv.logging.Api.js
+++ b/resources/mmv/logging/mmv.logging.Api.js
@@ -17,7 +17,7 @@
( function ( mw, $, oo ) {
/**
-* Runs performance analysis on requests via mw.mmv.logging.Performance
+* Runs performance analysis on requests via
mw.mmv.logging.PerformanceLogger
* @class mw.mmv.logging.Api
* @extends mw.Api
* @constructor
@@ -27,8 +27,8 @@
function Api( type, options ) {
mw.Api.call( this, options );
- /** @property {mw.mmv.logging.Performance} performance Used to
record performance data. */
- this.performance = new mw.mmv.logging.Performance();
+ /** @property {mw.mmv.logging.PerformanceLogger} performance
Used to record performance data. */
+ this.performance = new mw.mmv.logging.PerformanceLogger();
/** @property {string} type Type of requests being sent via
this API. */
this.type = type;
diff --git a/resources/mmv/logging/mmv.logging.Performance.js
b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
similarity index 91%
rename from resources/mmv/logging/mmv.logging.Performance.js
rename to resources/mmv/logging/mmv.logging.PerformanceLogger.js
index 677fa0f..bfde462 100644
--- a/resources/mmv/logging/mmv.logging.Performance.js
+++ b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
@@ -16,37 +16,37 @@
*/
( function ( mw, $, oo ) {
- var P;
+ var PL;
/**
* Measures the network performance
* See
[MediaWiki-commits] [Gerrit] dsh: add 7 new appservers to mediawiki-installation - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/174929 Change subject: dsh: add 7 new appservers to mediawiki-installation .. dsh: add 7 new appservers to mediawiki-installation Change-Id: Ie175515493519268f02fd50ce2b01852fab1282f Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/dsh/files/group/mediawiki-installation 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/29/174929/1 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 4939b43..278299e 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -227,3 +227,10 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 +mw1234 +mw1235 -- To view, visit https://gerrit.wikimedia.org/r/174929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie175515493519268f02fd50ce2b01852fab1282f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] syslog: deprecate /home/wikipedia/syslog - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: syslog: deprecate /home/wikipedia/syslog
..
syslog: deprecate /home/wikipedia/syslog
on lithium it is already a symlink to /srv/syslog
Change-Id: Id0b34433ad9d5da2ba40d0fed5b8dd7160f21185
---
M manifests/misc/logging.pp
M manifests/role/syslog.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index aeb6fc7..6a3a9436 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -11,7 +11,7 @@
# $basepath - Path where to write logs to, without trailing slash.
# Default: '/home/wikipedia/syslog'
#
-class misc::syslog-server($config='nfs', $basepath='/home/wikipedia/syslog') {
+class misc::syslog-server($config='nfs', $basepath='/srv/syslog') {
system::role { 'misc::syslog-server': description = central syslog
server (${config}) }
diff --git a/manifests/role/syslog.pp b/manifests/role/syslog.pp
index a55163e..3fc7987 100644
--- a/manifests/role/syslog.pp
+++ b/manifests/role/syslog.pp
@@ -9,7 +9,7 @@
class { 'misc::syslog-server':
config = 'nfs',
-basepath = '/home/wikipedia/syslog',
+basepath = '/srv/syslog',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/174673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0b34433ad9d5da2ba40d0fed5b8dd7160f21185
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: 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] dsh: add 7 new appservers to mediawiki-installation - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: dsh: add 7 new appservers to mediawiki-installation .. dsh: add 7 new appservers to mediawiki-installation Change-Id: Ie175515493519268f02fd50ce2b01852fab1282f Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/dsh/files/group/mediawiki-installation 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 4939b43..278299e 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -227,3 +227,10 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 +mw1234 +mw1235 -- To view, visit https://gerrit.wikimedia.org/r/174929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie175515493519268f02fd50ce2b01852fab1282f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding openfashion.momu.be to wgCopyUploadsDomains - change (operations/mediawiki-config)
Steinsplitter has uploaded a new change for review. https://gerrit.wikimedia.org/r/174930 Change subject: adding openfashion.momu.be to wgCopyUploadsDomains .. adding openfashion.momu.be to wgCopyUploadsDomains Per Romaine's (GLAM User) request on IRC. Change-Id: I3b8ea946578f026d6f7d19df6c3417128d5c0a45 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/30/174930/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 743a0a0..dc7b44d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10929,6 +10929,7 @@ '*.kartverket.no', // Kartverket - bug 71195 '*.arkivverket.no', // The National Archives of Norway - bug 71195 'tools.wikimedia.pl', // Facilities server for Wikimedia users - bug 72897 + 'openfashion.momu.be', // Open Fashion Antwerp Fashion Museum (MoMu) ), ), -- To view, visit https://gerrit.wikimedia.org/r/174930 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b8ea946578f026d6f7d19df6c3417128d5c0a45 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding openfashion.momu.be to wgCopyUploadsDomains - change (operations/mediawiki-config)
Steinsplitter has uploaded a new change for review. https://gerrit.wikimedia.org/r/174931 Change subject: adding openfashion.momu.be to wgCopyUploadsDomains .. adding openfashion.momu.be to wgCopyUploadsDomains Per Romaine's (GLAM User) request on IRC. For GWT upload on commons. Change-Id: If803e018872cffcdea74c80318d5448314489c72 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/31/174931/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 64c7fa9..bb82875 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10970,6 +10970,7 @@ 'serg-klymenko.narod.ru', // Ukraine interesting photography source - bug 73045 'ua.vlasenko.net', // Ukraine interesting photography source - bug 73045 '*.wikiportret.nl', // Wikiportret - bug 72953 + 'openfashion.momu.be', // Open Fashion Antwerp Fashion Museum (MoMu) ), ), -- To view, visit https://gerrit.wikimedia.org/r/174931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If803e018872cffcdea74c80318d5448314489c72 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make flickr import use postWithToken instead of iframe trans... - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Make flickr import use postWithToken instead of iframe transport
..
Make flickr import use postWithToken instead of iframe transport
Change-Id: Ib521edd1b4fda77294ef34b04388625817316da5
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/960
Bug: 65423
---
M UploadWizard.php
M UploadWizardHooks.php
A resources/mw.ApiUploadPostHandler.js
M resources/mw.UploadWizardUpload.js
4 files changed, 42 insertions(+), 1 deletion(-)
Approvals:
MarkTraceur: Looks good to me, but someone else must approve
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizard.php b/UploadWizard.php
index 881e9b3..3552ab4 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -111,6 +111,11 @@
'messages' = 'mwe-upwiz-transport-started',
) + $uploadWizardModuleInfo;
+$wgResourceModules['ext.uploadWizard.apiUploadPostHandler'] = array(
+ 'scripts' = 'mw.ApiUploadPostHandler.js',
+ 'messages' = 'mwe-upwiz-transport-started',
+) + $uploadWizardModuleInfo;
+
//upload using FormData, large files in chunks
$wgResourceModules['ext.uploadWizard.apiUploadFormDataHandler'] = array(
'scripts' = 'mw.ApiUploadFormDataHandler.js',
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index c6cbc3e..42cba49 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -42,6 +42,7 @@
'mediawiki.feedback',
'uw.base',
'ext.uploadWizard.apiUploadHandler',
+ 'ext.uploadWizard.apiUploadPostHandler',
'ext.uploadWizard.apiUploadFormDataHandler',
'ext.uploadWizard.events',
diff --git a/resources/mw.ApiUploadPostHandler.js
b/resources/mw.ApiUploadPostHandler.js
new file mode 100644
index 000..9a605d2
--- /dev/null
+++ b/resources/mw.ApiUploadPostHandler.js
@@ -0,0 +1,35 @@
+( function ( mw ) {
+ /**
+* Represents an object which send a direct request to the MediaWiki
API.
+* This is used when there is no actual file payload (eg. Flickr import)
+* @param {mw.UploadWizardUpload} upload current upload
+* @param {mw.Api} api
+*/
+ mw.ApiUploadPostHandler = function ( upload, api ) {
+ this.upload = upload;
+ this.api = api;
+ };
+
+ mw.ApiUploadPostHandler.prototype = {
+ start: function () {
+ var handler = this;
+
+ this.beginTime = ( new Date() ).getTime();
+ this.upload.ui.setStatus( 'mwe-upwiz-transport-started'
);
+
+ this.api.postWithToken( 'edit', {
+ action: 'upload',
+ stash: 1,
+ ignorewarnings: 1,
+ url: this.upload.providedFile.url,
+ filename: this.beginTime.toString() +
this.upload.filename
+ } )
+ .fail( function ( code, result ) {
+ handler.upload.setError( result.error.code,
result.error.info );
+ } )
+ .done( function ( result ) {
+ handler.upload.setTransported( result );
+ } );
+ }
+ };
+}( mediaWiki ) );
diff --git a/resources/mw.UploadWizardUpload.js
b/resources/mw.UploadWizardUpload.js
index 5da5b1f..7835da7 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -846,7 +846,7 @@
mw.log( 'mw.UploadWizard::getUploadHandler ' +
constructor );
}
if ( this.fromURL ) {
- constructor = 'ApiUploadHandler';
+ constructor = 'ApiUploadPostHandler';
}
this.uploadHandler = new mw[constructor]( this,
this.api );
}
--
To view, visit https://gerrit.wikimedia.org/r/168556
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib521edd1b4fda77294ef34b04388625817316da5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Rillke ril...@wikipedia.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] install-server: add swift cache partition - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174932
Change subject: install-server: add swift cache partition
..
install-server: add swift cache partition
Shrink root and partitions holding container databases, a fourth partition will
be raid1 and used to provide ssd block caching via bcache.
Root shrinks from 50GB to 30GB, our current utilization is ~27% (i.e. 15G).
Container database partition changes from 90G min to 60G min (120G max),
rationale being that some machines have 256G SSD and some 150G SSD, yet the
same weight in swift. This should accomodate growth on larger SSD while
allowing decent caching on small SSD. Container partition utilization is on
average ~20G (was ~16G beginning of June) so it isn't expected to grow fast
(we'll likely run out of storage space first anyway).
Another option would be to raid1 the two SSDs and switch to lvm to host root,
swap and the cache. That however seems overkill, the bits we really care about
are the partitions holding container databases (sdn3/sdm3) and those will need
to live off raid/lvm anyway.
Note that if caching turns out later to be ineffective, we can drop the fourth
partition in place and grow sdn3/sdm3 back.
Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
---
M modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/174932/1
diff --git a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
index 6597b9d..f63ebd9 100644
--- a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -22,16 +22,19 @@
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 6 80006 raid\
+ 3 80003 raid\
$primary{ } method{ raid } \
. \
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 -1 xfs \
+ 6 500 12 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ . \
+ 3 1 -1 raid\
+ $primary{ } method{ raid } \
.
# Parameters are:
@@ -43,6 +46,9 @@
. \
1 2 0 swap- \
/dev/sdm2#/dev/sdn2 \
+ . \
+ 1 2 0 none- \
+ /dev/sdm4#/dev/sdn4 \
.
d-ipartman-md/confirm boolean true
--
To view, visit https://gerrit.wikimedia.org/r/174932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Performance to PerformanceLogger - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Rename Performance to PerformanceLogger
..
Rename Performance to PerformanceLogger
Change-Id: Iacfde35851cf8f617c4672d3ea466d4f0e2e448f
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M resources/mmv/logging/mmv.logging.Api.js
R resources/mmv/logging/mmv.logging.PerformanceLogger.js
M resources/mmv/provider/mmv.provider.Image.js
R tests/qunit/mmv/logging/mmv.logging.PerformanceLogger.test.js
6 files changed, 41 insertions(+), 41 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index d6aea6f..7a47510 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -323,7 +323,7 @@
'mmv.model.Repo',
'mmv.model.Thumbnail',
'mmv.model.User',
- 'mmv.logging.Performance',
+ 'mmv.logging.PerformanceLogger',
'oojs',
),
),
@@ -849,9 +849,9 @@
),
),
- 'mmv.logging.Performance' = $wgMediaViewerResourceTemplate + array(
+ 'mmv.logging.PerformanceLogger' = $wgMediaViewerResourceTemplate +
array(
'scripts' = array(
- 'mmv/logging/mmv.logging.Performance.js',
+ 'mmv/logging/mmv.logging.PerformanceLogger.js',
),
'dependencies' = array(
@@ -1065,7 +1065,7 @@
if ( isset( $wgResourceModules['ext.eventLogging'] ) ) {
$wgResourceModules['mmv.logging.ActionLogger']['dependencies'][] =
'ext.eventLogging';
- $wgResourceModules['mmv.logging.Performance']['dependencies'][]
= 'ext.eventLogging';
+
$wgResourceModules['mmv.logging.PerformanceLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.DurationLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.AttributionLogger']['dependencies'][] =
'ext.eventLogging';
$wgResourceModules['mmv.logging.DimensionLogger']['dependencies'][] =
'ext.eventLogging';
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 55a9067..2d6eecd 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -198,7 +198,7 @@
'tests/qunit/mmv/mmv.Config.test.js',
'tests/qunit/mmv/mmv.HtmlUtils.test.js',
'tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js',
-
'tests/qunit/mmv/logging/mmv.logging.Performance.test.js',
+
'tests/qunit/mmv/logging/mmv.logging.PerformanceLogger.test.js',
'tests/qunit/mmv/logging/mmv.logging.ActionLogger.test.js',
'tests/qunit/mmv/logging/mmv.logging.AttributionLogger.test.js',
'tests/qunit/mmv/logging/mmv.logging.DimensionLogger.test.js',
diff --git a/resources/mmv/logging/mmv.logging.Api.js
b/resources/mmv/logging/mmv.logging.Api.js
index aa92f36..ff3d0c0 100644
--- a/resources/mmv/logging/mmv.logging.Api.js
+++ b/resources/mmv/logging/mmv.logging.Api.js
@@ -17,7 +17,7 @@
( function ( mw, $, oo ) {
/**
-* Runs performance analysis on requests via mw.mmv.logging.Performance
+* Runs performance analysis on requests via
mw.mmv.logging.PerformanceLogger
* @class mw.mmv.logging.Api
* @extends mw.Api
* @constructor
@@ -27,8 +27,8 @@
function Api( type, options ) {
mw.Api.call( this, options );
- /** @property {mw.mmv.logging.Performance} performance Used to
record performance data. */
- this.performance = new mw.mmv.logging.Performance();
+ /** @property {mw.mmv.logging.PerformanceLogger} performance
Used to record performance data. */
+ this.performance = new mw.mmv.logging.PerformanceLogger();
/** @property {string} type Type of requests being sent via
this API. */
this.type = type;
diff --git a/resources/mmv/logging/mmv.logging.Performance.js
b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
similarity index 91%
rename from resources/mmv/logging/mmv.logging.Performance.js
rename to resources/mmv/logging/mmv.logging.PerformanceLogger.js
index 677fa0f..bfde462 100644
--- a/resources/mmv/logging/mmv.logging.Performance.js
+++ b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
@@ -16,37 +16,37 @@
*/
( function ( mw, $, oo ) {
- var P;
+ var PL;
/**
* Measures the network performance
* See
https://meta.wikimedia.org/wiki/Schema:MultimediaViewerNetworkPerformance
-
[MediaWiki-commits] [Gerrit] [WIP] Track the most recent upload time for performance events - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174933
Change subject: [WIP] Track the most recent upload time for performance events
..
[WIP] Track the most recent upload time for performance events
Change-Id: I673f9487deea15dc148452a3a4d6b91563a2c417
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/975
---
M MultimediaViewer.php
M resources/mmv/logging/mmv.logging.PerformanceLogger.js
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboximage.js
M resources/mmv/model/mmv.model.Image.js
M resources/mmv/provider/mmv.provider.Image.js
6 files changed, 56 insertions(+), 41 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/33/174933/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 7a47510..dae2dad 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -1052,7 +1052,7 @@
$wgHooks['EventLoggingRegisterSchemas'][] = function( array $schemas ) {
$schemas += array(
'MediaViewer' = 10536413,
- 'MultimediaViewerNetworkPerformance' = 7917896,
+ 'MultimediaViewerNetworkPerformance' = 10596581,
'MultimediaViewerDuration' = 10427980,
'MultimediaViewerAttribution' = 9758179,
'MultimediaViewerDimensions' = 10014238,
diff --git a/resources/mmv/logging/mmv.logging.PerformanceLogger.js
b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
index bfde462..d665996 100644
--- a/resources/mmv/logging/mmv.logging.PerformanceLogger.js
+++ b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
@@ -62,9 +62,10 @@
* cached by the browser, as it will consume unnecessary bandwidth for
the user.
* @param {string} type the type of request to be measured
* @param {string} url URL to be measured
+* @param {jQuery.Promise.string} uploadDateTimePromise A promise
which resolves to the image upload timestamp.
* @returns {jQuery.Promise} A promise that resolves when the contents
of the URL have been fetched
*/
- PL.record = function ( type, url ) {
+ PL.record = function ( type, url, uploadDateTimePromise ) {
var deferred = $.Deferred(),
request,
perf = this,
@@ -89,7 +90,7 @@
if ( request.readyState === 4 ) {
deferred.notify( request.response, 100
);
deferred.resolve( request.response );
- perf.recordEntryDelayed( type, total,
url, request );
+ perf.recordEntryDelayed( type, total,
url, request, uploadDateTimePromise );
}
};
@@ -111,9 +112,11 @@
* @param {number} total the total load time tracked with a basic
technique
* @param {string} url URL of that was measured
* @param {XMLHttpRequest} request HTTP request that just completed
+* @param {jQuery.Promise.string} uploadDateTimePromise A promise
which resolves to the image upload timestamp.
*/
- PL.recordEntry = function ( type, total, url, request ) {
+ PL.recordEntry = function ( type, total, url, request,
uploadDateTimePromise ) {
var matches,
+ logger = this,
stats = { type: type,
contentHost: window.location.host,
isHttps: window.location.protocol === 'https:',
@@ -165,7 +168,17 @@
}
}
- this.log( stats );
+ if ( uploadDateTimePromise ) { // Only defined for images
+ uploadDateTimePromise.done( function ( uploadDateTime )
{
+ stats.uploadTimestamp = uploadDateTime;
+ logger.log( stats );
+ } )
+ .fail( function() {
+ logger.log( stats );
+ } );
+ } else {
+ this.log( stats );
+ }
};
/**
@@ -305,14 +318,15 @@
* @param {number} total the total load time tracked with a basic
technique
* @param {string} url URL of that was measured
* @param {XMLHttpRequest} request HTTP request that just completed
+* @param {jQuery.Promise.string} uploadDateTimePromise A promise
which resolves to the image upload timestamp.
*/
- PL.recordEntryDelayed = function ( type, total, url, request ) {
+ PL.recordEntryDelayed = function ( type, total, url, request,
uploadDateTimePromise ) {
var perf = this;
// The timeout is necessary because if
[MediaWiki-commits] [Gerrit] adding openfashion.momu.be to wgCopyUploadsDomains - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: adding openfashion.momu.be to wgCopyUploadsDomains .. adding openfashion.momu.be to wgCopyUploadsDomains Per Romaine's (GLAM User) request on IRC. For GWT upload on commons. Change-Id: If803e018872cffcdea74c80318d5448314489c72 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved Giuseppe Lavagetto: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 64c7fa9..bb82875 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10970,6 +10970,7 @@ 'serg-klymenko.narod.ru', // Ukraine interesting photography source - bug 73045 'ua.vlasenko.net', // Ukraine interesting photography source - bug 73045 '*.wikiportret.nl', // Wikiportret - bug 72953 + 'openfashion.momu.be', // Open Fashion Antwerp Fashion Museum (MoMu) ), ), -- To view, visit https://gerrit.wikimedia.org/r/174931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If803e018872cffcdea74c80318d5448314489c72 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Steinsplitter steinsplit...@wikipedia.de Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Matanya mata...@foss.co.il Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...MsInsert)
Luis Felipe Schenone has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174934
Change subject: Initial commit
..
Initial commit
Change-Id: I0755fe91fafc613a3e643ecc17264df8feac0ec8
---
A .gitignore
A MsInsert.body.php
A MsInsert.i18n.php
A MsInsert.js
A MsInsert.php
A README.md
A i18n/de.json
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
10 files changed, 276 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsInsert
refs/changes/34/174934/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/MsInsert.body.php b/MsInsert.body.php
new file mode 100644
index 000..9e7524d
--- /dev/null
+++ b/MsInsert.body.php
@@ -0,0 +1,24 @@
+?php
+
+class MsInsert {
+
+ static function start() {
+ global $wgOut, $wgTemplates;
+
+ $wgOut-addModules( 'ext.MsInsert' );
+
+ $templates = array();
+ foreach ( $wgTemplates as $key = $template ) {
+ $title = Title::newFromText( htmlentities( $template )
);
+ $title2 = Title::newFromText( $template );
+ if ( $title and $title-exists() ) {
+ $templates[] = htmlentities( $template );
+ } elseif ( $title2 and $title2-exists() ) {
+ $templates[] = $template;
+ }
+ }
+ $templates = json_encode( $templates );
+ $wgOut-addScript( scriptvar msi_templates =
JSON.parse('$templates');/script );
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/MsInsert.i18n.php b/MsInsert.i18n.php
new file mode 100644
index 000..b64e7a0
--- /dev/null
+++ b/MsInsert.i18n.php
@@ -0,0 +1,35 @@
+?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
+$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9bfcb6d3a88a9ce0' ) ) {
+ function wfJsonI18nShim9bfcb6d3a88a9ce0( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
/extensions/MsInsert/i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
+
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
+
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9bfcb6d3a88a9ce0';
+}
\ No newline at end of file
diff --git a/MsInsert.js b/MsInsert.js
new file mode 100755
index 000..e19f412
--- /dev/null
+++ b/MsInsert.js
@@ -0,0 +1,121 @@
+if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !== -1 ) {
+ mw.loader.using( 'user.options', function () {
+ if ( mw.user.options.get( 'usebetatoolbar' )
mw.user.options.get( 'showtoolbar' ) ) {
+ mw.loader.using( 'ext.wikiEditor.toolbar',
msi_modifyToolbar1 );
+ } else {
+ msi_modifyToolbar2();
+ }
+ });
+}
+
+function msi_modifyToolbar1() {
+ var dropdownMenu = $( 'select/' ).attr( 'id', 'msi-select' ).css(
'margin', '4px' ).change( function () {
+ var selection = this.options[ this.selectedIndex ].value;
+ msi_templateSelect( selection );
+ });
+ dropdownMenu.append( 'option value=0' + mw.msg(
'msi-insert-template' ) + '/option' );
+ for ( var i = 0; i msi_templates.length; i++ ) {
+ dropdownMenu.append( 'option value=' + ( i + 1 ) + '' +
msi_templates[ i ] + '/option' );
+ }
+ $( '#editform' ).find( '.group-insert'
[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...MsInsert)
Luis Felipe Schenone has submitted this change and it was merged.
Change subject: Initial commit
..
Initial commit
Change-Id: I0755fe91fafc613a3e643ecc17264df8feac0ec8
---
A .gitignore
A MsInsert.body.php
A MsInsert.i18n.php
A MsInsert.js
A MsInsert.php
A README.md
A i18n/de.json
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
10 files changed, 276 insertions(+), 0 deletions(-)
Approvals:
Luis Felipe Schenone: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/MsInsert.body.php b/MsInsert.body.php
new file mode 100644
index 000..9e7524d
--- /dev/null
+++ b/MsInsert.body.php
@@ -0,0 +1,24 @@
+?php
+
+class MsInsert {
+
+ static function start() {
+ global $wgOut, $wgTemplates;
+
+ $wgOut-addModules( 'ext.MsInsert' );
+
+ $templates = array();
+ foreach ( $wgTemplates as $key = $template ) {
+ $title = Title::newFromText( htmlentities( $template )
);
+ $title2 = Title::newFromText( $template );
+ if ( $title and $title-exists() ) {
+ $templates[] = htmlentities( $template );
+ } elseif ( $title2 and $title2-exists() ) {
+ $templates[] = $template;
+ }
+ }
+ $templates = json_encode( $templates );
+ $wgOut-addScript( scriptvar msi_templates =
JSON.parse('$templates');/script );
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/MsInsert.i18n.php b/MsInsert.i18n.php
new file mode 100644
index 000..b64e7a0
--- /dev/null
+++ b/MsInsert.i18n.php
@@ -0,0 +1,35 @@
+?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
+$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9bfcb6d3a88a9ce0' ) ) {
+ function wfJsonI18nShim9bfcb6d3a88a9ce0( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
/extensions/MsInsert/i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
+
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
+
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9bfcb6d3a88a9ce0';
+}
\ No newline at end of file
diff --git a/MsInsert.js b/MsInsert.js
new file mode 100755
index 000..e19f412
--- /dev/null
+++ b/MsInsert.js
@@ -0,0 +1,121 @@
+if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !== -1 ) {
+ mw.loader.using( 'user.options', function () {
+ if ( mw.user.options.get( 'usebetatoolbar' )
mw.user.options.get( 'showtoolbar' ) ) {
+ mw.loader.using( 'ext.wikiEditor.toolbar',
msi_modifyToolbar1 );
+ } else {
+ msi_modifyToolbar2();
+ }
+ });
+}
+
+function msi_modifyToolbar1() {
+ var dropdownMenu = $( 'select/' ).attr( 'id', 'msi-select' ).css(
'margin', '4px' ).change( function () {
+ var selection = this.options[ this.selectedIndex ].value;
+ msi_templateSelect( selection );
+ });
+ dropdownMenu.append( 'option value=0' + mw.msg(
'msi-insert-template' ) + '/option' );
+ for ( var i = 0; i msi_templates.length; i++ ) {
+ dropdownMenu.append( 'option value=' + ( i + 1 ) + '' +
msi_templates[ i ] + '/option' );
+ }
+ $( '#editform' ).find( '.group-insert' ).append( dropdownMenu );
+}
+
+function msi_modifyToolbar2() {
[MediaWiki-commits] [Gerrit] dsh: add new servers in a few groups - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/174935 Change subject: dsh: add new servers in a few groups .. dsh: add new servers in a few groups Change-Id: Ic082b3a9f7a562637ee55f1ab1bd5b356bb81c48 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/174935/1 diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index f6edafd..2ad30ba 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -50,6 +50,7 @@ mw1050 mw1051 mw1052 +mw1053 mw1054 mw1055 mw1056 @@ -159,6 +160,7 @@ mw1160 mw1161 mw1162 +mw1163 mw1164 mw1165 mw1166 @@ -216,3 +218,19 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 +mw1234 +mw1235 +mw1236 +mw1237 +mw1238 +mw1240 +mw1241 +mw1242 +mw1244 +mw1245 +mw1246 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 278299e..9f426d7 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -234,3 +234,12 @@ mw1233 mw1234 mw1235 +mw1236 +mw1237 +mw1238 +mw1240 +mw1241 +mw1242 +mw1244 +mw1245 +mw1246 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index be6497c..21ffe20 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -218,6 +218,22 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 +mw1234 +mw1235 +mw1236 +mw1237 +mw1238 +mw1240 +mw1241 +mw1242 +mw1244 +mw1245 +mw1246 terbium snapshot1001 snapshot1002 -- To view, visit https://gerrit.wikimedia.org/r/174935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic082b3a9f7a562637ee55f1ab1bd5b356bb81c48 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dsh: add new servers in a few groups - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: dsh: add new servers in a few groups .. dsh: add new servers in a few groups Change-Id: Ic082b3a9f7a562637ee55f1ab1bd5b356bb81c48 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 43 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index f6edafd..2ad30ba 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -50,6 +50,7 @@ mw1050 mw1051 mw1052 +mw1053 mw1054 mw1055 mw1056 @@ -159,6 +160,7 @@ mw1160 mw1161 mw1162 +mw1163 mw1164 mw1165 mw1166 @@ -216,3 +218,19 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 +mw1234 +mw1235 +mw1236 +mw1237 +mw1238 +mw1240 +mw1241 +mw1242 +mw1244 +mw1245 +mw1246 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 278299e..9f426d7 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -234,3 +234,12 @@ mw1233 mw1234 mw1235 +mw1236 +mw1237 +mw1238 +mw1240 +mw1241 +mw1242 +mw1244 +mw1245 +mw1246 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index be6497c..21ffe20 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -218,6 +218,22 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 +mw1234 +mw1235 +mw1236 +mw1237 +mw1238 +mw1240 +mw1241 +mw1242 +mw1244 +mw1245 +mw1246 terbium snapshot1001 snapshot1002 -- To view, visit https://gerrit.wikimedia.org/r/174935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic082b3a9f7a562637ee55f1ab1bd5b356bb81c48 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...MsWikiEditor)
Luis Felipe Schenone has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174937
Change subject: Initial commit
..
Initial commit
Change-Id: I66ac225f8884930ddff0d124eb114a571aae2d1f
---
A .gitignore
A MsWikiEditor.body.php
A MsWikiEditor.i18n.php
A MsWikiEditor.js
A MsWikiEditor.php
A README.md
A i18n/de.json
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
A images/Achtung-Link.gif
A images/Btn_toolbar_gallery.png
A images/Button_strike.png
A images/Button_vote_biblio.png
A images/E-Mail.png
A images/Information-Link.gif
A images/Kalender.gif
A images/Link_button_oldschool.gif
A images/Wiki-Editor-Buttons_Achtung_22.png
A images/Wiki-Editor-Buttons_E-Mail_22.png
A images/Wiki-Editor-Buttons_Gallery_22.png
A images/Wiki-Editor-Buttons_Info_22.png
A images/Wiki-Editor-Buttons_Kalender_22.png
A images/Wiki-Editor-Buttons_Li.png
A images/Wiki-Editor-Buttons_Strike_22.png
A images/Wiki-Editor-Buttons_Upload_22.png
A images/password.png
A images/username.png
28 files changed, 236 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsWikiEditor
refs/changes/37/174937/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/MsWikiEditor.body.php b/MsWikiEditor.body.php
new file mode 100644
index 000..ca26f20
--- /dev/null
+++ b/MsWikiEditor.body.php
@@ -0,0 +1,20 @@
+?php
+
+class MsWikiEditor {
+
+ static function start() {
+ global $wgOut, $wgScriptPath, $wgMSWE_add, $wgMSWE_remove,
$wgMSWE_buttons;
+
+ $mswe_add = json_encode( $wgMSWE_add );
+ $mswe_remove = json_encode( $wgMSWE_remove );
+ $mswe_buttons = json_encode( $wgMSWE_buttons );
+ $wgOut-addScript( script
+ var mswe_add = JSON.parse('$mswe_add');
+ var mswe_remove = JSON.parse('$mswe_remove');
+ var mswe_buttons = JSON.parse('$mswe_buttons');
+ /script
+ );
+ $wgOut-addModules( 'ext.MsWikiEditor' );
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/MsWikiEditor.i18n.php b/MsWikiEditor.i18n.php
new file mode 100644
index 000..455283b
--- /dev/null
+++ b/MsWikiEditor.i18n.php
@@ -0,0 +1,35 @@
+?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
+$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9bfcb6d3a88a9ce0' ) ) {
+ function wfJsonI18nShim9bfcb6d3a88a9ce0( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
/extensions/MsWikiEditor/i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
+
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
+
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9bfcb6d3a88a9ce0';
+}
\ No newline at end of file
diff --git a/MsWikiEditor.js b/MsWikiEditor.js
new file mode 100755
index 000..e99b7bf
--- /dev/null
+++ b/MsWikiEditor.js
@@ -0,0 +1,83 @@
+// Check if we are in edit mode and the required modules are available and
then customize the toolbar
+if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !== -1 ) {
+ mw.loader.using( 'user.options', function () {
+ if ( mw.user.options.get( 'usebetatoolbar' ) ) {
+ mw.loader.using( 'ext.wikiEditor.toolbar', function () {
+ $( document ).ready( mswe_modifyToolbar );
+ });
+ }
+ });
+}
+
+var mswe_setGroup =
[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...MsWikiEditor)
Luis Felipe Schenone has submitted this change and it was merged.
Change subject: Initial commit
..
Initial commit
Change-Id: I66ac225f8884930ddff0d124eb114a571aae2d1f
---
A .gitignore
A MsWikiEditor.body.php
A MsWikiEditor.i18n.php
A MsWikiEditor.js
A MsWikiEditor.php
A README.md
A i18n/de.json
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
A images/Achtung-Link.gif
A images/Btn_toolbar_gallery.png
A images/Button_strike.png
A images/Button_vote_biblio.png
A images/E-Mail.png
A images/Information-Link.gif
A images/Kalender.gif
A images/Link_button_oldschool.gif
A images/Wiki-Editor-Buttons_Achtung_22.png
A images/Wiki-Editor-Buttons_E-Mail_22.png
A images/Wiki-Editor-Buttons_Gallery_22.png
A images/Wiki-Editor-Buttons_Info_22.png
A images/Wiki-Editor-Buttons_Kalender_22.png
A images/Wiki-Editor-Buttons_Li.png
A images/Wiki-Editor-Buttons_Strike_22.png
A images/Wiki-Editor-Buttons_Upload_22.png
A images/password.png
A images/username.png
28 files changed, 236 insertions(+), 0 deletions(-)
Approvals:
Luis Felipe Schenone: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..496ee2c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/MsWikiEditor.body.php b/MsWikiEditor.body.php
new file mode 100644
index 000..ca26f20
--- /dev/null
+++ b/MsWikiEditor.body.php
@@ -0,0 +1,20 @@
+?php
+
+class MsWikiEditor {
+
+ static function start() {
+ global $wgOut, $wgScriptPath, $wgMSWE_add, $wgMSWE_remove,
$wgMSWE_buttons;
+
+ $mswe_add = json_encode( $wgMSWE_add );
+ $mswe_remove = json_encode( $wgMSWE_remove );
+ $mswe_buttons = json_encode( $wgMSWE_buttons );
+ $wgOut-addScript( script
+ var mswe_add = JSON.parse('$mswe_add');
+ var mswe_remove = JSON.parse('$mswe_remove');
+ var mswe_buttons = JSON.parse('$mswe_buttons');
+ /script
+ );
+ $wgOut-addModules( 'ext.MsWikiEditor' );
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/MsWikiEditor.i18n.php b/MsWikiEditor.i18n.php
new file mode 100644
index 000..455283b
--- /dev/null
+++ b/MsWikiEditor.i18n.php
@@ -0,0 +1,35 @@
+?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
+$messages = array();
+if ( !function_exists( 'wfJsonI18nShim9bfcb6d3a88a9ce0' ) ) {
+ function wfJsonI18nShim9bfcb6d3a88a9ce0( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
/extensions/MsWikiEditor/i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
+
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
+
+ $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim9bfcb6d3a88a9ce0';
+}
\ No newline at end of file
diff --git a/MsWikiEditor.js b/MsWikiEditor.js
new file mode 100755
index 000..e99b7bf
--- /dev/null
+++ b/MsWikiEditor.js
@@ -0,0 +1,83 @@
+// Check if we are in edit mode and the required modules are available and
then customize the toolbar
+if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !== -1 ) {
+ mw.loader.using( 'user.options', function () {
+ if ( mw.user.options.get( 'usebetatoolbar' ) ) {
+ mw.loader.using( 'ext.wikiEditor.toolbar', function () {
+ $( document ).ready( mswe_modifyToolbar );
+ });
+ }
+ });
+}
+
+var mswe_setGroup = false;
+
+function mswe_modifyToolbar() {
+
[MediaWiki-commits] [Gerrit] Fix lots of spelling mistakes and typos - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174938
Change subject: Fix lots of spelling mistakes and typos
..
Fix lots of spelling mistakes and typos
Change-Id: I76f4de0984f1feedaf7886bde8aa561a26321a04
---
M demos/trigger/trigger.js
M src/ce/nodes/ve.ce.TableRowNode.js
M src/ce/ve.ce.FocusableNode.js
M src/ce/ve.ce.Surface.js
M src/ce/ve.ce.SurfaceObserver.js
M src/ce/ve.ce.View.js
M src/dm/lineardata/ve.dm.ElementLinearData.js
M src/dm/ve.dm.AnnotationSet.js
M src/dm/ve.dm.Document.js
M src/dm/ve.dm.IndexValueStore.js
M src/dm/ve.dm.Node.js
M src/dm/ve.dm.Surface.js
M src/dm/ve.dm.SurfaceFragment.js
M src/dm/ve.dm.Transaction.js
M src/dm/ve.dm.TransactionProcessor.js
M src/init/ve.init.Platform.js
M src/init/ve.init.Target.js
M src/ui/actions/ve.ui.IndentationAction.js
M src/ui/actions/ve.ui.TableAction.js
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
M src/ui/inspectors/ve.ui.AnnotationInspector.js
M src/ui/tools/ve.ui.IndentationTool.js
M src/ui/ve.ui.Command.js
M src/ui/ve.ui.DesktopContext.js
M src/ui/ve.ui.FileDropHandler.js
M src/ui/ve.ui.Overlay.js
M src/ui/ve.ui.Surface.js
M src/ui/ve.ui.Toolbar.js
M src/ui/ve.ui.Trigger.js
M src/ui/widgets/ve.ui.ContextOptionWidget.js
M src/ui/widgets/ve.ui.ContextSelectWidget.js
M src/ui/widgets/ve.ui.ContextWidget.js
M src/ui/widgets/ve.ui.LanguageSearchWidget.js
M src/ui/widgets/ve.ui.SurfaceWidget.js
M src/ve.BranchNode.js
M src/ve.utils.js
36 files changed, 58 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/38/174938/1
diff --git a/demos/trigger/trigger.js b/demos/trigger/trigger.js
index 55d20a4..b13ce0f 100644
--- a/demos/trigger/trigger.js
+++ b/demos/trigger/trigger.js
@@ -15,7 +15,7 @@
}
}
-// Initialiation
+// Initialization
var i, len, key,
$primary = $( '#primary' ),
diff --git a/src/ce/nodes/ve.ce.TableRowNode.js
b/src/ce/nodes/ve.ce.TableRowNode.js
index 92092cb..d77689c 100644
--- a/src/ce/nodes/ve.ce.TableRowNode.js
+++ b/src/ce/nodes/ve.ce.TableRowNode.js
@@ -1,5 +1,5 @@
/*!
- * VisualEditor ContentEditable TableRowNodw class.
+ * VisualEditor ContentEditable TableRowNode class.
*
* @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
*/
diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js
index 59b7f0e..9316081 100644
--- a/src/ce/ve.ce.FocusableNode.js
+++ b/src/ce/ve.ce.FocusableNode.js
@@ -523,7 +523,7 @@
};
/**
- * Get the bounding rectangle of the focusable node highight relative to the
surface
+ * Get the bounding rectangle of the focusable node highlight relative to the
surface
*
* @return {Object|null} Top, left, bottom right positions of the focusable
node relative to the surface
*/
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index a6d5490..9a442db 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -68,7 +68,7 @@
// This is set on entering changeModel, then unset when leaving.
// It is used to test whether a reflected change event is emitted.
this.newModelSelection = null;
- // These are set during cursor moves (but not text addions/deletions at
the cursor)
+ // These are set during cursor moves (but not text additions/deletions
at the cursor)
this.cursorEvent = null;
this.cursorStartRange = null;
this.unicorningNode = null;
@@ -1592,7 +1592,7 @@
return true;
} );
} else {
- // HTML in pasteTarget my get wrapped, so use the
recursive $.find to looke for the clipboard key
+ // HTML in pasteTarget my get wrapped, so use the
recursive $.find to look for the clipboard key
clipboardKey = this.$pasteTarget.find(
'span[data-ve-clipboard-key]' ).data( 've-clipboard-key' );
// $elements is used by getClipboardHash so generate it
too
$elements = this.$pasteTarget.contents();
@@ -1620,7 +1620,7 @@
if ( slice ) {
// Internal paste
try {
- // Try to paste in the orignal data
+ // Try to paste in the original data
// Take a copy to prevent the data being annotated a
second time in the catch block
// and to prevent actions in the data model affecting
view.clipboard
pasteData = new ve.dm.ElementLinearData(
@@ -1687,7 +1687,7 @@
if ( !htmlDoc ) {
// If there were no problems, let CE do its sanitizing
as it may
// contain all sorts of horrible metadata (head tags
etc.)
- // TODO: IE will always take this path, and so may have
bugs with span unwapping
+
[MediaWiki-commits] [Gerrit] Fixed issue with wrong id format - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Fixed issue with wrong id format
..
Fixed issue with wrong id format
Since the id of the element has changed due to testing purpose, a string was
passed and an int was expected.
* Removed accidently added change which caused problems
Patchset 3: Added id handling for select boxes
Change-Id: I3cec5bc79f6c35734411ffc0217c4fd45867b686
---
M Checklist/resources/bluespice.checklist.js
1 file changed, 11 insertions(+), 4 deletions(-)
Approvals:
Mglaser: Verified
Smuggli: Verified; Looks good to me, approved
diff --git a/Checklist/resources/bluespice.checklist.js
b/Checklist/resources/bluespice.checklist.js
index bfe2b19..a957b26 100644
--- a/Checklist/resources/bluespice.checklist.js
+++ b/Checklist/resources/bluespice.checklist.js
@@ -27,13 +27,17 @@
},
click: function(elem) {
+ var id = elem.id;
+ id = id.split( - );
+ id = id.pop();
+
$.ajax({
type: GET,
url: bs.util.getAjaxDispatcherUrl(
'Checklist::doChangeCheckItem' ),
data: {
- pos:elem.id,
- value:elem.checked,
- articleId:mw.config.get('wgArticleId')
+ pos: id,
+ value: elem.checked,
+ articleId: mw.config.get('wgArticleId')
},
//dataType: 'html',
success: function(result){ // the returned value is
passed back as a _result_
@@ -43,12 +47,15 @@
},
change: function(elem) {
+ var id = elem.id;
+ id = id.split( - );
+ id = id.pop();
elem.style.color=elem.options[elem.selectedIndex].style.color;
$.ajax({
type: GET,
url: bs.util.getAjaxDispatcherUrl(
'Checklist::doChangeCheckItem' ),
data: {
- pos:elem.id,
+ pos: id,
value:$('#'+elem.id).find(:selected).text(),
articleId:mw.config.get('wgArticleId')
},
--
To view, visit https://gerrit.wikimedia.org/r/173800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cec5bc79f6c35734411ffc0217c4fd45867b686
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing docs - change (mediawiki...MsWikiEditor)
Luis Felipe Schenone has uploaded a new change for review. https://gerrit.wikimedia.org/r/174939 Change subject: Fixing docs .. Fixing docs Change-Id: I3661adc6425ca932e8233de6862050dfe50b78f6 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsWikiEditor refs/changes/39/174939/1 diff --git a/README.md b/README.md index aeaaf10..532f56c 100755 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To remove a button, include its name in the $wgMSWE_remove array, below the require_once line. For example: -$wgMSWE_remove = array( 'help', 'characters', 'reference', 'advanced' ); +$wgMSWE_remove = array( 'advanced', 'characters', 'help' ); By default, all arrays are empty. -- To view, visit https://gerrit.wikimedia.org/r/174939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3661adc6425ca932e8233de6862050dfe50b78f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MsWikiEditor Gerrit-Branch: master Gerrit-Owner: Luis Felipe Schenone scheno...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing docs - change (mediawiki...MsWikiEditor)
Luis Felipe Schenone has submitted this change and it was merged. Change subject: Fixing docs .. Fixing docs Change-Id: I3661adc6425ca932e8233de6862050dfe50b78f6 --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Luis Felipe Schenone: Verified; Looks good to me, approved diff --git a/README.md b/README.md index aeaaf10..532f56c 100755 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To remove a button, include its name in the $wgMSWE_remove array, below the require_once line. For example: -$wgMSWE_remove = array( 'help', 'characters', 'reference', 'advanced' ); +$wgMSWE_remove = array( 'advanced', 'characters', 'help' ); By default, all arrays are empty. -- To view, visit https://gerrit.wikimedia.org/r/174939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3661adc6425ca932e8233de6862050dfe50b78f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MsWikiEditor Gerrit-Branch: master Gerrit-Owner: Luis Felipe Schenone scheno...@gmail.com Gerrit-Reviewer: Luis Felipe Schenone scheno...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When removing figures, use a placeholder instead of empty fi... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: When removing figures, use a placeholder instead of empty figure
..
When removing figures, use a placeholder instead of empty figure
Empty figure tags does not work. User can add the figure again
by clicking on the placeholder(Add translation placeholder)
Similarly when machine translation is disabled, instead of providing
an empty figure, fill the image and provide empty figcaption
Bug: 73547
Change-Id: I08fea1340c65562a298c827752b1eba043b0192c
---
M modules/translation/ext.cx.translation.js
1 file changed, 19 insertions(+), 4 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index 4c1700b..e0426e7 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -231,14 +231,29 @@
.attr( {
id: 'cx' + sourceId,
'data-source': sourceId,
- 'data-cx-state': 'source',
+ 'data-cx-state': 'source'
} );
- if ( origin === 'mt-user-disabled' || origin ===
'clear' ) {
+ if ( origin === 'mt-user-disabled' ) {
$clone.attr( 'data-cx-state', 'empty' );
- $clone.empty();
- } // else: service-failure, non-editable,
mt-not-available
+ if ( $sourceSection.prop( 'tagName' ) ===
'FIGURE' ) {
+ // Clear figure caption alone.
+ $clone.find( 'figcaption' ).empty();
+ } else {
+ $clone.empty();
+ }
+ }
+ if ( origin === 'clear' ) {
+ $clone.attr( 'data-cx-state', 'empty' );
+ if ( $sourceSection.prop( 'tagName' ) ===
'FIGURE' ) {
+ // When clearing figures, replace it
with placeholder.
+ $clone = getPlaceholder( sourceId )
+ .attr( 'data-cx-section-type',
$sourceSection.prop( 'tagName' ) );
+ } else {
+ $clone.empty();
+ }
+ } // else: service-failure, non-editable,
mt-not-available
// Replace the placeholder with a translatable element
$section.replaceWith( $clone );
--
To view, visit https://gerrit.wikimedia.org/r/174912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08fea1340c65562a298c827752b1eba043b0192c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
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] Fix lots of spelling mistakes and typos - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174940
Change subject: Fix lots of spelling mistakes and typos
..
Fix lots of spelling mistakes and typos
Change-Id: Ibe0a55eeecd6a0c5feb8e38801f6d98bb75d5a87
---
M php/Theme.php
M php/layouts/GridLayout.php
M php/widgets/TextInputWidget.php
M src/ActionSet.js
M src/Element.js
M src/Theme.js
M src/Window.js
M src/WindowManager.js
M src/core.js
M src/dialogs/MessageDialog.js
M src/dialogs/ProcessDialog.js
M src/elements/ButtonElement.js
M src/elements/GroupElement.js
M src/elements/IconElement.js
M src/layouts/BookletLayout.js
M src/layouts/GridLayout.js
M src/toolgroups/ListToolGroup.js
M src/widgets/ButtonInputWidget.js
M src/widgets/ItemWidget.js
M src/widgets/OutlineOptionWidget.js
M src/widgets/SearchWidget.js
M src/widgets/SelectWidget.js
M src/widgets/TextInputMenuSelectWidget.js
M src/widgets/TextInputWidget.js
24 files changed, 39 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/174940/1
diff --git a/php/Theme.php b/php/Theme.php
index 84e50ea..39c266b 100644
--- a/php/Theme.php
+++ b/php/Theme.php
@@ -41,7 +41,7 @@
/**
* Update CSS classes provided by the theme.
*
-* For elements with theme logic hooks, this should be called anytime
there's a state change.
+* For elements with theme logic hooks, this should be called any time
there's a state change.
*
* @param Element $element Element for which to update classes
* @return array Categorized class names with `on` and `off` lists
diff --git a/php/layouts/GridLayout.php b/php/layouts/GridLayout.php
index 21b3ce5..577d2ad 100644
--- a/php/layouts/GridLayout.php
+++ b/php/layouts/GridLayout.php
@@ -135,7 +135,7 @@
*
* @param number $x Horizontal position
* @param number $y Vertical position
-* @return PanelLayout The panel at the given postion
+* @return PanelLayout The panel at the given position
*/
public function getPanel( $x, $y ) {
return $this-panels[ ( $x * count( $this-widths ) ) + $y ];
diff --git a/php/widgets/TextInputWidget.php b/php/widgets/TextInputWidget.php
index 33240b5..51f02b4 100644
--- a/php/widgets/TextInputWidget.php
+++ b/php/widgets/TextInputWidget.php
@@ -65,7 +65,7 @@
}
/**
-* Set the read-only state of the widget. This should probably change
the widgets's appearance and
+* Set the read-only state of the widget. This should probably change
the widget's appearance and
* prevent it from being used.
*
* @param boolean $state Make input read-only
diff --git a/src/ActionSet.js b/src/ActionSet.js
index 88ecc72..25efb12 100644
--- a/src/ActionSet.js
+++ b/src/ActionSet.js
@@ -9,7 +9,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.ActionSet = function OoUiActionSet( config ) {
- // Configuration intialization
+ // Configuration initialization
config = config || {};
// Mixin constructors
@@ -351,7 +351,7 @@
/**
* Organize actions.
*
- * This is called whenver organized information is requested. It will only
reorganize the actions
+ * This is called whenever organized information is requested. It will only
reorganize the actions
* if something has changed since the last time it ran.
*
* @private
@@ -368,7 +368,7 @@
for ( i = 0, iLen = this.list.length; i iLen; i++ ) {
action = this.list[i];
if ( action.isVisible() ) {
- // Populate catgeories
+ // Populate categories
for ( category in this.categories ) {
if ( !this.categorized[category] ) {
this.categorized[category] = {};
diff --git a/src/Element.js b/src/Element.js
index 1505a22..e0d6eb1 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -445,7 +445,7 @@
/**
* Update the theme-provided classes.
*
- * @localdoc This is called in element mixins and widget classes anytime state
changes.
+ * @localdoc This is called in element mixins and widget classes any time
state changes.
* Updating is debounced, minimizing overhead of changing multiple
attributes and
* guaranteeing that theme updates do not occur within an element's
constructor
*/
diff --git a/src/Theme.js b/src/Theme.js
index 65bf091..92de72e 100644
--- a/src/Theme.js
+++ b/src/Theme.js
@@ -34,7 +34,7 @@
/**
* Update CSS classes provided by the theme.
*
- * For elements with theme logic hooks, this should be called anytime there's
a state change.
+ * For elements with theme logic hooks, this should be called any time there's
a state change.
*
* @param {OO.ui.Element} element Element for which
[MediaWiki-commits] [Gerrit] Fix lots of spelling mistakes and typos - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174941
Change subject: Fix lots of spelling mistakes and typos
..
Fix lots of spelling mistakes and typos
Change-Id: Icf78d3d599326d3f12d09edcd2b8491ed35ade04
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
15 files changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/41/174941/1
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 5e3e637..e8fce67 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -24,7 +24,7 @@
/* Toolbar */
-.ve-init-mw-viewPageTarget-toolbar-utilites,
+.ve-init-mw-viewPageTarget-toolbar-utilities,
.ve-init-mw-viewPageTarget-toolbar-actions {
display: inline-block;
vertical-align: middle;
@@ -36,7 +36,7 @@
padding: 0.25em;
}
-.ve-init-mw-viewPageTarget-toolbar-utilites .oo-ui-buttonElement-frameless {
+.ve-init-mw-viewPageTarget-toolbar-utilities .oo-ui-buttonElement-frameless {
margin-right: 0.2em;
margin-top: 0.2em;
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 3cce1d6..5c5f764 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1166,7 +1166,7 @@
] );
$actionTools
- .addClass( 've-init-mw-viewPageTarget-toolbar-utilites' )
+ .addClass( 've-init-mw-viewPageTarget-toolbar-utilities' )
.append( actions.$element );
$pushButtons
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 322d196..0ab2be2 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -14,7 +14,7 @@
* @extends ve.init.Target
*
* @constructor
- * @param {jQuery} $container Conainter to render target into
+ * @param {jQuery} $container Container to render target into
* @param {string} pageName Name of target page
* @param {number} [revisionId] If the editor should load a revision of the
page, pass the
* revision id here. Defaults to loading the latest version (see #load).
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
index f21877d..9257951 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
@@ -17,7 +17,7 @@
* @param {Object} [config] Configuration options
*/
ve.ui.MWCategoryInputWidget = function VeUiMWCategoryInputWidget(
categoryWidget, config ) {
- // Config intialization
+ // Config initialization
config = ve.extendObject( {
placeholder: ve.msg(
'visualeditor-dialog-meta-categories-input-placeholder' )
}, config );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
index 91b8aff..2a7b6ee 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
@@ -21,7 +21,7 @@
* @cfg {string} [redirectTo] The name of the category this category's page
redirects to.
*/
ve.ui.MWCategoryItemWidget = function VeUiMWCategoryItemWidget( config ) {
- // Config intialization
+ // Config initialization
config = ve.extendObject( { indicator: 'down' }, config );
// Parent constructor
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index c6bce9f..fbc105f 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -18,7 +18,7 @@
* @cfg {jQuery} [$overlay] Overlay to render dropdowns in
*/
ve.ui.MWCategoryWidget = function
[MediaWiki-commits] [Gerrit] Fix lots of spelling mistakes and typos - change (unicodejs)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174942
Change subject: Fix lots of spelling mistakes and typos
..
Fix lots of spelling mistakes and typos
Change-Id: I64985db430ee38e21e5948b16811c736b2ae846d
---
M src/unicodejs.graphemebreak.js
M src/unicodejs.js
M src/unicodejs.textstring.js
M src/unicodejs.wordbreak.js
4 files changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/unicodejs refs/changes/42/174942/1
diff --git a/src/unicodejs.graphemebreak.js b/src/unicodejs.graphemebreak.js
index 26c8c61..1078c51 100644
--- a/src/unicodejs.graphemebreak.js
+++ b/src/unicodejs.graphemebreak.js
@@ -90,7 +90,7 @@
* Split a string into grapheme clusters.
*
* @param {string} text Text to split
-* @returns {string[]} Array of clusters
+* @return {string[]} Array of clusters
*/
graphemebreak.splitClusters = function ( text ) {
var i, parts, length, clusters = [];
diff --git a/src/unicodejs.js b/src/unicodejs.js
index d8a3e08..736a0a7 100644
--- a/src/unicodejs.js
+++ b/src/unicodejs.js
@@ -21,7 +21,7 @@
* You probably want to call unicodeJS.graphemebreak.splitClusters
instead.
*
* @param {string} text Text to split
-* @returns {string[]} Array of characters
+* @return {string[]} Array of characters
*/
unicodeJS.splitCharacters = function ( text ) {
return text.split( /(?![\uDC00-\uDFFF])/g );
@@ -33,7 +33,7 @@
*
* @private
* @param {number} codeUnit integer between 0x and 0x
-* @returns {string} String literal ('\u' followed by 4 hex digits)
+* @return {string} String literal ('\u' followed by 4 hex digits)
*/
function uEsc( codeUnit ) {
return '\\u' + ( codeUnit + 0x1 ).toString( 16 ).substr( -4
);
@@ -45,8 +45,8 @@
* @private
* @param {number} min the minimum code unit in the range.
* @param {number} max the maximum code unit in the range.
-* @param {boolean} bracket If true, then wrap range in [ ... ]
-* @returns {string} Regexp string which matches the range
+* @param {boolean} [bracket] If true, then wrap range in [ ... ]
+* @return {string} Regexp string which matches the range
*/
function codeUnitRange( min, max, bracket ) {
var value;
@@ -81,7 +81,7 @@
* @private
* @param {number} ch1 The min character of the range; must be over
0x
* @param {number} ch2 The max character of the range; must be at least
ch1
-* @returns {Object} A list of boxes {hi: [x, y], lo: [z, w]}
+* @return {Object} A list of boxes {hi: [x, y], lo: [z, w]}
*/
function getCodeUnitBoxes( ch1, ch2 ) {
var loMin, loMax, hi1, hi2, lo1, lo2, boxes, hiMinAbove,
hiMaxBelow;
@@ -133,10 +133,11 @@
* only match ill-formed strings).
*
* @param {Array} ranges Array of ranges, each of which is a character
or an interval
-* @returns {string} Regexp string for the disjunction of the ranges.
+* @return {string} Regexp string for the disjunction of the ranges.
*/
unicodeJS.charRangeArrayRegexp = function ( ranges ) {
- var i, j, min, max, hi, lo, range, box, boxes,
+ var i, j, min, max, hi, lo, range, box,
+ boxes = [],
characterClass = [], // list of (\u code unit or
interval), for BMP
disjunction = []; // list of regex strings, to be
joined with '|'
@@ -182,7 +183,6 @@
if ( max = 0x ) {
// interval is entirely BMP
characterClass.push( codeUnitRange( min, max )
);
- boxes = [];
} else if ( min = 0x max 0x ) {
// interval is BMP and non-BMP
characterClass.push( codeUnitRange( min, 0x
) );
diff --git a/src/unicodejs.textstring.js b/src/unicodejs.textstring.js
index 9ee4218..f89ea0e 100644
--- a/src/unicodejs.textstring.js
+++ b/src/unicodejs.textstring.js
@@ -26,7 +26,7 @@
*
* @method
* @param {number} position Position to read from
- * @returns {string|null} Grapheme cluster, or null if out of bounds
+ * @return {string|null} Grapheme cluster, or null if out of bounds
*/
unicodeJS.TextString.prototype.read = function ( position ) {
var clusterAt = this.clusters[position];
@@ -37,7 +37,7 @@
* Return number of grapheme clusters in the text string
*
* @method
- * @returns {number} Number of grapheme clusters
+ * @return {number} Number of grapheme clusters
*/
[MediaWiki-commits] [Gerrit] Updating all - change (mediawiki...MsLinks)
Luis Felipe Schenone has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174943
Change subject: Updating all
..
Updating all
Change-Id: I2043fcf0ae022591b4d72759c5bedfe57debc1ea
---
M .gitignore
A MsLinks.body.php
A MsLinks.i18n.php
A MsLinks.php
D README.TXT
A README.md
A i18n/de.json
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
M images/broken_icon.png
D images/code__red_icon.png
M images/code_icon.png
D images/delete_icon.png
M images/doc_icon.png
A images/document-access.png
A images/document-excel-table.png
A images/dwg_icon.gif
A images/exe_icon.gif
D images/exe_icon.png
A images/film_icon.png
M images/image_ai_icon.png
M images/image_icon.png
M images/image_ps_icon.png
M images/movie_flash_icon.png
M images/movie_icon.png
R images/mslink_icon.png
A images/mslink_icon_oldschool.gif
M images/music_icon.png
M images/no_icon.png
M images/pdf_icon.png
D images/php_icon.png
M images/pps_icon.png
M images/txt_icon.png
M images/xls_icon.png
M images/zip_icon.png
M mslinks.js
D mslinks.php
D mslinks_body.php
39 files changed, 341 insertions(+), 290 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsLinks
refs/changes/43/174943/1
diff --git a/.gitignore b/.gitignore
index 98b092a..2c8761d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
.svn
*~
*.kate-swp
diff --git a/MsLinks.body.php b/MsLinks.body.php
new file mode 100755
index 000..603b6f9
--- /dev/null
+++ b/MsLinks.body.php
@@ -0,0 +1,73 @@
+?php
+
+class MsLinks {
+
+ static function start() {
+ global $wgOut, $wgJsMimeType, $wgScriptPath;
+ $wgOut-addModules( 'ext.MsLinks' );
+ $path = $wgScriptPath . '/extensions/MsLinks';
+ $wgOut-addScript( script type=\$wgJsMimeType\var
msl_icon_path = \$path\;/script );
+ return true;
+ }
+
+ static function setHook( $parser ) {
+ $parser-setFunctionHook( 'mslink', 'MsLinks::render' );
+ return true;
+ }
+
+ static function getMagicWord( $magicWords, $langCode ) {
+ $magicWords['mslink'] = array( 0, 'l' );
+ return true;
+ }
+
+ static function render( $parser, $type = 'no', $url = '', $description
= '', $align = '' ) {
+ global $wgOut, $wgScriptPath, $wgMSL_FileTypes;
+
+ if ( $type !== 'dlink' and $type !== 'vlink' ) {
+ $align = $description;
+ $description = $url;
+ $url = $type;
+ }
+
+ try {
+ $title = Title::newFromText( $url, NS_IMAGE );
+ $file = function_exists( 'wfFindFile' ) ? wfFindFile(
$title ) : new Image( $title );
+ $base = ( is_object( $file ) $file-exists() ) ?
':Image' : 'Media';
+ } catch( Exception $exception ) {
+ $base = 'Media';
+ }
+
+ $extension = strtolower( substr( strrchr( $url, '.' ), 1 ) );
+ if ( !$description ) {
+ if ( $extension ) {
+ $description = substr( $url, 0, ( strlen( $url
) - ( strlen( $extension ) + 1 ) ) );
+ } else {
+ $description = $url;
+ }
+ }
+
+ //Defaults
+ $wikitext = [[$base:$url|$description]];
+ $image = img src=\$wgScriptPath/extensions/MsLinks/images/
. $wgMSL_FileTypes['no'] . \;
+
+ foreach ( $wgMSL_FileTypes as $key = $value ) {
+ if ( $key === $extension ) {
+ $image = img title=\$extension\
src=\$wgScriptPath/extensions/MsLinks/images/$value\;
+ }
+ }
+ $image = $parser-insertStripItem( $image, $parser-mStripState
);
+
+ if ( $type !== 'vlink' and $type !== 'dlink' ) {
+ $base = 'Media';
+ }
+
+ $image = [[$base:$url|$image]];
+
+ if ( $align === 'right' ) {
+ $wikitext = $wikitext . ' ' . $image;
+ } else {
+ $wikitext = $image . ' ' . $wikitext;
+ }
+ return $wikitext;
+ }
+}
\ No newline at end of file
diff --git a/MsLinks.i18n.php b/MsLinks.i18n.php
new file mode 100644
index 000..4ec7bdb
--- /dev/null
+++ b/MsLinks.i18n.php
@@ -0,0 +1,35 @@
+?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of
[MediaWiki-commits] [Gerrit] Updating all - change (mediawiki...MsLinks)
Luis Felipe Schenone has submitted this change and it was merged.
Change subject: Updating all
..
Updating all
Change-Id: I2043fcf0ae022591b4d72759c5bedfe57debc1ea
---
M .gitignore
A MsLinks.body.php
A MsLinks.i18n.php
A MsLinks.php
D README.TXT
A README.md
A i18n/de.json
A i18n/en.json
A i18n/es.json
A i18n/qqq.json
M images/broken_icon.png
D images/code__red_icon.png
M images/code_icon.png
D images/delete_icon.png
M images/doc_icon.png
A images/document-access.png
A images/document-excel-table.png
A images/dwg_icon.gif
A images/exe_icon.gif
D images/exe_icon.png
A images/film_icon.png
M images/image_ai_icon.png
M images/image_icon.png
M images/image_ps_icon.png
M images/movie_flash_icon.png
M images/movie_icon.png
R images/mslink_icon.png
A images/mslink_icon_oldschool.gif
M images/music_icon.png
M images/no_icon.png
M images/pdf_icon.png
D images/php_icon.png
M images/pps_icon.png
M images/txt_icon.png
M images/xls_icon.png
M images/zip_icon.png
M mslinks.js
D mslinks.php
D mslinks_body.php
39 files changed, 341 insertions(+), 290 deletions(-)
Approvals:
Luis Felipe Schenone: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 98b092a..2c8761d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
.svn
*~
*.kate-swp
diff --git a/MsLinks.body.php b/MsLinks.body.php
new file mode 100755
index 000..603b6f9
--- /dev/null
+++ b/MsLinks.body.php
@@ -0,0 +1,73 @@
+?php
+
+class MsLinks {
+
+ static function start() {
+ global $wgOut, $wgJsMimeType, $wgScriptPath;
+ $wgOut-addModules( 'ext.MsLinks' );
+ $path = $wgScriptPath . '/extensions/MsLinks';
+ $wgOut-addScript( script type=\$wgJsMimeType\var
msl_icon_path = \$path\;/script );
+ return true;
+ }
+
+ static function setHook( $parser ) {
+ $parser-setFunctionHook( 'mslink', 'MsLinks::render' );
+ return true;
+ }
+
+ static function getMagicWord( $magicWords, $langCode ) {
+ $magicWords['mslink'] = array( 0, 'l' );
+ return true;
+ }
+
+ static function render( $parser, $type = 'no', $url = '', $description
= '', $align = '' ) {
+ global $wgOut, $wgScriptPath, $wgMSL_FileTypes;
+
+ if ( $type !== 'dlink' and $type !== 'vlink' ) {
+ $align = $description;
+ $description = $url;
+ $url = $type;
+ }
+
+ try {
+ $title = Title::newFromText( $url, NS_IMAGE );
+ $file = function_exists( 'wfFindFile' ) ? wfFindFile(
$title ) : new Image( $title );
+ $base = ( is_object( $file ) $file-exists() ) ?
':Image' : 'Media';
+ } catch( Exception $exception ) {
+ $base = 'Media';
+ }
+
+ $extension = strtolower( substr( strrchr( $url, '.' ), 1 ) );
+ if ( !$description ) {
+ if ( $extension ) {
+ $description = substr( $url, 0, ( strlen( $url
) - ( strlen( $extension ) + 1 ) ) );
+ } else {
+ $description = $url;
+ }
+ }
+
+ //Defaults
+ $wikitext = [[$base:$url|$description]];
+ $image = img src=\$wgScriptPath/extensions/MsLinks/images/
. $wgMSL_FileTypes['no'] . \;
+
+ foreach ( $wgMSL_FileTypes as $key = $value ) {
+ if ( $key === $extension ) {
+ $image = img title=\$extension\
src=\$wgScriptPath/extensions/MsLinks/images/$value\;
+ }
+ }
+ $image = $parser-insertStripItem( $image, $parser-mStripState
);
+
+ if ( $type !== 'vlink' and $type !== 'dlink' ) {
+ $base = 'Media';
+ }
+
+ $image = [[$base:$url|$image]];
+
+ if ( $align === 'right' ) {
+ $wikitext = $wikitext . ' ' . $image;
+ } else {
+ $wikitext = $image . ' ' . $wikitext;
+ }
+ return $wikitext;
+ }
+}
\ No newline at end of file
diff --git a/MsLinks.i18n.php b/MsLinks.i18n.php
new file mode 100644
index 000..4ec7bdb
--- /dev/null
+++ b/MsLinks.i18n.php
@@ -0,0 +1,35 @@
+?php
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ *
[MediaWiki-commits] [Gerrit] shinken: Don't specify any contacts for services - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174944
Change subject: shinken: Don't specify any contacts for services
..
shinken: Don't specify any contacts for services
This allows notifications to pass directly through to the
contacts specified for the host/hostgroup
Change-Id: I9dcb05572f08b0367a8e912899f5edd467738742
---
M modules/shinken/files/basic-checks.cfg
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/174944/1
diff --git a/modules/shinken/files/basic-checks.cfg
b/modules/shinken/files/basic-checks.cfg
index 9c9475b..83b9c1d 100644
--- a/modules/shinken/files/basic-checks.cfg
+++ b/modules/shinken/files/basic-checks.cfg
@@ -5,7 +5,6 @@
# Check that all mounts have at least 10% free space (for warn), 5% (for crit)
define service {
check_command
check_graphite_series_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.diskspace.*.byte_percentfree.value!15!10!10min!1!--under
-contacts guest
hostgroup_name labshost
service_descriptionFree space - all mounts
usegeneric-service
@@ -15,7 +14,6 @@
# Check for puppet failure events
define service {
check_command
check_graphite_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.failed_events.value!0!0!10min!1!--over
-contacts guest
hostgroup_name labshost
service_descriptionPuppet failure
usegeneric-service
@@ -24,7 +22,6 @@
# Check for puppet staleness
define service {
check_command
check_graphite_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.time_since_last_run.value!3600!43200!10min!1!--over
-contacts guest
hostgroup_name labshost
service_descriptionPuppet staleness
usegeneric-service
--
To view, visit https://gerrit.wikimedia.org/r/174944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dcb05572f08b0367a8e912899f5edd467738742
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Javadoc comments to WikidataCache. - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Add Javadoc comments to WikidataCache.
..
Add Javadoc comments to WikidataCache.
The methods in WikidataCache are quite complicated, and it might not be
outwardly clear which ones are best to use for any particular purpose.
This patch adds Javadoc comments to the class so that it's a bit clearer how
to use it.
Change-Id: I2d0595c99a42592bde68114f1e6db2cb14686255
---
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
1 file changed, 52 insertions(+), 3 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
b/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
index b05be2a..2813a30 100644
--- a/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
+++ b/wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
@@ -10,7 +10,6 @@
public class WikidataCache {
private static final int MAX_CACHE_SIZE_DESCRIPTIONS = 96;
-
private WikipediaApp app;
private ParcelableLruCacheString descriptionCache
= new ParcelableLruCacheString(MAX_CACHE_SIZE_DESCRIPTIONS,
String.class);
@@ -19,31 +18,81 @@
this.app = app;
}
+/**
+ * Removes all the data in the Wikidata descriptions cache.
+ */
public void clear() {
descriptionCache.evictAll();
}
+/**
+ * Adds the description for a Wikidata item directly to the Wikidata
description cache.
+ *
+ * This method should be used sparingly. Instead of putting descriptions
directly into the
+ * cache consider using the get method instead, which will (if necessary)
retrieve descriptions
+ * that the cache currently does not contain and cache them itself if
appropriate.
+ *
+ * @param key Wikidata ID of the page for which the description is to be
cached.
+ * @param value Wikidata description of the page associated with the
Wikidata ID.
+ */
public void put(String key, String value) {
descriptionCache.put(key, value);
}
+/**
+ * Retrieves the description for a Wikidata item directly from the
Wikidata description cache.
+ *
+ * This method should be used sparingly. Instead of getting descriptions
directly from the
+ * cache consider using the get method instead, which will (if necessary)
retrieve descriptions
+ * that the cache currently does not contain and cache them itself if
appropriate.
+ *
+ * @param id Wikidata ID of the page for which the description is required.
+ * @return The Wikidata description that was cached, or null if the
description is not cached.
+ */
public String get(String id) {
return descriptionCache.get(id);
}
+/**
+ * Retrieves Wikidata description for a page in the app's current primary
language.
+ *
+ * @param id Wikidata ID of the page for which the description is required.
+ * @param listener Listener that will receive the description retrieved
from the cache.
+ */
public void get(String id, OnWikidataReceiveListener listener) {
get(id, app.getPrimaryLanguage(), listener);
}
+/**
+ * Retrieves Wikidata description for a page in the specified language.
+ *
+ * @param id Wikidata ID of the page for which the description is required.
+ * @param language The language in which the description is required.
+ * @param listener Listener that will receive the description retrieved
from the cache.
+ */
public void get(String id, String language, OnWikidataReceiveListener
listener) {
ListString idList = new ArrayListString();
idList.add(id);
get(idList, language, listener);
}
+
+/**
+ * Retrieves Wikidata descriptions for a list of pages in the app's
current primary language.
+ *
+ * @param ids Wikidata IDs of the pages for which the descriptions are
required.
+ * @param listener Listener that will receive the descriptions retrieved
from the cache.
+ */
public void get(ListString ids, final OnWikidataReceiveListener
listener) {
get(ids, app.getPrimaryLanguage(), listener);
}
+/**
+ * Retrieves Wikidata descriptions for a list of pages in the specified
language.
+ *
+ * @param ids Wikidata IDs of the pages for which the descriptions are
required.
+ * @param language The language in which the descriptions are required.
+ * @param listener Listener that will receive the descriptions retrieved
from the cache.
+ */
public void get(ListString ids, final String language, final
OnWikidataReceiveListener listener) {
final MapString, String results = new HashMapString, String();
ListString idsToFetch = new ArrayListString();
@@ -68,8 +117,8 @@
[MediaWiki-commits] [Gerrit] shinken: Don't specify any contacts for services - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Don't specify any contacts for services
..
shinken: Don't specify any contacts for services
This allows notifications to pass directly through to the
contacts specified for the host/hostgroup
Change-Id: I9dcb05572f08b0367a8e912899f5edd467738742
---
M modules/shinken/files/basic-checks.cfg
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/shinken/files/basic-checks.cfg
b/modules/shinken/files/basic-checks.cfg
index 9c9475b..83b9c1d 100644
--- a/modules/shinken/files/basic-checks.cfg
+++ b/modules/shinken/files/basic-checks.cfg
@@ -5,7 +5,6 @@
# Check that all mounts have at least 10% free space (for warn), 5% (for crit)
define service {
check_command
check_graphite_series_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.diskspace.*.byte_percentfree.value!15!10!10min!1!--under
-contacts guest
hostgroup_name labshost
service_descriptionFree space - all mounts
usegeneric-service
@@ -15,7 +14,6 @@
# Check for puppet failure events
define service {
check_command
check_graphite_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.failed_events.value!0!0!10min!1!--over
-contacts guest
hostgroup_name labshost
service_descriptionPuppet failure
usegeneric-service
@@ -24,7 +22,6 @@
# Check for puppet staleness
define service {
check_command
check_graphite_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.time_since_last_run.value!3600!43200!10min!1!--over
-contacts guest
hostgroup_name labshost
service_descriptionPuppet staleness
usegeneric-service
--
To view, visit https://gerrit.wikimedia.org/r/174944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9dcb05572f08b0367a8e912899f5edd467738742
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@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] Adding dns entries for mw1247-58 - change (operations/dns)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174945
Change subject: Adding dns entries for mw1247-58
..
Adding dns entries for mw1247-58
Change-Id: I65261cda7f49a066680aa29e4a0ea1923a9b0b8f
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 48 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/45/174945/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 61ce21a..e46285c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -975,6 +975,18 @@
79 1H IN PTR mw1244.eqiad.wmnet.
80 1H IN PTR mw1245.eqiad.wmnet.
81 1H IN PTR mw1246.eqiad.wmnet.
+82 1H IN PTR mw1247.eqiad.wmnet.
+83 1H IN PTR mw1248.eqiad.wmnet.
+84 1H IN PTR mw1249.eqiad.wmnet.
+85 1H IN PTR mw1250.eqiad.wmnet.
+86 1H IN PTR mw1251.eqiad.wmnet.
+87 1H IN PTR mw1252.eqiad.wmnet.
+88 1H IN PTR mw1253.eqiad.wmnet.
+89 1H IN PTR mw1254.eqiad.wmnet.
+90 1H IN PTR mw1255.eqiad.wmnet.
+91 1H IN PTR mw1256.eqiad.wmnet.
+92 1H IN PTR mw1257.eqiad.wmnet.
+93 1H IN PTR mw1258.eqiad.wmnet.
$ORIGIN 49.64.{{ zonename }}.
1 1H IN PTR vl1020-eth3.lvs1001.wikimedia.org.
@@ -1569,6 +1581,18 @@
94 1H IN PTR mw1244.mgmt.eqiad.wmnet.
95 1H IN PTR mw1245.mgmt.eqiad.wmnet.
96 1H IN PTR mw1246.mgmt.eqiad.wmnet.
+97 1H IN PTR mw1247.mgmt.eqiad.wmnet.
+98 1H IN PTR mw1248.mgmt.eqiad.wmnet.
+99 1H IN PTR mw1249.mgmt.eqiad.wmnet.
+100 1H IN PTR mw1250.mgmt.eqiad.wmnet.
+101 1H IN PTR mw1251.mgmt.eqiad.wmnet.
+102 1H IN PTR mw1252.mgmt.eqiad.wmnet.
+103 1H IN PTR mw1253.mgmt.eqiad.wmnet.
+104 1H IN PTR mw1254.mgmt.eqiad.wmnet.
+105 1H IN PTR mw1255.mgmt.eqiad.wmnet.
+106 1H IN PTR mw1256.mgmt.eqiad.wmnet.
+107 1H IN PTR mw1257.mgmt.eqiad.wmnet.
+108 1H IN PTR mw1258.mgmt.eqiad.wmnet.
$ORIGIN 3.65.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 5003da3..c642db0 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -610,6 +610,18 @@
mw1244 1H IN A10.64.48.79
mw1245 1H IN A10.64.48.80
mw1246 1H IN A10.64.48.81
+mw1247 1H IN A10.64.48.82
+mw1248 1H IN A10.64.48.83
+mw1249 1H IN A10.64.48.84
+mw1250 1H IN A10.64.48.85
+mw1251 1H IN A10.64.48.86
+mw1252 1H IN A10.64.48.87
+mw1253 1H IN A10.64.48.88
+mw1254 1H IN A10.64.48.89
+mw1255 1H IN A10.64.48.90
+mw1256 1H IN A10.64.48.91
+mw1257 1H IN A10.64.48.92
+mw1258 1H IN A10.64.48.93
ocg1001 1H IN A10.64.32.151
ocg1002 1H IN A10.64.48.42
ocg1003 1H IN A10.64.48.43
@@ -1619,6 +1631,18 @@
mw1244 1H IN A10.65.2.94
mw1245 1H IN A10.65.2.95
mw1246 1H IN A10.65.2.96
+mw1247 1H IN A10.65.2.97
+mw1248 1H IN A10.65.2.98
+mw1249 1H IN A10.65.2.99
+mw1250 1H IN A10.65.2.100
+mw1251 1H IN A10.65.2.101
+mw1252 1H IN A10.65.2.102
+mw1253 1H IN A10.65.2.103
+mw1254 1H IN A10.65.2.104
+mw1255 1H IN A10.65.2.105
+mw1256 1H IN A10.65.2.106
+mw1257 1H IN A10.65.2.107
+mw1258 1H IN A10.65.2.108
osm-cp1001 1H IN A10.65.3.90
osm-cp1002 1H IN A10.65.3.91
osm-cp1003 1H IN A10.65.3.92
--
To view, visit https://gerrit.wikimedia.org/r/174945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65261cda7f49a066680aa29e4a0ea1923a9b0b8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding dns entries for mw1247-58 - change (operations/dns)
Cmjohnson has submitted this change and it was merged.
Change subject: Adding dns entries for mw1247-58
..
Adding dns entries for mw1247-58
Change-Id: I65261cda7f49a066680aa29e4a0ea1923a9b0b8f
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 48 insertions(+), 0 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 61ce21a..e46285c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -975,6 +975,18 @@
79 1H IN PTR mw1244.eqiad.wmnet.
80 1H IN PTR mw1245.eqiad.wmnet.
81 1H IN PTR mw1246.eqiad.wmnet.
+82 1H IN PTR mw1247.eqiad.wmnet.
+83 1H IN PTR mw1248.eqiad.wmnet.
+84 1H IN PTR mw1249.eqiad.wmnet.
+85 1H IN PTR mw1250.eqiad.wmnet.
+86 1H IN PTR mw1251.eqiad.wmnet.
+87 1H IN PTR mw1252.eqiad.wmnet.
+88 1H IN PTR mw1253.eqiad.wmnet.
+89 1H IN PTR mw1254.eqiad.wmnet.
+90 1H IN PTR mw1255.eqiad.wmnet.
+91 1H IN PTR mw1256.eqiad.wmnet.
+92 1H IN PTR mw1257.eqiad.wmnet.
+93 1H IN PTR mw1258.eqiad.wmnet.
$ORIGIN 49.64.{{ zonename }}.
1 1H IN PTR vl1020-eth3.lvs1001.wikimedia.org.
@@ -1569,6 +1581,18 @@
94 1H IN PTR mw1244.mgmt.eqiad.wmnet.
95 1H IN PTR mw1245.mgmt.eqiad.wmnet.
96 1H IN PTR mw1246.mgmt.eqiad.wmnet.
+97 1H IN PTR mw1247.mgmt.eqiad.wmnet.
+98 1H IN PTR mw1248.mgmt.eqiad.wmnet.
+99 1H IN PTR mw1249.mgmt.eqiad.wmnet.
+100 1H IN PTR mw1250.mgmt.eqiad.wmnet.
+101 1H IN PTR mw1251.mgmt.eqiad.wmnet.
+102 1H IN PTR mw1252.mgmt.eqiad.wmnet.
+103 1H IN PTR mw1253.mgmt.eqiad.wmnet.
+104 1H IN PTR mw1254.mgmt.eqiad.wmnet.
+105 1H IN PTR mw1255.mgmt.eqiad.wmnet.
+106 1H IN PTR mw1256.mgmt.eqiad.wmnet.
+107 1H IN PTR mw1257.mgmt.eqiad.wmnet.
+108 1H IN PTR mw1258.mgmt.eqiad.wmnet.
$ORIGIN 3.65.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 5003da3..c642db0 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -610,6 +610,18 @@
mw1244 1H IN A10.64.48.79
mw1245 1H IN A10.64.48.80
mw1246 1H IN A10.64.48.81
+mw1247 1H IN A10.64.48.82
+mw1248 1H IN A10.64.48.83
+mw1249 1H IN A10.64.48.84
+mw1250 1H IN A10.64.48.85
+mw1251 1H IN A10.64.48.86
+mw1252 1H IN A10.64.48.87
+mw1253 1H IN A10.64.48.88
+mw1254 1H IN A10.64.48.89
+mw1255 1H IN A10.64.48.90
+mw1256 1H IN A10.64.48.91
+mw1257 1H IN A10.64.48.92
+mw1258 1H IN A10.64.48.93
ocg1001 1H IN A10.64.32.151
ocg1002 1H IN A10.64.48.42
ocg1003 1H IN A10.64.48.43
@@ -1619,6 +1631,18 @@
mw1244 1H IN A10.65.2.94
mw1245 1H IN A10.65.2.95
mw1246 1H IN A10.65.2.96
+mw1247 1H IN A10.65.2.97
+mw1248 1H IN A10.65.2.98
+mw1249 1H IN A10.65.2.99
+mw1250 1H IN A10.65.2.100
+mw1251 1H IN A10.65.2.101
+mw1252 1H IN A10.65.2.102
+mw1253 1H IN A10.65.2.103
+mw1254 1H IN A10.65.2.104
+mw1255 1H IN A10.65.2.105
+mw1256 1H IN A10.65.2.106
+mw1257 1H IN A10.65.2.107
+mw1258 1H IN A10.65.2.108
osm-cp1001 1H IN A10.65.3.90
osm-cp1002 1H IN A10.65.3.91
osm-cp1003 1H IN A10.65.3.92
--
To view, visit https://gerrit.wikimedia.org/r/174945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65261cda7f49a066680aa29e4a0ea1923a9b0b8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@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] shinken: Fix email commands to work properly - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174946
Change subject: shinken: Fix email commands to work properly
..
shinken: Fix email commands to work properly
Also use templates for contacts
Change-Id: I517ada22351305f43352a632c628ec529cb566c7
---
M modules/shinken/files/contacts.cfg
M modules/shinken/files/templates.cfg
2 files changed, 16 insertions(+), 63 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/174946/1
diff --git a/modules/shinken/files/contacts.cfg
b/modules/shinken/files/contacts.cfg
index f39b287..64ae65d 100644
--- a/modules/shinken/files/contacts.cfg
+++ b/modules/shinken/files/contacts.cfg
@@ -7,14 +7,7 @@
contact_nameguest
alias Guest Account
email guest@guest
-host_notifications_enabled 0
-service_notifications_enabled 0
-host_notification_periodnone
-service_notification_period none
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
passwordguest
}
@@ -22,82 +15,40 @@
contact_nameyuvipanda
alias Yuvi Panda
email yuvipa...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namelegoktm
alias Lego KTM
email lego...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namemilimetric
alias Dan Andreescu
email dandree...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namegreg_g
alias Greg G
email g...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namecmcmahon
alias Chris McMahon
email cmcma...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_nameamusso
alias Antoine Musso
email has...@free.fr
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-
[MediaWiki-commits] [Gerrit] Finishing update - change (mediawiki...MsCatSelect)
Luis Felipe Schenone has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174948
Change subject: Finishing update
..
Finishing update
Change-Id: I65ce5c392a345de33d3e292f9b499e16f4fcd253
---
M MsCatSelect.body.php
M MsCatSelect.js
M MsCatSelect.php
D README.TXT
A README.md
M i18n/en.json
6 files changed, 51 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsCatSelect
refs/changes/48/174948/1
diff --git a/MsCatSelect.body.php b/MsCatSelect.body.php
index 64f9574..841a8ac 100755
--- a/MsCatSelect.body.php
+++ b/MsCatSelect.body.php
@@ -3,20 +3,20 @@
class MsCatSelect {
static function start() {
- global $wgOut, $wgJsMimeType, $wgMSCS_MainCategories,
$wgMSCS_UseNiceDropdown, $wgMSCS_WarnNoCategories;
+ global $wgOut, $wgMSCS_MainCategories, $wgMSCS_UseNiceDropdown,
$wgMSCS_WarnNoCategories, $wgMSCS_WarnNoCategoriesException;
// Load module
$wgOut-addModules( 'ext.MsCatSelect' );
- // Make the configuration available to JavaScript
+ // Make the configuration variables available to JavaScript
$mscsVars = array(
'MainCategories' = $wgMSCS_MainCategories,
'UseNiceDropdown' = $wgMSCS_UseNiceDropdown,
'WarnNoCategories' = $wgMSCS_WarnNoCategories,
+ 'WarnNoCategoriesException' =
$wgMSCS_WarnNoCategoriesException,
);
$mscsVars = json_encode( $mscsVars, true );
- $wgOut-addScript( script type=\{$wgJsMimeType}\var
mscsVars = $mscsVars;/script\n );
-
+ $wgOut-addScript( scriptvar mscsVars = $mscsVars;/script
);
return true;
}
diff --git a/MsCatSelect.js b/MsCatSelect.js
index b909f39..51031be 100755
--- a/MsCatSelect.js
+++ b/MsCatSelect.js
@@ -246,7 +246,7 @@
}
function mscsCheckCategories() {
- if ( mscsVars.WarnNoCategories === true jQuery( '#mscs-added
input[type=checkbox]:checked' ).length === 0 ) {
+ if ( mscsVars.WarnNoCategories === true jQuery( '#mscs-added
input[type=checkbox]:checked' ).length === 0 jQuery.inArray(
mw.config.get( 'wgNamespaceNumber' ), mscsVars.WarnNoCategoriesException ) ===
-1 ) {
return confirm( mediaWiki.msg( 'mscs-warnnocat' ) );
}
return true;
diff --git a/MsCatSelect.php b/MsCatSelect.php
index 0825191..491ee80 100755
--- a/MsCatSelect.php
+++ b/MsCatSelect.php
@@ -3,10 +3,10 @@
$wgExtensionCredits['parserhook'][] = array(
'name' = 'MsCatSelect',
'url' = 'http://www.mediawiki.org/wiki/Extension:MsCatSelect',
- 'version' = 6,
- 'license-name' = 'GPLv2+',
- 'author' = array( '[mailto:mscatsel...@ratin.de Martin Schwindl]',
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe
Schenone]' ),
+ 'version' = '6.0',
'descriptionmsg' = 'mscs-desc',
+ 'license-name' = 'GPLv2+',
+ 'author' = array( '[mailto:w...@ratin.de Martin Schwindl]',
'[mailto:w...@keyler-consult.de Martin Keyler]',
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe
Schenone]' ),
);
$wgResourceModules['ext.MsCatSelect'] = array(
@@ -37,7 +37,8 @@
$wgHooks['EditPage::showEditForm:initial'][] = 'MsCatSelect::showHook';
$wgHooks['EditPage::attemptSave'][] = 'MsCatSelect::saveHook';
-//Configuration defaults
+// Default configuration
$wgMSCS_MainCategories = null;
$wgMSCS_UseNiceDropdown = true;
-$wgMSCS_WarnNoCategories = true;
\ No newline at end of file
+$wgMSCS_WarnNoCategories = true;
+$wgMSCS_WarnNoCategoriesException = array();
\ No newline at end of file
diff --git a/README.TXT b/README.TXT
deleted file mode 100755
index 6bf36ef..000
--- a/README.TXT
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#
-# Author: Martin Schwindl, mscatsel...@ratin.de
-#
-# Updated, debugged and normalised by Luis Felipe Schenone
(scheno...@gmail.com) in 2014
-#
-# Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a
Creative Commons Attribution 3.0 License.
-# http://p.yusukekamiyamane.com
-#
-# Chosen, a Select Box Enhancer for jQuery and Protoype
-# by Patrick Filler for Harvest
-# Available for use under the MIT License
-# Copyright (c) 2011-2013 by Harvest
-# Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the Software), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-# The above copyright notice and this permission notice shall be included in
[MediaWiki-commits] [Gerrit] Finishing update - change (mediawiki...MsCatSelect)
Luis Felipe Schenone has submitted this change and it was merged.
Change subject: Finishing update
..
Finishing update
Change-Id: I65ce5c392a345de33d3e292f9b499e16f4fcd253
---
M MsCatSelect.body.php
M MsCatSelect.js
M MsCatSelect.php
D README.TXT
A README.md
M i18n/en.json
6 files changed, 51 insertions(+), 39 deletions(-)
Approvals:
Luis Felipe Schenone: Verified; Looks good to me, approved
diff --git a/MsCatSelect.body.php b/MsCatSelect.body.php
index 64f9574..841a8ac 100755
--- a/MsCatSelect.body.php
+++ b/MsCatSelect.body.php
@@ -3,20 +3,20 @@
class MsCatSelect {
static function start() {
- global $wgOut, $wgJsMimeType, $wgMSCS_MainCategories,
$wgMSCS_UseNiceDropdown, $wgMSCS_WarnNoCategories;
+ global $wgOut, $wgMSCS_MainCategories, $wgMSCS_UseNiceDropdown,
$wgMSCS_WarnNoCategories, $wgMSCS_WarnNoCategoriesException;
// Load module
$wgOut-addModules( 'ext.MsCatSelect' );
- // Make the configuration available to JavaScript
+ // Make the configuration variables available to JavaScript
$mscsVars = array(
'MainCategories' = $wgMSCS_MainCategories,
'UseNiceDropdown' = $wgMSCS_UseNiceDropdown,
'WarnNoCategories' = $wgMSCS_WarnNoCategories,
+ 'WarnNoCategoriesException' =
$wgMSCS_WarnNoCategoriesException,
);
$mscsVars = json_encode( $mscsVars, true );
- $wgOut-addScript( script type=\{$wgJsMimeType}\var
mscsVars = $mscsVars;/script\n );
-
+ $wgOut-addScript( scriptvar mscsVars = $mscsVars;/script
);
return true;
}
diff --git a/MsCatSelect.js b/MsCatSelect.js
index b909f39..51031be 100755
--- a/MsCatSelect.js
+++ b/MsCatSelect.js
@@ -246,7 +246,7 @@
}
function mscsCheckCategories() {
- if ( mscsVars.WarnNoCategories === true jQuery( '#mscs-added
input[type=checkbox]:checked' ).length === 0 ) {
+ if ( mscsVars.WarnNoCategories === true jQuery( '#mscs-added
input[type=checkbox]:checked' ).length === 0 jQuery.inArray(
mw.config.get( 'wgNamespaceNumber' ), mscsVars.WarnNoCategoriesException ) ===
-1 ) {
return confirm( mediaWiki.msg( 'mscs-warnnocat' ) );
}
return true;
diff --git a/MsCatSelect.php b/MsCatSelect.php
index 0825191..491ee80 100755
--- a/MsCatSelect.php
+++ b/MsCatSelect.php
@@ -3,10 +3,10 @@
$wgExtensionCredits['parserhook'][] = array(
'name' = 'MsCatSelect',
'url' = 'http://www.mediawiki.org/wiki/Extension:MsCatSelect',
- 'version' = 6,
- 'license-name' = 'GPLv2+',
- 'author' = array( '[mailto:mscatsel...@ratin.de Martin Schwindl]',
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe
Schenone]' ),
+ 'version' = '6.0',
'descriptionmsg' = 'mscs-desc',
+ 'license-name' = 'GPLv2+',
+ 'author' = array( '[mailto:w...@ratin.de Martin Schwindl]',
'[mailto:w...@keyler-consult.de Martin Keyler]',
'[https://www.mediawiki.org/wiki/User:Luis_Felipe_Schenone Luis Felipe
Schenone]' ),
);
$wgResourceModules['ext.MsCatSelect'] = array(
@@ -37,7 +37,8 @@
$wgHooks['EditPage::showEditForm:initial'][] = 'MsCatSelect::showHook';
$wgHooks['EditPage::attemptSave'][] = 'MsCatSelect::saveHook';
-//Configuration defaults
+// Default configuration
$wgMSCS_MainCategories = null;
$wgMSCS_UseNiceDropdown = true;
-$wgMSCS_WarnNoCategories = true;
\ No newline at end of file
+$wgMSCS_WarnNoCategories = true;
+$wgMSCS_WarnNoCategoriesException = array();
\ No newline at end of file
diff --git a/README.TXT b/README.TXT
deleted file mode 100755
index 6bf36ef..000
--- a/README.TXT
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#
-# Author: Martin Schwindl, mscatsel...@ratin.de
-#
-# Updated, debugged and normalised by Luis Felipe Schenone
(scheno...@gmail.com) in 2014
-#
-# Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a
Creative Commons Attribution 3.0 License.
-# http://p.yusukekamiyamane.com
-#
-# Chosen, a Select Box Enhancer for jQuery and Protoype
-# by Patrick Filler for Harvest
-# Available for use under the MIT License
-# Copyright (c) 2011-2013 by Harvest
-# Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the Software), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-# The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-# THE
[MediaWiki-commits] [Gerrit] shinken: Fix email commands to work properly - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Fix email commands to work properly
..
shinken: Fix email commands to work properly
Also use templates for contacts
Change-Id: I517ada22351305f43352a632c628ec529cb566c7
---
M modules/shinken/files/contacts.cfg
M modules/shinken/files/templates.cfg
2 files changed, 16 insertions(+), 56 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/shinken/files/contacts.cfg
b/modules/shinken/files/contacts.cfg
index f39b287..ab63ff6 100644
--- a/modules/shinken/files/contacts.cfg
+++ b/modules/shinken/files/contacts.cfg
@@ -12,7 +12,7 @@
host_notification_periodnone
service_notification_period none
service_notification_commands notify-by-email
-host_notification_commands notify-by-email
+host_notification_commands host-notify-by-email
host_notification_options d,u,r
service_notification_optionsw,u,r,c
passwordguest
@@ -22,82 +22,40 @@
contact_nameyuvipanda
alias Yuvi Panda
email yuvipa...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namelegoktm
alias Lego KTM
email lego...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namemilimetric
alias Dan Andreescu
email dandree...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namegreg_g
alias Greg G
email g...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_namecmcmahon
alias Chris McMahon
email cmcma...@wikimedia.org
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
define contact {
contact_nameamusso
alias Antoine Musso
email has...@free.fr
-host_notifications_enabled 1
-service_notifications_enabled 1
-host_notification_period24x7
-service_notification_period 24x7
-service_notification_commands notify-by-email
-host_notification_commands notify-by-email
-host_notification_options d,u,r
-service_notification_optionsw,u,r,c
+use generic-contact
}
diff --git
[MediaWiki-commits] [Gerrit] Adding and correcting new app servers dhcpd file - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174949
Change subject: Adding and correcting new app servers dhcpd file
..
Adding and correcting new app servers dhcpd file
Change-Id: I2476673b101b389180e83b0f80daa27105a955ef
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 72 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/174949/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 3b96221..30f6662 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3275,13 +3275,18 @@
}
host mw1227 {
- hardware ethernet B0:83:FE:CF:12:EB;
+ hardware ethernet B0:83:FE:CF:0A:84;
fixed-address mw1227.eqiad.wmnet;
}
host mw1228 {
- hardware ethernet B0:83:FE:CF:0D:A3;
+ hardware ethernet B0:83:FE:CF:12:EB;
fixed-address mw1228.eqiad.wmnet;
+}
+
+host mw1229 {
+ hardware ethernet B0:83:FE:CF:0D:A3;
+ fixed-address mw1229.eqiad.wmnet;
}
host mw1230 {
@@ -3329,6 +3334,11 @@
fixed-address mw1238.eqiad.wmnet;
}
+host mw1239 {
+ hardware ethernet B0:83:FE:CF:0E:3F;
+ fixed-address mw1239.eqiad.wmnet;
+}
+
host mw1240 {
hardware ethernet B0:83:FE:CF:0F:CD;
fixed-address mw1240.eqiad.wmnet;
@@ -3364,6 +3374,66 @@
fixed-address mw1246.eqiad.wmnet;
}
+host mw1247 {
+ hardware ethernet B0:83:FE:CF:06:4E;
+ fixed-address mw1247.eqiad.wmnet;
+}
+
+host mw1248 {
+ hardware ethernet B0:83:FE:CF:0B:CD;
+ fixed-address mw1248.eqiad.wmnet;
+}
+
+host mw1249 {
+ hardware ethernet B0:83:FE:CF:03:D7;
+ fixed-address mw1249.eqiad.wmnet;
+}
+
+host mw1250 {
+ hardware ethernet B0:83:FE:CF:11:01;
+ fixed-address mw1250.eqiad.wmnet;
+}
+
+host mw1251 {
+ hardware ethernet B0:83:FE:CF:12:87;
+ fixed-address mw1251.eqiad.wmnet;
+}
+
+host mw1252 {
+ hardware ethernet B0:83:FE:CF:0F:F5;
+ fixed-address mw1252.eqiad.wmnet;
+}
+
+host mw1253 {
+ hardware ethernet B0:83:FE:CF:0D:BB;
+ fixed-address mw1253.eqiad.wmnet;
+}
+
+host mw1254 {
+ hardware ethernet B0:83:FE:CF:11:31;
+ fixed-address mw1254.eqiad.wmnet;
+}
+
+host mw1255 {
+ hardware ethernet B0:83:FE:CF:0D:BF;
+ fixed-address mw1255.eqiad.wmnet;
+}
+
+host mw1256 {
+ hardware ethernet B0:83:FE:CF:03:03;
+ fixed-address mw1256.eqiad.wmnet;
+}
+
+host mw1257 {
+ hardware ethernet B0:83:FE:CF:12:BB;
+ fixed-address mw1257.eqiad.wmnet;
+}
+
+host mw1258 {
+ hardware ethernet B0:83:FE:CF:13:13;
+ fixed-address mw1258.eqiad.wmnet;
+}
+
host neon {
hardware ethernet 78:2b:cb:08:a4:2f;
fixed-address neon.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/174949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2476673b101b389180e83b0f80daa27105a955ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Also whitelist IPv6 ips for bouncehandler - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174950
Change subject: Also whitelist IPv6 ips for bouncehandler
..
Also whitelist IPv6 ips for bouncehandler
... this should really migrate towards using a shared secret
and not this crappy IP whitelist.
Change-Id: I9f8a3220e8fbe8cf307d6280bcb6f11b33d8c993
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/50/174950/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 07309ba..9c09aab 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2215,7 +2215,7 @@
$wgBounceHandlerUnconfirmUsers = false;
$wgBounceHandlerCluster = 'extension1';
$wgBounceHandlerSharedDB = 'wikishared';
- $wgBounceHandlerInternalIPs = array( '208.80.154.90', '208.80.154.89'
); # polonium and lead
+ $wgBounceHandlerInternalIPs = array( '208.80.154.90', '208.80.154.89',
'2620:0:861:3:208:80:154:90', '2620:0:861:3:208:80:154:91',
'2620:0:861:3:ca1f:66ff:febf:8dd6' ); # polonium and lead
}
if ( $wmgUseTranslate ) {
--
To view, visit https://gerrit.wikimedia.org/r/174950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f8a3220e8fbe8cf307d6280bcb6f11b33d8c993
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding and correcting new app servers dhcpd file - change (operations/puppet)
Cmjohnson has submitted this change and it was merged.
Change subject: Adding and correcting new app servers dhcpd file
..
Adding and correcting new app servers dhcpd file
Change-Id: I2476673b101b389180e83b0f80daa27105a955ef
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 72 insertions(+), 2 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 3b96221..30f6662 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3275,13 +3275,18 @@
}
host mw1227 {
- hardware ethernet B0:83:FE:CF:12:EB;
+ hardware ethernet B0:83:FE:CF:0A:84;
fixed-address mw1227.eqiad.wmnet;
}
host mw1228 {
- hardware ethernet B0:83:FE:CF:0D:A3;
+ hardware ethernet B0:83:FE:CF:12:EB;
fixed-address mw1228.eqiad.wmnet;
+}
+
+host mw1229 {
+ hardware ethernet B0:83:FE:CF:0D:A3;
+ fixed-address mw1229.eqiad.wmnet;
}
host mw1230 {
@@ -3329,6 +3334,11 @@
fixed-address mw1238.eqiad.wmnet;
}
+host mw1239 {
+ hardware ethernet B0:83:FE:CF:0E:3F;
+ fixed-address mw1239.eqiad.wmnet;
+}
+
host mw1240 {
hardware ethernet B0:83:FE:CF:0F:CD;
fixed-address mw1240.eqiad.wmnet;
@@ -3364,6 +3374,66 @@
fixed-address mw1246.eqiad.wmnet;
}
+host mw1247 {
+ hardware ethernet B0:83:FE:CF:06:4E;
+ fixed-address mw1247.eqiad.wmnet;
+}
+
+host mw1248 {
+ hardware ethernet B0:83:FE:CF:0B:CD;
+ fixed-address mw1248.eqiad.wmnet;
+}
+
+host mw1249 {
+ hardware ethernet B0:83:FE:CF:03:D7;
+ fixed-address mw1249.eqiad.wmnet;
+}
+
+host mw1250 {
+ hardware ethernet B0:83:FE:CF:11:01;
+ fixed-address mw1250.eqiad.wmnet;
+}
+
+host mw1251 {
+ hardware ethernet B0:83:FE:CF:12:87;
+ fixed-address mw1251.eqiad.wmnet;
+}
+
+host mw1252 {
+ hardware ethernet B0:83:FE:CF:0F:F5;
+ fixed-address mw1252.eqiad.wmnet;
+}
+
+host mw1253 {
+ hardware ethernet B0:83:FE:CF:0D:BB;
+ fixed-address mw1253.eqiad.wmnet;
+}
+
+host mw1254 {
+ hardware ethernet B0:83:FE:CF:11:31;
+ fixed-address mw1254.eqiad.wmnet;
+}
+
+host mw1255 {
+ hardware ethernet B0:83:FE:CF:0D:BF;
+ fixed-address mw1255.eqiad.wmnet;
+}
+
+host mw1256 {
+ hardware ethernet B0:83:FE:CF:03:03;
+ fixed-address mw1256.eqiad.wmnet;
+}
+
+host mw1257 {
+ hardware ethernet B0:83:FE:CF:12:BB;
+ fixed-address mw1257.eqiad.wmnet;
+}
+
+host mw1258 {
+ hardware ethernet B0:83:FE:CF:13:13;
+ fixed-address mw1258.eqiad.wmnet;
+}
+
host neon {
hardware ethernet 78:2b:cb:08:a4:2f;
fixed-address neon.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/174949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2476673b101b389180e83b0f80daa27105a955ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@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] Also whitelist IPv6 ips for bouncehandler - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Also whitelist IPv6 ips for bouncehandler
..
Also whitelist IPv6 ips for bouncehandler
... this should really migrate towards using a shared secret
and not this crappy IP whitelist.
Change-Id: I9f8a3220e8fbe8cf307d6280bcb6f11b33d8c993
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 07309ba..9c09aab 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2215,7 +2215,7 @@
$wgBounceHandlerUnconfirmUsers = false;
$wgBounceHandlerCluster = 'extension1';
$wgBounceHandlerSharedDB = 'wikishared';
- $wgBounceHandlerInternalIPs = array( '208.80.154.90', '208.80.154.89'
); # polonium and lead
+ $wgBounceHandlerInternalIPs = array( '208.80.154.90', '208.80.154.89',
'2620:0:861:3:208:80:154:90', '2620:0:861:3:208:80:154:91',
'2620:0:861:3:ca1f:66ff:febf:8dd6' ); # polonium and lead
}
if ( $wmgUseTranslate ) {
--
To view, visit https://gerrit.wikimedia.org/r/174950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f8a3220e8fbe8cf307d6280bcb6f11b33d8c993
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bouncehandler: Use the API pool for API requests - change (operations/puppet)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174951
Change subject: Bouncehandler: Use the API pool for API requests
..
Bouncehandler: Use the API pool for API requests
Change-Id: I643ed6df42bfd8694744ae848a2474910166d815
---
M manifests/role/mail.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/174951/1
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 86027a8..06ec7d5 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -38,7 +38,7 @@
'wikimedia.org'
]
$verp_post_connect_server = 'test2.wikipedia.org'
-$verp_bounce_post_url =
appservers.svc.${::mw_primary}.wmnet/w/api.php
+$verp_bounce_post_url =
api.svc.${::mw_primary}.wmnet/w/api.php
}
default: {
fail('unknown realm, should be labs or production')
--
To view, visit https://gerrit.wikimedia.org/r/174951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I643ed6df42bfd8694744ae848a2474910166d815
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'BounceHandler' to wgDebugLogGroups - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/174952 Change subject: Add 'BounceHandler' to wgDebugLogGroups .. Add 'BounceHandler' to wgDebugLogGroups Change-Id: Id604c41229d38288e6ae5adaf71ffc594f7e63e7 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/52/174952/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index bb82875..2db933d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4201,6 +4201,7 @@ 'collection' = udp://$wmfUdp2logDest/collection, // -cscott for bug 71675 'GlobalTitleFail' = udp://$wmfUdp2logDest/globaltitlefail, // chad hates $wgTitle 'FSFileBackend' = udp://$wmfUdp2logDest/fsfilebackend, // - gilles for bug 73229 + 'BounceHandler' = udp://$wmfUdp2logDest/bouncehandler, // - tonythomas' BounceHandler ext. ), '+enwiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/174952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id604c41229d38288e6ae5adaf71ffc594f7e63e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removing mw1227, 1230-33 from dsh groups...reinstalling - change (operations/puppet)
Cmjohnson has uploaded a new change for review. https://gerrit.wikimedia.org/r/174953 Change subject: removing mw1227,1230-33 from dsh groups...reinstalling .. removing mw1227,1230-33 from dsh groups...reinstalling Change-Id: I4c610f3c2a71f3cc5652e70053f60a1ee14552c3 --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 1 insertion(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/174953/1 diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index 2ad30ba..9c0da16 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -218,11 +218,7 @@ mw1218 mw1219 mw1220 -mw1227 -mw1230 -mw1231 -mw1232 -mw1233 + mw1234 mw1235 mw1236 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 9f426d7..bf66c1b 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -227,11 +227,6 @@ mw1218 mw1219 mw1220 -mw1227 -mw1230 -mw1231 -mw1232 -mw1233 mw1234 mw1235 mw1236 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index 21ffe20..f057723 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -218,11 +218,6 @@ mw1218 mw1219 mw1220 -mw1227 -mw1230 -mw1231 -mw1232 -mw1233 mw1234 mw1235 mw1236 -- To view, visit https://gerrit.wikimedia.org/r/174953 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c610f3c2a71f3cc5652e70053f60a1ee14552c3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removing mw1227, 1230-33 from dsh groups...reinstalling - change (operations/puppet)
Cmjohnson has submitted this change and it was merged. Change subject: removing mw1227,1230-33 from dsh groups...reinstalling .. removing mw1227,1230-33 from dsh groups...reinstalling Change-Id: I4c610f3c2a71f3cc5652e70053f60a1ee14552c3 --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 1 insertion(+), 15 deletions(-) Approvals: Cmjohnson: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index 2ad30ba..9c0da16 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -218,11 +218,7 @@ mw1218 mw1219 mw1220 -mw1227 -mw1230 -mw1231 -mw1232 -mw1233 + mw1234 mw1235 mw1236 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 9f426d7..bf66c1b 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -227,11 +227,6 @@ mw1218 mw1219 mw1220 -mw1227 -mw1230 -mw1231 -mw1232 -mw1233 mw1234 mw1235 mw1236 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index 21ffe20..f057723 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -218,11 +218,6 @@ mw1218 mw1219 mw1220 -mw1227 -mw1230 -mw1231 -mw1232 -mw1233 mw1234 mw1235 mw1236 -- To view, visit https://gerrit.wikimedia.org/r/174953 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c610f3c2a71f3cc5652e70053f60a1ee14552c3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org Gerrit-Reviewer: Cmjohnson cmjohn...@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 'BounceHandler' to wgDebugLogGroups - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add 'BounceHandler' to wgDebugLogGroups .. Add 'BounceHandler' to wgDebugLogGroups Change-Id: Id604c41229d38288e6ae5adaf71ffc594f7e63e7 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index bb82875..2db933d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4201,6 +4201,7 @@ 'collection' = udp://$wmfUdp2logDest/collection, // -cscott for bug 71675 'GlobalTitleFail' = udp://$wmfUdp2logDest/globaltitlefail, // chad hates $wgTitle 'FSFileBackend' = udp://$wmfUdp2logDest/fsfilebackend, // - gilles for bug 73229 + 'BounceHandler' = udp://$wmfUdp2logDest/bouncehandler, // - tonythomas' BounceHandler ext. ), '+enwiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/174952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id604c41229d38288e6ae5adaf71ffc594f7e63e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Jgreen jgr...@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] Introduces monitoring of multiple files for cache invalidation - change (mediawiki...Bootstrap)
Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174954
Change subject: Introduces monitoring of multiple files for cache invalidation
..
Introduces monitoring of multiple files for cache invalidation
* adds composer.lock to default list of files monitored for cache triggering
* adds 'cachetriggers' key to keys recognized by ResourceLoaderBootstrapModule
* adds 'cachetriggers' key to $wgResourcemodules[ 'ext.bootstrap.styles' ]
Change-Id: I32a198f1b6f34d8fa93c4e650cd2f3f6f781c5de
---
M Bootstrap.php
M src/BootstrapManager.php
M src/Hooks/SetupAfterCache.php
M src/ResourceLoaderBootstrapModule.php
M tests/phpunit/BootstrapManagerTest.php
M tests/phpunit/Hooks/SetupAfterCacheTest.php
M tests/phpunit/ResourceLoaderBootstrapModuleTest.php
7 files changed, 196 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Bootstrap
refs/changes/54/174954/1
diff --git a/Bootstrap.php b/Bootstrap.php
index 96ee9a7..b82ff09 100644
--- a/Bootstrap.php
+++ b/Bootstrap.php
@@ -49,7 +49,7 @@
/**
* The extension version
*/
- define( 'BS_VERSION', '1.0.2-alpha' );
+ define( 'BS_VERSION', '1.1-alpha' );
// register the extension
$GLOBALS[ 'wgExtensionCredits' ][ 'other' ][ ] = array(
@@ -77,6 +77,7 @@
$configuration = array();
$configuration[ 'localBasePath' ] = str_replace(
DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR . 'Bootstrap',
'/vendor/twitter/bootstrap', __DIR__ );
$configuration[ 'remoteBasePath' ] = str_replace( $GLOBALS[
'IP' ], $GLOBALS[ 'wgScriptPath' ], $configuration[ 'localBasePath' ] );
+ $configuration[ 'IP' ] = $GLOBALS[ 'IP' ];
$setupAfterCache = new \Bootstrap\Hooks\SetupAfterCache(
$configuration );
$setupAfterCache-process();
@@ -89,6 +90,10 @@
'styles' = array(),
'variables' = array(),
'dependencies' = array(),
+ 'cachetriggers' = array(
+ 'LocalSettings.php' = null,
+ 'composer.lock' = null,
+ ),
);
$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.scripts' ] = array(
diff --git a/src/BootstrapManager.php b/src/BootstrapManager.php
index 225aef2..7248320 100644
--- a/src/BootstrapManager.php
+++ b/src/BootstrapManager.php
@@ -113,23 +113,22 @@
/**
* @param string $filetype 'styles'|'scripts'
-* @param array|string $description
+* @param mixed[] $description
* @param $fileExt
-*
-* @internal param $relativePath
*/
protected function addFilesToGlobalResourceModules ( $filetype,
$description, $fileExt ) {
if ( isset( $description[ $filetype ] ) ) {
- $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.' .
$filetype ][ $filetype ] =
- array_merge(
- $GLOBALS[ 'wgResourceModules' ][
'ext.bootstrap.' . $filetype ][ $filetype ],
- array_map(
- function ( $filename ) use (
$fileExt ) { return $filename . $fileExt; },
- (array) $description[ $filetype
]
- )
- );
+ $files = array_map(
+ function ( $filename ) use ( $fileExt ) {
+ return $filename . $fileExt;
+ },
+ (array) $description[ $filetype ]
+ );
+
+ $this-adjustArrayElementOfResourceModuleDescription(
$filetype, $files, $filetype );
+
}
}
@@ -151,7 +150,7 @@
* @internal param string $path
*/
public function addExternalModule( $file, $remotePath = '' ) {
- $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][
'external styles' ][ $file ] = $remotePath;
+ $this-adjustArrayElementOfResourceModuleDescription( 'external
styles', array( $file = $remotePath ) );
}
/**
@@ -167,14 +166,18 @@
/**
* @since 1.0
*
-* @param $variables
+* @param mixed[] $variables
*/
public function setLessVariables( $variables ) {
- $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][
'variables' ] =
- array_merge(
- $GLOBALS[ 'wgResourceModules' ][
'ext.bootstrap.styles' ][ 'variables' ],
- $variables
- );
+
[MediaWiki-commits] [Gerrit] Replaced sync method modifyBody with async - change (mediawiki...citoid)
Mvolz has submitted this change and it was merged.
Change subject: Replaced sync method modifyBody with async
..
Replaced sync method modifyBody with async
Replaced syncronous method modifyBody()
and syncronous methods convertToMediawiki(),
convertToMWDeprecated() and convertToZotero()
with asyncronous methods selectFormatFcn(),
convertToMediawikiAsync(), convertToMWDeprecatedAsync(),
and convertToZoteroAsync.
Converted associated citation property methods
to async pattern as well, such as fixAccessDate(),
fixURL, addPMID(), etc.
Fixes race condition bug apparent in the /api endpoint.
Change-Id: Icaef5a5f74fb240e9c45892b0c9d2f1c779dff38
---
M lib/zotero.js
M server.js
2 files changed, 101 insertions(+), 88 deletions(-)
Approvals:
Mvolz: Verified; Looks good to me, approved
diff --git a/lib/zotero.js b/lib/zotero.js
index 17db3d2..d2bba9e 100644
--- a/lib/zotero.js
+++ b/lib/zotero.js
@@ -6,6 +6,7 @@
*/
var request = require('request');
+var async = require('async');
/**
* Requests to Zotero server
@@ -25,7 +26,11 @@
request(options, function (error, response, body) {
if (!error response.statusCode == 200) {
- callback(error, response, modifyBody(requestedURL,
opts.format, body));
+ selectFormatFcn(opts.format, function(convert){
+ convert(requestedURL, body,
function(modifiedBody){
+ callback(error, response, modifiedBody);
+ });
+ });
}
else {
callback(error, response, body);
@@ -34,102 +39,99 @@
});
};
-/**
- * Modify body of a zotero or other response body
- * @param {String} urloriginal uri requested
- * @param {String} format 'mediawiki', 'mwDeprecated', 'zotero', etc.
- * @param {Object} body JSON request body
- * @return {Object}JSON request body
- */
-var modifyBody = function(url, format, body){
+/*Picks fcn given format*/
+var selectFormatFcn = function (format, callback){
var formatFcns = {
- 'mwDeprecated':convertToMWDeprecated,
- 'mediawiki':convertToMediawiki,
- 'zotero':convertToZotero
- },
- convert = formatFcns[format];
-
- //if format is not available, use zotero as default- may want to switch
to returning error instead
- if (convert){
- return convert(url, body);
- }
- else {
- return convertToZotero(url, body);
- }
+ 'mwDeprecated':convertToMWDeprecatedAsync,
+ 'mediawiki':convertToMediawikiAsync,
+ 'zotero':convertToZoteroAsync
+ };
+ callback(formatFcns[format]);
};
/*Specific conversion methods*/
-var convertToZotero = function(url, body){
- citation = body[0][0];
+var convertToZoteroAsync = function (url, body, callback){
+ var citation = body[0][0];
- fixAccessDate(citation);
- fixURL(url, citation);
+ async.waterfall([
+ function(cb){ //this function exists to pass url to fixURLAsync
+ cb(null, url, citation);
+ },
+ fixURL, //must go directly after unnamed function that hands it
url
+ fixAccessDate
+ ], function (err, citation) {
+ callback([[citation]]);
+ });
- return [[citation]];
};
-var convertToMediawiki = function(url, body){
+var convertToMediawikiAsync = function (url, body, callback){
+ var citation = body[0][0];
- citation = body[0][0];
+ async.waterfall([
+ function(cb){ //this function exists to pass url to fixURLAsync
+ cb(null, url, citation);
+ },
+ fixURL, //must go directly after unnamed function that hands it
url
+ fixAccessDate,
+ replaceCreators,
+ addPMID,
+ fixISBN,
+ fixISSN
+ ], function (err, citation) {
+ callback([[citation]]);
+ });
- replaceCreators(citation);
- addPMID(citation);
- fixURL(url, citation);
- fixAccessDate(citation);
- fixISBN(citation);
- fixISSN(citation);
-
- return [citation];
};
-var convertToMWDeprecated = function(url, body){
- var zotCreators, issn,
+var convertToMWDeprecatedAsync = function (url, body, callback){
+ var zotCreators, creatorFieldName,
creatorTypeCount = {},
citation = body[0][0];
- //flattens creator field
- if (citation.creators) {
- zotCreators = citation.creators;
+ async.waterfall([
+ function(cb){ //this function exists to pass url to fixURLAsync
+ cb(null, url,
[MediaWiki-commits] [Gerrit] Introduces monitoring of multiple files for cache invalidation - change (mediawiki...Bootstrap)
Foxtrott has submitted this change and it was merged.
Change subject: Introduces monitoring of multiple files for cache invalidation
..
Introduces monitoring of multiple files for cache invalidation
* adds composer.lock to default list of files monitored for cache triggering
* adds 'cachetriggers' key to keys recognized by ResourceLoaderBootstrapModule
* adds 'cachetriggers' key to $wgResourcemodules[ 'ext.bootstrap.styles' ]
Change-Id: I32a198f1b6f34d8fa93c4e650cd2f3f6f781c5de
---
M Bootstrap.php
M src/BootstrapManager.php
M src/Hooks/SetupAfterCache.php
M src/ResourceLoaderBootstrapModule.php
M tests/phpunit/BootstrapManagerTest.php
M tests/phpunit/Hooks/SetupAfterCacheTest.php
M tests/phpunit/ResourceLoaderBootstrapModuleTest.php
7 files changed, 196 insertions(+), 47 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/Bootstrap.php b/Bootstrap.php
index 96ee9a7..b82ff09 100644
--- a/Bootstrap.php
+++ b/Bootstrap.php
@@ -49,7 +49,7 @@
/**
* The extension version
*/
- define( 'BS_VERSION', '1.0.2-alpha' );
+ define( 'BS_VERSION', '1.1-alpha' );
// register the extension
$GLOBALS[ 'wgExtensionCredits' ][ 'other' ][ ] = array(
@@ -77,6 +77,7 @@
$configuration = array();
$configuration[ 'localBasePath' ] = str_replace(
DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR . 'Bootstrap',
'/vendor/twitter/bootstrap', __DIR__ );
$configuration[ 'remoteBasePath' ] = str_replace( $GLOBALS[
'IP' ], $GLOBALS[ 'wgScriptPath' ], $configuration[ 'localBasePath' ] );
+ $configuration[ 'IP' ] = $GLOBALS[ 'IP' ];
$setupAfterCache = new \Bootstrap\Hooks\SetupAfterCache(
$configuration );
$setupAfterCache-process();
@@ -89,6 +90,10 @@
'styles' = array(),
'variables' = array(),
'dependencies' = array(),
+ 'cachetriggers' = array(
+ 'LocalSettings.php' = null,
+ 'composer.lock' = null,
+ ),
);
$GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.scripts' ] = array(
diff --git a/src/BootstrapManager.php b/src/BootstrapManager.php
index 225aef2..7248320 100644
--- a/src/BootstrapManager.php
+++ b/src/BootstrapManager.php
@@ -113,23 +113,22 @@
/**
* @param string $filetype 'styles'|'scripts'
-* @param array|string $description
+* @param mixed[] $description
* @param $fileExt
-*
-* @internal param $relativePath
*/
protected function addFilesToGlobalResourceModules ( $filetype,
$description, $fileExt ) {
if ( isset( $description[ $filetype ] ) ) {
- $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.' .
$filetype ][ $filetype ] =
- array_merge(
- $GLOBALS[ 'wgResourceModules' ][
'ext.bootstrap.' . $filetype ][ $filetype ],
- array_map(
- function ( $filename ) use (
$fileExt ) { return $filename . $fileExt; },
- (array) $description[ $filetype
]
- )
- );
+ $files = array_map(
+ function ( $filename ) use ( $fileExt ) {
+ return $filename . $fileExt;
+ },
+ (array) $description[ $filetype ]
+ );
+
+ $this-adjustArrayElementOfResourceModuleDescription(
$filetype, $files, $filetype );
+
}
}
@@ -151,7 +150,7 @@
* @internal param string $path
*/
public function addExternalModule( $file, $remotePath = '' ) {
- $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][
'external styles' ][ $file ] = $remotePath;
+ $this-adjustArrayElementOfResourceModuleDescription( 'external
styles', array( $file = $remotePath ) );
}
/**
@@ -167,14 +166,18 @@
/**
* @since 1.0
*
-* @param $variables
+* @param mixed[] $variables
*/
public function setLessVariables( $variables ) {
- $GLOBALS[ 'wgResourceModules' ][ 'ext.bootstrap.styles' ][
'variables' ] =
- array_merge(
- $GLOBALS[ 'wgResourceModules' ][
'ext.bootstrap.styles' ][ 'variables' ],
- $variables
- );
+ $this-adjustArrayElementOfResourceModuleDescription(
'variables', $variables );
+ }
[MediaWiki-commits] [Gerrit] [FIX] Upload: Use fake filename in MIME header - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Upload: Use fake filename in MIME header
..
[FIX] Upload: Use fake filename in MIME header
The standard MIME request does only support ASCII characters in the
headers. As the value is apparently not interpreted it's replaced by
a dummy value, so Unicode characters in the file page name doesn't cause
pywikibot to receive an API error.
There is RFC2231 which is supported by both Python versions but not by
PHP on which the MediaWiki server rely (see bug: 73662). This does only
fix the uploads as it is unknown how to handle other MIME requests.
Bug: 73661
Change-Id: I5ea92dcf1115b675b56142494d805e75d389b7d4
---
M pywikibot/site.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 5b1399d..0093c79 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4460,6 +4460,8 @@
result = None
file_page_title = filepage.title(withNamespace=False)
if source_filename:
+# TODO: Dummy value to allow also Unicode names, see bug 73661
+mime_filename = 'FAKE-NAME'
# upload local file
# make sure file actually exists
if not os.path.isfile(source_filename):
@@ -4483,7 +4485,7 @@
mime_params={}, throttle=throttle)
req.mime_params['chunk'] = (chunk,
(application,
octet-stream),
-{'filename':
file_page_title})
+{'filename':
mime_filename})
if file_key:
req['filekey'] = file_key
try:
@@ -4518,7 +4520,7 @@
'mime_params': {
'file': (file_contents,
filetype.split('/'),
- {'filename': file_page_title})
+ {'filename': mime_filename})
}
}
req = api.Request(site=self, action=upload, token=token,
--
To view, visit https://gerrit.wikimedia.org/r/174677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ea92dcf1115b675b56142494d805e75d389b7d4
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.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] codfw row B labs network - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174955
Change subject: codfw row B labs network
..
codfw row B labs network
Allocate a /24 for labs support hosts on codfw row B. Leave:
10.192.4.0/24
10.192.20.0/24
10.192.36.0/24
10.192.52.0/24
for labs hosts free for now.
Accordingly other rows should have:
10.192.5.0/24
10.192.37.0/24
10.192.53.0/24
Change-Id: Ie7046404bd7152d5c678a5bdc15fe9a63b6db669
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/55/174955/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e46285c..bcc4a39 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2417,6 +2417,12 @@
5 1H IN PTR vl2017-eth1.lvs2005.codfw.wmnet.
6 1H IN PTR vl2017-eth1.lvs2006.codfw.wmnet.
+; 10.192.21.0/22 - labs-support1-b-codfw
+$ORIGIN 21.192.{{ zonename }}.
+1 1H IN PTR vrrp-gw-2122.codfw.wmnet.
+2 1H IN PTR ae1-2122.cr1-codfw.wikimedia.org.
+3 1H IN PTR ae1-2122.cr2-codfw.wikimedia.org.
+
; 10.192.16.0/22 - private1-b-codfw
$ORIGIN 16.192.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index c642db0..64afb6a 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2130,6 +2130,9 @@
vl2020-eth3.lvs2005 1H IN A10.192.49.5
vl2020-eth3.lvs2006 1H IN A10.192.49.6
+; codfw VRRP addresses
+vrrp-gw-21221H IN A 10.192.21.1
+
; CODFW fundraising/payments
$ORIGIN frack.codfw.{{ zonename }}.
payments20011H IN A10.195.0.5
--
To view, visit https://gerrit.wikimedia.org/r/174955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7046404bd7152d5c678a5bdc15fe9a63b6db669
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
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] BsFileSystemHelper: Fixed Fatal - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174956
Change subject: BsFileSystemHelper: Fixed Fatal
..
BsFileSystemHelper: Fixed Fatal
* FileSystemHelper returned no status object
* Fixed typo in exception
Change-Id: I8f5534bd4a15de0795f3fe5c2fb05eaa550d8c90
---
M includes/utility/FileSystemHelper.class.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/56/174956/1
diff --git a/includes/utility/FileSystemHelper.class.php
b/includes/utility/FileSystemHelper.class.php
index 86e95c9..98a741f 100644
--- a/includes/utility/FileSystemHelper.class.php
+++ b/includes/utility/FileSystemHelper.class.php
@@ -13,7 +13,7 @@
return
Status::newFatal(wfMessage(bs-filesystemhelper-has-path-traversal)-plain());
if (!empty($sSubDirName) !preg_match('#^[a-zA-Z/\\\]+#',
$sSubDirName)) {
wfProfileOut(__METHOD__);
- return Status::newFatal('Requested subdirectory of ' .
BS_DATA_DIR . ' contains illegal chars');
+ return Status::newFatal('Requested subdirectory of ' .
BS_CACHE_DIR . ' contains illegal chars');
}
if (!is_dir(BS_CACHE_DIR)) {
if (!mkdir(BS_CACHE_DIR, 0777, true)) {
@@ -33,6 +33,8 @@
wfProfileOut(__METHOD__);
return Status::newFatal(BS_CACHE_DIR . ' is not
accessible');
}
+
+ return Status::newGood(BS_CACHE_DIR . '/' . $sSubDirName);
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/174956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f5534bd4a15de0795f3fe5c2fb05eaa550d8c90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert removing mw1227, 1230-33 from dsh groups...reinstalling - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/174957 Change subject: Revert removing mw1227,1230-33 from dsh groups...reinstalling .. Revert removing mw1227,1230-33 from dsh groups...reinstalling This reverts commit ab2bcf72da81ed005b974007563a273311b1461d. Change-Id: If3ada9ecf814f9c042507ceb8af46921a0b59e03 --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/57/174957/1 diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index 9c0da16..2ad30ba 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -218,7 +218,11 @@ mw1218 mw1219 mw1220 - +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 mw1234 mw1235 mw1236 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index bf66c1b..9f426d7 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -227,6 +227,11 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 mw1234 mw1235 mw1236 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index f057723..21ffe20 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -218,6 +218,11 @@ mw1218 mw1219 mw1220 +mw1227 +mw1230 +mw1231 +mw1232 +mw1233 mw1234 mw1235 mw1236 -- To view, visit https://gerrit.wikimedia.org/r/174957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3ada9ecf814f9c042507ceb8af46921a0b59e03 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make mdot landing page faster - change (mediawiki...ZeroBanner)
jenkins-bot has submitted this change and it was merged.
Change subject: Make mdot landing page faster
..
Make mdot landing page faster
Now the landing page on mdot will load fast like on zerodot.
A separate patch is being created for core for logo thumbnails.
Just like mdot, the zerodot landing page will now also show the
community provided quote.
Change-Id: Id50f5aaba65241649dc7938786bc29ab32780d48
---
M includes/ZeroSpecialPage.php
1 file changed, 21 insertions(+), 68 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index 0594a23..c0b99bd 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -4,9 +4,9 @@
use Language;
use UnlistedSpecialPage;
use Html;
-use MobileContext;
use WebRequest;
use Xml;
+use CSSMin;
/**
* Default startup page for ZeroBanner extension that shows the list of
available languages.
@@ -62,7 +62,7 @@
$out-addHTML( $output );
} else {
$config = $state-getZeroConfig();
- if ( $config $state-isZeroSubdomain() ) {
+ if ( $config ) {
$out-disable();
$req = $this-getRequest();
$resp = $req-response();
@@ -75,14 +75,10 @@
$output =
$this-renderSimplerSpecialPage( $state );
echo $output;
- } elseif ( $config || $state-isZeroSubdomain()
) {
+ } elseif ( $state-isZeroSubdomain() ) {
$out-addModules(
'zerobanner.special.scripts' );
$out-addModuleStyles(
'zerobanner.special.styles' );
- if ( $config ) {
- $output =
$this-renderSpecialPage( $state );
- } else {
- $output =
$this-renderUnknownZeroPartnerPage( $state );
- }
+ $output =
$this-renderUnknownZeroPartnerPage( $state );
$out-addHTML( $output );
}
}
@@ -114,64 +110,6 @@
wfLogWarning( Error $retval executing $cmd: $output );
return false;
}
- }
-
- /**
-* @param PageRendering $state
-* @throws \MWException
-* @return string
-*/
- private function renderSpecialPage( PageRendering $state ) {
- $output = '';
-
- // CSS hack to get rid of the header that comes from the mobile
frontend
- $output .= 'style type=text/css.header {display:
none}/style';
- $output .= $this-msg( 'zero-landing-welcome' )-parseAsBlock()
. Html::element( 'hr' );
-
- $config = $state-getZeroConfig();
-
- $languageNames = $this-getLangNamesWithOverrides( $config );
- $output .= $this-renderPrimaryLangs( $state, $config,
$languageNames);
- $output .= Html::element( 'hr' );
- $output .= wfMessage( 'zero-home-page-selection-text'
)-escaped();
- $output .= Html::openElement( 'form' );
- $currentTitle = $this-getPageTitle();
- $defaultUrl = MobileContext::singleton()-getMobileUrl(
$currentTitle-getFullURL() );
- $output .= Html::element( 'input', array( 'type' = 'hidden',
- 'name' = 'from',
- 'value' = $currentTitle,
- ) );
- // TODO: Remove unnecessary 'id' attributes
- $output .= Html::openElement( 'select',
- array( 'id' = 'languageselection',
- 'onchange' = 'javascript:window.location =
this.options[this.selectedIndex].value;',
- 'class' = 'mw-zero-language',
- 'name' = 'to',
- )
- );
- $output .= Html::element( 'option',
- array( 'value' = $defaultUrl ),
- wfMessage( 'zero-language-selection' )-text()
- );
-
- $freeLangs = $config-whitelistedLangs();
- foreach ( $languageNames as $languageCode = $languageName ) {
- $isFree = count( $freeLangs ) === 0 || in_array(
$languageCode, $freeLangs );
- $url = $state-getStartPageUrl( $languageCode, $isFree
? 0 :
[MediaWiki-commits] [Gerrit] WIP Schema change for bucket reshuffle date - change (mediawiki...CentralNotice)
AndyRussG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174958
Change subject: WIP Schema change for bucket reshuffle date
..
WIP Schema change for bucket reshuffle date
Change-Id: I8fee5e50f7b16440519a7daf261758fcb6f4a805
---
M CentralNotice.sql
M patches/CNDatabasePatcher.php
A patches/patch-notice-bucket-reshuffle-date.sql
3 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/58/174958/1
diff --git a/CentralNotice.sql b/CentralNotice.sql
index f1437e7..4a20ff4 100644
--- a/CentralNotice.sql
+++ b/CentralNotice.sql
@@ -15,7 +15,8 @@
`not_buckets` tinyint(1) NOT NULL DEFAULT '1',
`not_weight` int(11) NOT NULL DEFAULT '100',
`not_mobile_carrier` tinyint(1) NOT NULL DEFAULT '0',
- `not_archived` tinyint(1) NOT NULL DEFAULT '0'
+ `not_archived` tinyint(1) NOT NULL DEFAULT '0',
+ `not_bucket_reshuffle_date` char(14) DEFAULT NULL
) /*$wgDBTableOptions*/;
CREATE TABLE IF NOT EXISTS /*_*/cn_assignments (
diff --git a/patches/CNDatabasePatcher.php b/patches/CNDatabasePatcher.php
index aa15264..1fe4084 100644
--- a/patches/CNDatabasePatcher.php
+++ b/patches/CNDatabasePatcher.php
@@ -142,6 +142,12 @@
$base .
'/patch-notice-logging-comments.sql', true
)
);
+ $updater-addExtensionUpdate(
+ array(
+'addField', 'cn_notices',
'not_bucket_reshuffle_date',
+$base .
'/patch-notice-bucket-reshuffle-date.sql', true
+ )
+ );
} elseif ( $updater-getDB()-getType() == 'sqlite' ) {
$updater-addExtensionUpdate(
array(
diff --git a/patches/patch-notice-bucket-reshuffle-date.sql
b/patches/patch-notice-bucket-reshuffle-date.sql
new file mode 100644
index 000..66f3e45
--- /dev/null
+++ b/patches/patch-notice-bucket-reshuffle-date.sql
@@ -0,0 +1,4 @@
+-- Update to support bucket reshuffling
+
+-- Add a bucket reshuffle date column to cn_notinces
+ALTER TABLE /*_*/cn_notices ADD `not_bucket_reshuffle_date` char(14) DEFAULT
NULL;
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/174958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fee5e50f7b16440519a7daf261758fcb6f4a805
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG andrew.green...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] rubocop updates to replace double quotes with ... - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174959
Change subject: [BrowserTest] rubocop updates to replace double quotes with
single
..
[BrowserTest] rubocop updates to replace double quotes with single
Change-Id: I0608aea2bd634156bf800b3be47a5c2a6d9fadca
---
M .rubocop_todo.yml
M modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/links_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/media_interface_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/multiedit_workflow_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
M modules/ve-mw/tests/browser/features/support/env.rb
M modules/ve-mw/tests/browser/features/support/hooks.rb
M modules/ve-mw/tests/browser/features/support/language_screenshot.rb
M modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
M modules/ve-mw/tests/browser/features/support/pages/user_page.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
M modules/ve-mw/tests/browser/spec/rectangle_spec.rb
M modules/ve-mw/tests/browser/upload.rb
19 files changed, 258 insertions(+), 264 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/59/174959/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c35940b..e22b64b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -50,9 +50,3 @@
# Cop supports --auto-correct.
Style/SpaceAfterComma:
Enabled: false
-
-# Offense count: 281
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
- Enabled: false
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
index e464fc3..b33bcfc 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
@@ -7,7 +7,7 @@
When(/^I click Decrease indentation$/) do
on(VisualEditorPage) do |page|
-step I click in the editable part
+step 'I click in the editable part'
page.bullet_number_selector_element.when_present.click
page.decrease_indentation_element.when_present.click
end
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
index 18cbcc5..2b4ac7e 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
@@ -85,36 +85,36 @@
Then(/^diff view should show the Book citation added$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? Cite VisualEditor Test
+ page.diff_view.include? 'Cite VisualEditor Test'
end
-expect(page.diff_view).to match ref{{Cite book|title = Book title|last
= Book author last name|first = Book author first name|publisher = Book
publisher|year = 2014|isbn = 9780743273565|location = Location of
publication|pages = 123|New book field = New book field contents}}/refCite
VisualEditor Test
+expect(page.diff_view).to match 'ref{{Cite book|title = Book title|last
= Book author last name|first = Book author first name|publisher = Book
publisher|year = 2014|isbn = 9780743273565|location = Location of
publication|pages = 123|New book field = New book field contents}}/refCite
VisualEditor Test'
end
end
Then(/^diff view should show the Journal citation added$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? Cite VisualEditor Test
+ page.diff_view.include? 'Cite VisualEditor Test'
end
-expect(page.diff_view).to match ref{{Cite journal|title = Journal
title|date = Journal Source date}}/refCite VisualEditor Test
+expect(page.diff_view).to match 'ref{{Cite journal|title = Journal
title|date = Journal Source date}}/refCite VisualEditor Test'
end
end
Then(/^diff view should show the News citation added$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? Cite VisualEditor Test
+ page.diff_view.include? 'Cite VisualEditor Test'
end
-expect(page.diff_view).to match ref{{Cite news|url = News URL|title =
News Source title|last = News Last name|first = News First name|date = News
Source date|work = News
[MediaWiki-commits] [Gerrit] [BrowserTest] rubocop updates to replace double quotes with ... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] rubocop updates to replace double quotes with
single
..
[BrowserTest] rubocop updates to replace double quotes with single
Change-Id: I0608aea2bd634156bf800b3be47a5c2a6d9fadca
---
M .rubocop_todo.yml
M modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/links_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/media_interface_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/multiedit_workflow_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/references_steps.rb
M modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
M
modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb
M modules/ve-mw/tests/browser/features/support/env.rb
M modules/ve-mw/tests/browser/features/support/hooks.rb
M modules/ve-mw/tests/browser/features/support/language_screenshot.rb
M modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
M modules/ve-mw/tests/browser/features/support/pages/user_page.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
M modules/ve-mw/tests/browser/spec/rectangle_spec.rb
M modules/ve-mw/tests/browser/upload.rb
19 files changed, 258 insertions(+), 264 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c35940b..e22b64b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -50,9 +50,3 @@
# Cop supports --auto-correct.
Style/SpaceAfterComma:
Enabled: false
-
-# Offense count: 281
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
- Enabled: false
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
index e464fc3..b33bcfc 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/bullets_steps.rb
@@ -7,7 +7,7 @@
When(/^I click Decrease indentation$/) do
on(VisualEditorPage) do |page|
-step I click in the editable part
+step 'I click in the editable part'
page.bullet_number_selector_element.when_present.click
page.decrease_indentation_element.when_present.click
end
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
index 18cbcc5..2b4ac7e 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
@@ -85,36 +85,36 @@
Then(/^diff view should show the Book citation added$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? Cite VisualEditor Test
+ page.diff_view.include? 'Cite VisualEditor Test'
end
-expect(page.diff_view).to match ref{{Cite book|title = Book title|last
= Book author last name|first = Book author first name|publisher = Book
publisher|year = 2014|isbn = 9780743273565|location = Location of
publication|pages = 123|New book field = New book field contents}}/refCite
VisualEditor Test
+expect(page.diff_view).to match 'ref{{Cite book|title = Book title|last
= Book author last name|first = Book author first name|publisher = Book
publisher|year = 2014|isbn = 9780743273565|location = Location of
publication|pages = 123|New book field = New book field contents}}/refCite
VisualEditor Test'
end
end
Then(/^diff view should show the Journal citation added$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? Cite VisualEditor Test
+ page.diff_view.include? 'Cite VisualEditor Test'
end
-expect(page.diff_view).to match ref{{Cite journal|title = Journal
title|date = Journal Source date}}/refCite VisualEditor Test
+expect(page.diff_view).to match 'ref{{Cite journal|title = Journal
title|date = Journal Source date}}/refCite VisualEditor Test'
end
end
Then(/^diff view should show the News citation added$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? Cite VisualEditor Test
+ page.diff_view.include? 'Cite VisualEditor Test'
end
-expect(page.diff_view).to match ref{{Cite news|url = News URL|title =
News Source title|last = News Last name|first = News First name|date = News
Source date|work = News Work|accessdate = News URL access date}}/refCite
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c8028df..ede14c7 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174961 Change subject: Syncronize VisualEditor: c8028df..ede14c7 .. Syncronize VisualEditor: c8028df..ede14c7 Change-Id: Ia0c2fff5206a31fb007b26e04c921549b1b7bb63 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/61/174961/1 diff --git a/VisualEditor b/VisualEditor index c8028df..ede14c7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c8028dfe062c3a155e5fee6a494915405a3d3835 +Subproject commit ede14c75fb9c4ff6a21462b55fffebce09bc3549 -- To view, visit https://gerrit.wikimedia.org/r/174961 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0c2fff5206a31fb007b26e04c921549b1b7bb63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c8028df..ede14c7 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: c8028df..ede14c7 .. Syncronize VisualEditor: c8028df..ede14c7 Change-Id: Ia0c2fff5206a31fb007b26e04c921549b1b7bb63 --- 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 c8028df..ede14c7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c8028dfe062c3a155e5fee6a494915405a3d3835 +Subproject commit ede14c75fb9c4ff6a21462b55fffebce09bc3549 -- To view, visit https://gerrit.wikimedia.org/r/174961 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0c2fff5206a31fb007b26e04c921549b1b7bb63 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] [BrowserTest] various rubocop updates - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174962
Change subject: [BrowserTest] various rubocop updates
..
[BrowserTest] various rubocop updates
Change-Id: Ia11c32c74acf4c2226f84ea566f4074b193f4e20
---
M .rubocop_todo.yml
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/language_screenshot.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/spec/rectangle_spec.rb
5 files changed, 69 insertions(+), 73 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/62/174962/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e22b64b..7699ca7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -46,7 +46,3 @@
Style/LeadingCommentSpace:
Enabled: false
-# Offense count: 179
-# Cop supports --auto-correct.
-Style/SpaceAfterComma:
- Enabled: false
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index ccb609e..7f3f051 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -141,7 +141,7 @@
end
Then(/^I take screenshot of Formatting pull-down menu$/) do
-
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.ve_text_style_element,@current_page.formatting_option_menus_element])
+
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.ve_text_style_element,
@current_page.formatting_option_menus_element])
end
Then(/^I should see pull-down menu containing Page Settings$/) do
diff --git
a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
index a2655af..dad782d 100644
--- a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
+++ b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
@@ -19,7 +19,7 @@
if offset_element
offset_rectangle = coordinates_from_page_element(offset_element)
else
-offset_rectangle = [0,0,0,0]
+offset_rectangle = [0, 0, 0, 0]
end
rectangles = coordinates_from_page_elements(page_elements)
crop_rectangle = rectangle(rectangles, offset_rectangle)
@@ -42,7 +42,7 @@
image.save path
end
-def rectangle(rectangles, offset_rectangle = [0,0,0,0])
+def rectangle(rectangles, offset_rectangle = [0, 0, 0, 0])
top_left_x, top_left_y = top_left_x_y rectangles
bottom_right_x, bottom_right_y = bottom_right_x_y rectangles
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 53209fb..d6d56b8 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -50,7 +50,7 @@
a(:first_reference, text: '[1]', index: 1)
div(:formatting_option_menus, class: 'oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable', index: 1)
img(:formula_image, class: 'mwe-math-fallback-png-inline')
- span(:formula_insert_menu,class: 'oo-ui-tool-name-math')
+ span(:formula_insert_menu, class: 'oo-ui-tool-name-math')
a(:formula_link, css: 'span.oo-ui-tool-name-math a.oo-ui-tool-link')
a(:heading, text: /Heading/)
span(:hamburger_menu, css: 'div.oo-ui-listToolGroup:nth-child(2)
span:nth-child(1) span:nth-child(3)')
diff --git a/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
b/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
index 42ae8ac..30d5f2e 100644
--- a/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
+++ b/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
@@ -3,46 +3,46 @@
# Rectangle is defined as set of co-ordinates represented by top left x, top
left y, width, height
describe 'Rectangle' do
it 'should return the co-ordinates of provided 1 rectangle' do
-input_rectangle = [0,0,1,1]
+input_rectangle = [0, 0, 1, 1]
input_rectangles = [input_rectangle]
expect(rectangle(input_rectangles)).to eq(input_rectangle)
end
it 'should return the co-ordinates of the rectangle which is inside a
iframe' do
-input_rectangle = [50,50,10,10]
-iframe_rectangle = [100,100,20,20]
+input_rectangle = [50, 50, 10, 10]
+iframe_rectangle = [100, 100, 20, 20]
input_rectangles = [input_rectangle]
output_rectangle = [150, 150, 10, 10]
expect(rectangle(input_rectangles, iframe_rectangle)).to
eq(output_rectangle)
end
it 'if we provide 2 rectangles and if one contains the other then it should
return co-ordinates of bigger
[MediaWiki-commits] [Gerrit] Fix tappable area of upload button - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174963
Change subject: Fix tappable area of upload button
..
Fix tappable area of upload button
Previously not all button on Special:Uploads was tappable.
Cloaked elements are absolutely positioned to parent element.
Change-Id: I85c590f166b688201dce22a627319bb73fa7a431
---
M less/modules/uploads/PhotoUploaderButton.less
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/63/174963/1
diff --git a/less/modules/uploads/PhotoUploaderButton.less
b/less/modules/uploads/PhotoUploaderButton.less
index 4f711eb..9328940 100644
--- a/less/modules/uploads/PhotoUploaderButton.less
+++ b/less/modules/uploads/PhotoUploaderButton.less
@@ -3,12 +3,18 @@
@import minerva.mixins;
.ctaUploadPhoto {
+ // Ensure entire button is clickable
+ .button {
+ position: relative;
+ }
+
// FIXME: Remove when mw-ui-icon in stable
.icon-photo {
background-position: left 10px center !important;
padding-left: 44px;
}
+ // FIXME: Rename to generic .button when mw-ui-icon in stable
.mw-ui-icon-photo {
display: table;
position: relative;
--
To view, visit https://gerrit.wikimedia.org/r/174963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85c590f166b688201dce22a627319bb73fa7a431
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ede14c7..1b69fc9 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: ede14c7..1b69fc9 .. Syncronize VisualEditor: ede14c7..1b69fc9 Change-Id: I448cfddcdabce89f36a0383981cb91b1a5cfb341 --- 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 ede14c7..1b69fc9 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ede14c75fb9c4ff6a21462b55fffebce09bc3549 +Subproject commit 1b69fc97c785c9e212cfdbe6199deb8e0416d02d -- To view, visit https://gerrit.wikimedia.org/r/174964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I448cfddcdabce89f36a0383981cb91b1a5cfb341 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] [BrowserTest] Fixed Style/SpaceAfterComma RuboCop offense - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Fixed Style/SpaceAfterComma RuboCop offense
..
[BrowserTest] Fixed Style/SpaceAfterComma RuboCop offense
Change-Id: Ia11c32c74acf4c2226f84ea566f4074b193f4e20
---
M .rubocop_todo.yml
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/language_screenshot.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/spec/rectangle_spec.rb
5 files changed, 69 insertions(+), 73 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e22b64b..7699ca7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -46,7 +46,3 @@
Style/LeadingCommentSpace:
Enabled: false
-# Offense count: 179
-# Cop supports --auto-correct.
-Style/SpaceAfterComma:
- Enabled: false
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index ccb609e..7f3f051 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -141,7 +141,7 @@
end
Then(/^I take screenshot of Formatting pull-down menu$/) do
-
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.ve_text_style_element,@current_page.formatting_option_menus_element])
+
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.ve_text_style_element,
@current_page.formatting_option_menus_element])
end
Then(/^I should see pull-down menu containing Page Settings$/) do
diff --git
a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
index a2655af..dad782d 100644
--- a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
+++ b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb
@@ -19,7 +19,7 @@
if offset_element
offset_rectangle = coordinates_from_page_element(offset_element)
else
-offset_rectangle = [0,0,0,0]
+offset_rectangle = [0, 0, 0, 0]
end
rectangles = coordinates_from_page_elements(page_elements)
crop_rectangle = rectangle(rectangles, offset_rectangle)
@@ -42,7 +42,7 @@
image.save path
end
-def rectangle(rectangles, offset_rectangle = [0,0,0,0])
+def rectangle(rectangles, offset_rectangle = [0, 0, 0, 0])
top_left_x, top_left_y = top_left_x_y rectangles
bottom_right_x, bottom_right_y = bottom_right_x_y rectangles
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 53209fb..d6d56b8 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -50,7 +50,7 @@
a(:first_reference, text: '[1]', index: 1)
div(:formatting_option_menus, class: 'oo-ui-toolGroup-tools
oo-ui-clippableElement-clippable', index: 1)
img(:formula_image, class: 'mwe-math-fallback-png-inline')
- span(:formula_insert_menu,class: 'oo-ui-tool-name-math')
+ span(:formula_insert_menu, class: 'oo-ui-tool-name-math')
a(:formula_link, css: 'span.oo-ui-tool-name-math a.oo-ui-tool-link')
a(:heading, text: /Heading/)
span(:hamburger_menu, css: 'div.oo-ui-listToolGroup:nth-child(2)
span:nth-child(1) span:nth-child(3)')
diff --git a/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
b/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
index 42ae8ac..30d5f2e 100644
--- a/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
+++ b/modules/ve-mw/tests/browser/spec/rectangle_spec.rb
@@ -3,46 +3,46 @@
# Rectangle is defined as set of co-ordinates represented by top left x, top
left y, width, height
describe 'Rectangle' do
it 'should return the co-ordinates of provided 1 rectangle' do
-input_rectangle = [0,0,1,1]
+input_rectangle = [0, 0, 1, 1]
input_rectangles = [input_rectangle]
expect(rectangle(input_rectangles)).to eq(input_rectangle)
end
it 'should return the co-ordinates of the rectangle which is inside a
iframe' do
-input_rectangle = [50,50,10,10]
-iframe_rectangle = [100,100,20,20]
+input_rectangle = [50, 50, 10, 10]
+iframe_rectangle = [100, 100, 20, 20]
input_rectangles = [input_rectangle]
output_rectangle = [150, 150, 10, 10]
expect(rectangle(input_rectangles, iframe_rectangle)).to
eq(output_rectangle)
end
it 'if we provide 2 rectangles and if one contains the other then it should
return co-ordinates of bigger rectangle' do
-
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ede14c7..1b69fc9 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174964 Change subject: Syncronize VisualEditor: ede14c7..1b69fc9 .. Syncronize VisualEditor: ede14c7..1b69fc9 Change-Id: I448cfddcdabce89f36a0383981cb91b1a5cfb341 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/64/174964/1 diff --git a/VisualEditor b/VisualEditor index ede14c7..1b69fc9 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ede14c75fb9c4ff6a21462b55fffebce09bc3549 +Subproject commit 1b69fc97c785c9e212cfdbe6199deb8e0416d02d -- To view, visit https://gerrit.wikimedia.org/r/174964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I448cfddcdabce89f36a0383981cb91b1a5cfb341 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] rubocop proper format for comments - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174965
Change subject: [BrowserTest] rubocop proper format for comments
..
[BrowserTest] rubocop proper format for comments
Change-Id: I2fe136f29e0bc430420a0931092695d3f4147112
---
M .rubocop_todo.yml
M Gemfile.lock
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/hooks.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
5 files changed, 5 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/65/174965/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7699ca7..8cf6572 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,8 +41,3 @@
Style/IfUnlessModifier:
Enabled: false
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
- Enabled: false
-
diff --git a/Gemfile.lock b/Gemfile.lock
index e9df15d..826f0b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@
watir-webdriver (= 0.6.9)
page_navigation (0.9)
data_magic (= 0.14)
-parser (2.2.0.pre.7)
+parser (2.2.0.pre.8)
ast (= 1.1, 3.0)
slop (~ 3.4, = 3.4.5)
powerpack (0.0.9)
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 7f3f051..b2dd0cd 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -87,7 +87,7 @@
When(/^I send right arrow times (\d+)$/) do |number|
number.to_i.times do
on(VisualEditorPage).content_element.send_keys :arrow_right
-on(VisualEditorPage).content_element.fire_event('onblur') #gerrit
86800/86801
+on(VisualEditorPage).content_element.fire_event('onblur') # gerrit
86800/86801
end
end
diff --git a/modules/ve-mw/tests/browser/features/support/hooks.rb
b/modules/ve-mw/tests/browser/features/support/hooks.rb
index ca0a93a..0bc32da 100644
--- a/modules/ve-mw/tests/browser/features/support/hooks.rb
+++ b/modules/ve-mw/tests/browser/features/support/hooks.rb
@@ -2,7 +2,7 @@
$browser.close unless ENV['KEEP_BROWSER_OPEN'] == 'true'
end
-#This is for the multiedit test
+# This is for the multiedit test
Before('@edit_user_page_login') do
if (!$edit_user_page_login || !(ENV['REUSE_BROWSER'] == 'true')) @browser
step 'I am logged in'
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index d6d56b8..9b08946 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -162,9 +162,9 @@
span(:another_save_page, class: 'oo-ui-labelElement-label', text: 'Save
page', frame: frame)
text_field(:link_textfield, index: 0, frame: frame)
span(:links_done, text: 'Done', frame: frame)
-div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame:
frame) #ALSO USED IN LANGUAGE SCREENSHOT
+div(:content_box, class: 've-ce-documentNode ve-ce-branchNode', frame:
frame) # ALSO USED IN LANGUAGE SCREENSHOT
-#USED IN LANGUAGE SCREENSHOT TEST:
+# USED IN LANGUAGE SCREENSHOT TEST:
text_field(:media_alternative_text, css:
'div.oo-ui-widget.oo-ui-widget-enabled.oo-ui-inputWidget.oo-ui-textInputWidget.ve-ui-mwMediaDialog-altText
input', frame: frame)
div(:media_alternative_block, class: 'oo-ui-layout oo-ui-iconElement
oo-ui-labelElement oo-ui-fieldsetLayout', index: 1, frame: frame)
list_item(:media_advanced_settings, class: 'oo-ui-widget
oo-ui-widget-enabled oo-ui-optionWidget oo-ui-decoratedOptionWidget
oo-ui-outlineItemWidget oo-ui-outlineItemWidget-level-0 oo-ui-iconElement
oo-ui-labelElement', frame: frame)
--
To view, visit https://gerrit.wikimedia.org/r/174965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fe136f29e0bc430420a0931092695d3f4147112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1b69fc9..95a7988 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 1b69fc9..95a7988 .. Syncronize VisualEditor: 1b69fc9..95a7988 Change-Id: I67b229cc932be9bd08ab4304e2398795dd9cc42f --- 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 1b69fc9..95a7988 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1b69fc97c785c9e212cfdbe6199deb8e0416d02d +Subproject commit 95a798867c3926c501270aad30f0397dfc697d60 -- To view, visit https://gerrit.wikimedia.org/r/174966 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67b229cc932be9bd08ab4304e2398795dd9cc42f 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: 1b69fc9..95a7988 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174966 Change subject: Syncronize VisualEditor: 1b69fc9..95a7988 .. Syncronize VisualEditor: 1b69fc9..95a7988 Change-Id: I67b229cc932be9bd08ab4304e2398795dd9cc42f --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/66/174966/1 diff --git a/VisualEditor b/VisualEditor index 1b69fc9..95a7988 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1b69fc97c785c9e212cfdbe6199deb8e0416d02d +Subproject commit 95a798867c3926c501270aad30f0397dfc697d60 -- To view, visit https://gerrit.wikimedia.org/r/174966 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67b229cc932be9bd08ab4304e2398795dd9cc42f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround of bug 72960, disabling WikiEditor dialog in Page... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Workaround of bug 72960, disabling WikiEditor dialog in Page
namespace
..
Workaround of bug 72960, disabling WikiEditor dialog in Page namespace
Workaround of issue when dialog class of WikiEditor isn't being loaded,
affecting both WikiEditor functinality and tools/user scripts depending on that
class.
Some more long term solution would be to fix this in WikiEditor, by treating
CONTENT_MODEL_PROOFREAD_PAGE same way as CONTENT_MODEL_WIKITEXT
Bug: 72960
Bug: T72960
Change-Id: I6830b97519ed6027c198552eeaed86b82eb9ea30
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index da1e709..5bce78a 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -224,6 +224,12 @@
$editForm.find( '.editOptions' ).before(
$editForm.find( '.wikiEditor-ui' ) );
$editForm.find( '.wikiEditor-ui-text' ).append(
$editForm.find( '.prp-page-container' ) );
} );
+
+ // load the dialogs module of WikiEditor if enabled , bug:
72960
+ if( mw.user.options.get( 'usebetatoolbar-cgd' ) ) {
+ mw.loader.load('ext.wikiEditor.dialogs');
+ }
+ // TODO: other modules of WikiEditor may miss, see bug 72960.
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/174936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6830b97519ed6027c198552eeaed86b82eb9ea30
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Xelgen xelgen...@gmail.com
Gerrit-Reviewer: Tpt thomaspe...@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] Add vim modelines all over the repo - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174967
Change subject: Add vim modelines all over the repo
..
Add vim modelines all over the repo
Adding a vim modeline for tab expansion and smarttab on all zones files
in the repo.
Change-Id: I706fbd064528eea7a2951716d5ecfebba29e736c
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/0.8.c.e.2.0.a.2.ip6.arpa
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/152.80.208.in-addr.arpa
M templates/153.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/155.80.208.in-addr.arpa
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/26.35.198.in-addr.arpa
M templates/27.35.198.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/56.15.185.in-addr.arpa
M templates/57.15.185.in-addr.arpa
M templates/58.15.185.in-addr.arpa
M templates/59.15.185.in-addr.arpa
M templates/mediawiki.org
M templates/wikibooks.org
M templates/wikidata.org
M templates/wikimania.org
M templates/wikimedia.com
M templates/wikimedia.community
M templates/wikimedia.ee
M templates/wikimedia.org
M templates/wikimediafoundation.org
M templates/wikinews.org
M templates/wikipedia.org
M templates/wikiquote.org
M templates/wikisource.org
M templates/wikiversity.org
M templates/wikivoyage-old.org
M templates/wikivoyage.org
M templates/wiktionary.org
M templates/wmftest.org
M templates/wmfusercontent.org
M templates/wmnet
37 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/67/174967/1
diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 4610062..d299038 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/0.8.c.e.2.0.a.2.ip6.arpa
b/templates/0.8.c.e.2.0.a.2.ip6.arpa
index c931ef7..7d5db5e 100644
--- a/templates/0.8.c.e.2.0.a.2.ip6.arpa
+++ b/templates/0.8.c.e.2.0.a.2.ip6.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 86b98ea..b8db9c4 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e46285c..255a3ec 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/152.80.208.in-addr.arpa
b/templates/152.80.208.in-addr.arpa
index 0b1474e..46ecc0b 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/153.80.208.in-addr.arpa
b/templates/153.80.208.in-addr.arpa
index 82f0fb4..d2bb9a7 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index 65e8df8..e5c7a7b 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org. hostmaster.wikimedia.org.(
diff --git a/templates/155.80.208.in-addr.arpa
b/templates/155.80.208.in-addr.arpa
index 962438c..4eefeba 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -1,3 +1,4 @@
+; vim: set expandtab:smarttab
$TTL 3600
$ORIGIN {{ zonename }}.
@ 1D IN SOA ns0.wikimedia.org.
hostmaster.wikimedia.org.(
diff --git a/templates/174.198.91.in-addr.arpa
b/templates/174.198.91.in-addr.arpa
index 0fd1a54..52b9ffc 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -1,3 +1,4 @@
+; vim: set
[MediaWiki-commits] [Gerrit] Nearby link should be local url - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174960
Change subject: Nearby link should be local url
..
Nearby link should be local url
A full URL will cause the mobile site to jump to the desktop site.
Change-Id: I3baa761c12d7199c667823e7b6573eb350f11cd7
---
M includes/skins/MinervaTemplateAlpha.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/60/174960/1
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index 7cc2347..8f59aa8 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -24,7 +24,7 @@
if ( $wgMFNearby class_exists( 'GeoData' )
GeoData::getPageCoordinates( $title ) ) {
$result['nearby'] = array(
- 'url' = SpecialPage::getTitleFor( 'Nearby'
)-getFullUrl() . '#/page/' . $title-getText(),
+ 'url' = SpecialPage::getTitleFor( 'Nearby'
)-getLocalUrl() . '#/page/' . $title-getText(),
'class' = 'nearbyButton',
'label' = wfMessage(
'mobile-frontend-nearby-sectiontext' )-text()
);
--
To view, visit https://gerrit.wikimedia.org/r/174960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3baa761c12d7199c667823e7b6573eb350f11cd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] update Gemfile to prevent rubocop failures in ... - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/174968 Change subject: [BrowserTest] update Gemfile to prevent rubocop failures in gerrit .. [BrowserTest] update Gemfile to prevent rubocop failures in gerrit Change-Id: I9d98542583050829a63c297736c12d835aa55c2c --- M Gemfile 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/68/174968/1 diff --git a/Gemfile b/Gemfile index d96f40c..ba0171c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=VisualEditor +# ruby=ruby-2.1.1 +# ruby-gemset=VisualEditor -source https://rubygems.org; +source 'https://rubygems.org' -gem chunky_png -gem mediawiki_api -gem mediawiki_selenium -gem rspec -gem rubocop, require: false +gem 'chunky_png' +gem 'mediawiki_api' +gem 'mediawiki_selenium' +gem 'rspec' +gem 'rubocop', require: false -- To view, visit https://gerrit.wikimedia.org/r/174968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d98542583050829a63c297736c12d835aa55c2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug fixes; incorrect indexing - change (mediawiki...citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174969
Change subject: Bug fixes; incorrect indexing
..
Bug fixes; incorrect indexing
Fixed several indexing issues.
In some cases (likely depending on Zotero version),
body is a either an Array of objects or an Array
of Array of objects, so convertTo methods were
fixed to deal with either case.
Additionally, convertTo methods incorrectly
produced bodies that were Array of Arrays
instead of Arrays.
Change-Id: I212abccef0f37584c6e3c2ee84293c55476ec237
---
M lib/zotero.js
1 file changed, 15 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/69/174969/1
diff --git a/lib/zotero.js b/lib/zotero.js
index d2bba9e..f383ce4 100644
--- a/lib/zotero.js
+++ b/lib/zotero.js
@@ -51,7 +51,10 @@
/*Specific conversion methods*/
var convertToZoteroAsync = function (url, body, callback){
- var citation = body[0][0];
+ var citation = body[0];
+ if (citation instanceof Array){
+ citation = citation[0];
+ }
async.waterfall([
function(cb){ //this function exists to pass url to fixURLAsync
@@ -60,13 +63,16 @@
fixURL, //must go directly after unnamed function that hands it
url
fixAccessDate
], function (err, citation) {
- callback([[citation]]);
+ callback([citation]);
});
};
var convertToMediawikiAsync = function (url, body, callback){
- var citation = body[0][0];
+ var citation = body[0];
+ if (citation instanceof Array){
+ citation = citation[0];
+ }
async.waterfall([
function(cb){ //this function exists to pass url to fixURLAsync
@@ -79,7 +85,7 @@
fixISBN,
fixISSN
], function (err, citation) {
- callback([[citation]]);
+ callback([citation]);
});
};
@@ -87,7 +93,10 @@
var convertToMWDeprecatedAsync = function (url, body, callback){
var zotCreators, creatorFieldName,
creatorTypeCount = {},
- citation = body[0][0];
+ citation = body[0];
+ if (citation instanceof Array){
+ citation = citation[0];
+ }
async.waterfall([
function(cb){ //this function exists to pass url to fixURLAsync
@@ -122,7 +131,7 @@
fixISBN,
fixISSN
], function (err, citation) {
- callback([[citation]]);
+ callback([citation]);
});
};
--
To view, visit https://gerrit.wikimedia.org/r/174969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I212abccef0f37584c6e3c2ee84293c55476ec237
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] update Gemfile to prevent rubocop failures in ... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] update Gemfile to prevent rubocop failures in gerrit .. [BrowserTest] update Gemfile to prevent rubocop failures in gerrit Change-Id: I9d98542583050829a63c297736c12d835aa55c2c --- M Gemfile 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile b/Gemfile index d96f40c..ba0171c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=VisualEditor +# ruby=ruby-2.1.1 +# ruby-gemset=VisualEditor -source https://rubygems.org; +source 'https://rubygems.org' -gem chunky_png -gem mediawiki_api -gem mediawiki_selenium -gem rspec -gem rubocop, require: false +gem 'chunky_png' +gem 'mediawiki_api' +gem 'mediawiki_selenium' +gem 'rspec' +gem 'rubocop', require: false -- To view, visit https://gerrit.wikimedia.org/r/174968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d98542583050829a63c297736c12d835aa55c2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@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] Syncronize VisualEditor: 95a7988..3d61fe7 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 95a7988..3d61fe7 .. Syncronize VisualEditor: 95a7988..3d61fe7 Change-Id: I2676e8f5792f76f75dce5efb439a957f0310e848 --- 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 95a7988..3d61fe7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 95a798867c3926c501270aad30f0397dfc697d60 +Subproject commit 3d61fe724d6aabebc87edb097dc437ab38a891ba -- To view, visit https://gerrit.wikimedia.org/r/174970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2676e8f5792f76f75dce5efb439a957f0310e848 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: 95a7988..3d61fe7 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174970 Change subject: Syncronize VisualEditor: 95a7988..3d61fe7 .. Syncronize VisualEditor: 95a7988..3d61fe7 Change-Id: I2676e8f5792f76f75dce5efb439a957f0310e848 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/70/174970/1 diff --git a/VisualEditor b/VisualEditor index 95a7988..3d61fe7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 95a798867c3926c501270aad30f0397dfc697d60 +Subproject commit 3d61fe724d6aabebc87edb097dc437ab38a891ba -- To view, visit https://gerrit.wikimedia.org/r/174970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2676e8f5792f76f75dce5efb439a957f0310e848 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug fixes; incorrect indexing - change (mediawiki...citoid)
Mvolz has submitted this change and it was merged.
Change subject: Bug fixes; incorrect indexing
..
Bug fixes; incorrect indexing
Fixed several indexing issues.
In some cases (likely depending on Zotero version),
body is a either an Array of objects or an Array
of Array of objects, so convertTo methods were
fixed to deal with either case.
Additionally, convertTo methods incorrectly
produced bodies that were Array of Arrays
instead of Arrays.
Change-Id: I212abccef0f37584c6e3c2ee84293c55476ec237
---
M lib/zotero.js
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
Mvolz: Verified; Looks good to me, approved
diff --git a/lib/zotero.js b/lib/zotero.js
index d2bba9e..f383ce4 100644
--- a/lib/zotero.js
+++ b/lib/zotero.js
@@ -51,7 +51,10 @@
/*Specific conversion methods*/
var convertToZoteroAsync = function (url, body, callback){
- var citation = body[0][0];
+ var citation = body[0];
+ if (citation instanceof Array){
+ citation = citation[0];
+ }
async.waterfall([
function(cb){ //this function exists to pass url to fixURLAsync
@@ -60,13 +63,16 @@
fixURL, //must go directly after unnamed function that hands it
url
fixAccessDate
], function (err, citation) {
- callback([[citation]]);
+ callback([citation]);
});
};
var convertToMediawikiAsync = function (url, body, callback){
- var citation = body[0][0];
+ var citation = body[0];
+ if (citation instanceof Array){
+ citation = citation[0];
+ }
async.waterfall([
function(cb){ //this function exists to pass url to fixURLAsync
@@ -79,7 +85,7 @@
fixISBN,
fixISSN
], function (err, citation) {
- callback([[citation]]);
+ callback([citation]);
});
};
@@ -87,7 +93,10 @@
var convertToMWDeprecatedAsync = function (url, body, callback){
var zotCreators, creatorFieldName,
creatorTypeCount = {},
- citation = body[0][0];
+ citation = body[0];
+ if (citation instanceof Array){
+ citation = citation[0];
+ }
async.waterfall([
function(cb){ //this function exists to pass url to fixURLAsync
@@ -122,7 +131,7 @@
fixISBN,
fixISSN
], function (err, citation) {
- callback([[citation]]);
+ callback([citation]);
});
};
--
To view, visit https://gerrit.wikimedia.org/r/174969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I212abccef0f37584c6e3c2ee84293c55476ec237
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org
Gerrit-Reviewer: Mvolz mv...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the ubuntu cloud archive for all Ubuntu versions - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174971
Change subject: Use the ubuntu cloud archive for all Ubuntu versions
..
Use the ubuntu cloud archive for all Ubuntu versions
I don't know why this was only marked for 'precise' --
as we move to Trusty we still want the latest packages.
Change-Id: If191bab1886881dc33f33df39816ad961cb7e754
---
M modules/openstack/manifests/repo.pp
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/174971/1
diff --git a/modules/openstack/manifests/repo.pp
b/modules/openstack/manifests/repo.pp
index 4230ee9..efc510e 100644
--- a/modules/openstack/manifests/repo.pp
+++ b/modules/openstack/manifests/repo.pp
@@ -1,13 +1,10 @@
class openstack::repo(
$openstack_version=$::openstack::version,
) {
-
-if ($::lsbdistcodename == 'precise') {
-apt::repository { 'ubuntucloud':
-uri= 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
-dist = precise-updates/${openstack_version},
-components = 'main',
-keyfile= 'puppet:///files/misc/ubuntu-cloud.key';
-}
+apt::repository { 'ubuntucloud':
+uri= 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
+dist = precise-updates/${openstack_version},
+components = 'main',
+keyfile= 'puppet:///files/misc/ubuntu-cloud.key';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/174971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If191bab1886881dc33f33df39816ad961cb7e754
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove broken and unnecessary execution guards - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove broken and unnecessary execution guards
..
Remove broken and unnecessary execution guards
Change-Id: If76bf0d0079f14f99f47cef145b1e25381d9edc2
---
M classes/Dispatch.php
M classes/HistoricalThread.php
M classes/NewMessagesController.php
M classes/Thread.php
M classes/ThreadRevision.php
M pages/NewUserMessagesView.php
M pages/SummaryPageView.php
M pages/TalkpageHeaderView.php
M pages/ThreadActionPage.php
M pages/ThreadDiffView.php
M pages/ThreadHistoricalRevisionView.php
M pages/ThreadProtectionFormView.php
M pages/ThreadWatchView.php
13 files changed, 2 insertions(+), 11 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/classes/Dispatch.php b/classes/Dispatch.php
index ca79fee..d997624 100644
--- a/classes/Dispatch.php
+++ b/classes/Dispatch.php
@@ -1,4 +1,5 @@
?php
+
class LqtDispatch {
/** static cache of per-page LiquidThreads activation setting */
static $userLqtOverride = array();
diff --git a/classes/HistoricalThread.php b/classes/HistoricalThread.php
index d980bd7..8dc4f28 100644
--- a/classes/HistoricalThread.php
+++ b/classes/HistoricalThread.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class HistoricalThread extends Thread {
/* Information about what changed in this revision. */
diff --git a/classes/NewMessagesController.php
b/classes/NewMessagesController.php
index 56bf082..e9aab83 100644
--- a/classes/NewMessagesController.php
+++ b/classes/NewMessagesController.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class NewMessages {
static function markThreadAsUnreadByUser( $thread, $user ) {
diff --git a/classes/Thread.php b/classes/Thread.php
index d2a04ce..88a8840 100644
--- a/classes/Thread.php
+++ b/classes/Thread.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class Thread {
/* SCHEMA changes must be reflected here. */
diff --git a/classes/ThreadRevision.php b/classes/ThreadRevision.php
index ae3d9a8..c46e40f 100644
--- a/classes/ThreadRevision.php
+++ b/classes/ThreadRevision.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadRevision {
static $load =
diff --git a/pages/NewUserMessagesView.php b/pages/NewUserMessagesView.php
index 6edf23a..d2270f2 100644
--- a/pages/NewUserMessagesView.php
+++ b/pages/NewUserMessagesView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class NewUserMessagesView extends LqtView {
protected $highlightedThreads;
diff --git a/pages/SummaryPageView.php b/pages/SummaryPageView.php
index 2b55ca0..d71080e 100644
--- a/pages/SummaryPageView.php
+++ b/pages/SummaryPageView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class SummaryPageView extends LqtView {
function show() {
diff --git a/pages/TalkpageHeaderView.php b/pages/TalkpageHeaderView.php
index f1909e5..99ee6a3 100644
--- a/pages/TalkpageHeaderView.php
+++ b/pages/TalkpageHeaderView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
// Pass-through wrapper with an extra note at the top
class TalkpageHeaderView extends LqtView {
diff --git a/pages/ThreadActionPage.php b/pages/ThreadActionPage.php
index 58031eb..c328698 100644
--- a/pages/ThreadActionPage.php
+++ b/pages/ThreadActionPage.php
@@ -1,4 +1,5 @@
?php
+
abstract class ThreadActionPage extends UnlistedSpecialPage {
protected $user, $output, $request, $title, $mThread;
diff --git a/pages/ThreadDiffView.php b/pages/ThreadDiffView.php
index d8f827f..8cfe326 100644
--- a/pages/ThreadDiffView.php
+++ b/pages/ThreadDiffView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadDiffView extends LqtView {
function customizeNavigation( $skin, $links ) {
diff --git a/pages/ThreadHistoricalRevisionView.php
b/pages/ThreadHistoricalRevisionView.php
index 89b09f0..e6d59f1 100644
--- a/pages/ThreadHistoricalRevisionView.php
+++ b/pages/ThreadHistoricalRevisionView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadHistoricalRevisionView extends ThreadPermalinkView {
public $mDisplayRevision = null;
diff --git a/pages/ThreadProtectionFormView.php
b/pages/ThreadProtectionFormView.php
index c233af5..c63b488 100644
--- a/pages/ThreadProtectionFormView.php
+++ b/pages/ThreadProtectionFormView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
// Pass-through wrapper
class ThreadProtectionFormView extends LqtView {
diff --git a/pages/ThreadWatchView.php b/pages/ThreadWatchView.php
index 00aa1fb..7ee7ee8 100644
--- a/pages/ThreadWatchView.php
+++ b/pages/ThreadWatchView.php
@@ -1,5 +1,4 @@
?php
-if ( !defined( 'MEDIAWIKI' ) ) die;
class ThreadWatchView extends LqtView {
function show() {
--
To view, visit https://gerrit.wikimedia.org/r/174921
To unsubscribe,
[MediaWiki-commits] [Gerrit] Remove code related to SkinTemplateTabs hook - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove code related to SkinTemplateTabs hook
..
Remove code related to SkinTemplateTabs hook
The hook was removed in MW 1.18
Change-Id: Ia5848b49c7b73c08c4400e1db9e046bd7ed1707b
---
M LiquidThreads.php
M classes/Dispatch.php
M classes/View.php
M pages/IndividualThreadHistoryView.php
M pages/TalkpageHeaderView.php
M pages/TalkpageHistoryView.php
M pages/TalkpageView.php
M pages/ThreadDiffView.php
M pages/ThreadHistoryListingView.php
M pages/ThreadPermalinkView.php
M pages/ThreadProtectionFormView.php
11 files changed, 2 insertions(+), 128 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LiquidThreads.php b/LiquidThreads.php
index e6ca056..076472a 100644
--- a/LiquidThreads.php
+++ b/LiquidThreads.php
@@ -109,7 +109,6 @@
// Main dispatch hook
$wgHooks['MediaWikiPerformAction'][] = 'LqtDispatch::tryPage';
-$wgHooks['SkinTemplateTabs'][] = 'LqtDispatch::onSkinTemplateTabs';
$wgHooks['SkinTemplateNavigation'][] = 'LqtDispatch::onSkinTemplateNavigation';
$wgHooks['PageContentLanguage'][] = 'LqtDispatch::onPageContentLanguage';
diff --git a/classes/Dispatch.php b/classes/Dispatch.php
index 5a26631..ca79fee 100644
--- a/classes/Dispatch.php
+++ b/classes/Dispatch.php
@@ -235,14 +235,6 @@
return true;
}
- static function onSkinTemplateTabs( $skinTemplate, $links ) {
- if ( !self::$primaryView ) return true;
-
- self::$primaryView-customizeTabs( $skinTemplate, $links );
-
- return true;
- }
-
/**
* Most stuff is in the user language.
* @param $title Title
diff --git a/classes/View.php b/classes/View.php
index 95b54a3..b1101b6 100644
--- a/classes/View.php
+++ b/classes/View.php
@@ -2380,10 +2380,6 @@
return $sig;
}
- function customizeTabs( $skin, $links ) {
- // No-op
- }
-
function customizeNavigation( $skin, $links ) {
// No-op
}
diff --git a/pages/IndividualThreadHistoryView.php
b/pages/IndividualThreadHistoryView.php
index be88b2f..0a6bf8f 100644
--- a/pages/IndividualThreadHistoryView.php
+++ b/pages/IndividualThreadHistoryView.php
@@ -3,12 +3,6 @@
class IndividualThreadHistoryView extends ThreadPermalinkView {
protected $oldid;
- function customizeTabs( $skintemplate, $content_actions ) {
- $content_actions['history']['class'] = 'selected';
- parent::customizeTabs( $skintemplate, $content_actions );
- return true;
- }
-
function customizeNavigation( $skin, $links ) {
$links['views']['history']['class'] = 'selected';
parent::customizeNavigation( $skin, $links );
diff --git a/pages/TalkpageHeaderView.php b/pages/TalkpageHeaderView.php
index 3007946..f1909e5 100644
--- a/pages/TalkpageHeaderView.php
+++ b/pages/TalkpageHeaderView.php
@@ -3,21 +3,6 @@
// Pass-through wrapper with an extra note at the top
class TalkpageHeaderView extends LqtView {
- function customizeTabs( $skintemplate, $content_actions ) {
- unset( $content_actions['edit'] );
- unset( $content_actions['addsection'] );
- unset( $content_actions['history'] );
- unset( $content_actions['watch'] );
- unset( $content_actions['move'] );
-
- $content_actions['talk']['class'] = false;
- $content_actions['header'] = array(
- 'class' = 'selected',
- 'text' = wfMessage( 'lqt-talkpage-history-tab'
)-text(),
- 'href' = '',
- );
- }
-
function customizeNavigation( $skin, $links ) {
$remove = array(
'actions/edit',
diff --git a/pages/TalkpageHistoryView.php b/pages/TalkpageHistoryView.php
index 4d9be65..60b58cf 100644
--- a/pages/TalkpageHistoryView.php
+++ b/pages/TalkpageHistoryView.php
@@ -20,12 +20,6 @@
return false;
}
- function customizeTabs( $skin, $links ) {
- TalkpageView::customizeTalkpageTabs( $skin, $links, $this );
-
- $links['history']['class'] = 'selected';
- }
-
function customizeNavigation( $skin, $links ) {
TalkpageView::customizeTalkpageNavigation( $skin, $links, $this
);
$links['views']['history']['class'] = 'selected';
diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index 003e3b2..a0fe8ef 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -14,21 +14,6 @@
$this-talkpage = $tp;
}
- /* Added to SkinTemplateTabs hook in TalkpageView::show(). */
- static function customizeTalkpageTabs( $skintemplate,
$content_actions, $view ) {
-
[MediaWiki-commits] [Gerrit] Fix PHP Notice when viewing history of a non-existing thread - change (mediawiki...LiquidThreads)
Alex Monk has submitted this change and it was merged.
Change subject: Fix PHP Notice when viewing history of a non-existing thread
..
Fix PHP Notice when viewing history of a non-existing thread
PHP Notice: Vector/VectorTemplate.php: Undefined index: href
Bug: 38334
Change-Id: I13785361fb5042062d3b0ec650450b48102f88fb
---
M pages/ThreadHistoryListingView.php
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Alex Monk: Verified; Looks good to me, approved
diff --git a/pages/ThreadHistoryListingView.php
b/pages/ThreadHistoryListingView.php
index a3a5722..e388479 100644
--- a/pages/ThreadHistoryListingView.php
+++ b/pages/ThreadHistoryListingView.php
@@ -31,7 +31,10 @@
function customizeNavigation( $skin, $links ) {
parent::customizeNavigation( $skin, $links );
- $links['views']['history']['class'] = 'selected';
- $links['views']['view']['class'] = '';
+ // Not present if thread does not exist
+ if ( isset( $links['views']['history'] ) ) {
+ $links['views']['history']['class'] = 'selected';
+ $links['views']['view']['class'] = '';
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/174922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13785361fb5042062d3b0ec650450b48102f88fb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dsh: add mw1228 and mw1229 - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/174972 Change subject: dsh: add mw1228 and mw1229 .. dsh: add mw1228 and mw1229 Change-Id: I6ebfff060029df738bdc62077c3fa7af9b35084c Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/72/174972/1 diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index 2ad30ba..1870bd9 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -219,6 +219,8 @@ mw1219 mw1220 mw1227 +mw1228 +mw1229 mw1230 mw1231 mw1232 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 9f426d7..5067815 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -228,6 +228,8 @@ mw1219 mw1220 mw1227 +mw1228 +mw1229 mw1230 mw1231 mw1232 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index 21ffe20..9bf722c 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -219,6 +219,8 @@ mw1219 mw1220 mw1227 +mw1228 +mw1229 mw1230 mw1231 mw1232 -- To view, visit https://gerrit.wikimedia.org/r/174972 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ebfff060029df738bdc62077c3fa7af9b35084c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw row B labs network - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: codfw row B labs network
..
codfw row B labs network
Allocate a /24 for labs support hosts on codfw row B. Leave:
10.192.4.0/24
10.192.20.0/24
10.192.36.0/24
10.192.52.0/24
for labs hosts free for now.
Accordingly other rows should have:
10.192.5.0/24
10.192.37.0/24
10.192.53.0/24
Change-Id: Ie7046404bd7152d5c678a5bdc15fe9a63b6db669
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 30 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e46285c..9626ce6 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2417,6 +2417,12 @@
5 1H IN PTR vl2017-eth1.lvs2005.codfw.wmnet.
6 1H IN PTR vl2017-eth1.lvs2006.codfw.wmnet.
+; 10.192.4.0/22 - labs-hosts1-a-codfw - RESERVED
+$ORIGIN 4.192.{{ zonename }}.
+
+; 10.192.4.0/22 - labs-support1-a-codfw - RESERVED
+$ORIGIN 5.192.{{ zonename }}.
+
; 10.192.16.0/22 - private1-b-codfw
$ORIGIN 16.192.{{ zonename }}.
@@ -2460,6 +2466,15 @@
5 1H IN PTR lvs2005.codfw.wmnet.
6 1H IN PTR lvs2006.codfw.wmnet.
+; 10.192.20.0/22 - labs-hosts1-b-codfw - RESERVED
+$ORIGIN 20.192.{{ zonename }}.
+
+; 10.192.21.0/22 - labs-support1-b-codfw
+$ORIGIN 21.192.{{ zonename }}.
+1 1H IN PTR vrrp-gw-2122.codfw.wmnet.
+2 1H IN PTR ae1-2122.cr1-codfw.wikimedia.org.
+3 1H IN PTR ae1-2122.cr2-codfw.wikimedia.org.
+
; 10.192.32.0/22 - private1-c-codfw
$ORIGIN 32.192.{{ zonename }}.
@@ -2489,6 +2504,12 @@
5 1H IN PTR vl2019-eth2.lvs2005.codfw.wmnet.
6 1H IN PTR vl2019-eth2.lvs2006.codfw.wmnet.
+; 10.192.36.0/22 - labs-hosts1-c-codfw - RESERVED
+$ORIGIN 36.192.{{ zonename }}.
+
+; 10.192.37.0/22 - labs-support1-c-codfw - RESERVED
+$ORIGIN 37.192.{{ zonename }}.
+
; 10.192.48.0/22 - private1-d-codfw
$ORIGIN 48.192.{{ zonename }}.
@@ -2504,6 +2525,12 @@
5 1H IN PTR vl2020-eth3.lvs2005.codfw.wmnet.
6 1H IN PTR vl2020-eth3.lvs2006.codfw.wmnet.
+; 10.192.52.0/22 - labs-hosts1-d-codfw - RESERVED
+$ORIGIN 52.192.{{ zonename }}.
+
+; 10.192.53.0/22 - labs-support1-d-codfw - RESERVED
+$ORIGIN 53.192.{{ zonename }}.
+
$ORIGIN 0.193.{{ zonename }}.
; 10.193.0.0/16 - mgmt-codfw
diff --git a/templates/wmnet b/templates/wmnet
index c642db0..fdc1e2f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2130,6 +2130,9 @@
vl2020-eth3.lvs2005 1H IN A10.192.49.5
vl2020-eth3.lvs2006 1H IN A10.192.49.6
+; codfw VRRP addresses
+vrrp-gw-21221H IN A10.192.21.1
+
; CODFW fundraising/payments
$ORIGIN frack.codfw.{{ zonename }}.
payments20011H IN A10.195.0.5
--
To view, visit https://gerrit.wikimedia.org/r/174955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7046404bd7152d5c678a5bdc15fe9a63b6db669
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@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] dsh: add mw1228 and mw1229 - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: dsh: add mw1228 and mw1229 .. dsh: add mw1228 and mw1229 Change-Id: I6ebfff060029df738bdc62077c3fa7af9b35084c Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/dsh/files/group/apaches M modules/dsh/files/group/mediawiki-installation M modules/dsh/files/group/mw-eqiad 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/dsh/files/group/apaches b/modules/dsh/files/group/apaches index 2ad30ba..1870bd9 100644 --- a/modules/dsh/files/group/apaches +++ b/modules/dsh/files/group/apaches @@ -219,6 +219,8 @@ mw1219 mw1220 mw1227 +mw1228 +mw1229 mw1230 mw1231 mw1232 diff --git a/modules/dsh/files/group/mediawiki-installation b/modules/dsh/files/group/mediawiki-installation index 9f426d7..5067815 100644 --- a/modules/dsh/files/group/mediawiki-installation +++ b/modules/dsh/files/group/mediawiki-installation @@ -228,6 +228,8 @@ mw1219 mw1220 mw1227 +mw1228 +mw1229 mw1230 mw1231 mw1232 diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad index 21ffe20..9bf722c 100644 --- a/modules/dsh/files/group/mw-eqiad +++ b/modules/dsh/files/group/mw-eqiad @@ -219,6 +219,8 @@ mw1219 mw1220 mw1227 +mw1228 +mw1229 mw1230 mw1231 mw1232 -- To view, visit https://gerrit.wikimedia.org/r/174972 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ebfff060029df738bdc62077c3fa7af9b35084c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] rubocop change to an if() - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/174973 Change subject: [BrowserTest] rubocop change to an if() .. [BrowserTest] rubocop change to an if() Change-Id: I5ae9ec4d94af88fa67ac8de58a38b6ea03b14acc --- M .rubocop_todo.yml M modules/ve-mw/tests/browser/features/support/language_screenshot.rb 2 files changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/73/174973/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8cf6572..cf265f1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -36,8 +36,3 @@ Style/GlobalVars: Enabled: false -# Offense count: 1 -# Configuration parameters: MaxLineLength. -Style/IfUnlessModifier: - Enabled: false - diff --git a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb index dad782d..29870f5 100644 --- a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb +++ b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb @@ -34,9 +34,7 @@ # It happens with some elements that an image goes off the screen a bit, # and chunky_png fails when this happens - if image.width top_left_x + width -width = image.width - top_left_x - end + width = image.width - top_left_x if image.width top_left_x + width image.crop!(top_left_x, top_left_y, width, height) image.save path -- To view, visit https://gerrit.wikimedia.org/r/174973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ae9ec4d94af88fa67ac8de58a38b6ea03b14acc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] rubocop change to an if() - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] rubocop change to an if() .. [BrowserTest] rubocop change to an if() Change-Id: I5ae9ec4d94af88fa67ac8de58a38b6ea03b14acc --- M .rubocop_todo.yml M modules/ve-mw/tests/browser/features/support/language_screenshot.rb 2 files changed, 1 insertion(+), 8 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8cf6572..cf265f1 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -36,8 +36,3 @@ Style/GlobalVars: Enabled: false -# Offense count: 1 -# Configuration parameters: MaxLineLength. -Style/IfUnlessModifier: - Enabled: false - diff --git a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb index dad782d..29870f5 100644 --- a/modules/ve-mw/tests/browser/features/support/language_screenshot.rb +++ b/modules/ve-mw/tests/browser/features/support/language_screenshot.rb @@ -34,9 +34,7 @@ # It happens with some elements that an image goes off the screen a bit, # and chunky_png fails when this happens - if image.width top_left_x + width -width = image.width - top_left_x - end + width = image.width - top_left_x if image.width top_left_x + width image.crop!(top_left_x, top_left_y, width, height) image.save path -- To view, visit https://gerrit.wikimedia.org/r/174973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ae9ec4d94af88fa67ac8de58a38b6ea03b14acc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@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] Syncronize VisualEditor: 3d61fe7..4738772 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 3d61fe7..4738772 .. Syncronize VisualEditor: 3d61fe7..4738772 Change-Id: If0aab3e7b18a113bd18d8967014d0f6fc6fe2bcd --- 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 3d61fe7..4738772 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 3d61fe724d6aabebc87edb097dc437ab38a891ba +Subproject commit 473877202bec449bffd54eabe42a1b02c0dfd22d -- To view, visit https://gerrit.wikimedia.org/r/174974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0aab3e7b18a113bd18d8967014d0f6fc6fe2bcd 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: 3d61fe7..4738772 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174974 Change subject: Syncronize VisualEditor: 3d61fe7..4738772 .. Syncronize VisualEditor: 3d61fe7..4738772 Change-Id: If0aab3e7b18a113bd18d8967014d0f6fc6fe2bcd --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/74/174974/1 diff --git a/VisualEditor b/VisualEditor index 3d61fe7..4738772 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 3d61fe724d6aabebc87edb097dc437ab38a891ba +Subproject commit 473877202bec449bffd54eabe42a1b02c0dfd22d -- To view, visit https://gerrit.wikimedia.org/r/174974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0aab3e7b18a113bd18d8967014d0f6fc6fe2bcd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix translate log saving - change (mediawiki...SecurePoll)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix translate log saving
..
Fix translate log saving
We need to reload the election from the database before getting a
Content from it, or else we save the pre-edit data.
Change-Id: Ife263b0cb1969aebd72bb2416b1fede4c2c8c9f2
---
M includes/pages/TranslatePage.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/pages/TranslatePage.php b/includes/pages/TranslatePage.php
index 1b13238..e92fe7c 100644
--- a/includes/pages/TranslatePage.php
+++ b/includes/pages/TranslatePage.php
@@ -188,8 +188,12 @@
);
if ( $wgSecurePollUseNamespace ) {
+ // Create a new context to bypass caching
+ $context = new SecurePoll_Context;
+ $election = $context-getElection(
$this-election-getId() );
+
list( $title, $content ) =
SecurePollContentHandler::makeContentFromElection(
- $this-election, msg/$secondary );
+ $election, msg/$secondary );
$wp = WikiPage::factory( $title );
$wp-doEditContent( $content,
$wgRequest-getText( 'comment' ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/174898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife263b0cb1969aebd72bb2416b1fede4c2c8c9f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
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] [BrowserTest] comments for classes - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174975
Change subject: [BrowserTest] comments for classes
..
[BrowserTest] comments for classes
Change-Id: I3d5e063ee4dd36632ab9c2a433660567b70777ea
---
M .rubocop_todo.yml
M modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
D modules/ve-mw/tests/browser/features/support/pages/user_page.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
5 files changed, 3 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/75/174975/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cf265f1..a45077f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -27,10 +27,6 @@
Metrics/MethodLength:
Max: 18
-# Offense count: 4
-Style/Documentation:
- Enabled: false
-
# Offense count: 3
# Configuration parameters: AllowedVariables.
Style/GlobalVars:
diff --git a/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
index 11f099a..54e4cdd 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
@@ -1,3 +1,4 @@
+# This is used in the verify_production_wikis test
class DummyPage
include PageObject
diff --git a/modules/ve-mw/tests/browser/features/support/pages/user_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/user_page.rb
deleted file mode 100644
index a7c80be..000
--- a/modules/ve-mw/tests/browser/features/support/pages/user_page.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class UserPage
- include PageObject
-
- include URL
- page_url URL.url('%=params[:page_title]%')
-
- div(:ve_editing_surface, class: 've-ui-surface
ve-init-mw-viewPageTarget-surface')
-end
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 9b08946..b0b2b97 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -1,3 +1,4 @@
+# This is the main page for VisualEditor
class VisualEditorPage
include PageObject
include URL
diff --git a/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
b/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
index ed379ff..732dd2d 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
@@ -1,3 +1,4 @@
+# This page object exists because logged in users should not see these URL
params
class ZtargetPage VisualEditorPage
include URL
page_url
URL.url('%=params[:article_name]%?vehidebetadialog=trueveaction=edit')
--
To view, visit https://gerrit.wikimedia.org/r/174975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d5e063ee4dd36632ab9c2a433660567b70777ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] comments for classes - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] comments for classes
..
[BrowserTest] comments for classes
Change-Id: I3d5e063ee4dd36632ab9c2a433660567b70777ea
---
M .rubocop_todo.yml
M modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
D modules/ve-mw/tests/browser/features/support/pages/user_page.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
5 files changed, 3 insertions(+), 12 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cf265f1..a45077f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -27,10 +27,6 @@
Metrics/MethodLength:
Max: 18
-# Offense count: 4
-Style/Documentation:
- Enabled: false
-
# Offense count: 3
# Configuration parameters: AllowedVariables.
Style/GlobalVars:
diff --git a/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
index 11f099a..54e4cdd 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
@@ -1,3 +1,4 @@
+# This is used in the verify_production_wikis test
class DummyPage
include PageObject
diff --git a/modules/ve-mw/tests/browser/features/support/pages/user_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/user_page.rb
deleted file mode 100644
index a7c80be..000
--- a/modules/ve-mw/tests/browser/features/support/pages/user_page.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class UserPage
- include PageObject
-
- include URL
- page_url URL.url('%=params[:page_title]%')
-
- div(:ve_editing_surface, class: 've-ui-surface
ve-init-mw-viewPageTarget-surface')
-end
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 9b08946..b0b2b97 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -1,3 +1,4 @@
+# This is the main page for VisualEditor
class VisualEditorPage
include PageObject
include URL
diff --git a/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
b/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
index ed379ff..732dd2d 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/zarticlepage.rb
@@ -1,3 +1,4 @@
+# This page object exists because logged in users should not see these URL
params
class ZtargetPage VisualEditorPage
include URL
page_url
URL.url('%=params[:article_name]%?vehidebetadialog=trueveaction=edit')
--
To view, visit https://gerrit.wikimedia.org/r/174975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d5e063ee4dd36632ab9c2a433660567b70777ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon cmcma...@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] Avoid IndexOutOfBoundsException in when loading page - change (apps...wikipedia)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174976
Change subject: Avoid IndexOutOfBoundsException in when loading page
..
Avoid IndexOutOfBoundsException in when loading page
Change-Id: I29ce4a6f682828a1d113246bf63e71b79cb2bec5
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/76/174976/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 2f5a2ce..edbc805 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -241,7 +241,7 @@
if (index page.getSections().size()) {
wrapper.put(section, page.getSections().get(index).toJSON());
wrapper.put(index, index);
-if (sectionTargetFromIntent 0) {
+if (sectionTargetFromIntent 0 sectionTargetFromIntent
page.getSections().size()) {
//if we have a section to scroll to (from our Intent):
wrapper.put(fragment,
page.getSections().get(sectionTargetFromIntent).getAnchor());
} else if (sectionTargetFromTitle != null) {
--
To view, visit https://gerrit.wikimedia.org/r/174976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29ce4a6f682828a1d113246bf63e71b79cb2bec5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4738772..f6526cb - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174977 Change subject: Syncronize VisualEditor: 4738772..f6526cb .. Syncronize VisualEditor: 4738772..f6526cb Change-Id: I17fa23cdb53ada6ec58973124dae553934fafadd --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/77/174977/1 diff --git a/VisualEditor b/VisualEditor index 4738772..f6526cb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 473877202bec449bffd54eabe42a1b02c0dfd22d +Subproject commit f6526cb0a91ab162ef73962ac13d7fff7c788fdd -- To view, visit https://gerrit.wikimedia.org/r/174977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17fa23cdb53ada6ec58973124dae553934fafadd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4738772..f6526cb - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4738772..f6526cb .. Syncronize VisualEditor: 4738772..f6526cb Change-Id: I17fa23cdb53ada6ec58973124dae553934fafadd --- 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 4738772..f6526cb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 473877202bec449bffd54eabe42a1b02c0dfd22d +Subproject commit f6526cb0a91ab162ef73962ac13d7fff7c788fdd -- To view, visit https://gerrit.wikimedia.org/r/174977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17fa23cdb53ada6ec58973124dae553934fafadd 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] [BrowserTest] have rubocop not complain about number of line... - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/174978 Change subject: [BrowserTest] have rubocop not complain about number of lines in class .. [BrowserTest] have rubocop not complain about number of lines in class Change-Id: I9d5f040c9a2da7a3d18e7cc62b79bc9274275274 --- M .rubocop.yml M .rubocop_todo.yml 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/78/174978/1 diff --git a/.rubocop.yml b/.rubocop.yml index bbb0089..3d08c55 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,3 +2,6 @@ Metrics/ClassLength: Enabled: false + +Metrics/MethodLength: + Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a45077f..2226b2b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -23,11 +23,6 @@ Max: 398 # Offense count: 3 -# Configuration parameters: CountComments. -Metrics/MethodLength: - Max: 18 - -# Offense count: 3 # Configuration parameters: AllowedVariables. Style/GlobalVars: Enabled: false -- To view, visit https://gerrit.wikimedia.org/r/174978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d5f040c9a2da7a3d18e7cc62b79bc9274275274 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] RuboCop should not complain about number of li... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] RuboCop should not complain about number of lines in a method .. [BrowserTest] RuboCop should not complain about number of lines in a method Change-Id: I9d5f040c9a2da7a3d18e7cc62b79bc9274275274 --- M .rubocop.yml M .rubocop_todo.yml 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop.yml b/.rubocop.yml index bbb0089..3d08c55 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,3 +2,6 @@ Metrics/ClassLength: Enabled: false + +Metrics/MethodLength: + Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a45077f..2226b2b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -23,11 +23,6 @@ Max: 398 # Offense count: 3 -# Configuration parameters: CountComments. -Metrics/MethodLength: - Max: 18 - -# Offense count: 3 # Configuration parameters: AllowedVariables. Style/GlobalVars: Enabled: false -- To view, visit https://gerrit.wikimedia.org/r/174978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d5f040c9a2da7a3d18e7cc62b79bc9274275274 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@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] Syncronize VisualEditor: f6526cb..7c19097 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: f6526cb..7c19097 .. Syncronize VisualEditor: f6526cb..7c19097 Change-Id: I43ea8c045d2b87492956a449b126b7cffa944aaf --- 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 f6526cb..7c19097 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit f6526cb0a91ab162ef73962ac13d7fff7c788fdd +Subproject commit 7c190978c9af5e66d7dba738ab4d0f23c8014b30 -- To view, visit https://gerrit.wikimedia.org/r/174979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43ea8c045d2b87492956a449b126b7cffa944aaf 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: f6526cb..7c19097 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/174979 Change subject: Syncronize VisualEditor: f6526cb..7c19097 .. Syncronize VisualEditor: f6526cb..7c19097 Change-Id: I43ea8c045d2b87492956a449b126b7cffa944aaf --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/79/174979/1 diff --git a/VisualEditor b/VisualEditor index f6526cb..7c19097 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit f6526cb0a91ab162ef73962ac13d7fff7c788fdd +Subproject commit 7c190978c9af5e66d7dba738ab4d0f23c8014b30 -- To view, visit https://gerrit.wikimedia.org/r/174979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43ea8c045d2b87492956a449b126b7cffa944aaf 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
