[MediaWiki-commits] [Gerrit] tests: Reformat tests, evaluate status in addition to I/O - change (mediawiki...TemplateData)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63992
Change subject: tests: Reformat tests, evaluate status in addition to I/O
..
tests: Reformat tests, evaluate status in addition to I/O
Previously we only compared output, we now evaluate
status as well.
For example test {} = {} was misleading since the reason
it roundtripped was because it is *invalid* and we replace
invalid blobs with an empty object in blob storage.
But in the API this'll never get used because getStatus
will have a fatal error in it. Which overrides the data.
The tests were previously looking in the data whilst ignoring
the return status.
Change-Id: I9809f126c1615c9bc9c28ce2d8bb7953058cbf6e
---
M tests/TemplateDataBlobTest.php
1 file changed, 81 insertions(+), 89 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/92/63992/1
diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index d19656b..88fd22b 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -11,37 +11,56 @@
}
public static function provideParse() {
- return array(
+ $cases = array(
array(
- '
- {}
+ 'input' = '[]
',
- '
- {}
- ',
- 'Empty object'
+ 'status' = false,
+ 'msg' = 'Not an object'
),
array(
- '
- {
+ 'input' = '{
+ params: {}
+ }
+ ',
+ 'output' = '{
+ description: null,
+ params: {}
+ }
+ ',
+ 'status' = true,
+ 'msg' = 'Minimal valid blob'
+ ),
+ array(
+ 'input' = '{
+ params: {},
foo: bar
}
',
- '
- {}
- ',
- 'Unknown properties are stripped'
+ 'status' = false,
+ 'msg' = 'Unknown properties'
),
array(
- '
- {
+ 'input' = '{}',
+ 'status' = false,
+ 'msg' = 'Empty object'
+ ),
+ array(
+ 'input' = '{
+ foo: bar
+ }
+ ',
+ 'status' = false,
+ 'msg' = 'Unknown properties invalidate the
blob'
+ ),
+ array(
+ 'input' = '{
params: {
foo: {}
}
}
',
- '
- {
+ 'output' = '{
description: null,
params: {
foo: {
@@ -56,11 +75,10 @@
}
}
',
- 'Optional properties are added if missing'
+ 'msg' = 'Optional properties are added if
missing'
),
array(
- '
- {
+ 'input' = '{
description: User badge MediaWiki
developers.,
params: {
nickname: {
@@ -75,8 +93,7 @@
}
}
',
- '
- {
[MediaWiki-commits] [Gerrit] Implement Sets - change (mediawiki...TemplateData)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63999
Change subject: Implement Sets
..
Implement Sets
Change-Id: I93a0ba7287fec6e5566994d03dff1d8eaeeb8430
---
M TemplateDataBlob.php
M spec.templatedata.json
M tests/TemplateDataBlobTest.php
3 files changed, 165 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/99/63999/1
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 9bd9114..e9eb497 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -49,8 +49,9 @@
$data = $this-data;
static $rootKeys = array(
- 'params',
'description',
+ 'params',
+ 'sets',
);
static $paramKeys = array(
'label',
@@ -213,7 +214,45 @@
}
}
- // TODO: Root.sets
+ // Root.sets
+ if ( isset( $data-sets ) ) {
+ if ( !is_array( $data-sets ) ) {
+ return Status::newFatal(
'templatedata-invalid-type', 'sets', 'array' );
+ }
+ } else {
+ $data-sets = array();
+ }
+
+ foreach ( $data-sets as $setNr = $setObj ) {
+ if ( !is_object( $setObj ) ) {
+ return Status::newFatal(
'templatedata-invalid-type', sets.{$setNr}, 'object' );
+ }
+
+ if ( !isset( $setObj-label ) ) {
+ return Status::newFatal(
'templatedata-invalid-missing', sets.{$setNr}.label, 'string|object' );
+ }
+
+ if ( !is_object( $setObj-label ) !is_string(
$setObj-label ) ) {
+ // TODO: Also validate that if it is an object,
the keys are valid lang codes and the values strings.
+ return Status::newFatal(
'templatedata-invalid-type', sets.{$setNr}.label, 'string|object' );
+ }
+
+ $setObj-label = self::normaliseInterfaceText(
$setObj-label );
+
+ if ( !isset( $setObj-params ) ) {
+ return Status::newFatal(
'templatedata-invalid-missing', sets.{$setNr}.params, 'array' );
+ }
+
+ if ( !is_array( $setObj-params ) ) {
+ return Status::newFatal(
'templatedata-invalid-type', sets.{$setNr}.params, 'array' );
+ }
+
+ foreach ( $setObj-params as $param ) {
+ if ( !isset( $data-params-$param ) ) {
+ return Status::newFatal(
'templatedata-invalid-missing', params.{$param} );
+ }
+ }
+ }
return Status::newGood();
}
diff --git a/spec.templatedata.json b/spec.templatedata.json
index 75869b4..d57a6f1 100644
--- a/spec.templatedata.json
+++ b/spec.templatedata.json
@@ -98,10 +98,10 @@
required: false
}
},
- sets: {
- date: {
+ sets: [
+ {
label: Date,
params: [year, month, day]
}
- }
+ ]
}
diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index 77d7267..9b823d4 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -24,7 +24,8 @@
',
'output' = '{
description: null,
- params: {}
+ params: {},
+ sets: []
}
',
'status' = true,
@@ -71,7 +72,8 @@
aliases: [],
type: unknown
}
- }
+ },
+ sets: []
}
',
'msg' = 'Optional properties are added if
missing'
@@ -110,7 +112,8 @@
],
type: unknown
}
- }
+
[MediaWiki-commits] [Gerrit] Enable mwext-TemplateData-phpcs-HEAD - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/64056 Change subject: Enable mwext-TemplateData-phpcs-HEAD .. Enable mwext-TemplateData-phpcs-HEAD Change-Id: I0ea73ca1439c8aa6015d66a28828a47f984d56ed --- M layout.yaml 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/56/64056/1 diff --git a/layout.yaml b/layout.yaml index 34d2477..75c2232 100644 --- a/layout.yaml +++ b/layout.yaml @@ -486,7 +486,6 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-REL1_21 - # phpcs is just running on modified files, it is too slow otherwise - mediawiki-core-regression-phpcs-HEAD - mediawiki-core-doxygen-publish @@ -2545,11 +2544,14 @@ - name: mediawiki/extensions/TemplateData check: + - mwext-TemplateData-phpcs-HEAD - mwext-TemplateData-lint test: + - mwext-TemplateData-phpcs-HEAD - mwext-TemplateData-lint: - mwext-TemplateData-testextensions-master gate-and-submit: + - mwext-TemplateData-phpcs-HEAD - mwext-TemplateData-lint: - mwext-TemplateData-testextensions-master -- To view, visit https://gerrit.wikimedia.org/r/64056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ea73ca1439c8aa6015d66a28828a47f984d56ed Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable mwext-TemplateData-phpcs-HEAD - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: Enable mwext-TemplateData-phpcs-HEAD .. Enable mwext-TemplateData-phpcs-HEAD Change-Id: I0ea73ca1439c8aa6015d66a28828a47f984d56ed --- M layout.yaml 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 34d2477..75c2232 100644 --- a/layout.yaml +++ b/layout.yaml @@ -486,7 +486,6 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-REL1_21 - # phpcs is just running on modified files, it is too slow otherwise - mediawiki-core-regression-phpcs-HEAD - mediawiki-core-doxygen-publish @@ -2545,11 +2544,14 @@ - name: mediawiki/extensions/TemplateData check: + - mwext-TemplateData-phpcs-HEAD - mwext-TemplateData-lint test: + - mwext-TemplateData-phpcs-HEAD - mwext-TemplateData-lint: - mwext-TemplateData-testextensions-master gate-and-submit: + - mwext-TemplateData-phpcs-HEAD - mwext-TemplateData-lint: - mwext-TemplateData-testextensions-master -- To view, visit https://gerrit.wikimedia.org/r/64056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ea73ca1439c8aa6015d66a28828a47f984d56ed Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sample commit for Jenkins - change (mediawiki...TemplateData)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64060
Change subject: Sample commit for Jenkins
..
Sample commit for Jenkins
Change-Id: Ib16f1f4305aecb5609beb18c6cc101f93ccdc84a
---
M TemplateData.hooks.php
M TemplateData.i18n.php
M TemplateData.php
M TemplateDataBlob.php
M api/ApiTemplateData.php
M tests/TemplateDataBlobTest.php
6 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/60/64060/1
diff --git a/TemplateData.hooks.php b/TemplateData.hooks.php
index d830948..40caa6f 100644
--- a/TemplateData.hooks.php
+++ b/TemplateData.hooks.php
@@ -9,7 +9,7 @@
class TemplateDataHooks {
/**
-* Register parser hooks
+* Register parser hooks..
*/
public static function onParserFirstCallInit( $parser ) {
$parser-setHook( 'templatedata', array( 'TemplateDataHooks',
'render' ) );
diff --git a/TemplateData.i18n.php b/TemplateData.i18n.php
index 05a528e..dcd2771 100644
--- a/TemplateData.i18n.php
+++ b/TemplateData.i18n.php
@@ -1,4 +1,5 @@
?php
+//..
$messages = array();
/** English
diff --git a/TemplateData.php b/TemplateData.php
index 159729f..a45675f 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -1,6 +1,6 @@
?php
/**
- * TemplateInfo extension.
+ * TemplateInfo extension...
*
* @file
* @ingroup Extensions
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index e9eb497..ed5c57f 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -1,7 +1,7 @@
?php
/**
* @file
- * @ingroup Extensions
+ * @ingroup Extensions..
*/
/**
diff --git a/api/ApiTemplateData.php b/api/ApiTemplateData.php
index 87fe544..1eb3d9f 100644
--- a/api/ApiTemplateData.php
+++ b/api/ApiTemplateData.php
@@ -1,7 +1,7 @@
?php
/**
* Implement the 'templatedata' query module in the API.
- * Format JSON only.
+ * Format JSON only..
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index 9b823d4..5f8e2b9 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -316,7 +316,7 @@
*/
public function testParse( Array $cases ) {
- // Expand defaults
+ // Expand defaults.
if ( !isset( $cases['status'] ) ) {
$cases['status'] = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/64060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib16f1f4305aecb5609beb18c6cc101f93ccdc84a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] phpcs: Resolve style violations - change (mediawiki...TemplateData)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64072
Change subject: phpcs: Resolve style violations
..
phpcs: Resolve style violations
Change-Id: Ie5d4d84b8d7b6bc88e7a5a1559579e504dd1bd20
---
M TemplateData.hooks.php
M TemplateDataBlob.php
M api/ApiTemplateData.php
M tests/TemplateDataBlobTest.php
4 files changed, 93 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/72/64072/1
diff --git a/TemplateData.hooks.php b/TemplateData.hooks.php
index d830948..25d2921 100644
--- a/TemplateData.hooks.php
+++ b/TemplateData.hooks.php
@@ -71,7 +71,8 @@
* @param array $args: The attributes of the tag.
* @param Parser $parser: Parser instance available to render
* wikitext into html, or parser methods.
-* @param PPFrame $frame: Can be used to see what template parameters
({{{1}}}, etc.) this hook was used with.
+* @param PPFrame $frame: Can be used to see what template parameters
({{{1}}}, etc.)
+* this hook was used with.
*
* @return string: HTML to insert in the page.
*/
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index e9eb497..58c4f41 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -111,21 +111,31 @@
foreach ( $data-params as $paramName = $paramObj ) {
if ( !is_object( $paramObj ) ) {
- return Status::newFatal(
'templatedata-invalid-type', params.{$paramName}, 'object' );
+ return Status::newFatal(
+ 'templatedata-invalid-type',
+ params.{$paramName},
+ 'object'
+ );
}
foreach ( $paramObj as $key = $value ) {
if ( !in_array( $key, $paramKeys ) ) {
- return Status::newFatal(
'templatedata-invalid-unknown', params.{$paramName}.{$key} );
+ return Status::newFatal(
+ 'templatedata-invalid-unknown',
+ params.{$paramName}.{$key}
+ );
}
}
// Param.label
if ( isset( $paramObj-label ) ) {
if ( !is_object( $paramObj-label )
!is_string( $paramObj-label ) ) {
- // TODO: Also validate that if it is an
object, the keys are valid lang codes
- // and the values strings.
- return Status::newFatal(
'templatedata-invalid-type', params.{$paramName}.label, 'string|object' );
+ // TODO: Also validate that the keys are valid
lang codes and the values strings.
+ return Status::newFatal(
+ 'templatedata-invalid-type',
+ params.{$paramName}.label,
+ 'string|object'
+ );
}
$paramObj-label =
self::normaliseInterfaceText( $paramObj-label );
} else {
@@ -135,7 +145,11 @@
// Param.required
if ( isset( $paramObj-required ) ) {
if ( !is_bool( $paramObj-required ) ) {
- return Status::newFatal(
'templatedata-invalid-type', params.{$paramName}.required, 'boolean' );
+ return Status::newFatal(
+ 'templatedata-invalid-type',
+ params.{$paramName}.required,
+ 'boolean'
+ );
}
} else {
$paramObj-required = false;
@@ -144,9 +158,12 @@
// Param.description
if ( isset( $paramObj-description ) ) {
if ( !is_object( $paramObj-description )
!is_string( $paramObj-description ) ) {
- // TODO: Also validate that if it is an
object, the keys are valid lang codes
- // and the values strings.
- return Status::newFatal(
'templatedata-invalid-type',
[MediaWiki-commits] [Gerrit] Disable Generic.CodeAnalysis.UnusedFunctionParameter - change (mediawiki...codesniffer)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/64074 Change subject: Disable Generic.CodeAnalysis.UnusedFunctionParameter .. Disable Generic.CodeAnalysis.UnusedFunctionParameter Change-Id: I6e587bf0e7eecd60f0d12afa937907b27d86c353 --- M MediaWiki/ruleset.xml 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer refs/changes/74/64074/1 diff --git a/MediaWiki/ruleset.xml b/MediaWiki/ruleset.xml index 06b3213..ff21bdd 100644 --- a/MediaWiki/ruleset.xml +++ b/MediaWiki/ruleset.xml @@ -13,7 +13,10 @@ rule ref=Generic.CodeAnalysis.JumbledIncrementer / rule ref=Generic.CodeAnalysis.UnconditionalIfStatement / rule ref=Generic.CodeAnalysis.UnnecessaryFinalModifier / - rule ref=Generic.CodeAnalysis.UnusedFunctionParameter / + !-- + https://pear.php.net/bugs/bug.php?id=19950 + rule ref=Generic.CodeAnalysis.UnusedFunctionParameter / + -- rule ref=Generic.CodeAnalysis.UselessOverridingMethod / rule ref=Generic.Files.ByteOrderMark / rule ref=Generic.Files.EndFileNewline / -- To view, visit https://gerrit.wikimedia.org/r/64074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e587bf0e7eecd60f0d12afa937907b27d86c353 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable Generic.CodeAnalysis.UnusedFunctionParameter - change (mediawiki...codesniffer)
Krinkle has submitted this change and it was merged. Change subject: Disable Generic.CodeAnalysis.UnusedFunctionParameter .. Disable Generic.CodeAnalysis.UnusedFunctionParameter Change-Id: I6e587bf0e7eecd60f0d12afa937907b27d86c353 --- M MediaWiki/ruleset.xml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/MediaWiki/ruleset.xml b/MediaWiki/ruleset.xml index 06b3213..ff21bdd 100644 --- a/MediaWiki/ruleset.xml +++ b/MediaWiki/ruleset.xml @@ -13,7 +13,10 @@ rule ref=Generic.CodeAnalysis.JumbledIncrementer / rule ref=Generic.CodeAnalysis.UnconditionalIfStatement / rule ref=Generic.CodeAnalysis.UnnecessaryFinalModifier / - rule ref=Generic.CodeAnalysis.UnusedFunctionParameter / + !-- + https://pear.php.net/bugs/bug.php?id=19950 + rule ref=Generic.CodeAnalysis.UnusedFunctionParameter / + -- rule ref=Generic.CodeAnalysis.UselessOverridingMethod / rule ref=Generic.Files.ByteOrderMark / rule ref=Generic.Files.EndFileNewline / -- To view, visit https://gerrit.wikimedia.org/r/64074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e587bf0e7eecd60f0d12afa937907b27d86c353 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update submodule tools/mwcodesniffer - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/64075 Change subject: Update submodule tools/mwcodesniffer .. Update submodule tools/mwcodesniffer Change-Id: If42c86a64de0f885ffb5867c41471d8091223026 --- M tools/mwcodesniffer 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/75/64075/1 diff --git a/tools/mwcodesniffer b/tools/mwcodesniffer index 51dc215..106143c 16 --- a/tools/mwcodesniffer +++ b/tools/mwcodesniffer -Subproject commit 51dc215e34b8d3027adecfbb68d1eec8aa30ec24 +Subproject commit 106143c3efd740344e1b60e8b2f04cc9ff039ea6 -- To view, visit https://gerrit.wikimedia.org/r/64075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If42c86a64de0f885ffb5867c41471d8091223026 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update submodule tools/mwcodesniffer - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: Update submodule tools/mwcodesniffer .. Update submodule tools/mwcodesniffer Change-Id: If42c86a64de0f885ffb5867c41471d8091223026 --- M tools/mwcodesniffer 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/tools/mwcodesniffer b/tools/mwcodesniffer index 51dc215..106143c 16 --- a/tools/mwcodesniffer +++ b/tools/mwcodesniffer -Subproject commit 51dc215e34b8d3027adecfbb68d1eec8aa30ec24 +Subproject commit 106143c3efd740344e1b60e8b2f04cc9ff039ea6 -- To view, visit https://gerrit.wikimedia.org/r/64075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If42c86a64de0f885ffb5867c41471d8091223026 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make mwext-TemplateData-phpcs-HEAD voting - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/64076 Change subject: Make mwext-TemplateData-phpcs-HEAD voting .. Make mwext-TemplateData-phpcs-HEAD voting Change-Id: I7565eff83a7a128e043b6bcd76de7c29ae73327c --- M layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/76/64076/1 diff --git a/layout.yaml b/layout.yaml index 75c2232..49b35b7 100644 --- a/layout.yaml +++ b/layout.yaml @@ -355,6 +355,9 @@ - name: mwext-VisualEditor-jslint voting: true + - name: mwext-TemplateData-phpcs-HEAD +voting: true + - name: mediawiki-core-qunit # Doesn't work in MediaWiki REL1_19 # (times out or doesn't start in the first place). -- To view, visit https://gerrit.wikimedia.org/r/64076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7565eff83a7a128e043b6bcd76de7c29ae73327c Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make mwext-TemplateData-phpcs-HEAD voting - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: Make mwext-TemplateData-phpcs-HEAD voting .. Make mwext-TemplateData-phpcs-HEAD voting Change-Id: I7565eff83a7a128e043b6bcd76de7c29ae73327c --- M layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 75c2232..49b35b7 100644 --- a/layout.yaml +++ b/layout.yaml @@ -355,6 +355,9 @@ - name: mwext-VisualEditor-jslint voting: true + - name: mwext-TemplateData-phpcs-HEAD +voting: true + - name: mediawiki-core-qunit # Doesn't work in MediaWiki REL1_19 # (times out or doesn't start in the first place). -- To view, visit https://gerrit.wikimedia.org/r/64076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7565eff83a7a128e043b6bcd76de7c29ae73327c Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr 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] gitignore: mw-skins, labs- - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/64077 Change subject: gitignore: mw-skins, labs- .. gitignore: mw-skins, labs- Change-Id: Ib0d5f2590d4f5d302878f69720be0b5a2cdce42e --- M jobs/.gitignore 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/77/64077/1 diff --git a/jobs/.gitignore b/jobs/.gitignore index aa92e00..9fb59b2 100644 --- a/jobs/.gitignore +++ b/jobs/.gitignore @@ -30,11 +30,10 @@ /beta-* /gerrit-* /integration-* -/labs-nagios-* +/labs-* /lucene-search-* -/mediawiki-core-* -/mediawiki-vagrant-* -/mw-tools-* +/mediawiki-* +/mw-* /mwext-* /operations-* /parsoid-* -- To view, visit https://gerrit.wikimedia.org/r/64077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0d5f2590d4f5d302878f69720be0b5a2cdce42e Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gitignore: mw-skins, labs- - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: gitignore: mw-skins, labs- .. gitignore: mw-skins, labs- Change-Id: Ib0d5f2590d4f5d302878f69720be0b5a2cdce42e --- M jobs/.gitignore 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/jobs/.gitignore b/jobs/.gitignore index aa92e00..9fb59b2 100644 --- a/jobs/.gitignore +++ b/jobs/.gitignore @@ -30,11 +30,10 @@ /beta-* /gerrit-* /integration-* -/labs-nagios-* +/labs-* /lucene-search-* -/mediawiki-core-* -/mediawiki-vagrant-* -/mw-tools-* +/mediawiki-* +/mw-* /mwext-* /operations-* /parsoid-* -- To view, visit https://gerrit.wikimedia.org/r/64077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0d5f2590d4f5d302878f69720be0b5a2cdce42e Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enabling phpcs-HEAD for various extensions (non-voting) - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/64079 Change subject: Enabling phpcs-HEAD for various extensions (non-voting) .. Enabling phpcs-HEAD for various extensions (non-voting) Change-Id: Ic9194c079fa7d463b5b36ebed8bc3bfff5f98b21 --- M layout.yaml 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/79/64079/1 diff --git a/layout.yaml b/layout.yaml index 49b35b7..2a34a42 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1962,9 +1962,11 @@ check: - mwext-Parsoid-merge: - mwext-Parsoid-jslint +- mwext-Parsoid-phpcs-HEAD test: - mwext-Parsoid-merge: - mwext-Parsoid-jslint +- mwext-Parsoid-phpcs-HEAD - parsoid-parsertests - parsoid-parse-tool-check - parsoid-roundtrip-test-check @@ -1972,6 +1974,7 @@ gate-and-submit: - mwext-Parsoid-merge: - mwext-Parsoid-jslint +- mwext-Parsoid-phpcs-HEAD - parsoid-parsertests - parsoid-parsertests-run-harder postmerge: @@ -2539,10 +2542,12 @@ check-only: - mwext-SyntaxHighlight_GeSHi-merge: - mwext-SyntaxHighlight_GeSHi-jslint +- mwext-SyntaxHighlight_GeSHi-phpcs-HEAD - mwext-SyntaxHighlight_GeSHi-lint gate-and-submit: - mwext-SyntaxHighlight_GeSHi-merge: - mwext-SyntaxHighlight_GeSHi-jslint +- mwext-SyntaxHighlight_GeSHi-phpcs-HEAD - mwext-SyntaxHighlight_GeSHi-lint - name: mediawiki/extensions/TemplateData @@ -2635,6 +2640,7 @@ gate-and-submit: - mwext-Translate-merge: - mwext-Translate-jslint +- mwext-Translate-phpcs-HEAD - mwext-Translate-lint: - mwext-Translate-testextensions-master @@ -2642,15 +2648,18 @@ check-only: - mwext-TranslationNotifications-merge: - mwext-TranslationNotifications-jslint +- mwext-TranslationNotifications-phpcs-HEAD - mwext-TranslationNotifications-lint test: - mwext-TranslationNotifications-merge: - mwext-TranslationNotifications-jslint +- mwext-TranslationNotifications-phpcs-HEAD - mwext-TranslationNotifications-lint: - mwext-TranslationNotifications-testextensions-master gate-and-submit: - mwext-TranslationNotifications-merge: - mwext-TranslationNotifications-jslint +- mwext-TranslationNotifications-phpcs-HEAD - mwext-TranslationNotifications-lint: - mwext-TranslationNotifications-testextensions-master @@ -2666,10 +2675,12 @@ check-only: - mwext-TwnMainPage-merge: - mwext-TwnMainPage-jslint +- mwext-TwnMainPage-phpcs-HEAD - mwext-TwnMainPage-lint gate-and-submit: - mwext-TwnMainPage-merge: - mwext-TwnMainPage-jslint +- mwext-TwnMainPage-phpcs-HEAD - mwext-TwnMainPage-lint - name: mediawiki/extensions/UnicodeConverter @@ -2684,10 +2695,12 @@ check-only: - mwext-UniversalLanguageSelector-merge: - mwext-UniversalLanguageSelector-lint +- mwext-UniversalLanguageSelector-phpcs-HEAD - mwext-UniversalLanguageSelector-jslint gate-and-submit: - mwext-UniversalLanguageSelector-merge: - mwext-UniversalLanguageSelector-jslint +- mwext-UniversalLanguageSelector-phpcs-HEAD - mwext-UniversalLanguageSelector-lint: - mwext-UniversalLanguageSelector-testextensions-master @@ -2705,14 +2718,17 @@ check: - mwext-UploadWizard-merge: - mwext-UploadWizard-jslint +- mwext-UploadWizard-phpcs-HEAD - mwext-UploadWizard-lint test: - mwext-UploadWizard-merge: - mwext-UploadWizard-jslint +- mwext-UploadWizard-phpcs-HEAD - mwext-UploadWizard-lint gate-and-submit: - mwext-UploadWizard-merge: - mwext-UploadWizard-jslint +- mwext-UploadWizard-phpcs-HEAD - mwext-UploadWizard-lint - name: mediawiki/extensions/UserDailyContribs @@ -2775,10 +2791,12 @@ check-only: - mwext-Vector-merge: - mwext-Vector-jslint +- mwext-Vector-phpcs-HEAD - mwext-Vector-lint gate-and-submit: - mwext-Vector-merge: - mwext-Vector-jslint +- mwext-Vector-phpcs-HEAD - mwext-Vector-lint - name: mediawiki/extensions/VipsScaler @@ -2795,16 +2813,19 @@ check: - mwext-VisualEditor-merge: - mwext-VisualEditor-jslint +- mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint test: - mwext-VisualEditor-merge: - mwext-VisualEditor-jslint +- mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - mwext-VisualEditor-qunit gate-and-submit:
[MediaWiki-commits] [Gerrit] Enabling phpcs-HEAD for various extensions (non-voting) - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: Enabling phpcs-HEAD for various extensions (non-voting) .. Enabling phpcs-HEAD for various extensions (non-voting) Change-Id: Ic9194c079fa7d463b5b36ebed8bc3bfff5f98b21 --- M layout.yaml 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 49b35b7..2a34a42 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1962,9 +1962,11 @@ check: - mwext-Parsoid-merge: - mwext-Parsoid-jslint +- mwext-Parsoid-phpcs-HEAD test: - mwext-Parsoid-merge: - mwext-Parsoid-jslint +- mwext-Parsoid-phpcs-HEAD - parsoid-parsertests - parsoid-parse-tool-check - parsoid-roundtrip-test-check @@ -1972,6 +1974,7 @@ gate-and-submit: - mwext-Parsoid-merge: - mwext-Parsoid-jslint +- mwext-Parsoid-phpcs-HEAD - parsoid-parsertests - parsoid-parsertests-run-harder postmerge: @@ -2539,10 +2542,12 @@ check-only: - mwext-SyntaxHighlight_GeSHi-merge: - mwext-SyntaxHighlight_GeSHi-jslint +- mwext-SyntaxHighlight_GeSHi-phpcs-HEAD - mwext-SyntaxHighlight_GeSHi-lint gate-and-submit: - mwext-SyntaxHighlight_GeSHi-merge: - mwext-SyntaxHighlight_GeSHi-jslint +- mwext-SyntaxHighlight_GeSHi-phpcs-HEAD - mwext-SyntaxHighlight_GeSHi-lint - name: mediawiki/extensions/TemplateData @@ -2635,6 +2640,7 @@ gate-and-submit: - mwext-Translate-merge: - mwext-Translate-jslint +- mwext-Translate-phpcs-HEAD - mwext-Translate-lint: - mwext-Translate-testextensions-master @@ -2642,15 +2648,18 @@ check-only: - mwext-TranslationNotifications-merge: - mwext-TranslationNotifications-jslint +- mwext-TranslationNotifications-phpcs-HEAD - mwext-TranslationNotifications-lint test: - mwext-TranslationNotifications-merge: - mwext-TranslationNotifications-jslint +- mwext-TranslationNotifications-phpcs-HEAD - mwext-TranslationNotifications-lint: - mwext-TranslationNotifications-testextensions-master gate-and-submit: - mwext-TranslationNotifications-merge: - mwext-TranslationNotifications-jslint +- mwext-TranslationNotifications-phpcs-HEAD - mwext-TranslationNotifications-lint: - mwext-TranslationNotifications-testextensions-master @@ -2666,10 +2675,12 @@ check-only: - mwext-TwnMainPage-merge: - mwext-TwnMainPage-jslint +- mwext-TwnMainPage-phpcs-HEAD - mwext-TwnMainPage-lint gate-and-submit: - mwext-TwnMainPage-merge: - mwext-TwnMainPage-jslint +- mwext-TwnMainPage-phpcs-HEAD - mwext-TwnMainPage-lint - name: mediawiki/extensions/UnicodeConverter @@ -2684,10 +2695,12 @@ check-only: - mwext-UniversalLanguageSelector-merge: - mwext-UniversalLanguageSelector-lint +- mwext-UniversalLanguageSelector-phpcs-HEAD - mwext-UniversalLanguageSelector-jslint gate-and-submit: - mwext-UniversalLanguageSelector-merge: - mwext-UniversalLanguageSelector-jslint +- mwext-UniversalLanguageSelector-phpcs-HEAD - mwext-UniversalLanguageSelector-lint: - mwext-UniversalLanguageSelector-testextensions-master @@ -2705,14 +2718,17 @@ check: - mwext-UploadWizard-merge: - mwext-UploadWizard-jslint +- mwext-UploadWizard-phpcs-HEAD - mwext-UploadWizard-lint test: - mwext-UploadWizard-merge: - mwext-UploadWizard-jslint +- mwext-UploadWizard-phpcs-HEAD - mwext-UploadWizard-lint gate-and-submit: - mwext-UploadWizard-merge: - mwext-UploadWizard-jslint +- mwext-UploadWizard-phpcs-HEAD - mwext-UploadWizard-lint - name: mediawiki/extensions/UserDailyContribs @@ -2775,10 +2791,12 @@ check-only: - mwext-Vector-merge: - mwext-Vector-jslint +- mwext-Vector-phpcs-HEAD - mwext-Vector-lint gate-and-submit: - mwext-Vector-merge: - mwext-Vector-jslint +- mwext-Vector-phpcs-HEAD - mwext-Vector-lint - name: mediawiki/extensions/VipsScaler @@ -2795,16 +2813,19 @@ check: - mwext-VisualEditor-merge: - mwext-VisualEditor-jslint +- mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint test: - mwext-VisualEditor-merge: - mwext-VisualEditor-jslint +- mwext-VisualEditor-phpcs-HEAD - mwext-VisualEditor-lint - mwext-VisualEditor-doc-test - mwext-VisualEditor-qunit gate-and-submit: - mwext-VisualEditor-merge: -
[MediaWiki-commits] [Gerrit] mediawiki-core-qunit: Set voting to true. - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/52952 Change subject: mediawiki-core-qunit: Set voting to true. .. mediawiki-core-qunit: Set voting to true. Change-Id: I8326d64a2edb2248b1c64848a3f99754c7121dce --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/52/52952/1 diff --git a/layout.yaml b/layout.yaml index f3acb3f..509d3ce 100644 --- a/layout.yaml +++ b/layout.yaml @@ -274,7 +274,7 @@ voting: true - name: mediawiki-core-qunit -voting: false +voting: true # Doesn't work in MediaWiki REL1_19 # (times out or doesn't start in the first place). branch: (?!REL1_19) -- To view, visit https://gerrit.wikimedia.org/r/52952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8326d64a2edb2248b1c64848a3f99754c7121dce Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-qunit: Set voting to true. - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: mediawiki-core-qunit: Set voting to true. .. mediawiki-core-qunit: Set voting to true. Change-Id: I8326d64a2edb2248b1c64848a3f99754c7121dce --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index f3acb3f..509d3ce 100644 --- a/layout.yaml +++ b/layout.yaml @@ -274,7 +274,7 @@ voting: true - name: mediawiki-core-qunit -voting: false +voting: true # Doesn't work in MediaWiki REL1_19 # (times out or doesn't start in the first place). branch: (?!REL1_19) -- To view, visit https://gerrit.wikimedia.org/r/52952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8326d64a2edb2248b1c64848a3f99754c7121dce Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename legacy 'live-1.5' to 'mw'. - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53125
Change subject: Rename legacy 'live-1.5' to 'mw'.
..
Rename legacy 'live-1.5' to 'mw'.
Change-Id: I46328599c0f9216e0e5f51e48ce7566bfd1b5ae6
---
M README
M extract2.php
A live-1.5
D live-1.5/redirect.phtml
D live-1.5/wiki.phtml
M multiversion/checkoutMediaWiki
M multiversion/deleteMediaWiki
R mw/404.php
R mw/COPYING
R mw/CREDITS
R mw/MWVersion.php
R mw/api.php
R mw/extensions
R mw/extract2.php
R mw/favicon.php
R mw/health-check.php
R mw/img_auth.php
R mw/index.php
R mw/load.php
R mw/mobileRedirect.php
R mw/opensearch_desc.php
R mw/query.php
R mw/redirect.php
C mw/redirect.phtml
R mw/resources
R mw/robots.php
R mw/skins
R mw/skins-1.5
R mw/static-1.21wmf1/extensions
R mw/static-1.21wmf1/resources
R mw/static-1.21wmf1/skins
R mw/static-1.21wmf10/extensions
R mw/static-1.21wmf10/resources
R mw/static-1.21wmf10/skins
R mw/static-1.21wmf11/extensions
R mw/static-1.21wmf11/resources
R mw/static-1.21wmf11/skins
R mw/static-1.21wmf2/extensions
R mw/static-1.21wmf2/resources
R mw/static-1.21wmf2/skins
R mw/static-1.21wmf3/extensions
R mw/static-1.21wmf3/resources
R mw/static-1.21wmf3/skins
R mw/static-1.21wmf4/extensions
R mw/static-1.21wmf4/resources
R mw/static-1.21wmf4/skins
R mw/static-1.21wmf5/extensions
R mw/static-1.21wmf5/resources
R mw/static-1.21wmf5/skins
R mw/static-1.21wmf6/extensions
R mw/static-1.21wmf6/resources
R mw/static-1.21wmf6/skins
R mw/static-1.21wmf7/extensions
R mw/static-1.21wmf7/resources
R mw/static-1.21wmf7/skins
R mw/static-1.21wmf8/extensions
R mw/static-1.21wmf8/resources
R mw/static-1.21wmf8/skins
R mw/static-1.21wmf9/extensions
R mw/static-1.21wmf9/resources
R mw/static-1.21wmf9/skins
R mw/thumb.php
R mw/thumb_handler.php
C mw/wiki.phtml
64 files changed, 23 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/25/53125/1
diff --git a/README b/README
index e4a9c9e..50fc4a1 100644
--- a/README
+++ b/README
@@ -21,7 +21,7 @@
images/
Shared pictures for the unified login system.
-live-1.5/
+mw/
The w/ directory in the docroot of any mediawiki-serving VirtualHost.
tests/
diff --git a/extract2.php b/extract2.php
index 6ad6e12..fba5242 100644
--- a/extract2.php
+++ b/extract2.php
@@ -11,7 +11,7 @@
#include_once(/apache/common/wmf-deployment/includes/WebStart.php);
-include /apache/common/live-1.5/MWVersion.php;
+include /apache/common/mw/MWVersion.php;
include getMediaWiki(includes/WebStart.php);
$allowed_portals = array(
@@ -58,4 +58,3 @@
header( 'Cache-Control: s-maxage=3600, must-revalidate, max-age=0' );
header( Last-modified: $lastmod );
echo $text;
-
diff --git a/live-1.5 b/live-1.5
new file mode 12
index 000..53b451e
--- /dev/null
+++ b/live-1.5
@@ -0,0 +1 @@
+mw
\ No newline at end of file
diff --git a/live-1.5/redirect.phtml b/live-1.5/redirect.phtml
deleted file mode 100644
index 50d9671..000
--- a/live-1.5/redirect.phtml
+++ /dev/null
@@ -1,4 +0,0 @@
-?php
-require_once( './MWVersion.php' );
-require getMediaWiki( 'redirect.php' );
-?
diff --git a/live-1.5/wiki.phtml b/live-1.5/wiki.phtml
deleted file mode 100644
index 3ed1528..000
--- a/live-1.5/wiki.phtml
+++ /dev/null
@@ -1,4 +0,0 @@
-?php
-require_once( './MWVersion.php' );
-require getMediaWiki( 'index.php' );
-?
diff --git a/multiversion/checkoutMediaWiki b/multiversion/checkoutMediaWiki
index 9f6c4b2..398700c 100755
--- a/multiversion/checkoutMediaWiki
+++ b/multiversion/checkoutMediaWiki
@@ -101,41 +101,41 @@
$link = ../wmf-config/StartProfiler.php;
createSymlink( $path, $link, Created StartProfiler.php symlink. );
- # Create bits.wikimedia.org symlinks...
+ # Create static- symlinks for bits.wikimedia.org...
$bitsStaticDir = $commonHomeDir/docroot/bits/static-$dstVersionNum;
if ( !file_exists( $bitsStaticDir ) ) {
mkdir( $bitsStaticDir, 0775 );
}
$path = $commonHomeDir/docroot/bits/static-$dstVersionNum/skins;
$link = $commonLocalDir/php-$dstVersionNum/skins/;
- createSymlink( $path, $link, Created static-$dstVersionNum/skins
symlink. );
+ createSymlink( $path, $link, Created bits/static-$dstVersionNum/skins
symlink. );
$path = $commonHomeDir/docroot/bits/static-$dstVersionNum/extensions;
$link = $commonLocalDir/php-$dstVersionNum/extensions;
- createSymlink( $path, $link, Created static-$dstVersionNum/extensions
symlink. );
+ createSymlink( $path, $link, Created
bits/static-$dstVersionNum/extensions symlink. );
$path = $commonHomeDir/docroot/bits/static-$dstVersionNum/resources;
$link = $commonLocalDir/php-$dstVersionNum/resources;
- createSymlink( $path, $link, Created static-$dstVersionNum/resources
symlink. );
+ createSymlink( $path, $link, Created
bits/static-$dstVersionNum/resources symlink.
[MediaWiki-commits] [Gerrit] Introduce wmgUseVectorFooterCleanup - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53126
Change subject: Introduce wmgUseVectorFooterCleanup
..
Introduce wmgUseVectorFooterCleanup
Follows-up 41d665f8ef6456457c0b144a89d62408e3d749b9.
The micro design changes can change over time. We shouldn't
mix their experimentation pool with wikis that specifically requested
certain bits of functionality.
Change-Id: I0a59c7194575b6da887c644431065c475e53a716
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/26/53126/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f841745..e6fcace 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2556,7 +2556,7 @@
$wgSubpageSortkeyByNamespace = $wmgSubpageSortkeyByNamespace;
}
-if ( $wmgUseMicroDesign ) {
+if ( $wmgUseMicroDesign || $wmgUseVectorFooterCleanup ) {
$wgVectorFeatures['footercleanup']['global'] = true;
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 2ce0e2c..ec92166 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11736,12 +11736,16 @@
'private' = false,
),
+'wmgUseVectorFooterCleanup' = array(
+ 'default' = false,
+ 'mlwiki' = true, // Bug 44634
+),
+
'wmgUseMicroDesign' = array(
'default' = false,
'testwiki' = true,
'enwiki' = true,
'itwikivoyage' = true,
- 'mlwiki' = true, // Bug 44634
),
'wmgEnablePostEdit' = array(
--
To view, visit https://gerrit.wikimedia.org/r/53126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a59c7194575b6da887c644431065c475e53a716
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] $wmgUseVectorFooterCleanup = true; for commonswiki - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53127 Change subject: $wmgUseVectorFooterCleanup = true; for commonswiki .. $wmgUseVectorFooterCleanup = true; for commonswiki Bug: 45946 Change-Id: I7c8174bcf6ca411014a712a6416d3a74e9fecb3d --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/27/53127/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ec92166..3883f14 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11739,6 +11739,7 @@ 'wmgUseVectorFooterCleanup' = array( 'default' = false, 'mlwiki' = true, // Bug 44634 + 'commonswiki' = true, // Bug 45946 ), 'wmgUseMicroDesign' = array( -- To view, visit https://gerrit.wikimedia.org/r/53127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c8174bcf6ca411014a712a6416d3a74e9fecb3d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (DRAFT) QUnit: Fix more missing assertion numbers - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53188
Change subject: (DRAFT) QUnit: Fix more missing assertion numbers
..
(DRAFT) QUnit: Fix more missing assertion numbers
Change-Id: I214b3d4da46f3f3bb0fcde313ac2d82439e40e3c
---
M tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
M
tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/53188/1
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index deff5b0..e7ee90d 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -635,7 +635,7 @@
} );
/** FIXME: the diff output is not very readeable. */
- QUnit.test( 'bug 32047 - caption must be before thead', function (
assert ) {
+ QUnit.test( 'bug 32047 - caption must be before thead', 1, function (
assert ) {
var $table;
$table = $(
'table class=sortable' +
@@ -655,7 +655,7 @@
);
} );
- QUnit.test( 'data-sort-value attribute, when available, should override
sorting position', function ( assert ) {
+ QUnit.test( 'data-sort-value attribute, when available, should override
sorting position', 2, function ( assert ) {
var $table, data;
// Example 1: All cells except one cell without data-sort-value,
@@ -925,7 +925,7 @@
}
);
- QUnit.test( 'Sorting images using alt text', function ( assert ) {
+ QUnit.test( 'Sorting images using alt text', 1, function ( assert ) {
var $table = $(
'table class=sortable' +
'trthTHEAD/th/tr' +
@@ -942,7 +942,7 @@
);
} );
- QUnit.test( 'Sorting images using alt text (complex)', function (
assert ) {
+ QUnit.test( 'Sorting images using alt text (complex)', 1, function (
assert ) {
var $table = $(
'table class=sortable' +
'trthTHEAD/th/tr' +
@@ -963,7 +963,7 @@
);
} );
- QUnit.test( 'Sorting images using alt text (with format
autodetection)', function ( assert ) {
+ QUnit.test( 'Sorting images using alt text (with format
autodetection)', 1, function ( assert ) {
var $table = $(
'table class=sortable' +
'trthTHEAD/th/tr' +
diff --git
a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
index 9389651..ee854ae 100644
---
a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
+++
b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
@@ -3,7 +3,7 @@
// TODO: verify checkboxes == [ 'nsassociated', 'nsinvert' ]
- QUnit.test( 'all namespace disable checkboxes', function ( assert ) {
+ QUnit.test( 'all namespace disable checkboxes', 8, function ( assert
) {
var selectHtml, $env, $options;
// from Special:Recentchanges
--
To view, visit https://gerrit.wikimedia.org/r/53188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I214b3d4da46f3f3bb0fcde313ac2d82439e40e3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix JSDuck warnings - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53461
Change subject: Fix JSDuck warnings
..
Fix JSDuck warnings
Change-Id: Ibc3f49c55ded5490fcb071f0ccf9f25a71a06c97
Warning: categories.json Class 've.NodeFactory' not found in categories file
Warning: ve.ui.ContentDialog.js:8: Unknown type ve.ui.Surface
Warning: ve.ui.MetaDialog.js:8: Unknown type ve.ui.Surface
Warning: ve.ui.Dialog.js:8: Unknown type ve.ui.Surface
---
M .docs/categories.json
M modules/ve/ui/dialogs/ve.ui.ContentDialog.js
M modules/ve/ui/dialogs/ve.ui.MetaDialog.js
M modules/ve/ui/ve.ui.Dialog.js
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/61/53461/1
diff --git a/.docs/categories.json b/.docs/categories.json
index fd3d78e..6900e4f 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -106,7 +106,7 @@
},
{
name: Factories,
- classes: [ve.ActionFactory]
+ classes: [ve.ActionFactory,
ve.NodeFactory]
},
{
name: Nodes,
diff --git a/modules/ve/ui/dialogs/ve.ui.ContentDialog.js
b/modules/ve/ui/dialogs/ve.ui.ContentDialog.js
index 2ded73d..3bf8a95 100644
--- a/modules/ve/ui/dialogs/ve.ui.ContentDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.ContentDialog.js
@@ -13,7 +13,7 @@
* @extends ve.ui.Dialog
*
* @constructor
- * @param {ve.ui.Surface} surface
+ * @param {ve.Surface} surface
*/
ve.ui.ContentDialog = function VeUiContentDialog( surface ) {
// Parent constructor
diff --git a/modules/ve/ui/dialogs/ve.ui.MetaDialog.js
b/modules/ve/ui/dialogs/ve.ui.MetaDialog.js
index 8312288..dc45e77 100644
--- a/modules/ve/ui/dialogs/ve.ui.MetaDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.MetaDialog.js
@@ -13,7 +13,7 @@
* @extends ve.ui.Dialog
*
* @constructor
- * @param {ve.ui.Surface} surface
+ * @param {ve.Surface} surface
*/
ve.ui.MetaDialog = function VeUiMetaDialog( surface ) {
// Parent constructor
diff --git a/modules/ve/ui/ve.ui.Dialog.js b/modules/ve/ui/ve.ui.Dialog.js
index faf881a..005a670 100644
--- a/modules/ve/ui/ve.ui.Dialog.js
+++ b/modules/ve/ui/ve.ui.Dialog.js
@@ -12,7 +12,7 @@
* @abstract
*
* @constructor
- * @param {ve.ui.Surface} surface
+ * @param {ve.Surface} surface
*/
ve.ui.Dialog = function VeUiDialog( surface ) {
// Parent constructor
--
To view, visit https://gerrit.wikimedia.org/r/53461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc3f49c55ded5490fcb071f0ccf9f25a71a06c97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] JSHint: Upgrade from 0.9.1 to 1.1.0 - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53503 Change subject: JSHint: Upgrade from 0.9.1 to 1.1.0 .. JSHint: Upgrade from 0.9.1 to 1.1.0 http://jshint.com/blog/2013-02-27/1-0-0/ http://jshint.com/blog/2013-03-05/1-1-0/ Bug: 45406 Change-Id: I208e79da8c701ad82276de34dc9b1f2870c8ceed --- M tools/node_modules/.bin/jshint A tools/node_modules/jshint/.npmignore A tools/node_modules/jshint/.travis.yml A tools/node_modules/jshint/CONTRIBUTING.md M tools/node_modules/jshint/LICENSE M tools/node_modules/jshint/README.md D tools/node_modules/jshint/bin/hint A tools/node_modules/jshint/bin/jshint A tools/node_modules/jshint/examples/.jshintignore A tools/node_modules/jshint/examples/.jshintrc A tools/node_modules/jshint/examples/reporter.js A tools/node_modules/jshint/jshint.json D tools/node_modules/jshint/lib/cli.js D tools/node_modules/jshint/lib/hint.js D tools/node_modules/jshint/lib/reporters/checkstyle.js D tools/node_modules/jshint/lib/reporters/default.js D tools/node_modules/jshint/lib/reporters/jslint_xml.js D tools/node_modules/jshint/lib/reporters/non_error.js A tools/node_modules/jshint/make.js A tools/node_modules/jshint/node_modules/.bin/esparse A tools/node_modules/jshint/node_modules/.bin/esvalidate A tools/node_modules/jshint/node_modules/.bin/shjs M tools/node_modules/jshint/node_modules/cli/cli.js M tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/graceful-fs/package.json M tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/.travis.yml D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/LICENSE D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/README.md D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/minimatch.js D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/.npmignore D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/LICENSE D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/README.md D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/basic.js D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/sigmund/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/test/basic.js M tools/node_modules/jshint/node_modules/cli/node_modules/glob/package.json M tools/node_modules/jshint/node_modules/cli/package.json A tools/node_modules/jshint/node_modules/esprima/.npmignore A tools/node_modules/jshint/node_modules/esprima/ChangeLog A tools/node_modules/jshint/node_modules/esprima/LICENSE.BSD A tools/node_modules/jshint/node_modules/esprima/README.md A tools/node_modules/jshint/node_modules/esprima/bin/esparse.js A tools/node_modules/jshint/node_modules/esprima/bin/esvalidate.js A tools/node_modules/jshint/node_modules/esprima/component.json A tools/node_modules/jshint/node_modules/esprima/doc/index.html A tools/node_modules/jshint/node_modules/esprima/esprima.js A tools/node_modules/jshint/node_modules/esprima/examples/detectnestedternary.js A tools/node_modules/jshint/node_modules/esprima/examples/findbooleantrap.js A tools/node_modules/jshint/node_modules/esprima/examples/tokendist.js A tools/node_modules/jshint/node_modules/esprima/index.html A tools/node_modules/jshint/node_modules/esprima/package.json A tools/node_modules/jshint/node_modules/esprima/test/benchmarks.html A tools/node_modules/jshint/node_modules/esprima/test/benchmarks.js A tools/node_modules/jshint/node_modules/esprima/test/compare.html A tools/node_modules/jshint/node_modules/esprima/test/compare.js A tools/node_modules/jshint/node_modules/esprima/test/compat.html A tools/node_modules/jshint/node_modules/esprima/test/compat.js A tools/node_modules/jshint/node_modules/esprima/test/coverage.html A tools/node_modules/jshint/node_modules/esprima/test/esprima.js.html A tools/node_modules/jshint/node_modules/esprima/test/index.html A tools/node_modules/jshint/node_modules/esprima/test/module.html A tools/node_modules/jshint/node_modules/esprima/test/module.js A tools/node_modules/jshint/node_modules/esprima/test/reflect.js A tools/node_modules/jshint/node_modules/esprima/test/run.js A
[MediaWiki-commits] [Gerrit] JSHint: Upgrade from 0.9.1 to 1.1.0 - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: JSHint: Upgrade from 0.9.1 to 1.1.0 .. JSHint: Upgrade from 0.9.1 to 1.1.0 http://jshint.com/blog/2013-02-27/1-0-0/ http://jshint.com/blog/2013-03-05/1-1-0/ Bug: 45406 Change-Id: I208e79da8c701ad82276de34dc9b1f2870c8ceed --- M tools/node_modules/.bin/jshint A tools/node_modules/jshint/.npmignore A tools/node_modules/jshint/.travis.yml A tools/node_modules/jshint/CONTRIBUTING.md M tools/node_modules/jshint/LICENSE M tools/node_modules/jshint/README.md D tools/node_modules/jshint/bin/hint A tools/node_modules/jshint/bin/jshint A tools/node_modules/jshint/examples/.jshintignore A tools/node_modules/jshint/examples/.jshintrc A tools/node_modules/jshint/examples/reporter.js A tools/node_modules/jshint/jshint.json D tools/node_modules/jshint/lib/cli.js D tools/node_modules/jshint/lib/hint.js D tools/node_modules/jshint/lib/reporters/checkstyle.js D tools/node_modules/jshint/lib/reporters/default.js D tools/node_modules/jshint/lib/reporters/jslint_xml.js D tools/node_modules/jshint/lib/reporters/non_error.js A tools/node_modules/jshint/make.js A tools/node_modules/jshint/node_modules/.bin/esparse A tools/node_modules/jshint/node_modules/.bin/esvalidate A tools/node_modules/jshint/node_modules/.bin/shjs M tools/node_modules/jshint/node_modules/cli/cli.js M tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/graceful-fs/package.json M tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/inherits/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/.travis.yml D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/LICENSE D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/README.md D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/minimatch.js D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/.npmignore D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/LICENSE D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/README.md D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/lib/lru-cache.js D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/test/basic.js D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/node_modules/sigmund/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/package.json D tools/node_modules/jshint/node_modules/cli/node_modules/glob/node_modules/minimatch/test/basic.js M tools/node_modules/jshint/node_modules/cli/node_modules/glob/package.json M tools/node_modules/jshint/node_modules/cli/package.json A tools/node_modules/jshint/node_modules/esprima/.npmignore A tools/node_modules/jshint/node_modules/esprima/ChangeLog A tools/node_modules/jshint/node_modules/esprima/LICENSE.BSD A tools/node_modules/jshint/node_modules/esprima/README.md A tools/node_modules/jshint/node_modules/esprima/bin/esparse.js A tools/node_modules/jshint/node_modules/esprima/bin/esvalidate.js A tools/node_modules/jshint/node_modules/esprima/component.json A tools/node_modules/jshint/node_modules/esprima/doc/index.html A tools/node_modules/jshint/node_modules/esprima/esprima.js A tools/node_modules/jshint/node_modules/esprima/examples/detectnestedternary.js A tools/node_modules/jshint/node_modules/esprima/examples/findbooleantrap.js A tools/node_modules/jshint/node_modules/esprima/examples/tokendist.js A tools/node_modules/jshint/node_modules/esprima/index.html A tools/node_modules/jshint/node_modules/esprima/package.json A tools/node_modules/jshint/node_modules/esprima/test/benchmarks.html A tools/node_modules/jshint/node_modules/esprima/test/benchmarks.js A tools/node_modules/jshint/node_modules/esprima/test/compare.html A tools/node_modules/jshint/node_modules/esprima/test/compare.js A tools/node_modules/jshint/node_modules/esprima/test/compat.html A tools/node_modules/jshint/node_modules/esprima/test/compat.js A tools/node_modules/jshint/node_modules/esprima/test/coverage.html A tools/node_modules/jshint/node_modules/esprima/test/esprima.js.html A tools/node_modules/jshint/node_modules/esprima/test/index.html A tools/node_modules/jshint/node_modules/esprima/test/module.html A tools/node_modules/jshint/node_modules/esprima/test/module.js A tools/node_modules/jshint/node_modules/esprima/test/reflect.js A tools/node_modules/jshint/node_modules/esprima/test/run.js A
[MediaWiki-commits] [Gerrit] Fix lint errors introduced after jshint upgrade. - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53504
Change subject: Fix lint errors introduced after jshint upgrade.
..
Fix lint errors introduced after jshint upgrade.
The new jshint is smarter about detecting trailing whitespace
(which enabled in our jshintrc file). Looks like we did indeed
let it slip through a few times in ve.Document.
Also cleaning up comment from * to - for consistency and avoiding
block-comment characters.
Change-Id: Ie1621816d608b5c42028ee945346d872a747c6a4
---
M modules/ve/ve.Document.js
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/04/53504/1
diff --git a/modules/ve/ve.Document.js b/modules/ve/ve.Document.js
index 2448367..937027a 100644
--- a/modules/ve/ve.Document.js
+++ b/modules/ve/ve.Document.js
@@ -181,11 +181,11 @@
} else if ( startBetween ) {
// start is between the previous sibling and node
// so the selection covers all or part of node
-
+
// Descend if
- // * we are in leaves mode, OR
- // * we are in covered mode and the end is inside node
OR
- // * we are in branches mode and node is a branch (can
have grandchildren)
+ // - we are in leaves mode, OR
+ // - we are in covered mode and the end is inside node
OR
+ // - we are in branches mode and node is a branch (can
have grandchildren)
if ( ( mode === 'leaves' ||
( mode === 'covered' endInside ) ||
( mode === 'branches'
node.canHaveGrandchildren() ) )
@@ -300,7 +300,7 @@
// end is between node and the next sibling
// start is not inside node, so the selection covers
// all of node, then ends
-
+
if (
( mode === 'leaves' || ( mode === 'branches'
node.canHaveGrandchildren() ) )
node.children node.children.length
@@ -403,7 +403,7 @@
} );
}
}
-
+
// Move to the next node
if ( nextNode ) {
// The next node exists
@@ -458,7 +458,7 @@
// (this is present for sure, because the
parent has children)
left++;
}
-
+
// Skip over nextNode's opening if present
if ( nextNode.isWrapped() ) {
left++;
--
To view, visit https://gerrit.wikimedia.org/r/53504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1621816d608b5c42028ee945346d872a747c6a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync: Commit deletion of jenkins job. - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53506 Change subject: Sync: Commit deletion of jenkins job. .. Sync: Commit deletion of jenkins job. Not sure when it got deleted, but it's gone in the working copy and no longer used. Change-Id: Idcf7e25a643e3a2006c5e2388c5f6264cd596bfb --- D jobs/Lucene-Search-3/config.xml 1 file changed, 0 insertions(+), 161 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/06/53506/1 diff --git a/jobs/Lucene-Search-3/config.xml b/jobs/Lucene-Search-3/config.xml deleted file mode 100644 index b3cdfc0..000 --- a/jobs/Lucene-Search-3/config.xml +++ /dev/null @@ -1,161 +0,0 @@ -?xml version='1.0' encoding='UTF-8'? -maven2-moduleset - actions/ - descriptionThe Next Generation Search for WikiMedia Foundation/description - keepDependenciesfalse/keepDependencies - properties/ - scm class=hudson.scm.SubversionSCM -locations - hudson.scm.SubversionSCM_-ModuleLocation - remotehttp://svn.wikimedia.org/svnroot/mediawiki/trunk/lucene-search-3/remote -local./local - /hudson.scm.SubversionSCM_-ModuleLocation -/locations -excludedRegions/excludedRegions -includedRegions/includedRegions -excludedUsers/excludedUsers -excludedRevprop/excludedRevprop -excludedCommitMessages/excludedCommitMessages -workspaceUpdater class=hudson.scm.subversion.UpdateWithCleanUpdater/ - /scm - canRoamtrue/canRoam - disabledtrue/disabled - blockBuildWhenDownstreamBuildingfalse/blockBuildWhenDownstreamBuilding - blockBuildWhenUpstreamBuildingfalse/blockBuildWhenUpstreamBuilding - triggers class=vector -hudson.triggers.SCMTrigger - spec15 * * * */spec -/hudson.triggers.SCMTrigger - /triggers - concurrentBuildfalse/concurrentBuild - rootModule -groupIdorg.wikimedia/groupId -artifactIdbazzar/artifactId - /rootModule - goalssite/goals - defaultGoalsinstall/defaultGoals - aggregatorStyleBuildtrue/aggregatorStyleBuild - incrementalBuildfalse/incrementalBuild - perModuleEmailtrue/perModuleEmail - ignoreUpstremChangestrue/ignoreUpstremChanges - archivingDisabledfalse/archivingDisabled - resolveDependenciesfalse/resolveDependencies - processPluginsfalse/processPlugins - mavenValidationLevel-1/mavenValidationLevel - runHeadlessfalse/runHeadless - settingConfigId/settingConfigId - globalSettingConfigId/globalSettingConfigId - reporters -hudson.plugins.pmd.PmdReporter - healthy/healthy - unHealthy/unHealthy - pluginName[PMD] /pluginName - thresholdLimitlow/thresholdLimit - canRunOnFailedtrue/canRunOnFailed - useDeltaValuestrue/useDeltaValues - thresholds -unstableTotalAll/unstableTotalAll -unstableTotalHigh/unstableTotalHigh -unstableTotalNormal/unstableTotalNormal -unstableTotalLow/unstableTotalLow -unstableNewAll/unstableNewAll -unstableNewHigh/unstableNewHigh -unstableNewNormal/unstableNewNormal -unstableNewLow/unstableNewLow -failedTotalAll/failedTotalAll -failedTotalHigh/failedTotalHigh -failedTotalNormal/failedTotalNormal -failedTotalLow/failedTotalLow -failedNewAll/failedNewAll -failedNewHigh/failedNewHigh -failedNewNormal/failedNewNormal -failedNewLow/failedNewLow - /thresholds - dontComputeNewfalse/dontComputeNew -/hudson.plugins.pmd.PmdReporter -hudson.plugins.dry.DryReporter - healthy/healthy - unHealthy/unHealthy - pluginName[DRY] /pluginName - thresholdLimitlow/thresholdLimit - canRunOnFailedfalse/canRunOnFailed - useDeltaValuesfalse/useDeltaValues - thresholds -unstableTotalAll/unstableTotalAll -unstableTotalHigh/unstableTotalHigh -unstableTotalNormal/unstableTotalNormal -unstableTotalLow/unstableTotalLow -failedTotalAll/failedTotalAll -failedTotalHigh/failedTotalHigh -failedTotalNormal/failedTotalNormal -failedTotalLow/failedTotalLow - /thresholds - dontComputeNewtrue/dontComputeNew - highThreshold50/highThreshold - normalThreshold25/normalThreshold -/hudson.plugins.dry.DryReporter - /reporters - publishers -hudson.plugins.cobertura.CoberturaPublisher - coberturaReportFile**/target/site/cobertura/coverage.xm/coberturaReportFile - onlyStabletrue/onlyStable - healthyTarget -targets class=enum-map enum-type=hudson.plugins.cobertura.targets.CoverageMetric - entry - hudson.plugins.cobertura.targets.CoverageMetricCONDITIONAL/hudson.plugins.cobertura.targets.CoverageMetric -int70/int - /entry - entry - hudson.plugins.cobertura.targets.CoverageMetricLINE/hudson.plugins.cobertura.targets.CoverageMetric -int80/int - /entry - entry -
[MediaWiki-commits] [Gerrit] Sync: Commit deletion of jenkins job. - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: Sync: Commit deletion of jenkins job. .. Sync: Commit deletion of jenkins job. Not sure when it got deleted, but it's gone in the working copy and no longer used. Change-Id: Idcf7e25a643e3a2006c5e2388c5f6264cd596bfb --- D jobs/Lucene-Search-3/config.xml 1 file changed, 0 insertions(+), 161 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/jobs/Lucene-Search-3/config.xml b/jobs/Lucene-Search-3/config.xml deleted file mode 100644 index b3cdfc0..000 --- a/jobs/Lucene-Search-3/config.xml +++ /dev/null @@ -1,161 +0,0 @@ -?xml version='1.0' encoding='UTF-8'? -maven2-moduleset - actions/ - descriptionThe Next Generation Search for WikiMedia Foundation/description - keepDependenciesfalse/keepDependencies - properties/ - scm class=hudson.scm.SubversionSCM -locations - hudson.scm.SubversionSCM_-ModuleLocation - remotehttp://svn.wikimedia.org/svnroot/mediawiki/trunk/lucene-search-3/remote -local./local - /hudson.scm.SubversionSCM_-ModuleLocation -/locations -excludedRegions/excludedRegions -includedRegions/includedRegions -excludedUsers/excludedUsers -excludedRevprop/excludedRevprop -excludedCommitMessages/excludedCommitMessages -workspaceUpdater class=hudson.scm.subversion.UpdateWithCleanUpdater/ - /scm - canRoamtrue/canRoam - disabledtrue/disabled - blockBuildWhenDownstreamBuildingfalse/blockBuildWhenDownstreamBuilding - blockBuildWhenUpstreamBuildingfalse/blockBuildWhenUpstreamBuilding - triggers class=vector -hudson.triggers.SCMTrigger - spec15 * * * */spec -/hudson.triggers.SCMTrigger - /triggers - concurrentBuildfalse/concurrentBuild - rootModule -groupIdorg.wikimedia/groupId -artifactIdbazzar/artifactId - /rootModule - goalssite/goals - defaultGoalsinstall/defaultGoals - aggregatorStyleBuildtrue/aggregatorStyleBuild - incrementalBuildfalse/incrementalBuild - perModuleEmailtrue/perModuleEmail - ignoreUpstremChangestrue/ignoreUpstremChanges - archivingDisabledfalse/archivingDisabled - resolveDependenciesfalse/resolveDependencies - processPluginsfalse/processPlugins - mavenValidationLevel-1/mavenValidationLevel - runHeadlessfalse/runHeadless - settingConfigId/settingConfigId - globalSettingConfigId/globalSettingConfigId - reporters -hudson.plugins.pmd.PmdReporter - healthy/healthy - unHealthy/unHealthy - pluginName[PMD] /pluginName - thresholdLimitlow/thresholdLimit - canRunOnFailedtrue/canRunOnFailed - useDeltaValuestrue/useDeltaValues - thresholds -unstableTotalAll/unstableTotalAll -unstableTotalHigh/unstableTotalHigh -unstableTotalNormal/unstableTotalNormal -unstableTotalLow/unstableTotalLow -unstableNewAll/unstableNewAll -unstableNewHigh/unstableNewHigh -unstableNewNormal/unstableNewNormal -unstableNewLow/unstableNewLow -failedTotalAll/failedTotalAll -failedTotalHigh/failedTotalHigh -failedTotalNormal/failedTotalNormal -failedTotalLow/failedTotalLow -failedNewAll/failedNewAll -failedNewHigh/failedNewHigh -failedNewNormal/failedNewNormal -failedNewLow/failedNewLow - /thresholds - dontComputeNewfalse/dontComputeNew -/hudson.plugins.pmd.PmdReporter -hudson.plugins.dry.DryReporter - healthy/healthy - unHealthy/unHealthy - pluginName[DRY] /pluginName - thresholdLimitlow/thresholdLimit - canRunOnFailedfalse/canRunOnFailed - useDeltaValuesfalse/useDeltaValues - thresholds -unstableTotalAll/unstableTotalAll -unstableTotalHigh/unstableTotalHigh -unstableTotalNormal/unstableTotalNormal -unstableTotalLow/unstableTotalLow -failedTotalAll/failedTotalAll -failedTotalHigh/failedTotalHigh -failedTotalNormal/failedTotalNormal -failedTotalLow/failedTotalLow - /thresholds - dontComputeNewtrue/dontComputeNew - highThreshold50/highThreshold - normalThreshold25/normalThreshold -/hudson.plugins.dry.DryReporter - /reporters - publishers -hudson.plugins.cobertura.CoberturaPublisher - coberturaReportFile**/target/site/cobertura/coverage.xm/coberturaReportFile - onlyStabletrue/onlyStable - healthyTarget -targets class=enum-map enum-type=hudson.plugins.cobertura.targets.CoverageMetric - entry - hudson.plugins.cobertura.targets.CoverageMetricCONDITIONAL/hudson.plugins.cobertura.targets.CoverageMetric -int70/int - /entry - entry - hudson.plugins.cobertura.targets.CoverageMetricLINE/hudson.plugins.cobertura.targets.CoverageMetric -int80/int - /entry - entry -
[MediaWiki-commits] [Gerrit] Update and clarify some comments. - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53509 Change subject: Update and clarify some comments. .. Update and clarify some comments. Change-Id: Ia329866d5f01a4b27aa47288a6bce1f81629c651 --- M layout.yaml 1 file changed, 23 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/09/53509/1 diff --git a/layout.yaml b/layout.yaml index 509d3ce..a113fe1 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1,36 +1,32 @@ # vim: set ts=2 sw=2 et ai foldmethod=indent: # -# This is the Zuul configuration file for the Wikimedia Foundation +# This is the Zuul configuration file for the Wikimedia Foundation. # -# See http://ci.openstack.org/zuul/zuul.html#configuration +# Zuul configuration is organised in three main sections: # - -# Zuul configuration comes with three main sections: +# - pipelines: Abstracts incoming Gerrit events and what to report back in Gerrit. # -# pipelines: filter Gerrit events and determine what is reported back in Gerrit -#once all jobs have been run. +# - jobs: Override the pipeline configuration on a per job basis. +#This is how we specificy behaviour for individual projects and jobs. # -# jobs: let you override the pipeline configuration on a per job basis. A nice -# way to handle exceptions to the usual workflow +# - projects: For each project we specify what jobs to run, in what order jobs +#should depend on each other and for which pipelines the jobs should run. # -# projects: Filter Gerrit event by project name then apply pipelines to filter -# the Gerrit events. Under each pipeline are listed jobs to trigger. -# Jobs can be made dependant on each other. -# -# See upstream documentation at: -# -# http://ci.openstack.org/zuul/zuul.html#layout-yaml +# See also upstream documentation: +# - http://ci.openstack.org/zuul/zuul.html#layout-yaml +# - http://ci.openstack.org/zuul/zuul.html#configuration pipelines: - # For some pipelines, we do not want to report anything back to Gerrit, - # this is useful when trying out a new set of filter or when adding a new - # repository in the workflow. Zuul still log the results in /var/log/zuul.log - # but simply ignore reporting back to Gerrit. By convention such pipelines - # names are suffixed with '-silent'. + # Terminology: + # - silent: For some pipelines, we do not want to report anything back to + #Gerrit, this is useful when trying out a new set of filter or when adding + #a new repository in the workflow. Zuul still log the results to + #/var/log/zuul.log but simply won't report back to Gerrit. + # - check: Basic testing run on any submission. Votes V+1 + # - test: More elaborate testing run only after CR+2 or when submitte + #by a whitelisted user. Votes V+2. - # Pipeline doing prechecks such as syntax linting - # Does NOT report back to Gerrit. - name: check-silent manager: IndependentPipelineManager trigger: @@ -38,8 +34,6 @@ - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ - # Pipeline doing prechecks such as syntax linting - # DOES report back to Gerrit. - name: check manager: IndependentPipelineManager trigger: @@ -47,18 +41,14 @@ - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ success: - # Prevents people from being able to submit a change - # before unit tests have been run since submit requires V+2. + # Only V+1 as these are not elaborate tests. This prevents a change from + # being merged (requires V+2) before elaborate tests, which vote V+2, have run. verified: 1 code-review: 0 failure: verified: -1 code-review: 0 - # Voting check for project that lack unit tests and only rely - # on lint check. Similiar to 'check' but additionally vote V+2 - # This is mostly for operations/puppet which ask to get V+2 whenever - # change is linted since they dont have unit tests. - name: check-voter manager: IndependentPipelineManager trigger: @@ -84,7 +74,7 @@ - .*?@wikimedia\.org$ - .*?@wikimedia\.de$ -# WMF Contractors: +# WMF contractors: - ^anomie\.wikipedia@gmail\.com$ - ^amir\.aharoni@mail\.huji\.ac\.il$ - ^hashar@free\.fr$ @@ -140,8 +130,7 @@ # Actual gate (report/vote in Gerrit) # - # WARNING: do modify the gate-and-submit pipeline below whenever - # changing the gate pipeline. + # WARNING: Also update the gate-and-submit pipeline when changing this one. # - name: gate manager: IndependentPipelineManager @@ -161,8 +150,7 @@ # Actual gate (report/vote in Gerrit) # Will auto submit change on success # - # WARNING: do modify the gate pipeline below whenever changing -
[MediaWiki-commits] [Gerrit] Update and clarify some comments. - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: Update and clarify some comments. .. Update and clarify some comments. Change-Id: Ia329866d5f01a4b27aa47288a6bce1f81629c651 --- M layout.yaml 1 file changed, 23 insertions(+), 35 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index 00a52ba..b6d068d 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1,36 +1,32 @@ # vim: set ts=2 sw=2 et ai foldmethod=indent: # -# This is the Zuul configuration file for the Wikimedia Foundation +# This is the Zuul configuration file for the Wikimedia Foundation. # -# See http://ci.openstack.org/zuul/zuul.html#configuration +# Zuul configuration is organised in three main sections: # - -# Zuul configuration comes with three main sections: +# - pipelines: Abstracts incoming Gerrit events and what to report back in Gerrit. # -# pipelines: filter Gerrit events and determine what is reported back in Gerrit -#once all jobs have been run. +# - jobs: Override the pipeline configuration on a per job basis. +#This is how we specificy behaviour for individual projects and jobs. # -# jobs: let you override the pipeline configuration on a per job basis. A nice -# way to handle exceptions to the usual workflow +# - projects: For each project we specify what jobs to run, in what order jobs +#should depend on each other and for which pipelines the jobs should run. # -# projects: Filter Gerrit event by project name then apply pipelines to filter -# the Gerrit events. Under each pipeline are listed jobs to trigger. -# Jobs can be made dependant on each other. -# -# See upstream documentation at: -# -# http://ci.openstack.org/zuul/zuul.html#layout-yaml +# See also upstream documentation: +# - http://ci.openstack.org/zuul/zuul.html#layout-yaml +# - http://ci.openstack.org/zuul/zuul.html#configuration pipelines: - # For some pipelines, we do not want to report anything back to Gerrit, - # this is useful when trying out a new set of filter or when adding a new - # repository in the workflow. Zuul still log the results in /var/log/zuul.log - # but simply ignore reporting back to Gerrit. By convention such pipelines - # names are suffixed with '-silent'. + # Terminology: + # - silent: For some pipelines, we do not want to report anything back to + #Gerrit, this is useful when trying out a new set of filter or when adding + #a new repository in the workflow. Zuul still log the results to + #/var/log/zuul.log but simply won't report back to Gerrit. + # - check: Basic testing run on any submission. Votes V+1 + # - test: More elaborate testing run only after CR+2 or when submitte + #by a whitelisted user. Votes V+2. - # Pipeline doing prechecks such as syntax linting - # Does NOT report back to Gerrit. - name: check-silent manager: IndependentPipelineManager trigger: @@ -38,8 +34,6 @@ - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ - # Pipeline doing prechecks such as syntax linting - # DOES report back to Gerrit. - name: check manager: IndependentPipelineManager trigger: @@ -47,18 +41,14 @@ - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ success: - # Prevents people from being able to submit a change - # before unit tests have been run since submit requires V+2. + # Only V+1 as these are not elaborate tests. This prevents a change from + # being merged (requires V+2) before elaborate tests, which vote V+2, have run. verified: 1 code-review: 0 failure: verified: -1 code-review: 0 - # Voting check for project that lack unit tests and only rely - # on lint check. Similiar to 'check' but additionally vote V+2 - # This is mostly for operations/puppet which ask to get V+2 whenever - # change is linted since they dont have unit tests. - name: check-voter manager: IndependentPipelineManager trigger: @@ -84,7 +74,7 @@ - .*?@wikimedia\.org$ - .*?@wikimedia\.de$ -# WMF Contractors: +# WMF contractors: - ^anomie\.wikipedia@gmail\.com$ - ^amir\.aharoni@mail\.huji\.ac\.il$ - ^hashar@free\.fr$ @@ -140,8 +130,7 @@ # Actual gate (report/vote in Gerrit) # - # WARNING: do modify the gate-and-submit pipeline below whenever - # changing the gate pipeline. + # WARNING: Also update the gate-and-submit pipeline when changing this one. # - name: gate manager: IndependentPipelineManager @@ -161,8 +150,7 @@ # Actual gate (report/vote in Gerrit) # Will auto submit change on success # - # WARNING: do modify the gate pipeline below whenever changing - # the gate-and-submit pipeline. + # WARNING: Also
[MediaWiki-commits] [Gerrit] Integration: Update index, fix discrepencies, move wikimedia... - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53513
Change subject: Integration: Update index, fix discrepencies, move wikimedia.org
..
Integration: Update index, fix discrepencies, move wikimedia.org
Index:
* Update phrasing from MediaWiki to Wikimedia.
* Remove old testswarm link.
* Add Zuul status.
Discrepencies:
* http/https conf:
- IndexStyleSheet for mobile nightly.
- IndexOrderDefault for nightly snapshots weren't set on both.
* Zuul:
- url_pattern for jenkins-bot comments was on http, and since
/ci is redirect-enforced to https, this was outputting
urls in Gerrit comments that are always redirects.
Domain:
* Update apache conf.
* Move docroot.
* Set up redirects.
* Fix SSL certificate issue (previously https://integration.wikimedia.org
served with certificate of star.mediawiki.org)
* Remove mentions of doc domain since that isn't even in these files.
Bug: 40697
Change-Id: I531ea5bcfe31b96e3eafd47fee5080f8aaf86121
---
M files/misc/jenkins/index.html
M manifests/misc/contint.pp
M manifests/role/zuul.pp
R modules/contint/files/apache/integration.wikimedia.org
M modules/contint/manifests/website.pp
5 files changed, 83 insertions(+), 72 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/53513/1
diff --git a/files/misc/jenkins/index.html b/files/misc/jenkins/index.html
index 8a1a56d..54669ae 100644
--- a/files/misc/jenkins/index.html
+++ b/files/misc/jenkins/index.html
@@ -2,9 +2,8 @@
html dir=ltr lang=en-US
head
meta charset=utf-8
- titleMediaWiki Continuous Integration/title
- meta name=viewport content=width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no /
- style type=text/css
+ titleWikimedia Continuous Integration/title
+ style
body {
margin: 0;
font-size: 14px;
@@ -55,39 +54,37 @@
/head
body
div
- img
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png;
class=logo
+ img
src=//upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png
class=logo
h1Welcome!/h1
- pThis is our continous integration server for MediaWiki./p
- pRight now, we are running Jenkins:/p
+ pThis the continous integration server for Wikimedia
Foundation projects./p
ul
- lia href=ci/Jenkins (PHPUnit/PHP)/a/li
- lisTestSwarm (QUnit/Javascript)/s, disabled/li
+ lia href=/ci/Jenkins/a/li
+ lia href=/zuul/statusZuul status/a/li
liNightly builds:br/
ul
li
- a href=nightly/mediawiki/core/MediaWiki Core/a
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
+ a href=/nightly/mediawiki/core/MediaWiki core/a
(a href=/nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
/li
li
a href=/nightly/mobile/android-commons/Commons/a
Android application
(github: a
href=https://github.com/wikimedia/android-commons;android-commons/a)
/li
li
- a href=WikipediaMobile/nightly/Wikipedia/a
Android application
+ a href=/WikipediaMobile/nightly/Wikipedia/a
Android application
(github: a
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
/li
li
- a href=WiktionaryMobile/nightly/Wiktionary/a
Android application
+ a href=/WiktionaryMobile/nightly/Wiktionary/a
Android application
(github: a
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
/li
li
- a href=WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
+ a href=/WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
(github: a
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
/li
/ul
/li
/ul
- pOur tools are available using either HTTP or HTTPS./p
- pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
+ pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#wikimedia-dev#wikimedia-dev/a./p
/div
/body
/html
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 100cc6c..246f5f7 100644
--- a/manifests/misc/contint.pp
+++
[MediaWiki-commits] [Gerrit] Update files and add doc.wikimedia.org - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53533
Change subject: Update files and add doc.wikimedia.org
..
Update files and add doc.wikimedia.org
Change-Id: I09225307686dcd071ac03b3021d684b799c7e620
---
A doc.wikimedia.org/index.html
D index.html
A integration.wikimedia.org/index.html
R integration.wikimedia.org/nightly.css
4 files changed, 104 insertions(+), 89 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/33/53533/1
diff --git a/doc.wikimedia.org/index.html b/doc.wikimedia.org/index.html
new file mode 100644
index 000..93fa505
--- /dev/null
+++ b/doc.wikimedia.org/index.html
@@ -0,0 +1,14 @@
+!DOCTYPE html
+html dir=ltr lang=en-US
+head
+ meta charset=utf-8
+ titleDocumentation - Wikimedia/title
+/head
+body
+ h3Documentation/h3
+ ul
+ lia href=/puppet/puppet/a/li
+ lia href=/puppetsource/puppetsource/a/li
+ /ul
+/body
+/html
diff --git a/index.html b/index.html
deleted file mode 100644
index e405479..000
--- a/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-!DOCTYPE html
-html dir=ltr lang=en-US
-head
- meta charset=utf-8
- titleMediaWiki Continuous Integration/title
- meta name=viewport content=width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no /
- style type=text/css
- body {
- margin: 0;
- font-size: 14px;
- line-height: 1.231;
- font-family: sans-serif;
- color: #333;
- background: rgb(233, 233, 233);
- }
-
- h1 {
- overflow: hidden;
- vertical-align:middle;
- }
-
- div {
- width: 700px;
- margin: 25px auto 40px;
- padding: 5px 20px;
- background: white;
- }
-
- p {
- color: #666;
- }
- img.logo {
- float: right;
- margin: 5px;
- width:66px;
- height:50px;
- }
- ul {
- line-height: 1.5em;
- }
-
- /** Mobile overrides */
- @media only screen and (max-width:480px) {
- div {
- width: auto;
- margin: 0px 10px;
- padding:0;
- }
- h1 { margin:0; }
- ul {
- line-height: 2em;
- }
- }
- /style
-/head
-body
- div
- img
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png;
class=logo
- h1Welcome!/h1
- pThis is our continous integration server for MediaWiki./p
- pRight now, we are running Jenkins:/p
- ul
- lia href=ci/Jenkins (PHPUnit/PHP)/a/li
- lisTestSwarm (QUnit/Javascript)/s, disabled/li
- liNightly builds:br/
- ul
- li
- a href=nightly/mediawiki/core/MediaWiki Core/a
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
- /li
- li
- a href=WikipediaMobile/nightly/Wikipedia/a
Android application
- (github: a
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
- /li
- li
- a href=WiktionaryMobile/nightly/Wiktionary/a
Android application
- (github: a
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
- /li
- li
- a href=WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
- (github: a
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
- /li
- /ul
- /li
- /ul
- pOur tools are available using either HTTP or HTTPS./p
- pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
- /div
-/body
-/html
diff --git a/integration.wikimedia.org/index.html
b/integration.wikimedia.org/index.html
new file mode 100644
index 000..58ef4e8
--- /dev/null
+++ b/integration.wikimedia.org/index.html
@@ -0,0 +1,90 @@
+!DOCTYPE html
+html dir=ltr lang=en-US
+head
+ meta charset=utf-8
+ titleContinuous Integration - Wikimedia/title
+ style
+ body {
+ margin: 0;
+ font-size: 14px;
+ line-height: 1.231;
+ font-family: sans-serif;
+ color: #333;
+ background: rgb(233, 233, 233);
+ }
+
+ h1 {
+ overflow: hidden;
+
[MediaWiki-commits] [Gerrit] Update files and add doc.wikimedia.org - change (integration/docroot)
Krinkle has submitted this change and it was merged.
Change subject: Update files and add doc.wikimedia.org
..
Update files and add doc.wikimedia.org
Change-Id: I09225307686dcd071ac03b3021d684b799c7e620
---
A doc.wikimedia.org/index.html
D index.html
A integration.wikimedia.org/index.html
R integration.wikimedia.org/nightly.css
4 files changed, 104 insertions(+), 89 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/doc.wikimedia.org/index.html b/doc.wikimedia.org/index.html
new file mode 100644
index 000..93fa505
--- /dev/null
+++ b/doc.wikimedia.org/index.html
@@ -0,0 +1,14 @@
+!DOCTYPE html
+html dir=ltr lang=en-US
+head
+ meta charset=utf-8
+ titleDocumentation - Wikimedia/title
+/head
+body
+ h3Documentation/h3
+ ul
+ lia href=/puppet/puppet/a/li
+ lia href=/puppetsource/puppetsource/a/li
+ /ul
+/body
+/html
diff --git a/index.html b/index.html
deleted file mode 100644
index e405479..000
--- a/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-!DOCTYPE html
-html dir=ltr lang=en-US
-head
- meta charset=utf-8
- titleMediaWiki Continuous Integration/title
- meta name=viewport content=width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no /
- style type=text/css
- body {
- margin: 0;
- font-size: 14px;
- line-height: 1.231;
- font-family: sans-serif;
- color: #333;
- background: rgb(233, 233, 233);
- }
-
- h1 {
- overflow: hidden;
- vertical-align:middle;
- }
-
- div {
- width: 700px;
- margin: 25px auto 40px;
- padding: 5px 20px;
- background: white;
- }
-
- p {
- color: #666;
- }
- img.logo {
- float: right;
- margin: 5px;
- width:66px;
- height:50px;
- }
- ul {
- line-height: 1.5em;
- }
-
- /** Mobile overrides */
- @media only screen and (max-width:480px) {
- div {
- width: auto;
- margin: 0px 10px;
- padding:0;
- }
- h1 { margin:0; }
- ul {
- line-height: 2em;
- }
- }
- /style
-/head
-body
- div
- img
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png;
class=logo
- h1Welcome!/h1
- pThis is our continous integration server for MediaWiki./p
- pRight now, we are running Jenkins:/p
- ul
- lia href=ci/Jenkins (PHPUnit/PHP)/a/li
- lisTestSwarm (QUnit/Javascript)/s, disabled/li
- liNightly builds:br/
- ul
- li
- a href=nightly/mediawiki/core/MediaWiki Core/a
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
- /li
- li
- a href=WikipediaMobile/nightly/Wikipedia/a
Android application
- (github: a
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
- /li
- li
- a href=WiktionaryMobile/nightly/Wiktionary/a
Android application
- (github: a
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
- /li
- li
- a href=WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
- (github: a
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
- /li
- /ul
- /li
- /ul
- pOur tools are available using either HTTP or HTTPS./p
- pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
- /div
-/body
-/html
diff --git a/integration.wikimedia.org/index.html
b/integration.wikimedia.org/index.html
new file mode 100644
index 000..58ef4e8
--- /dev/null
+++ b/integration.wikimedia.org/index.html
@@ -0,0 +1,90 @@
+!DOCTYPE html
+html dir=ltr lang=en-US
+head
+ meta charset=utf-8
+ titleContinuous Integration - Wikimedia/title
+ style
+ body {
+ margin: 0;
+ font-size: 14px;
+ line-height: 1.231;
+ font-family: sans-serif;
+ color: #333;
+ background: rgb(233, 233, 233);
+ }
+
+ h1 {
+ overflow: hidden;
+ vertical-align:middle;
+ }
+
+ div {
+
[MediaWiki-commits] [Gerrit] Build script for mediawiki documentation - change (integration/jenkins)
Krinkle has submitted this change and it was merged.
Change subject: Build script for mediawiki documentation
..
Build script for mediawiki documentation
This patch implements the mw-doc-gen.sh tool. It builds MediaWiki
documentation for tags and branches (based on ZUUL_REF) and publishes to
https://doc.wikimedia.org/.
Change-Id: I5dd693c81b28dc8d5231482a914fedf2518a1bb2
---
A tools/mw-doc-gen.sh
1 file changed, 57 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/tools/mw-doc-gen.sh b/tools/mw-doc-gen.sh
new file mode 100755
index 000..5b352e0
--- /dev/null
+++ b/tools/mw-doc-gen.sh
@@ -0,0 +1,57 @@
+#!/bin/bash -e
+#
+# A wrapper around MediaWiki core documentation generator used to creates
+# documentation for master, release branches and release tags.
+#
+# Copyright, All rights reserved.
+# - Wikimedia Foundation, 2012-2013
+# - Antoine hashar Musso, 2012-2013
+# - Timo Tijhof, 2012-2013
+#
+# Licensed under GPL v2.0
+
+
+# Will hold the tag or branch
+TARGET_NAME=
+
+if [[ $ZUUL_REF =~ ^refs/tags/(.*) ]]; then
+ TARGET_NAME=${BASH_REMATCH[1]}
+elif [[ $ZUUL_REF =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
+ TARGET_NAME=${BASH_REMATCH[1]}
+fi
+
+if [ -z $TARGET_NAME ]; then
+ echo Error: Change target reference is not a tag or a recognized
branch.
+ echo \$ZUUL_REF: $ZUUL_REF
+ exit 1
+fi
+
+if [ ! -e $WORKSPACE/maintenance/mwdocgen.php ]; then
+ echo Error: Could not find maintenance/mwdocgen.php
+ echo Make sure \$WORKSPACE points to a MediaWiki installation.
+ echo \$WORKSPACE: $WORKSPACE
+ exit 1
+fi
+
+echo Found target: '$TARGET_NAME'
+
+# Destination where the generated files will eventually land.
+# For example:
+# http://doc.wikimedia.org/mediawiki-core/master/php
+# http://doc.wikimedia.org/mediawiki-core/REL1_20/php
+# http://doc.wikimedia.org/mediawiki-core/1.20.2/php
+DEST_DIR=/srv/org/wikimedia/doc/mediawiki-core/$TARGET_NAME/php
+[ ! -d ${DEST_DIR} ] mkdir -p ${DEST_DIR}
+
+# Run the MediaWiki documentation wrapper
+#
+# We want to make sure both stdin and stderr are logged to publicly accessible
+# files so users can have a look at them directly from the doc site.
+# We also send back the stderr to the Jenkins console
+#
+# Trick explanation: the command stderr is sent as stdin to a tee FIFO which in
+# turns write back to stderr.
+php $WORKSPACE/maintenance/mwdocgen.php \
+ --no-extensions --output $DEST_DIR \
+ 1 $DEST_DIR/console.txt \
+ 2 (tee $DEST_DIR/errors.txt 2)
--
To view, visit https://gerrit.wikimedia.org/r/39212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5dd693c81b28dc8d5231482a914fedf2518a1bb2
Gerrit-PatchSet: 11
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: saper sa...@saper.info
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defaults: Also add ansicolor to global.wrappers - change (integration/jenkins-job-builder-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53723 Change subject: Defaults: Also add ansicolor to global.wrappers .. Defaults: Also add ansicolor to global.wrappers Since defaults don't inherit from each other we have to manually keep them in sync where appropiate. Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec --- M defaults.yaml 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/23/53723/1 diff --git a/defaults.yaml b/defaults.yaml index c83e460..681e6f8 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -1,7 +1,7 @@ - defaults: name: global description: | - pbJob is managed by Jenkins job builder/b/p + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p project-type: freestyle @@ -10,13 +10,14 @@ timeout: 360 fail: true - timestamps + - ansicolor - defaults: name: use-zuul -#defaults: global +# defaults: global description: | - pbJob is managed by Jenkins job builder/b/p + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p pThis job is triggered by Zuul/p project-type: freestyle @@ -37,10 +38,10 @@ - defaults: name: use-zuul-for-mw-ext -#defaults: global +# defaults: global description: | - pbJob is managed by Jenkins job builder/b/p + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p pThis job is triggered by Zuul/p project-type: freestyle -- To view, visit https://gerrit.wikimedia.org/r/53723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defaults: Also add ansicolor to global.wrappers - change (integration/jenkins-job-builder-config)
Krinkle has submitted this change and it was merged. Change subject: Defaults: Also add ansicolor to global.wrappers .. Defaults: Also add ansicolor to global.wrappers Since defaults don't inherit from each other we have to manually keep them in sync where appropiate. Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec --- M defaults.yaml 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/defaults.yaml b/defaults.yaml index c83e460..681e6f8 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -1,7 +1,7 @@ - defaults: name: global description: | - pbJob is managed by Jenkins job builder/b/p + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p project-type: freestyle @@ -10,13 +10,14 @@ timeout: 360 fail: true - timestamps + - ansicolor - defaults: name: use-zuul -#defaults: global +# defaults: global description: | - pbJob is managed by Jenkins job builder/b/p + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p pThis job is triggered by Zuul/p project-type: freestyle @@ -37,10 +38,10 @@ - defaults: name: use-zuul-for-mw-ext -#defaults: global +# defaults: global description: | - pbJob is managed by Jenkins job builder/b/p + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p pThis job is triggered by Zuul/p project-type: freestyle -- To view, visit https://gerrit.wikimedia.org/r/53723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a37aeaa72fe51ef1edb58abce96fe4a0c605aec Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] doc/configuration: Fix incorrect name defaults - change (integration/jenkins-job-builder)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53724 Change subject: doc/configuration: Fix incorrect name defaults .. doc/configuration: Fix incorrect name defaults See YamlParser#applyDefaults in builder.py. Change-Id: I763d23608b79f7b1c560ae41cf5ca0d2dcc19d60 --- M doc/source/configuration.rst 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder refs/changes/24/53724/1 diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 01fd2ae..5c1bdc5 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -269,7 +269,7 @@ the 'Job'_ definition. If a set of Defaults is specified with the name ``global``, that will be used by all `Job`_ (and `Job Template`_) definitions unless they specify a different Default object with the -``default`` attribute. For example:: +``defaults`` attribute. For example:: - defaults: name: global -- To view, visit https://gerrit.wikimedia.org/r/53724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I763d23608b79f7b1c560ae41cf5ca0d2dcc19d60 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DefaultSettings: Add @since annotations. - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53787
Change subject: DefaultSettings: Add @since annotations.
..
DefaultSettings: Add @since annotations.
Based on information from:
- https://www.mediawiki.org/wiki/Manual:$wgConf
- https://www.mediawiki.org/wiki/Manual:$wgVersion
- https://www.mediawiki.org/wiki/Manual:$wgCanonicalServer
- https://www.mediawiki.org/wiki/Manual:$wgUsePathInfo
- etc.
Change-Id: If359c57493de8efa3beb92b75e2ece9ca4a3a828
---
M includes/DefaultSettings.php
1 file changed, 20 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/87/53787/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5d051d7..cefd882 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -55,13 +55,19 @@
/**
* wgConf hold the site configuration.
* Not used for much in a default install.
+ * @since 1.5
*/
$wgConf = new SiteConfiguration;
-/** MediaWiki version number */
+/**
+ * MediaWiki version number
+ * @since 1.2
+ */
$wgVersion = '1.21alpha';
-/** Name of the site. It must be changed in LocalSettings.php */
+/**
+ * Name of the site. It must be changed in LocalSettings.php
+ */
$wgSitename = 'MediaWiki';
/**
@@ -87,6 +93,7 @@
* Must be fully qualified, even if $wgServer is protocol-relative.
*
* Defaults to $wgServer, expanded to a fully qualified http:// URL if needed.
+ * @since 1.18
*/
$wgCanonicalServer = false;
@@ -121,6 +128,7 @@
* The default $wgArticlePath will be set based on this value at runtime, but
if
* you have customized it, having this incorrectly set to true can cause
* redirect loops when pretty URLs are used.
+ * @since 1.2.1
*/
$wgUsePathInfo = ( strpos( PHP_SAPI, 'cgi' ) === false )
( strpos( PHP_SAPI, 'apache2filter' ) === false )
@@ -132,6 +140,7 @@
*
* Some hosting providers use PHP 4 for *.php files, and PHP 5 for *.php5. This
* variable is provided to support those providers.
+ * @since 1.11
*/
$wgScriptExtension = '.php';
@@ -174,12 +183,14 @@
* The URL path to load.php.
*
* Defaults to {$wgScriptPath}/load{$wgScriptExtension}.
+ * @since 1.17
*/
$wgLoadScript = false;
/**
* The URL path of the skins directory.
* Defaults to {$wgScriptPath}/skins.
+ * @since 1.3
*/
$wgStylePath = false;
$wgStyleSheetPath = $wgStylePath;
@@ -187,6 +198,7 @@
/**
* The URL path of the skins directory. Should not point to an external domain.
* Defaults to {$wgScriptPath}/skins.
+ * @since 1.17
*/
$wgLocalStylePath = false;
@@ -200,6 +212,7 @@
/**
* Filesystem stylesheets directory.
* Defaults to {$IP}/skins.
+ * @since 1.3
*/
$wgStyleDirectory = false;
@@ -237,12 +250,14 @@
/**
* The URL path of the shortcut icon.
+ * @since 1.6
*/
$wgFavicon = '/favicon.ico';
/**
* The URL path of the icon for iPhone and iPod Touch web app bookmarks.
* Defaults to no icon.
+ * @since 1.12
*/
$wgAppleTouchIcon = false;
@@ -266,6 +281,7 @@
/**
* If set, this URL is added to the start of $wgUploadPath to form a complete
* upload URL.
+ * @since 1.4
*/
$wgUploadBaseUrl = '';
@@ -274,6 +290,7 @@
* Full thumbnail URL will be like
$wgUploadStashScalerBaseUrl/e/e6/Foo.jpg/123px-Foo.jpg
* where 'e6' are the first two characters of the MD5 hash of the file name.
* If $wgUploadStashScalerBaseUrl is set to false, thumbs are rendered locally
as needed.
+ * @since 1.17
*/
$wgUploadStashScalerBaseUrl = false;
@@ -289,6 +306,7 @@
*
* There must be an appropriate script or rewrite rule in place to handle these
* URLs.
+ * @since 1.5
*/
$wgActionPaths = array();
--
To view, visit https://gerrit.wikimedia.org/r/53787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If359c57493de8efa3beb92b75e2ece9ca4a3a828
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update files and add doc.wikimedia.org - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53801
Change subject: Update files and add doc.wikimedia.org
..
Update files and add doc.wikimedia.org
Cherry picked from 36118c58af5e972b8ae6d24c00b49d5d00ca7df6.
Change-Id: Ia70316f973f220170c03d9a2dddc9897164d889a
---
M org/mediawiki/integration/index.html
A org/wikimedia/doc/index.html
2 files changed, 25 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/01/53801/1
diff --git a/org/mediawiki/integration/index.html
b/org/mediawiki/integration/index.html
index 8a1a56d..58ef4e8 100644
--- a/org/mediawiki/integration/index.html
+++ b/org/mediawiki/integration/index.html
@@ -2,9 +2,8 @@
html dir=ltr lang=en-US
head
meta charset=utf-8
- titleMediaWiki Continuous Integration/title
- meta name=viewport content=width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no /
- style type=text/css
+ titleContinuous Integration - Wikimedia/title
+ style
body {
margin: 0;
font-size: 14px;
@@ -55,39 +54,37 @@
/head
body
div
- img
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png;
class=logo
+ img
src=//upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png
class=logo
h1Welcome!/h1
- pThis is our continous integration server for MediaWiki./p
- pRight now, we are running Jenkins:/p
+ pThis the continous integration server for Wikimedia
Foundation projects./p
ul
- lia href=ci/Jenkins (PHPUnit/PHP)/a/li
- lisTestSwarm (QUnit/Javascript)/s, disabled/li
+ lia href=/ci/Jenkins/a/li
+ lia href=/zuul/statusZuul status/a/li
liNightly builds:br/
ul
li
- a href=nightly/mediawiki/core/MediaWiki Core/a
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
+ a href=/nightly/mediawiki/core/MediaWiki core/a
(a href=/nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
/li
li
a href=/nightly/mobile/android-commons/Commons/a
Android application
(github: a
href=https://github.com/wikimedia/android-commons;android-commons/a)
/li
li
- a href=WikipediaMobile/nightly/Wikipedia/a
Android application
+ a href=/WikipediaMobile/nightly/Wikipedia/a
Android application
(github: a
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
/li
li
- a href=WiktionaryMobile/nightly/Wiktionary/a
Android application
+ a href=/WiktionaryMobile/nightly/Wiktionary/a
Android application
(github: a
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
/li
li
- a href=WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
+ a href=/WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
(github: a
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
/li
/ul
/li
/ul
- pOur tools are available using either HTTP or HTTPS./p
- pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
+ pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#wikimedia-dev#wikimedia-dev/a./p
/div
/body
/html
diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html
new file mode 100644
index 000..93fa505
--- /dev/null
+++ b/org/wikimedia/doc/index.html
@@ -0,0 +1,14 @@
+!DOCTYPE html
+html dir=ltr lang=en-US
+head
+ meta charset=utf-8
+ titleDocumentation - Wikimedia/title
+/head
+body
+ h3Documentation/h3
+ ul
+ lia href=/puppet/puppet/a/li
+ lia href=/puppetsource/puppetsource/a/li
+ /ul
+/body
+/html
--
To view, visit https://gerrit.wikimedia.org/r/53801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia70316f973f220170c03d9a2dddc9897164d889a
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Update files and add doc.wikimedia.org - change (integration/docroot)
Krinkle has submitted this change and it was merged.
Change subject: Update files and add doc.wikimedia.org
..
Update files and add doc.wikimedia.org
Cherry picked from 36118c58af5e972b8ae6d24c00b49d5d00ca7df6.
Change-Id: Ia70316f973f220170c03d9a2dddc9897164d889a
---
M org/mediawiki/integration/index.html
A org/wikimedia/doc/index.html
2 files changed, 25 insertions(+), 14 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/org/mediawiki/integration/index.html
b/org/mediawiki/integration/index.html
index 8a1a56d..58ef4e8 100644
--- a/org/mediawiki/integration/index.html
+++ b/org/mediawiki/integration/index.html
@@ -2,9 +2,8 @@
html dir=ltr lang=en-US
head
meta charset=utf-8
- titleMediaWiki Continuous Integration/title
- meta name=viewport content=width=device-width, initial-scale=1.0,
maximum-scale=1.0, user-scalable=no /
- style type=text/css
+ titleContinuous Integration - Wikimedia/title
+ style
body {
margin: 0;
font-size: 14px;
@@ -55,39 +54,37 @@
/head
body
div
- img
src=https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png;
class=logo
+ img
src=//upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png
class=logo
h1Welcome!/h1
- pThis is our continous integration server for MediaWiki./p
- pRight now, we are running Jenkins:/p
+ pThis the continous integration server for Wikimedia
Foundation projects./p
ul
- lia href=ci/Jenkins (PHPUnit/PHP)/a/li
- lisTestSwarm (QUnit/Javascript)/s, disabled/li
+ lia href=/ci/Jenkins/a/li
+ lia href=/zuul/statusZuul status/a/li
liNightly builds:br/
ul
li
- a href=nightly/mediawiki/core/MediaWiki Core/a
(a href=nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
+ a href=/nightly/mediawiki/core/MediaWiki core/a
(a href=/nightly/mediawiki/core/mediawiki-latest.ziplatest/a)
/li
li
a href=/nightly/mobile/android-commons/Commons/a
Android application
(github: a
href=https://github.com/wikimedia/android-commons;android-commons/a)
/li
li
- a href=WikipediaMobile/nightly/Wikipedia/a
Android application
+ a href=/WikipediaMobile/nightly/Wikipedia/a
Android application
(github: a
href=https://github.com/wikimedia/WikipediaMobile;WikipediaMobile/a)
/li
li
- a href=WiktionaryMobile/nightly/Wiktionary/a
Android application
+ a href=/WiktionaryMobile/nightly/Wiktionary/a
Android application
(github: a
href=https://github.com/wikimedia/WiktionaryMobile;WiktionaryMobile/a)
/li
li
- a href=WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
+ a href=/WLMMobile/nightly/Wikimedia Loves
Monument/a Android application
(github: a
href=https://github.com/wikimedia/WLMMobile;WLMMobile/a)
/li
/ul
/li
/ul
- pOur tools are available using either HTTP or HTTPS./p
- pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#mediawiki#mediawiki/a./p
+ pQuestions? Comments? Concerns? Contact em^demon/em,
emKrinkle/em or emhashar/em on a
href=irc://irc.freenode.net/#wikimedia-dev#wikimedia-dev/a./p
/div
/body
/html
diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html
new file mode 100644
index 000..93fa505
--- /dev/null
+++ b/org/wikimedia/doc/index.html
@@ -0,0 +1,14 @@
+!DOCTYPE html
+html dir=ltr lang=en-US
+head
+ meta charset=utf-8
+ titleDocumentation - Wikimedia/title
+/head
+body
+ h3Documentation/h3
+ ul
+ lia href=/puppet/puppet/a/li
+ lia href=/puppetsource/puppetsource/a/li
+ /ul
+/body
+/html
--
To view, visit https://gerrit.wikimedia.org/r/53801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70316f973f220170c03d9a2dddc9897164d889a
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Add .gitignore file - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53808 Change subject: Add .gitignore file .. Add .gitignore file Change-Id: Icf968968e1d8bf4f03994b2cd51aae433a14bdf0 --- A .gitignore 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/08/53808/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..4cae7b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +jenkins-autodeploy +/localhost/qunit/ +/org/mediawiki/integration/WLMMobile/nightly/ +/org/mediawiki/integration/WikipediaMobile/nightly/ +/org/mediawiki/integration/WiktionaryMobile/nightly/ +/org/mediawiki/integration/coverage/ +/org/mediawiki/integration/nightly/ +/org/wikimedia/doc/puppet/ +/org/wikimedia/doc/puppetsource/ -- To view, visit https://gerrit.wikimedia.org/r/53808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf968968e1d8bf4f03994b2cd51aae433a14bdf0 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitignore file - change (integration/docroot)
Krinkle has submitted this change and it was merged. Change subject: Add .gitignore file .. Add .gitignore file Change-Id: Icf968968e1d8bf4f03994b2cd51aae433a14bdf0 --- A .gitignore 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..4cae7b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +jenkins-autodeploy +/localhost/qunit/ +/org/mediawiki/integration/WLMMobile/nightly/ +/org/mediawiki/integration/WikipediaMobile/nightly/ +/org/mediawiki/integration/WiktionaryMobile/nightly/ +/org/mediawiki/integration/coverage/ +/org/mediawiki/integration/nightly/ +/org/wikimedia/doc/puppet/ +/org/wikimedia/doc/puppetsource/ -- To view, visit https://gerrit.wikimedia.org/r/53808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf968968e1d8bf4f03994b2cd51aae433a14bdf0 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename integration to org/wikimedia, keeping symlink. - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53854 Change subject: Rename integration to org/wikimedia, keeping symlink. .. Rename integration to org/wikimedia, keeping symlink. This is backwards compatible with the current Apache configuration. Also pending (but not dependant) is operations/puppet: I531ea5bcfe31. Change-Id: I9267d7eac9d0b23fca38d1188524ddf2018d6609 --- A org/mediawiki/integration R org/wikimedia/integration/WLMMobile/HEADER.html R org/wikimedia/integration/WLMMobile/README.html R org/wikimedia/integration/WikipediaMobile/HEADER.html R org/wikimedia/integration/WikipediaMobile/README.html R org/wikimedia/integration/WiktionaryMobile/HEADER.html R org/wikimedia/integration/WiktionaryMobile/README.html R org/wikimedia/integration/index.html R org/wikimedia/integration/nightly.css 9 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/54/53854/1 diff --git a/org/mediawiki/integration b/org/mediawiki/integration new file mode 12 index 000..9146fc6 --- /dev/null +++ b/org/mediawiki/integration @@ -0,0 +1 @@ +org/wikimedia/integration \ No newline at end of file diff --git a/org/mediawiki/integration/WLMMobile/HEADER.html b/org/wikimedia/integration/WLMMobile/HEADER.html similarity index 100% rename from org/mediawiki/integration/WLMMobile/HEADER.html rename to org/wikimedia/integration/WLMMobile/HEADER.html diff --git a/org/mediawiki/integration/WLMMobile/README.html b/org/wikimedia/integration/WLMMobile/README.html similarity index 100% rename from org/mediawiki/integration/WLMMobile/README.html rename to org/wikimedia/integration/WLMMobile/README.html diff --git a/org/mediawiki/integration/WikipediaMobile/HEADER.html b/org/wikimedia/integration/WikipediaMobile/HEADER.html similarity index 100% rename from org/mediawiki/integration/WikipediaMobile/HEADER.html rename to org/wikimedia/integration/WikipediaMobile/HEADER.html diff --git a/org/mediawiki/integration/WikipediaMobile/README.html b/org/wikimedia/integration/WikipediaMobile/README.html similarity index 100% rename from org/mediawiki/integration/WikipediaMobile/README.html rename to org/wikimedia/integration/WikipediaMobile/README.html diff --git a/org/mediawiki/integration/WiktionaryMobile/HEADER.html b/org/wikimedia/integration/WiktionaryMobile/HEADER.html similarity index 100% rename from org/mediawiki/integration/WiktionaryMobile/HEADER.html rename to org/wikimedia/integration/WiktionaryMobile/HEADER.html diff --git a/org/mediawiki/integration/WiktionaryMobile/README.html b/org/wikimedia/integration/WiktionaryMobile/README.html similarity index 100% rename from org/mediawiki/integration/WiktionaryMobile/README.html rename to org/wikimedia/integration/WiktionaryMobile/README.html diff --git a/org/mediawiki/integration/index.html b/org/wikimedia/integration/index.html similarity index 100% rename from org/mediawiki/integration/index.html rename to org/wikimedia/integration/index.html diff --git a/org/mediawiki/integration/nightly.css b/org/wikimedia/integration/nightly.css similarity index 100% rename from org/mediawiki/integration/nightly.css rename to org/wikimedia/integration/nightly.css -- To view, visit https://gerrit.wikimedia.org/r/53854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9267d7eac9d0b23fca38d1188524ddf2018d6609 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename integration to org/wikimedia, keeping symlink. - change (integration/docroot)
Krinkle has submitted this change and it was merged. Change subject: Rename integration to org/wikimedia, keeping symlink. .. Rename integration to org/wikimedia, keeping symlink. This is backwards compatible with the current Apache configuration. Also pending (but not dependant) is operations/puppet: I531ea5bcfe31. Change-Id: I9267d7eac9d0b23fca38d1188524ddf2018d6609 --- A org/mediawiki/integration R org/wikimedia/integration/WLMMobile/HEADER.html R org/wikimedia/integration/WLMMobile/README.html R org/wikimedia/integration/WikipediaMobile/HEADER.html R org/wikimedia/integration/WikipediaMobile/README.html R org/wikimedia/integration/WiktionaryMobile/HEADER.html R org/wikimedia/integration/WiktionaryMobile/README.html R org/wikimedia/integration/index.html R org/wikimedia/integration/nightly.css 9 files changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/org/mediawiki/integration b/org/mediawiki/integration new file mode 12 index 000..9146fc6 --- /dev/null +++ b/org/mediawiki/integration @@ -0,0 +1 @@ +org/wikimedia/integration \ No newline at end of file diff --git a/org/mediawiki/integration/WLMMobile/HEADER.html b/org/wikimedia/integration/WLMMobile/HEADER.html similarity index 100% rename from org/mediawiki/integration/WLMMobile/HEADER.html rename to org/wikimedia/integration/WLMMobile/HEADER.html diff --git a/org/mediawiki/integration/WLMMobile/README.html b/org/wikimedia/integration/WLMMobile/README.html similarity index 100% rename from org/mediawiki/integration/WLMMobile/README.html rename to org/wikimedia/integration/WLMMobile/README.html diff --git a/org/mediawiki/integration/WikipediaMobile/HEADER.html b/org/wikimedia/integration/WikipediaMobile/HEADER.html similarity index 100% rename from org/mediawiki/integration/WikipediaMobile/HEADER.html rename to org/wikimedia/integration/WikipediaMobile/HEADER.html diff --git a/org/mediawiki/integration/WikipediaMobile/README.html b/org/wikimedia/integration/WikipediaMobile/README.html similarity index 100% rename from org/mediawiki/integration/WikipediaMobile/README.html rename to org/wikimedia/integration/WikipediaMobile/README.html diff --git a/org/mediawiki/integration/WiktionaryMobile/HEADER.html b/org/wikimedia/integration/WiktionaryMobile/HEADER.html similarity index 100% rename from org/mediawiki/integration/WiktionaryMobile/HEADER.html rename to org/wikimedia/integration/WiktionaryMobile/HEADER.html diff --git a/org/mediawiki/integration/WiktionaryMobile/README.html b/org/wikimedia/integration/WiktionaryMobile/README.html similarity index 100% rename from org/mediawiki/integration/WiktionaryMobile/README.html rename to org/wikimedia/integration/WiktionaryMobile/README.html diff --git a/org/mediawiki/integration/index.html b/org/wikimedia/integration/index.html similarity index 100% rename from org/mediawiki/integration/index.html rename to org/wikimedia/integration/index.html diff --git a/org/mediawiki/integration/nightly.css b/org/wikimedia/integration/nightly.css similarity index 100% rename from org/mediawiki/integration/nightly.css rename to org/wikimedia/integration/nightly.css -- To view, visit https://gerrit.wikimedia.org/r/53854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9267d7eac9d0b23fca38d1188524ddf2018d6609 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add sudo user krinkle on gallium. - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53861
Change subject: Add sudo user krinkle on gallium.
..
Add sudo user krinkle on gallium.
Filed as RT #4735.
Change-Id: Ief6441e7a78fedb910c9f3130f83577c0c58a9f9
---
M manifests/site.pp
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/53861/1
diff --git a/manifests/site.pp b/manifests/site.pp
index e7836ba..f077632 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -763,7 +763,7 @@
node gallium.wikimedia.org {
$cluster = misc
$gid=500
- sudo_user { [ demon, krinkle, reedy, dsc, mholmquist ]:
privileges = [
+ sudo_user { [ demon, reedy, dsc, mholmquist ]: privileges = [
'ALL = (jenkins) NOPASSWD: ALL'
,'ALL = NOPASSWD: /etc/init.d/jenkins'
,'ALL = (testswarm) NOPASSWD: ALL'
@@ -771,8 +771,9 @@
,'ALL = (postgres) NOPASSWD: /usr/bin/psql'
]}
- # full root for Jenkins admin (RT-4101)
- sudo_user { hashar: privileges = ['ALL = NOPASSWD: ALL'] }
+ # full root for continuous integration admins
+ sudo_user { hashar: privileges = ['ALL = NOPASSWD: ALL'] } # RT-4101
+ sudo_user { krinkle: privileges = ['ALL = NOPASSWD: ALL'] } # RT-4735
include standard,
nrpe,
--
To view, visit https://gerrit.wikimedia.org/r/53861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief6441e7a78fedb910c9f3130f83577c0c58a9f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install JSDuck 4.6.2 into tools/gem_modules. - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53929 Change subject: Install JSDuck 4.6.2 into tools/gem_modules. .. Install JSDuck 4.6.2 into tools/gem_modules. https://github.com/senchalabs/jsduck gem install jsduck\ --install-dir gem_modules\ --bindir gem_modules/.bin\ --no-rdoc\ --no-ri\ --env-shebang\ --include-dependencies Needed for generating documentation pages for mediawiki-core and mediawiki-extensions-visualeditor. Change-Id: Ib72e93f227364f4c32970bd4db850620bb518334 --- A bin/jsduck A tools/gem_modules/.bin/jsduck A tools/gem_modules/.bin/rdiscount A tools/gem_modules/cache/dimensions-1.2.0.gem A tools/gem_modules/cache/jsduck-4.6.2.gem A tools/gem_modules/cache/json-1.7.7.gem A tools/gem_modules/cache/rdiscount-2.0.7.1.gem A tools/gem_modules/gems/dimensions-1.2.0/LICENSE A tools/gem_modules/gems/dimensions-1.2.0/README.md A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/exif_scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/io.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/jpeg_scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/reader.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/tiff_scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/tiff_scanning.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/version.rb A tools/gem_modules/gems/jsduck-4.6.2/.gitignore A tools/gem_modules/gems/jsduck-4.6.2/.travis.yml A tools/gem_modules/gems/jsduck-4.6.2/COPYING A tools/gem_modules/gems/jsduck-4.6.2/README.md A tools/gem_modules/gems/jsduck-4.6.2/Rakefile A tools/gem_modules/gems/jsduck-4.6.2/bin/compare A tools/gem_modules/gems/jsduck-4.6.2/bin/graph A tools/gem_modules/gems/jsduck-4.6.2/bin/jsduck A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Array.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Boolean.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Date.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Function.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Number.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Object.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/RegExp.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/String.js A tools/gem_modules/gems/jsduck-4.6.2/jsduck.gemspec A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/accessors.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/aggregator.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/app.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/app_data.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/assets.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/ast.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/auto_categories.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/batch_formatter.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/batch_parser.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/categories.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/categories_class_name.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/circular_deps.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_doc_expander.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_formatter.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_name.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_writer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/css_lexer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/css_parser.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_ast.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_formatter.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_parser.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_type.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/enum.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/esprima.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/esprima/esprima.js A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/evaluator.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/examples.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/export_writer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/app.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/examples.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/full.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/ext_patterns.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/external_classes.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/file_categories.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/function_ast.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/grouped_asset.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/guide_writer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/guides.rb A
[MediaWiki-commits] [Gerrit] Rename tools/mw-doc-gen.sh to tools/mwcore-docgen.sh. - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53931 Change subject: Rename tools/mw-doc-gen.sh to tools/mwcore-docgen.sh. .. Rename tools/mw-doc-gen.sh to tools/mwcore-docgen.sh. Change-Id: I4d03c56d5fc20d3a3e14189e389912b1ad3d3678 --- R tools/mwcore-docgen.sh 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/31/53931/1 diff --git a/tools/mw-doc-gen.sh b/tools/mwcore-docgen.sh similarity index 100% rename from tools/mw-doc-gen.sh rename to tools/mwcore-docgen.sh -- To view, visit https://gerrit.wikimedia.org/r/53931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d03c56d5fc20d3a3e14189e389912b1ad3d3678 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename tools/mw-doc-gen.sh to tools/mwcore-docgen.sh. - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: Rename tools/mw-doc-gen.sh to tools/mwcore-docgen.sh. .. Rename tools/mw-doc-gen.sh to tools/mwcore-docgen.sh. Change-Id: I4d03c56d5fc20d3a3e14189e389912b1ad3d3678 --- R tools/mwcore-docgen.sh 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/tools/mw-doc-gen.sh b/tools/mwcore-docgen.sh similarity index 100% rename from tools/mw-doc-gen.sh rename to tools/mwcore-docgen.sh -- To view, visit https://gerrit.wikimedia.org/r/53931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d03c56d5fc20d3a3e14189e389912b1ad3d3678 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace with mediawiki-core @ de9a0853e6. - change (test/mediawiki)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53932 Change subject: Replace with mediawiki-core @ de9a0853e6. .. Replace with mediawiki-core @ de9a0853e6. (except for .git/ and .gitreview) Change-Id: I7514284d3ed45705108c8bb23d7c1b7e3130 --- M .gitignore M HISTORY M RELEASE-NOTES-1.21 M UPGRADE M api.php M api.php5 A cache/.htaccess A composer.json M docs/hooks.txt M docs/maintenance.txt M docs/memcached.txt M img_auth.php5 M includes/Action.php M includes/AjaxResponse.php M includes/ArrayUtils.php M includes/Article.php M includes/AuthPlugin.php M includes/AutoLoader.php M includes/Autopromote.php M includes/Block.php M includes/Category.php M includes/CategoryPage.php M includes/CategoryViewer.php M includes/Categoryfinder.php M includes/Cdb.php M includes/ChangeTags.php M includes/ChangesFeed.php M includes/ChangesList.php M includes/Collation.php M includes/ConfEditor.php M includes/Cookie.php M includes/CryptRand.php M includes/DataUpdate.php M includes/DefaultSettings.php M includes/DeferredUpdates.php M includes/Defines.php M includes/EditPage.php M includes/Exception.php M includes/Export.php M includes/ExternalEdit.php M includes/ExternalUser.php M includes/Fallback.php M includes/Feed.php M includes/FeedUtils.php M includes/FileDeleteForm.php M includes/FormOptions.php M includes/GitInfo.php M includes/GlobalFunctions.php M includes/HTMLForm.php M includes/HistoryBlob.php M includes/Hooks.php M includes/Html.php M includes/HttpFunctions.php M includes/IP.php M includes/ImageGallery.php M includes/ImagePage.php M includes/Import.php M includes/Init.php M includes/Licenses.php M includes/LinkFilter.php M includes/Linker.php M includes/LinksUpdate.php M includes/MagicWord.php A includes/MappedIterator.php M includes/Message.php M includes/MessageBlobStore.php M includes/MimeMagic.php M includes/Namespace.php M includes/OutputHandler.php M includes/OutputPage.php M includes/PHPVersionError.php M includes/Pager.php M includes/PathRouter.php M includes/PoolCounter.php M includes/Preferences.php M includes/PrefixSearch.php M includes/ProtectionForm.php M includes/ProxyTools.php M includes/QueryPage.php M includes/RecentChange.php M includes/Revision.php M includes/RevisionList.php M includes/Sanitizer.php M includes/SeleniumWebSettings.php M includes/Setup.php M includes/SiteConfiguration.php M includes/SiteStats.php M includes/Skin.php M includes/SkinLegacy.php M includes/SkinTemplate.php M includes/SpecialPage.php M includes/SpecialPageFactory.php M includes/Status.php M includes/StreamFile.php M includes/StringUtils.php M includes/StubObject.php M includes/Timestamp.php M includes/Title.php M includes/TitleArray.php M includes/UIDGenerator.php M includes/User.php M includes/UserMailer.php M includes/UserRightsProxy.php M includes/WatchedItem.php M includes/WebRequest.php M includes/WebResponse.php M includes/WebStart.php M includes/Wiki.php M includes/WikiError.php M includes/WikiMap.php M includes/WikiPage.php M includes/Xml.php M includes/XmlTypeCheck.php M includes/ZhClient.php M includes/ZipDirectoryReader.php M includes/actions/CachedAction.php M includes/actions/CreditsAction.php M includes/actions/DeleteAction.php M includes/actions/EditAction.php M includes/actions/HistoryAction.php M includes/actions/InfoAction.php M includes/actions/MarkpatrolledAction.php M includes/actions/ProtectAction.php M includes/actions/PurgeAction.php M includes/actions/RawAction.php M includes/actions/RenderAction.php M includes/actions/RevisiondeleteAction.php M includes/actions/ViewAction.php M includes/actions/WatchAction.php M includes/api/ApiBase.php M includes/api/ApiBlock.php M includes/api/ApiCreateAccount.php M includes/api/ApiDelete.php M includes/api/ApiEditPage.php M includes/api/ApiFeedWatchlist.php M includes/api/ApiFormatBase.php M includes/api/ApiFormatJson.php A includes/api/ApiImageRotate.php M includes/api/ApiLogin.php M includes/api/ApiMain.php M includes/api/ApiModuleManager.php M includes/api/ApiMove.php M includes/api/ApiOptions.php M includes/api/ApiPageSet.php M includes/api/ApiParamInfo.php M includes/api/ApiParse.php M includes/api/ApiProtect.php M includes/api/ApiPurge.php M includes/api/ApiQuery.php M includes/api/ApiQueryAllImages.php M includes/api/ApiQueryAllMessages.php M includes/api/ApiQueryAllPages.php M includes/api/ApiQueryAllUsers.php M includes/api/ApiQueryBacklinks.php M includes/api/ApiQueryBase.php M includes/api/ApiQueryCategories.php M includes/api/ApiQueryCategoryInfo.php M includes/api/ApiQueryCategoryMembers.php M includes/api/ApiQueryDeletedrevs.php M includes/api/ApiQueryDuplicateFiles.php M includes/api/ApiQueryExtLinksUsage.php M includes/api/ApiQueryExternalLinks.php M includes/api/ApiQueryFilearchive.php M includes/api/ApiQueryImageInfo.php M includes/api/ApiQueryImages.php M includes/api/ApiQueryInfo.php M includes/api/ApiQueryLangLinks.php M
[MediaWiki-commits] [Gerrit] Trigger tests-mediawiki-docgen from the postmerge pipeline. - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53933 Change subject: Trigger tests-mediawiki-docgen from the postmerge pipeline. .. Trigger tests-mediawiki-docgen from the postmerge pipeline. After testing, will enable mediawiki-core-docgen in I56b2422522. Change-Id: I3c8d5e395e35e003689dd15b7c5b1ffec258957e --- M layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/33/53933/1 diff --git a/layout.yaml b/layout.yaml index 663e6b6..0b0b56b 100644 --- a/layout.yaml +++ b/layout.yaml @@ -378,6 +378,7 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-phpcs + # - mediawiki-core-docgen - name: analytics/libanon test: @@ -1760,3 +1761,5 @@ - test-mediawiki-dumpenv - test-mediawiki-phpcs-HEAD - test-mediawiki-qunit +postmerge: + - test-mediawiki-docgen -- To view, visit https://gerrit.wikimedia.org/r/53933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c8d5e395e35e003689dd15b7c5b1ffec258957e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger mediawiki-core-docgen from the postmerge pipeline. - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53934 Change subject: Trigger mediawiki-core-docgen from the postmerge pipeline. .. Trigger mediawiki-core-docgen from the postmerge pipeline. Follows-up I0711d7a10a. Change-Id: I84579ad01a10fd9377795862bfb262b635925ca6 --- M layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/34/53934/1 diff --git a/layout.yaml b/layout.yaml index 0b0b56b..40a430e 100644 --- a/layout.yaml +++ b/layout.yaml @@ -378,7 +378,7 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-phpcs - # - mediawiki-core-docgen + - mediawiki-core-docgen - name: analytics/libanon test: -- To view, visit https://gerrit.wikimedia.org/r/53934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84579ad01a10fd9377795862bfb262b635925ca6 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger tests-mediawiki-docgen from the postmerge pipeline. - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: Trigger tests-mediawiki-docgen from the postmerge pipeline. .. Trigger tests-mediawiki-docgen from the postmerge pipeline. After testing, will enable mediawiki-core-docgen in I84579ad01a. Change-Id: I3c8d5e395e35e003689dd15b7c5b1ffec258957e --- M layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index 663e6b6..0b0b56b 100644 --- a/layout.yaml +++ b/layout.yaml @@ -378,6 +378,7 @@ - mediawiki-core-regression-REL1_19 - mediawiki-core-regression-REL1_20 - mediawiki-core-regression-phpcs + # - mediawiki-core-docgen - name: analytics/libanon test: @@ -1760,3 +1761,5 @@ - test-mediawiki-dumpenv - test-mediawiki-phpcs-HEAD - test-mediawiki-qunit +postmerge: + - test-mediawiki-docgen -- To view, visit https://gerrit.wikimedia.org/r/53933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c8d5e395e35e003689dd15b7c5b1ffec258957e Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace with mediawiki-core @ de9a0853e6. - change (test/mediawiki)
Krinkle has submitted this change and it was merged. Change subject: Replace with mediawiki-core @ de9a0853e6. .. Replace with mediawiki-core @ de9a0853e6. (except for .git/ and .gitreview) Change-Id: I7514284d3ed45705108c8bb23d7c1b7e3130 --- M .gitignore M HISTORY M RELEASE-NOTES-1.21 M UPGRADE M api.php M api.php5 A cache/.htaccess A composer.json M docs/hooks.txt M docs/maintenance.txt M docs/memcached.txt M img_auth.php5 M includes/Action.php M includes/AjaxResponse.php M includes/ArrayUtils.php M includes/Article.php M includes/AuthPlugin.php M includes/AutoLoader.php M includes/Autopromote.php M includes/Block.php M includes/Category.php M includes/CategoryPage.php M includes/CategoryViewer.php M includes/Categoryfinder.php M includes/Cdb.php M includes/ChangeTags.php M includes/ChangesFeed.php M includes/ChangesList.php M includes/Collation.php M includes/ConfEditor.php M includes/Cookie.php M includes/CryptRand.php M includes/DataUpdate.php M includes/DefaultSettings.php M includes/DeferredUpdates.php M includes/Defines.php M includes/EditPage.php M includes/Exception.php M includes/Export.php M includes/ExternalEdit.php M includes/ExternalUser.php M includes/Fallback.php M includes/Feed.php M includes/FeedUtils.php M includes/FileDeleteForm.php M includes/FormOptions.php M includes/GitInfo.php M includes/GlobalFunctions.php M includes/HTMLForm.php M includes/HistoryBlob.php M includes/Hooks.php M includes/Html.php M includes/HttpFunctions.php M includes/IP.php M includes/ImageGallery.php M includes/ImagePage.php M includes/Import.php M includes/Init.php M includes/Licenses.php M includes/LinkFilter.php M includes/Linker.php M includes/LinksUpdate.php M includes/MagicWord.php A includes/MappedIterator.php M includes/Message.php M includes/MessageBlobStore.php M includes/MimeMagic.php M includes/Namespace.php M includes/OutputHandler.php M includes/OutputPage.php M includes/PHPVersionError.php M includes/Pager.php M includes/PathRouter.php M includes/PoolCounter.php M includes/Preferences.php M includes/PrefixSearch.php M includes/ProtectionForm.php M includes/ProxyTools.php M includes/QueryPage.php M includes/RecentChange.php M includes/Revision.php M includes/RevisionList.php M includes/Sanitizer.php M includes/SeleniumWebSettings.php M includes/Setup.php M includes/SiteConfiguration.php M includes/SiteStats.php M includes/Skin.php M includes/SkinLegacy.php M includes/SkinTemplate.php M includes/SpecialPage.php M includes/SpecialPageFactory.php M includes/Status.php M includes/StreamFile.php M includes/StringUtils.php M includes/StubObject.php M includes/Timestamp.php M includes/Title.php M includes/TitleArray.php M includes/UIDGenerator.php M includes/User.php M includes/UserMailer.php M includes/UserRightsProxy.php M includes/WatchedItem.php M includes/WebRequest.php M includes/WebResponse.php M includes/WebStart.php M includes/Wiki.php M includes/WikiError.php M includes/WikiMap.php M includes/WikiPage.php M includes/Xml.php M includes/XmlTypeCheck.php M includes/ZhClient.php M includes/ZipDirectoryReader.php M includes/actions/CachedAction.php M includes/actions/CreditsAction.php M includes/actions/DeleteAction.php M includes/actions/EditAction.php M includes/actions/HistoryAction.php M includes/actions/InfoAction.php M includes/actions/MarkpatrolledAction.php M includes/actions/ProtectAction.php M includes/actions/PurgeAction.php M includes/actions/RawAction.php M includes/actions/RenderAction.php M includes/actions/RevisiondeleteAction.php M includes/actions/ViewAction.php M includes/actions/WatchAction.php M includes/api/ApiBase.php M includes/api/ApiBlock.php M includes/api/ApiCreateAccount.php M includes/api/ApiDelete.php M includes/api/ApiEditPage.php M includes/api/ApiFeedWatchlist.php M includes/api/ApiFormatBase.php M includes/api/ApiFormatJson.php A includes/api/ApiImageRotate.php M includes/api/ApiLogin.php M includes/api/ApiMain.php M includes/api/ApiModuleManager.php M includes/api/ApiMove.php M includes/api/ApiOptions.php M includes/api/ApiPageSet.php M includes/api/ApiParamInfo.php M includes/api/ApiParse.php M includes/api/ApiProtect.php M includes/api/ApiPurge.php M includes/api/ApiQuery.php M includes/api/ApiQueryAllImages.php M includes/api/ApiQueryAllMessages.php M includes/api/ApiQueryAllPages.php M includes/api/ApiQueryAllUsers.php M includes/api/ApiQueryBacklinks.php M includes/api/ApiQueryBase.php M includes/api/ApiQueryCategories.php M includes/api/ApiQueryCategoryInfo.php M includes/api/ApiQueryCategoryMembers.php M includes/api/ApiQueryDeletedrevs.php M includes/api/ApiQueryDuplicateFiles.php M includes/api/ApiQueryExtLinksUsage.php M includes/api/ApiQueryExternalLinks.php M includes/api/ApiQueryFilearchive.php M includes/api/ApiQueryImageInfo.php M includes/api/ApiQueryImages.php M includes/api/ApiQueryInfo.php M includes/api/ApiQueryLangLinks.php M includes/api/ApiQueryLinks.php M
[MediaWiki-commits] [Gerrit] mwcore-docgen: Fix script to work with postmerge parameters. - change (integration/jenkins)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53936
Change subject: mwcore-docgen: Fix script to work with postmerge parameters.
..
mwcore-docgen: Fix script to work with postmerge parameters.
Change-Id: Icaa08a1d4782003ef16673ea147091c3d392dc55
---
M tools/mwcore-docgen.sh
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/36/53936/1
diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh
index 5b352e0..8a5ff4f 100755
--- a/tools/mwcore-docgen.sh
+++ b/tools/mwcore-docgen.sh
@@ -14,9 +14,12 @@
# Will hold the tag or branch
TARGET_NAME=
+# Example values:
+# - ZUUL_REF: refs/zuul/master/Z74178670e7c5495199f8a92e92cf609c
+# - GERRIT_BRANCH: master
if [[ $ZUUL_REF =~ ^refs/tags/(.*) ]]; then
TARGET_NAME=${BASH_REMATCH[1]}
-elif [[ $ZUUL_REF =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
+elif [[ $GERRIT_BRANCH =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
TARGET_NAME=${BASH_REMATCH[1]}
fi
--
To view, visit https://gerrit.wikimedia.org/r/53936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaa08a1d4782003ef16673ea147091c3d392dc55
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwcore-docgen: Fix script to work with postmerge parameters. - change (integration/jenkins)
Krinkle has submitted this change and it was merged.
Change subject: mwcore-docgen: Fix script to work with postmerge parameters.
..
mwcore-docgen: Fix script to work with postmerge parameters.
Change-Id: Icaa08a1d4782003ef16673ea147091c3d392dc55
---
M tools/mwcore-docgen.sh
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh
index 5b352e0..8a5ff4f 100755
--- a/tools/mwcore-docgen.sh
+++ b/tools/mwcore-docgen.sh
@@ -14,9 +14,12 @@
# Will hold the tag or branch
TARGET_NAME=
+# Example values:
+# - ZUUL_REF: refs/zuul/master/Z74178670e7c5495199f8a92e92cf609c
+# - GERRIT_BRANCH: master
if [[ $ZUUL_REF =~ ^refs/tags/(.*) ]]; then
TARGET_NAME=${BASH_REMATCH[1]}
-elif [[ $ZUUL_REF =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
+elif [[ $GERRIT_BRANCH =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
TARGET_NAME=${BASH_REMATCH[1]}
fi
--
To view, visit https://gerrit.wikimedia.org/r/53936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaa08a1d4782003ef16673ea147091c3d392dc55
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Example commit - change (test/mediawiki)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53937 Change subject: Example commit .. Example commit Change-Id: I02136d3926c343ca40dfc5719c3314f2ebc08e6c --- A example.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki refs/changes/37/53937/1 diff --git a/example.txt b/example.txt new file mode 100644 index 000..12a719a --- /dev/null +++ b/example.txt @@ -0,0 +1 @@ +Example -- To view, visit https://gerrit.wikimedia.org/r/53937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02136d3926c343ca40dfc5719c3314f2ebc08e6c Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Example commit - change (test/mediawiki)
Krinkle has submitted this change and it was merged. Change subject: Example commit .. Example commit Change-Id: I02136d3926c343ca40dfc5719c3314f2ebc08e6c --- A example.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/example.txt b/example.txt new file mode 100644 index 000..12a719a --- /dev/null +++ b/example.txt @@ -0,0 +1 @@ +Example -- To view, visit https://gerrit.wikimedia.org/r/53937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02136d3926c343ca40dfc5719c3314f2ebc08e6c Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwdocgen.php: Exit with exit code of passthru(doxygen) - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53939 Change subject: mwdocgen.php: Exit with exit code of passthru(doxygen) .. mwdocgen.php: Exit with exit code of passthru(doxygen) Previously it just naturally exited which means even if the doxygen bin doesn't exist, it'll return success. Bug: 46151 Change-Id: Ie1e3d956ce5d3e1f28c7c829bb57596113f07c4a --- M RELEASE-NOTES-1.21 M maintenance/mwdocgen.php 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/39/53939/1 diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index e7e718d..fe7f95c 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -203,6 +203,7 @@ * (bug 44719) Removed mention of non-existing maintenance/migrateCurStubs.php script in includes/DefaultSettings.php * (bug 45143) jquery.badge: Treat non-Latin variants of zero as zero as well. +* (bug 46151) mwdocgen.php should not ignore exit code of doxygen command. === API changes in 1.21 === * prop=revisions can now report the contentmodel and contentformat. diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php index 5e505eb..4e41a0d 100644 --- a/maintenance/mwdocgen.php +++ b/maintenance/mwdocgen.php @@ -254,7 +254,8 @@ TEXT; -passthru( $command ); +$exitcode = 1; +passthru( $command, $exitcode ); echo TEXT --- @@ -264,3 +265,5 @@ You might want to delete the temporary file $generatedConf TEXT; + +exit( $exitcode ); -- To view, visit https://gerrit.wikimedia.org/r/53939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1e3d956ce5d3e1f28c7c829bb57596113f07c4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Example: Put your hands together for Doc Xi Yen. - change (test/mediawiki)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53942 Change subject: Example: Put your hands together for Doc Xi Yen. .. Example: Put your hands together for Doc Xi Yen. Change-Id: I08eb66d81d13556fbf066197b0ff6d8f67cda96a --- M example.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/test/mediawiki refs/changes/42/53942/1 diff --git a/example.txt b/example.txt index 12a719a..77572d9 100644 --- a/example.txt +++ b/example.txt @@ -1 +1,2 @@ Example +Put your hands together for Doc Xi Yen -- To view, visit https://gerrit.wikimedia.org/r/53942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08eb66d81d13556fbf066197b0ff6d8f67cda96a Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Example: Put your hands together for Doc Xi Yen. - change (test/mediawiki)
Krinkle has submitted this change and it was merged. Change subject: Example: Put your hands together for Doc Xi Yen. .. Example: Put your hands together for Doc Xi Yen. Change-Id: I08eb66d81d13556fbf066197b0ff6d8f67cda96a --- M example.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/example.txt b/example.txt index 12a719a..77572d9 100644 --- a/example.txt +++ b/example.txt @@ -1 +1,2 @@ Example +Put your hands together for Doc Xi Yen -- To view, visit https://gerrit.wikimedia.org/r/53942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08eb66d81d13556fbf066197b0ff6d8f67cda96a Gerrit-PatchSet: 1 Gerrit-Project: test/mediawiki Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwdocgen.php: Implement --version option. - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53945
Change subject: mwdocgen.php: Implement --version option.
..
mwdocgen.php: Implement --version option.
So that the job that runs it can pass along what it should
display (e.g. branch, tag, hash etc. whatever is appropiate
for the context of that run).
Change-Id: I1d5b6266e49a71672b0a53069e6ea6bb4658c3d2
---
M maintenance/mwdocgen.php
1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/53945/1
diff --git a/maintenance/mwdocgen.php b/maintenance/mwdocgen.php
index 5e505eb..756db6c 100644
--- a/maintenance/mwdocgen.php
+++ b/maintenance/mwdocgen.php
@@ -63,6 +63,8 @@
/** where Phpdoc should output documentation */
$doxyOutput = $mwPath . 'docs' . DIRECTORY_SEPARATOR ;
+$doxyVersion = 'master';
+
/** MediaWiki subpaths */
$mwPathI = $mwPath . 'includes/';
$mwPathL = $mwPath . 'languages/';
@@ -164,6 +166,12 @@
$doxyOutput = realpath( $argv[$i] );
}
break;
+ case '--version':
+ $i++;
+ if ( isset( $argv[$i] ) ) {
+ $doxyVersion = $argv[$i];
+ }
+ break;
case '--generate-man':
$doxyGenerateMan = true;
break;
@@ -183,8 +191,9 @@
If no command is given, you will be prompted.
Other options:
---output dir Set output directory (default $doxyOutput)
+--output dir Set output directory (default: $doxyOutput)
--generate-man Generates man page documentation
+--version Project version to display in the outut (default:
$doxyVersion)
--help Show this help and exit.
@@ -234,14 +243,11 @@
$excludePatterns = 'extensions';
}
-// @todo FIXME to work on git
-$version = 'master';
-
// Generate path exclusions
$excludedPaths = $mwPath . join( $mwPath, $mwExcludePaths );
print EXCLUDE: $excludedPaths\n\n;
-$generatedConf = generateConfigFile( $doxygenTemplate, $doxyOutput, $mwPath,
$version, $input, $excludedPaths, $excludePatterns, $doxyGenerateMan,
$doxygenInputFilter );
+$generatedConf = generateConfigFile( $doxygenTemplate, $doxyOutput, $mwPath,
$doxyVersion, $input, $excludedPaths, $excludePatterns, $doxyGenerateMan,
$doxygenInputFilter );
$command = $doxygenBin . ' ' . $generatedConf;
echo TEXT
--
To view, visit https://gerrit.wikimedia.org/r/53945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d5b6266e49a71672b0a53069e6ea6bb4658c3d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mediawiki-core-docgen job - change (integration/jenkins-job-builder-config)
Krinkle has submitted this change and it was merged.
Change subject: Add mediawiki-core-docgen job
..
Add mediawiki-core-docgen job
Will be used to generate MediaWiki documentation pages using the
mw-docgen.sh (I5dd693c81b) tool which publishes the content to
doc.wikimedia.org/mediawiki-core.
Jenkins will not report anything back to Gerrit for this job.
Also added one to 'test/mediawiki' which will be enabled first
in Zuul.
Change-Id: I67cf7405c562522b95ce216be25c3ad93215e980
---
M mediawiki.yaml
M test-mediawiki.yaml
2 files changed, 22 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/mediawiki.yaml b/mediawiki.yaml
index d19b125..9d3f040 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -177,3 +177,16 @@
jobs:
- 'mediawiki-core-regression-{branch}'
- '{name}-phpcs'
+
+- job:
+name: mediawiki-core-docgen
+gerrit-name: mediawiki/core
+
+defaults: use-zuul
+scm:
+ - git-mwcore-nosubmodules
+triggers:
+ - zuul-post
+
+builders:
+ - shell: /var/lib/jenkins/tools/mwcore-docgen.sh
diff --git a/test-mediawiki.yaml b/test-mediawiki.yaml
index 82aeee9..446abc9 100644
--- a/test-mediawiki.yaml
+++ b/test-mediawiki.yaml
@@ -12,6 +12,14 @@
echo Showing up all variables using export:
export
+- job-template:
+name: 'test-mediawiki-docgen'
+defaults: use-zuul
+triggers:
+ - zuul
+builders:
+ - shell: /var/lib/jenkins/tools/mwcore-docgen.sh
+
- project:
name: test-mediawiki
gerrit-name: test/mediawiki
@@ -19,3 +27,4 @@
- 'test-mediawiki-dumpenv'
- '{name}-phpcs-HEAD'
- '{name}-qunit'
+ - 'test-mediawiki-docgen'
--
To view, visit https://gerrit.wikimedia.org/r/39210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67cf7405c562522b95ce216be25c3ad93215e980
Gerrit-PatchSet: 7
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwcore-docgen: Don't hard code mediawiki-core - change (integration/jenkins)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53947
Change subject: mwcore-docgen: Don't hard code mediawiki-core
..
mwcore-docgen: Don't hard code mediawiki-core
(so that when test-mediawiki-docgen is temporarily enabled,
it won't override the main documentation site).
Change-Id: Ie509fcf9a616ce3394476578df28fee57d419cdc
---
M tools/mwcore-docgen.sh
1 file changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/47/53947/1
diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh
index 8a5ff4f..cc5ffe7 100755
--- a/tools/mwcore-docgen.sh
+++ b/tools/mwcore-docgen.sh
@@ -10,22 +10,28 @@
#
# Licensed under GPL v2.0
+TARGET_PROJECTDIR=`echo $ZUUL_PROJECT | tr '/' '-'`
+TARGET_VERSIONDIR=
-# Will hold the tag or branch
-TARGET_NAME=
+if [ -z $TARGET_PROJECTDIR ]; then
+ echo Error: Project name not found.
+ echo \$ZUUL_PROJECT: $ZUUL_PROJECT
+ exit 1
+fi
# Example values:
# - ZUUL_REF: refs/zuul/master/Z74178670e7c5495199f8a92e92cf609c
# - GERRIT_BRANCH: master
if [[ $ZUUL_REF =~ ^refs/tags/(.*) ]]; then
- TARGET_NAME=${BASH_REMATCH[1]}
+ TARGET_VERSIONDIR=${BASH_REMATCH[1]}
elif [[ $GERRIT_BRANCH =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
- TARGET_NAME=${BASH_REMATCH[1]}
+ TARGET_VERSIONDIR=${BASH_REMATCH[1]}
fi
-if [ -z $TARGET_NAME ]; then
+if [ -z $TARGET_VERSIONDIR ]; then
echo Error: Change target reference is not a tag or a recognized
branch.
echo \$ZUUL_REF: $ZUUL_REF
+ echo \$GERRIT_BRANCH: $GERRIT_BRANCH
exit 1
fi
@@ -36,16 +42,17 @@
exit 1
fi
-echo Found target: '$TARGET_NAME'
# Destination where the generated files will eventually land.
# For example:
# http://doc.wikimedia.org/mediawiki-core/master/php
# http://doc.wikimedia.org/mediawiki-core/REL1_20/php
# http://doc.wikimedia.org/mediawiki-core/1.20.2/php
-DEST_DIR=/srv/org/wikimedia/doc/mediawiki-core/$TARGET_NAME/php
+DEST_DIR=/srv/org/wikimedia/doc/$TARGET_PROJECTDIR/$TARGET_VERSIONDIR/php
[ ! -d ${DEST_DIR} ] mkdir -p ${DEST_DIR}
+echo Found target: '$DEST_DIR'
+
# Run the MediaWiki documentation wrapper
#
# We want to make sure both stdin and stderr are logged to publicly accessible
--
To view, visit https://gerrit.wikimedia.org/r/53947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie509fcf9a616ce3394476578df28fee57d419cdc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwcore-docgen: Don't hard code mediawiki-core - change (integration/jenkins)
Krinkle has submitted this change and it was merged.
Change subject: mwcore-docgen: Don't hard code mediawiki-core
..
mwcore-docgen: Don't hard code mediawiki-core
(so that when test-mediawiki-docgen is temporarily enabled,
it won't override the main documentation site).
Change-Id: Ie509fcf9a616ce3394476578df28fee57d419cdc
---
M tools/mwcore-docgen.sh
1 file changed, 14 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh
index 8a5ff4f..cc5ffe7 100755
--- a/tools/mwcore-docgen.sh
+++ b/tools/mwcore-docgen.sh
@@ -10,22 +10,28 @@
#
# Licensed under GPL v2.0
+TARGET_PROJECTDIR=`echo $ZUUL_PROJECT | tr '/' '-'`
+TARGET_VERSIONDIR=
-# Will hold the tag or branch
-TARGET_NAME=
+if [ -z $TARGET_PROJECTDIR ]; then
+ echo Error: Project name not found.
+ echo \$ZUUL_PROJECT: $ZUUL_PROJECT
+ exit 1
+fi
# Example values:
# - ZUUL_REF: refs/zuul/master/Z74178670e7c5495199f8a92e92cf609c
# - GERRIT_BRANCH: master
if [[ $ZUUL_REF =~ ^refs/tags/(.*) ]]; then
- TARGET_NAME=${BASH_REMATCH[1]}
+ TARGET_VERSIONDIR=${BASH_REMATCH[1]}
elif [[ $GERRIT_BRANCH =~ ^(master|REL[0-9]+_[0-9]+)$ ]]; then
- TARGET_NAME=${BASH_REMATCH[1]}
+ TARGET_VERSIONDIR=${BASH_REMATCH[1]}
fi
-if [ -z $TARGET_NAME ]; then
+if [ -z $TARGET_VERSIONDIR ]; then
echo Error: Change target reference is not a tag or a recognized
branch.
echo \$ZUUL_REF: $ZUUL_REF
+ echo \$GERRIT_BRANCH: $GERRIT_BRANCH
exit 1
fi
@@ -36,16 +42,17 @@
exit 1
fi
-echo Found target: '$TARGET_NAME'
# Destination where the generated files will eventually land.
# For example:
# http://doc.wikimedia.org/mediawiki-core/master/php
# http://doc.wikimedia.org/mediawiki-core/REL1_20/php
# http://doc.wikimedia.org/mediawiki-core/1.20.2/php
-DEST_DIR=/srv/org/wikimedia/doc/mediawiki-core/$TARGET_NAME/php
+DEST_DIR=/srv/org/wikimedia/doc/$TARGET_PROJECTDIR/$TARGET_VERSIONDIR/php
[ ! -d ${DEST_DIR} ] mkdir -p ${DEST_DIR}
+echo Found target: '$DEST_DIR'
+
# Run the MediaWiki documentation wrapper
#
# We want to make sure both stdin and stderr are logged to publicly accessible
--
To view, visit https://gerrit.wikimedia.org/r/53947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie509fcf9a616ce3394476578df28fee57d419cdc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] svn: Disable mwdocs and redirect to doc.wikimedia.org - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53954
Change subject: svn: Disable mwdocs and redirect to doc.wikimedia.org
..
svn: Disable mwdocs and redirect to doc.wikimedia.org
Moved all related resources together and disabled them by
ensuring absence.
The only one not ensured absent is the exec, as it (to my knowledge)
doesn't support ensure absence, I instead commented out the resource
and the require property of cron.
Change-Id: I0f9a586202e8f3e7204bc303c3faaf698752916c
---
M files/apache/sites/svn.wikimedia.org
M manifests/svn.pp
2 files changed, 47 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/53954/1
diff --git a/files/apache/sites/svn.wikimedia.org
b/files/apache/sites/svn.wikimedia.org
index d4d6c04..09b9848 100644
--- a/files/apache/sites/svn.wikimedia.org
+++ b/files/apache/sites/svn.wikimedia.org
@@ -21,7 +21,7 @@
Allow from all
Deny from 220.181.19.85
Deny from 221.115.95.197
- Deny from 81.208.25.37
+ Deny from 81.208.25.37
Options Indexes FollowSymLinks
/Directory
@@ -41,10 +41,7 @@
ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
- Alias /doc /var/mwdocs/phase3/docs/html
- Directory /var/mwdocs/phase3/docs/html
- Allow from all
- /Directory
+ Redirect permanent /doc
http://doc.wikimedia.org/mediawiki-core/master/php/html
# FIXME: What is this for??
Alias /stats /var/statsvn/html
@@ -97,8 +94,5 @@
ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
- Alias /doc /var/mwdocs/phase3/docs/html
- Directory /var/mwdocs/phase3/docs/html
- Allow from all
- /Directory
+ Redirect permanent /doc
https://doc.wikimedia.org/mediawiki-core/master/php/html
/VirtualHost
diff --git a/manifests/svn.pp b/manifests/svn.pp
index f160967..04d24c0 100644
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -17,11 +17,6 @@
group = root,
mode = 0555,
source = puppet:///files/svn/sillyshell;
- /var/log/mwdocs.log:
- owner = mwdocs,
- group = svn,
- mode = 0644,
- ensure = present;
/etc/apache2/sites-available/svn:
owner = root,
group = root,
@@ -35,14 +30,6 @@
group = svnadm,
mode = 0664,
recurse = true;
- /var/mwdocs:
- owner = mwdocs,
- group = svn,
- mode = 0755,
- ensure = directory;
- /home/mwdocs/phase3:
- ensure = link,
- target = /var/mwdocs/phase3;
/var/cache/svnusers:
ensure = directory,
owner = www-data,
@@ -72,28 +59,12 @@
monitor_service { https: description = HTTPS, check_command =
check_ssl_cert!svn.wikimedia.org }
- cron {
- doc_generation:
- command = (cd /var/mwdocs/phase3 git pull php
maintenance/mwdocgen.php --all) /var/log/mwdocs.log 21,
- require = Exec[clone mediawiki for doc],
- user = mwdocs,
- hour = 0,
- minute = 0;
- svnuser_generation:
+ cron { svnuser_generation:
command = (cd /var/cache/svnusers svn up)
/dev/null 21,
require = Package[apache2],
user = www-data,
hour = 0,
minute = 0;
- }
-
- exec {
- clone mediawiki for doc:
- command = /usr/bin/git clone
https://gerrit.wikimedia.org/r/p/mediawiki/core.git /var/mwdocs/phase3,
- creates = /var/mwdocs/phase3,
- cwd = /var/mwdocs,
- user = mwdocs,
- require = File[/var/mwdocs];
}
exec { /usr/bin/svn co file:///svnroot/mediawiki/USERINFO svnusers:
@@ -177,6 +148,46 @@
}
include viewvc, hooks, dumps, cia, conversion
+
+
+ # Ensure doxygen is disabled on svn.wikimedia.org (bug 35663)
+ # @{
+
+ file {
+ /var/log/mwdocs.log:
+ owner = mwdocs,
+ ensure = absent,
+ group = svn,
+ mode = 0644;
+ /var/mwdocs:
+ owner = mwdocs,
+ #ensure = directory,
+ ensure = absent,
+ group = svn,
+
[MediaWiki-commits] [Gerrit] misc::docsite: Remove file doc/index.html. - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53955
Change subject: misc::docsite: Remove file doc/index.html.
..
misc::docsite: Remove file doc/index.html.
Puppet is currently conflicting this one file with the rest
of the docroot of the documentation site in integration/docroot.git
This resolves the conflict.
Change-Id: I5b5282c26c76a8d51e5f07ea91c4e4b9fe9279df
---
M manifests/misc/docs.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/53955/1
diff --git a/manifests/misc/docs.pp b/manifests/misc/docs.pp
index 0d37088..01d8316 100644
--- a/manifests/misc/docs.pp
+++ b/manifests/misc/docs.pp
@@ -9,11 +9,6 @@
source =
'puppet:///files/apache/sites/doc.wikimedia.org';
'/srv/org/wikimedia/doc':
ensure = 'directory';
- '/srv/org/wikimedia/doc/index.html':
- mode = 0444,
- ensure = 'present',
- source = 'puppet:///files/misc/jenkins/doc_index.html',
- require = File[/srv/org/wikimedia/doc];
}
apache_site { docs: name = 'doc.wikimedia.org' }
--
To view, visit https://gerrit.wikimedia.org/r/53955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b5282c26c76a8d51e5f07ea91c4e4b9fe9279df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwcore-docgen: Use --version option. - change (integration/jenkins)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53956 Change subject: mwcore-docgen: Use --version option. .. mwcore-docgen: Use --version option. See also mediawiki-core I1d5b6266e49a. Change-Id: I52e3c414fb06ba2fd0ecc76b46cd4250c5e67373 --- M tools/mwcore-docgen.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/56/53956/1 diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh index cc5ffe7..00bade0 100755 --- a/tools/mwcore-docgen.sh +++ b/tools/mwcore-docgen.sh @@ -62,6 +62,8 @@ # Trick explanation: the command stderr is sent as stdin to a tee FIFO which in # turns write back to stderr. php $WORKSPACE/maintenance/mwdocgen.php \ - --no-extensions --output $DEST_DIR \ + --no-extensions \ + --output $DEST_DIR \ + --version $TARGET_VERSIONDIR \ 1 $DEST_DIR/console.txt \ 2 (tee $DEST_DIR/errors.txt 2) -- To view, visit https://gerrit.wikimedia.org/r/53956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52e3c414fb06ba2fd0ecc76b46cd4250c5e67373 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwcore-docgen: Use --version option. - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: mwcore-docgen: Use --version option. .. mwcore-docgen: Use --version option. See also mediawiki-core I1d5b6266e49a. Change-Id: I52e3c414fb06ba2fd0ecc76b46cd4250c5e67373 --- M tools/mwcore-docgen.sh 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh index cc5ffe7..00bade0 100755 --- a/tools/mwcore-docgen.sh +++ b/tools/mwcore-docgen.sh @@ -62,6 +62,8 @@ # Trick explanation: the command stderr is sent as stdin to a tee FIFO which in # turns write back to stderr. php $WORKSPACE/maintenance/mwdocgen.php \ - --no-extensions --output $DEST_DIR \ + --no-extensions \ + --output $DEST_DIR \ + --version $TARGET_VERSIONDIR \ 1 $DEST_DIR/console.txt \ 2 (tee $DEST_DIR/errors.txt 2) -- To view, visit https://gerrit.wikimedia.org/r/53956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52e3c414fb06ba2fd0ecc76b46cd4250c5e67373 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: Fix permissions in /srv. - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53957
Change subject: contint: Fix permissions in /srv.
..
contint: Fix permissions in /srv.
The /srv directory on the contint server is now a git-clone
of integration/docroot.git, which is deployed on-merge by
Jenkins.
These file resources should probably go away, but for now keeping
them so that the apache conf point to directories that exist
regardless of the state of the docroot.git repository.
However do need to be owned by jenkins because right now
every deploy to docroot is failing as git (under user jenkins)
is unable to do anything with the working copy as long as puppet
is restoring ownership and locking it out of the tree.
Change-Id: I945f97e3b86b8a551479e1a6dec5c4b22feb11ba
---
M modules/contint/manifests/website.pp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/53957/1
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 29b03c6..0616d06 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -8,20 +8,20 @@
file { '/srv/org':
ensure = directory,
mode = '0755',
-owner = 'www-data',
+owner = 'jenkins',
group = 'wikidev',
}
file { '/srv/org/mediawiki':
ensure = directory,
mode = '0755',
-owner = 'www-data',
+owner = 'jenkins',
group = 'wikidev',
}
file { '/srv/org/mediawiki/integration':
ensure = directory,
mode = '0755',
-owner = 'www-data',
+owner = 'jenkins',
group = 'wikidev',
}
# MediaWiki code coverage
@@ -46,14 +46,14 @@
file { '/srv/org/wikimedia':
ensure = directory,
mode = '0755',
-owner = 'www-data',
+owner = 'jenkins',
group = 'wikidev',
}
file { '/srv/localhost':
ensure = directory,
mode = '0755',
-owner = 'www-data',
+owner = 'jenkins',
group = 'wikidev',
}
file { '/srv/localhost/qunit':
--
To view, visit https://gerrit.wikimedia.org/r/53957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I945f97e3b86b8a551479e1a6dec5c4b22feb11ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: Move docs.pp into contint - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53958
Change subject: contint: Move docs.pp into contint
..
contint: Move docs.pp into contint
Change-Id: I1a503f65ea15e160ae4b5e1a8110c5bfba37a348
---
D manifests/misc/docs.pp
M manifests/site.pp
R modules/contint/files/apache/doc.wikimedia.org
A modules/contint/manifests/docs.pp
M modules/contint/manifests/website.pp
5 files changed, 38 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/53958/1
diff --git a/manifests/misc/docs.pp b/manifests/misc/docs.pp
deleted file mode 100644
index 01d8316..000
--- a/manifests/misc/docs.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-class misc::docsite {
- system_role { misc::docsite: description = doc site server }
- file {
- '/etc/apache2/sites-available/doc.wikimedia.org':
- path =
'/etc/apache2/sites-available/doc.wikimedia.org',
- mode = 0444,
- owner = root,
- group = root,
- source =
'puppet:///files/apache/sites/doc.wikimedia.org';
- '/srv/org/wikimedia/doc':
- ensure = 'directory';
- }
-
- apache_site { docs: name = 'doc.wikimedia.org' }
-}
-
-class misc::docs::puppet {
-
- git::clone { puppetsource:
- directory = /srv/org/wikimedia/doc/puppetsource,
- branch = master,
- ensure = latest,
- origin = https://gerrit.wikimedia.org/r/p/operations/puppet;;
- }
-
- exec { generate puppet docsite:
- require = git::clone['puppetsource'],
- command = /usr/bin/puppet doc --mode rdoc --outputdir
/srv/org/wikimedia/doc/puppet --modulepath
/srv/org/wikimedia/doc/puppetsource/modules --manifestdir
/srv/org/wikimedia/doc/puppetsource/manifests,
- }
-
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4dc3fc5..03f8512 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -782,7 +782,6 @@
misc::contint::test::packages,
misc::contint::test::jenkins,
misc::contint::android::sdk,
- misc::docsite,
misc::docs::puppet,
role::zuul::production,
admins::roots,
diff --git a/files/apache/sites/doc.wikimedia.org
b/modules/contint/files/apache/doc.wikimedia.org
similarity index 100%
rename from files/apache/sites/doc.wikimedia.org
rename to modules/contint/files/apache/doc.wikimedia.org
diff --git a/modules/contint/manifests/docs.pp
b/modules/contint/manifests/docs.pp
new file mode 100644
index 000..3a4c804
--- /dev/null
+++ b/modules/contint/manifests/docs.pp
@@ -0,0 +1,15 @@
+class misc::docs::puppet {
+
+ git::clone { puppetsource:
+ directory = /srv/org/wikimedia/doc/puppetsource,
+ branch = master,
+ ensure = latest,
+ origin = https://gerrit.wikimedia.org/r/p/operations/puppet;;
+ }
+
+ exec { generate puppet docsite:
+ require = git::clone['puppetsource'],
+ command = /usr/bin/puppet doc --mode rdoc --outputdir
/srv/org/wikimedia/doc/puppet --modulepath
/srv/org/wikimedia/doc/puppetsource/modules --manifestdir
/srv/org/wikimedia/doc/puppetsource/manifests,
+ }
+
+}
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 0616d06..013d690 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -1,10 +1,10 @@
# Class for website hosted on the continuous integration server
# https://integration.mediawiki.org/
# https://doc.wikimedia.org/
-# https://doc.mediawiki.org/
class contint::website {
- # This is mostly to get the files properly setup
+ # Static files in these docroots are in integration/docroot.git
+
file { '/srv/org':
ensure = directory,
mode = '0755',
@@ -25,6 +25,7 @@
group = 'wikidev',
}
# MediaWiki code coverage
+ # Written to by jenkins
file { '/srv/org/mediawiki/integration/coverage':
ensure = directory,
mode = '0775',
@@ -50,6 +51,26 @@
group = 'wikidev',
}
+ # Written to by jenkins for mediawiki-core docs
+ # Written to by misc::docs::puppet for puppet docs
+ file { '/srv/org/wikimedia/doc':
+ensure = directory,
+mode = '0755',
+owner = 'www-data',
+group = 'wikidev',
+ }
+
+ file { '/etc/apache2/sites-available/doc.wikimedia.org':
+mode = '0444',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/contint/apache/doc.wikimedia.org',
+ }
+
+ apache_site { 'doc.wikimedia.org':
+name = 'doc.wikimedia.org'
+ }
+
file { '/srv/localhost':
ensure = directory,
mode = '0755',
--
To view, visit https://gerrit.wikimedia.org/r/53958
[MediaWiki-commits] [Gerrit] Install JSDuck 4.6.2 into tools/gem_modules. - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: Install JSDuck 4.6.2 into tools/gem_modules. .. Install JSDuck 4.6.2 into tools/gem_modules. https://github.com/senchalabs/jsduck gem install jsduck\ --install-dir gem_modules\ --bindir gem_modules/.bin\ --no-rdoc\ --no-ri\ --env-shebang\ --include-dependencies Needed for generating documentation pages for mediawiki-core and mediawiki-extensions-visualeditor. Change-Id: Ib72e93f227364f4c32970bd4db850620bb518334 --- A bin/jsduck A tools/gem_modules/.bin/jsduck A tools/gem_modules/.bin/rdiscount A tools/gem_modules/cache/dimensions-1.2.0.gem A tools/gem_modules/cache/jsduck-4.6.2.gem A tools/gem_modules/cache/json-1.7.7.gem A tools/gem_modules/cache/rdiscount-2.0.7.1.gem A tools/gem_modules/gems/dimensions-1.2.0/LICENSE A tools/gem_modules/gems/dimensions-1.2.0/README.md A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/exif_scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/io.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/jpeg_scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/reader.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/tiff_scanner.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/tiff_scanning.rb A tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/version.rb A tools/gem_modules/gems/jsduck-4.6.2/.gitignore A tools/gem_modules/gems/jsduck-4.6.2/.travis.yml A tools/gem_modules/gems/jsduck-4.6.2/COPYING A tools/gem_modules/gems/jsduck-4.6.2/README.md A tools/gem_modules/gems/jsduck-4.6.2/Rakefile A tools/gem_modules/gems/jsduck-4.6.2/bin/compare A tools/gem_modules/gems/jsduck-4.6.2/bin/graph A tools/gem_modules/gems/jsduck-4.6.2/bin/jsduck A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Array.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Boolean.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Date.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Function.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Number.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/Object.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/RegExp.js A tools/gem_modules/gems/jsduck-4.6.2/js-classes/String.js A tools/gem_modules/gems/jsduck-4.6.2/jsduck.gemspec A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/accessors.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/aggregator.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/app.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/app_data.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/assets.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/ast.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/auto_categories.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/batch_formatter.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/batch_parser.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/categories.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/categories_class_name.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/circular_deps.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_doc_expander.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_formatter.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_name.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_writer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/css_lexer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/css_parser.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_ast.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_formatter.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_parser.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_type.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/enum.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/esprima.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/esprima/esprima.js A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/evaluator.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/examples.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/export_writer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/app.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/examples.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/full.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/ext_patterns.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/external_classes.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/file_categories.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/function_ast.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/grouped_asset.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/guide_writer.rb A tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/guides.rb A
[MediaWiki-commits] [Gerrit] docgen: Exit with exit code of jsduck command - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53992 Change subject: docgen: Exit with exit code of jsduck command .. docgen: Exit with exit code of jsduck command Change-Id: Idf896dc6d9dcd11effcc9836b857267570db3e15 --- M .docs/generate.sh 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/92/53992/1 diff --git a/.docs/generate.sh b/.docs/generate.sh index 46536ee..63e3368 100755 --- a/.docs/generate.sh +++ b/.docs/generate.sh @@ -17,5 +17,8 @@ ) eg-iframe.tpl | php eg-iframe.html jsduck --config=config.json +c=$? rm eg-iframe.html cd - /dev/null +# Exit with exit code of jsduck command +exit $ec -- To view, visit https://gerrit.wikimedia.org/r/53992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf896dc6d9dcd11effcc9836b857267570db3e15 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mwext-VisualEditor-docgen job - change (integration/jenkins-job-builder-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53995 Change subject: Add mwext-VisualEditor-docgen job .. Add mwext-VisualEditor-docgen job Change-Id: I52ae434b1e0a4661fcf61829fb54e0f4e1a0f564 --- M mediawiki-extensions.yaml 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/95/53995/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 8f4d845..92285e0 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -90,6 +90,32 @@ - junit: results: 'junit*.xml' +- job-template: +name: 'mwext-VisualEditor-docgen' +defaults: use-zuul-for-mw-ext +triggers: + - zuul +builders: + - get-mw-core: +branch: 'master' +# VisualEditor's custom documentation generator has a maintenance +# script which needs MediaWiki to be installed first. + - mw-install-sqlite + - shell: | +# Add jsduck bin to the path +export PATH=/var/lib/jenkins/bin:$PATH +# Generate documentation +$WORKSPACE/extensions/VisualEditor/.docs/generate.sh +# Get destination +DEST_DIR=/srv/org/wikimedia/doc/VisualEditor +DEST_VERSIONDIR=`echo $GERRIT_BRANCH | tr '/' '-'` +# Trash the old version (if any) +rm -rf $DEST_DIR/$DEST_VERSIONDIR +# Ensure the parent directory exists +mkdir -p $DEST_DIR +# Publish it +mv $WORKSPACE/extensions/VisualEditor/docs $DEST_DIR/$DEST_VERSIONDIR + - job-group: name: mwext-check-jobs jobs: -- To view, visit https://gerrit.wikimedia.org/r/53995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52ae434b1e0a4661fcf61829fb54e0f4e1a0f564 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable mwext-VisualEditor-docgen job - change (integration/zuul-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/53997 Change subject: Enable mwext-VisualEditor-docgen job .. Enable mwext-VisualEditor-docgen job Depends on I52ae434b1e0a4661fcf61829fb54e0f4e1a0f564. Change-Id: I64208ae10a0b65dff914e6a492016cd0977fb5e8 --- M layout.yaml 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/97/53997/1 diff --git a/layout.yaml b/layout.yaml index 40a430e..e6ec399 100644 --- a/layout.yaml +++ b/layout.yaml @@ -245,6 +245,9 @@ success-message: 'Change has been deployed on the server and should be live.' failure-message: 'FAILED to deploy change. Please contact a member of the continuous integration team to fixup the docroot on the destination server.' + - name: 'mwext-VisualEditor-docgen' +branch: ^master$ + - name: mwext-EventLogging-pep8 voting: true - name: sartoris-pep8 @@ -1640,8 +1643,10 @@ - mwext-VisualEditor-merge: - mwext-VisualEditor-jslint - mwext-VisualEditor-lint -# VE team does not need any install nor has any PHP Unit tests -# so skip the installer entirely and PHPUnit tests. + # VisualEditor does not have any PHP Unit tests + # so skip the installer and PHPUnit tests. +postmerge: + - mwext-VisualEditor-docgen - name: mediawiki/extensions/WebChat check: -- To view, visit https://gerrit.wikimedia.org/r/53997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64208ae10a0b65dff914e6a492016cd0977fb5e8 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Install JSDuck 4.6.2 into tools/gem_modules. - change (integration/jenkins)
Krinkle has submitted this change and it was merged. Change subject: Revert Install JSDuck 4.6.2 into tools/gem_modules. .. Revert Install JSDuck 4.6.2 into tools/gem_modules. See bug 46236. This reverts commit 6764e3f3c9d5f3faf29b865d10eece82d02c9fe2 Change-Id: Iafaf89d8110338fdad4bc82981dc6d253d9b35dd --- D bin/jsduck D tools/gem_modules/.bin/jsduck D tools/gem_modules/.bin/rdiscount D tools/gem_modules/cache/dimensions-1.2.0.gem D tools/gem_modules/cache/jsduck-4.6.2.gem D tools/gem_modules/cache/json-1.7.7.gem D tools/gem_modules/cache/rdiscount-2.0.7.1.gem D tools/gem_modules/gems/dimensions-1.2.0/LICENSE D tools/gem_modules/gems/dimensions-1.2.0/README.md D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/exif_scanner.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/io.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/jpeg_scanner.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/reader.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/scanner.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/tiff_scanner.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/tiff_scanning.rb D tools/gem_modules/gems/dimensions-1.2.0/lib/dimensions/version.rb D tools/gem_modules/gems/jsduck-4.6.2/.gitignore D tools/gem_modules/gems/jsduck-4.6.2/.travis.yml D tools/gem_modules/gems/jsduck-4.6.2/COPYING D tools/gem_modules/gems/jsduck-4.6.2/README.md D tools/gem_modules/gems/jsduck-4.6.2/Rakefile D tools/gem_modules/gems/jsduck-4.6.2/bin/compare D tools/gem_modules/gems/jsduck-4.6.2/bin/graph D tools/gem_modules/gems/jsduck-4.6.2/bin/jsduck D tools/gem_modules/gems/jsduck-4.6.2/js-classes/Array.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/Boolean.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/Date.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/Function.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/Number.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/Object.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/RegExp.js D tools/gem_modules/gems/jsduck-4.6.2/js-classes/String.js D tools/gem_modules/gems/jsduck-4.6.2/jsduck.gemspec D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/accessors.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/aggregator.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/app.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/app_data.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/assets.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/ast.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/auto_categories.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/batch_formatter.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/batch_parser.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/categories.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/categories_class_name.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/circular_deps.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_doc_expander.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_formatter.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_name.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/class_writer.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/css_lexer.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/css_parser.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_ast.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_formatter.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_parser.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/doc_type.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/enum.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/esprima.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/esprima/esprima.js D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/evaluator.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/examples.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/export_writer.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/app.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/examples.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/exporter/full.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/ext_patterns.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/external_classes.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/file_categories.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/function_ast.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/grouped_asset.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/guide_writer.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/guides.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/html_stack.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/icons.rb D tools/gem_modules/gems/jsduck-4.6.2/lib/jsduck/img/dir.rb D
[MediaWiki-commits] [Gerrit] Implement Twitter Bootstrap in web portals - change (integration/docroot)
Krinkle has submitted this change and it was merged. Change subject: Implement Twitter Bootstrap in web portals .. Implement Twitter Bootstrap in web portals * Add Bootstrap under the /shared/ directory * Expose under /bootstrap * Port old HTML to Bootstrap Change-Id: I0ab5321f01260f21cf59d907fcc8ac0c268aa8b4 --- A org/wikimedia/doc/bootstrap M org/wikimedia/doc/index.html A org/wikimedia/integration/bootstrap M org/wikimedia/integration/index.html A shared/bootstrap/css/bootstrap-responsive.css A shared/bootstrap/css/bootstrap-responsive.min.css A shared/bootstrap/css/bootstrap.css A shared/bootstrap/css/bootstrap.min.css A shared/bootstrap/img/glyphicons-halflings-white.png A shared/bootstrap/img/glyphicons-halflings.png A shared/bootstrap/js/bootstrap.js A shared/bootstrap/js/bootstrap.min.js 12 files changed, 9,660 insertions(+), 71 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/53757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ab5321f01260f21cf59d907fcc8ac0c268aa8b4 Gerrit-PatchSet: 6 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Demon ch...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gitignore: Update mediawiki.org wikimedia.org; Add doc/med... - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54596 Change subject: Gitignore: Update mediawiki.org wikimedia.org; Add doc/mediawiki-core. .. Gitignore: Update mediawiki.org wikimedia.org; Add doc/mediawiki-core. Change-Id: I1fab573b73ce9140765d55b8f0582baa6b41f7de --- M .gitignore 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/96/54596/1 diff --git a/.gitignore b/.gitignore index 4cae7b8..dd7e851 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ jenkins-autodeploy /localhost/qunit/ -/org/mediawiki/integration/WLMMobile/nightly/ -/org/mediawiki/integration/WikipediaMobile/nightly/ -/org/mediawiki/integration/WiktionaryMobile/nightly/ -/org/mediawiki/integration/coverage/ -/org/mediawiki/integration/nightly/ +/org/wikimedia/integration/WLMMobile/nightly/ +/org/wikimedia/integration/WikipediaMobile/nightly/ +/org/wikimedia/integration/WiktionaryMobile/nightly/ +/org/wikimedia/integration/coverage/ +/org/wikimedia/integration/nightly/ +/org/wikimedia/doc/mediawiki-core/ /org/wikimedia/doc/puppet/ /org/wikimedia/doc/puppetsource/ -- To view, visit https://gerrit.wikimedia.org/r/54596 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fab573b73ce9140765d55b8f0582baa6b41f7de Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gitignore: Update mediawiki.org wikimedia.org; Add doc/med... - change (integration/docroot)
Krinkle has submitted this change and it was merged. Change subject: Gitignore: Update mediawiki.org wikimedia.org; Add doc/mediawiki-core. .. Gitignore: Update mediawiki.org wikimedia.org; Add doc/mediawiki-core. Change-Id: I1fab573b73ce9140765d55b8f0582baa6b41f7de --- M .gitignore 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore index 4cae7b8..dd7e851 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ jenkins-autodeploy /localhost/qunit/ -/org/mediawiki/integration/WLMMobile/nightly/ -/org/mediawiki/integration/WikipediaMobile/nightly/ -/org/mediawiki/integration/WiktionaryMobile/nightly/ -/org/mediawiki/integration/coverage/ -/org/mediawiki/integration/nightly/ +/org/wikimedia/integration/WLMMobile/nightly/ +/org/wikimedia/integration/WikipediaMobile/nightly/ +/org/wikimedia/integration/WiktionaryMobile/nightly/ +/org/wikimedia/integration/coverage/ +/org/wikimedia/integration/nightly/ +/org/wikimedia/doc/mediawiki-core/ /org/wikimedia/doc/puppet/ /org/wikimedia/doc/puppetsource/ -- To view, visit https://gerrit.wikimedia.org/r/54596 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1fab573b73ce9140765d55b8f0582baa6b41f7de Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] doc.mediawiki.org: Redirect to canonical wikimedia.org and f... - change (operations/puppet)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54614 Change subject: doc.mediawiki.org: Redirect to canonical wikimedia.org and fix invalid SSL .. doc.mediawiki.org: Redirect to canonical wikimedia.org and fix invalid SSL I don't know since when but apparently doc.mediawiki.org has been registered in addition to doc.wikimedia.org and pointed to the same server, but Apache was never properly configured for it so we were serving duplicate content on these 4 different urls, of which one was causing an invalid certificate error. (http/https)://doc.(mediawiki,wikimedia).org - https://doc.wikimedia.org Also updated outdated puppet:// file paths. Bug: 46298 Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 --- M files/apache/sites/doc.wikimedia.org M modules/contint/files/apache/integration.mediawiki.org M modules/contint/files/apache/integration.wikimedia.org 3 files changed, 25 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/54614/1 diff --git a/files/apache/sites/doc.wikimedia.org b/files/apache/sites/doc.wikimedia.org index 60a577f..a9cacba 100644 --- a/files/apache/sites/doc.wikimedia.org +++ b/files/apache/sites/doc.wikimedia.org @@ -5,20 +5,32 @@ # vim: filetype=apache VirtualHost *:80 - ServerAdmin n...@wikimedia.org - ServerName doc.wikimedia.org + ServerName doc.mediawiki.org - DocumentRoot /srv/org/wikimedia/doc - - ErrorLog /var/log/apache2/error.log - LogLevel warn - CustomLog /var/log/apache2/access.log combined + Redirect permanent / https://doc.wikimedia.org/ /VirtualHost VirtualHost *:443 - ServerAdmin n...@wikimedia.org + ServerName doc.mediawiki.org + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem + SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key + SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + + Redirect permanent / https://doc.wikimedia.org/ +/VirtualHost + +VirtualHost *:80 ServerName doc.wikimedia.org + Redirect permanent / https://doc.wikimedia.org/ +/VirtualHost + +VirtualHost *:443 + ServerName doc.wikimedia.org + ServerAdmin n...@wikimedia.org + DocumentRoot /srv/org/wikimedia/doc ErrorLog /var/log/apache2/error.log diff --git a/modules/contint/files/apache/integration.mediawiki.org b/modules/contint/files/apache/integration.mediawiki.org index a1104de..416574d 100644 --- a/modules/contint/files/apache/integration.mediawiki.org +++ b/modules/contint/files/apache/integration.mediawiki.org @@ -1,15 +1,17 @@ # ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.mediawiki.org +### puppet:///modules/contint/files/apache/integration.mediawiki.org # # vim: filetype=apache NameVirtualHost *:443 + VirtualHost *:80 ServerName integration.mediawiki.org Redirect permanent / https://integration.wikimedia.org/ /VirtualHost + VirtualHost *:443 ServerName integration.mediawiki.org diff --git a/modules/contint/files/apache/integration.wikimedia.org b/modules/contint/files/apache/integration.wikimedia.org index d6547e3..5cf9ed3 100644 --- a/modules/contint/files/apache/integration.wikimedia.org +++ b/modules/contint/files/apache/integration.wikimedia.org @@ -1,10 +1,11 @@ # ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.wikimedia.org +### puppet:///modules/contint/files/apache/integration.wikimedia.org # # vim: filetype=apache NameVirtualHost *:443 + VirtualHost *:80 ServerName integration.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/54614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] extract2.php: Clean up old code. - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54645
Change subject: extract2.php: Clean up old code.
..
extract2.php: Clean up old code.
- The _portals are no longer used. Some of them still exist
on meta.wikimedia.org but only with content like
This is no longer used or {{Historical}} etc.
extract2.php was still parsing these on every request and doing
a pointless string search/replace.
- The text/plain header is broken, PHP outputs text/html instead
because it somehow called header() with the value as second
argument, which is an incorrect invokation.
- Secure.wikimedia.org should no longer be exposed.
- Whitespace, single quotes, commented out code.
Bug: 38167
Change-Id: Ib77f5312e7667ce2ebc074172a12ad3c5efb3a13
---
M extract2.php
1 file changed, 21 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/45/54645/1
diff --git a/extract2.php b/extract2.php
index 6ad6e12..5d18dfa 100644
--- a/extract2.php
+++ b/extract2.php
@@ -1,61 +1,35 @@
?php
-header(Content-Type: text/html; charset=utf-8);
-$lang = meta;
+$lang = 'meta';
putenv( MW_LANG={$lang} ); // notify MWMultiVersion
-define( MEDIAWIKI, true );
-#include_once(CommonSettings.php);
-#include_once(/apache/common/wmf-deployment/includes/ProfileStub.php );
-#include_once(/apache/common/wmf-deployment/includes/Defines.php );
-#include_once(/apache/common/wmf-deployment/wmf-config/CommonSettings.php);
-#include_once(/apache/common/wmf-deployment/includes/Setup.php);
+define( 'MEDIAWIKI', true );
-#include_once(/apache/common/wmf-deployment/includes/WebStart.php);
+include '/apache/common/live-1.5/MWVersion.php';
+include getMediaWiki( 'includes/WebStart.php' );
-include /apache/common/live-1.5/MWVersion.php;
-include getMediaWiki(includes/WebStart.php);
-
-$allowed_portals = array(
- Www.wikipedia.org_portal,
- Www.wikinews.org_portal,
- Www.wiktionary.org_portal,
- Www.wikiquote.org_portal,
- Www.wikimedia.org_portal,
- Www.wikiversity.org_portal,
- Www.wikibooks.org_portal,
- Secure.wikimedia.org_portal,
- Www.wikivoyage.org_portal,
-);
$allowed_templates = array(
- Www.wikipedia.org_template,
- Www.wikinews.org_template,
- Www.wiktionary.org_template,
- Www.wikiquote.org_template,
- Www.wikimedia.org_template,
- Www.wikiversity.org_template,
- Www.wikibooks.org_template,
- Secure.wikimedia.org_template,
- Www.wikivoyage.org_template,
+ 'Www.wikimedia.org_template',
+ 'Www.wikipedia.org_template',
+ 'Www.wikinews.org_template',
+ 'Www.wiktionary.org_template',
+ 'Www.wikiquote.org_template',
+ 'Www.wikiversity.org_template',
+ 'Www.wikibooks.org_template',
+ 'Www.wikivoyage.org_template',
);
-$useportal = $wgRequest-getText( 'title', 'Www.wikipedia.org_portal' );
-$usetemplate = $wgRequest-getText( 'template', 'Www.wikipedia.org_template' );
-if (!in_array($useportal, $allowed_portals) || !in_array($usetemplate,
$allowed_templates)) {
- header(Content-Type, text/plain; charset=US-ASCII);
- echo sorry...;
+$template = $wgRequest-getText( 'template', 'Www.wikipedia.org_template' );
+if ( !in_array( $template, $allowed_templates ) ) {
+ header( 'Content-Type: text/plain; charset=utf-8' );
+ echo 'Invalid parameters...';
exit;
}
-$wgTitle = Title::newFromText( $useportal );
+$wgTitle = Title::newFromText( $template );
$wgArticle = new Article( $wgTitle );
-$mainText = $wgOut-parse( $wgArticle-getContent( false ) );
+$rawHtml = $wgArticle-getContent( false );
-$templateTitle = Title::newFromText( $usetemplate );
-$templateArticle = new Article( $templateTitle );
-$templateText = $templateArticle-getContent( false );
-$text = str_replace( '$1', $mainText, $templateText );
-
-$lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp(TS_UNIX, max(
$wgArticle-getTouched(), $templateArticle-getTouched() ) ) ) . ' GMT';
+$lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp( TS_UNIX,
$wgArticle-getTouched() ) ) . ' GMT';
+header( 'Content-Type: text/html; charset=utf-8' );
header( 'Cache-Control: s-maxage=3600, must-revalidate, max-age=0' );
header( Last-modified: $lastmod );
-echo $text;
-
+echo $rawHtml;
--
To view, visit https://gerrit.wikimedia.org/r/54645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib77f5312e7667ce2ebc074172a12ad3c5efb3a13
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing dependency on ruby-execjs - change (operations...ruby-jsduck)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54709
Change subject: Add missing dependency on ruby-execjs
..
Add missing dependency on ruby-execjs
Change-Id: I50db6e97bf5e4bbb24d63d69ae1d6a0bf20c4151
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/ruby-jsduck
refs/changes/09/54709/1
diff --git a/debian/control b/debian/control
index 9b26ace..381ede4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@
Package: ruby-jsduck
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-json, ruby-rdiscount, ruby-dimensions, ruby-parallel
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-json, ruby-rdiscount, ruby-dimensions, ruby-parallel, ruby-execjs
Recommends: libjs-extjs
Description: Simple JavaScript Duckumentation generator
Documentation generator for Sencha JS frameworks
--
To view, visit https://gerrit.wikimedia.org/r/54709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50db6e97bf5e4bbb24d63d69ae1d6a0bf20c4151
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/ruby-jsduck
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Include package ruby-jsduck on contint server. - change (operations/puppet)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54787 Change subject: Include package ruby-jsduck on contint server. .. Include package ruby-jsduck on contint server. Change-Id: Ibf50b41e28d5cd7ea20316e0e2bb794b458beee9 --- M modules/contint/manifests/packages.pp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/54787/1 diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 3e00d53..29f216a 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -65,6 +65,8 @@ 'libthai-dev', 'doxygen', +'ruby-execjs', # TODO: Should be a dependency of ruby-jsduck +'ruby-jsduck', ]: ensure = present, } -- To view, visit https://gerrit.wikimedia.org/r/54787 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf50b41e28d5cd7ea20316e0e2bb794b458beee9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mwext-VisualEditor-docgen job - change (integration/jenkins-job-builder-config)
Krinkle has submitted this change and it was merged.
Change subject: Add mwext-VisualEditor-docgen job
..
Add mwext-VisualEditor-docgen job
Depends on Ibf50b41e28d5 in operations/puppet for jsduck.
Change-Id: I52ae434b1e0a4661fcf61829fb54e0f4e1a0f564
---
M mediawiki-extensions.yaml
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 1352bd6..951be83 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -90,6 +90,28 @@
- junit:
results: 'junit*.xml'
+- job-template:
+name: 'mwext-VisualEditor-docgen'
+defaults: use-zuul-for-mw-ext
+triggers:
+ - zuul
+builders:
+ - get-mw-core:
+branch: 'master'
+# VisualEditor's custom documentation generator has a maintenance
+# script which needs MediaWiki to be installed first.
+ - mw-install-sqlite
+ - shell: |
+# Generate documentation
+$WORKSPACE/extensions/VisualEditor/.docs/generate.sh
+# Set destination and version directory therein
+DEST_DIR=/srv/org/wikimedia/doc/VisualEditor
+DEST_VERSIONDIR=`echo $GERRIT_BRANCH | tr '/' '-'`
+# Ensure the destination exists
+mkdir -p $DEST_DIR
+# Publish it (trailing slash is important!)
+rsync --verbose --recursive --delete-after --force
$WORKSPACE/extensions/VisualEditor/docs/ $DEST_DIR/$DEST_VERSIONDIR/
+
- job-group:
name: mwext-check-jobs
jobs:
@@ -384,3 +406,6 @@
- '{name}-{ext-name}-pep8':
name: mwext
ext-name: WikimediaMaintenance
+
+ - 'mwext-VisualEditor-docgen':
+ext-name: VisualEditor
--
To view, visit https://gerrit.wikimedia.org/r/53995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52ae434b1e0a4661fcf61829fb54e0f4e1a0f564
Gerrit-PatchSet: 7
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: Set ensure latest on ruby-jsduck - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54798
Change subject: contint: Set ensure latest on ruby-jsduck
..
contint: Set ensure latest on ruby-jsduck
Change-Id: I710529a9b31a0ffb741e7554b526317e9f85fa64
---
M modules/contint/manifests/packages.pp
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/54798/1
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 55698bb..00f6033 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -65,7 +65,6 @@
'libthai-dev',
'doxygen',
-'ruby-jsduck',
]: ensure = present,
}
@@ -86,10 +85,10 @@
# need geoip to build udp-filter
include geoip
-
- # Node.js evolves quickly so we want to update it
- # automatically.
- package { 'nodejs':
+ # These evolve quickly and we update them frequently
+ # Simply let it update to the latest automatically whenever
+ # we package a new version.
+ package { ['nodejs', 'ruby-jsduck']:
ensure = latest,
}
--
To view, visit https://gerrit.wikimedia.org/r/54798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I710529a9b31a0ffb741e7554b526317e9f85fa64
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable mwext-VisualEditor-docgen job - change (integration/zuul-config)
Krinkle has submitted this change and it was merged. Change subject: Enable mwext-VisualEditor-docgen job .. Enable mwext-VisualEditor-docgen job Depends on I52ae434b1e0a in integration/jenkins-job-builder-config. Change-Id: I64208ae10a0b65dff914e6a492016cd0977fb5e8 --- M layout.yaml 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index 4dcef32..232b4d2 100644 --- a/layout.yaml +++ b/layout.yaml @@ -245,6 +245,9 @@ success-message: 'Change has been deployed on the server and should be live.' failure-message: 'FAILED to deploy change. Please contact a member of the continuous integration team to fixup the docroot on the destination server.' + - name: 'mwext-VisualEditor-docgen' +branch: ^master$ + - name: mwext-EventLogging-pep8 voting: true - name: sartoris-pep8 @@ -2527,8 +2530,10 @@ - mwext-VisualEditor-merge: - mwext-VisualEditor-jslint - mwext-VisualEditor-lint -# VE team does not need any install nor has any PHP Unit tests -# so skip the installer entirely and PHPUnit tests. + # VisualEditor does not have any PHP Unit tests + # so skip the installer and PHPUnit tests. +postmerge: + - mwext-VisualEditor-docgen - name: mediawiki/extensions/WebChat check: -- To view, visit https://gerrit.wikimedia.org/r/53997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64208ae10a0b65dff914e6a492016cd0977fb5e8 Gerrit-PatchSet: 3 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ExtJS: Use provided copy instead of overwriting with libsjs-... - change (operations...ruby-jsduck)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54818
Change subject: ExtJS: Use provided copy instead of overwriting with
libsjs-extjs.
..
ExtJS: Use provided copy instead of overwriting with libsjs-extjs.
libsjs-extjs in Debian squeeze (as of writing) is at 3.0.3,
which is incompatible with JSDuck (it currently assumes 4.1).
The fetch from Gemwatch already includes everything it needs
in template-min/. Nothing needs to be replaced or pre-processed.
Change-Id: Ib3e813d57780c7e89b67bd479860558a51104758
---
M debian/control
M debian/rules
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/ruby-jsduck
refs/changes/18/54818/1
diff --git a/debian/control b/debian/control
index 381ede4..aa33dea 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,5 @@
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-json, ruby-rdiscount, ruby-dimensions, ruby-parallel, ruby-execjs
-Recommends: libjs-extjs
Description: Simple JavaScript Duckumentation generator
Documentation generator for Sencha JS frameworks
diff --git a/debian/rules b/debian/rules
index 3408e74..65360d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,7 @@
rm -f debian/ruby-jsduck/usr/bin/graph
# put template-min in place
mkdir -p debian/ruby-jsduck/usr/share/ruby-jsduck/
- cp -r template-min/ debian/ruby-jsduck/usr/share/ruby-jsduck/
- rm -f debian/ruby-jsduck/usr/share/ruby-jsduck/template-min/README.md
- rm -rf debian/ruby-jsduck/usr/share/ruby-jsduck/template-min/extjs
- ln -s /usr/share/javascript/extjs/ \
- debian/ruby-jsduck/usr/share/ruby-jsduck/template-min/extjs
+ cp -r template-min/ debian/ruby-jsduck/usr/share/ruby-jsduck/
+ rm -f debian/ruby-jsduck/usr/share/ruby-jsduck/template-min/README.md
.PHONY: override_dh_auto_install
--
To view, visit https://gerrit.wikimedia.org/r/54818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e813d57780c7e89b67bd479860558a51104758
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/ruby-jsduck
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Document and clean up events in all the things - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54826
Change subject: Document and clean up events in all the things
..
Document and clean up events in all the things
* Document them consistently between secetions Inheritance and
Static Properties under their own (new) section Events.
* Removed any quotes or brackets around the event name in existing
@emit annotations
Search: @emit.*[;{}(){}]
* For every call to this.emit() anywhere, added @emits.
* Fixed all warnings for references to undefined events
(introduced as a result of the previous point).
Event handler parameter documented based on the emit() call
and actual handlers using the event. Usually the latter is
more elaborate.
* Extend coverage of jQuery as needed
(copied from mwcore/maintenance/jsduck/external.js
written by me, hereby implicitly and explicitly released under MIT).
Specifics
* ve.ce.Surface#onContentChange: Fixed type of range from Object to ve.Range.
* ve.ce.SurfaceObserver#poll: Fix syntax for code from {} to `backticks`.
* ve.ui.Toolbar#onContextChange: Doesn't actually emit clearState event.
Removed #onClearState in Tool, ButtonTool and DropdownTool.
Bug: 45872
Change-Id: Id879aa769b2c72d86a0322e75dddeb868211ce28
---
M .docs/categories.json
M .docs/external.js
M CODING.md
M modules/ve/ce/ve.ce.BranchNode.js
M modules/ve/ce/ve.ce.Node.js
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ce/ve.ce.SurfaceObserver.js
M modules/ve/dm/ve.dm.Node.js
M modules/ve/dm/ve.dm.Surface.js
M modules/ve/dm/ve.dm.SurfaceFragment.js
M modules/ve/init/mw/ve.init.mw.Target.js
M modules/ve/ui/layouts/ve.ui.GridLayout.js
M modules/ve/ui/tools/ve.ui.AnnotationButtonTool.js
M modules/ve/ui/tools/ve.ui.ButtonTool.js
M modules/ve/ui/tools/ve.ui.DropdownTool.js
M modules/ve/ui/ve.ui.Frame.js
M modules/ve/ui/ve.ui.Tool.js
M modules/ve/ui/ve.ui.Toolbar.js
M modules/ve/ui/ve.ui.Window.js
M modules/ve/ui/ve.ui.WindowSet.js
M modules/ve/ui/widgets/ve.ui.ButtonWidget.js
M modules/ve/ui/widgets/ve.ui.IconButtonWidget.js
M modules/ve/ui/widgets/ve.ui.MenuItemWidget.js
M modules/ve/ui/widgets/ve.ui.MenuWidget.js
M modules/ve/ve.EventEmitter.js
M modules/ve/ve.Node.js
M modules/ve/ve.Registry.js
27 files changed, 256 insertions(+), 85 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/26/54826/1
diff --git a/.docs/categories.json b/.docs/categories.json
index 15ffd0e..5ec7775 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -154,7 +154,7 @@
groups: [
{
name: jQuery,
- classes: [jQuery, jQuery.Event, QUnit]
+ classes: [jQuery, jQuery.Event,
jQuery.Promise, jQuery.Deferred, jQuery.jqXHR, QUnit]
},
{
name: JavaScript,
diff --git a/.docs/external.js b/.docs/external.js
index 9b3ee94..038f8e3 100644
--- a/.docs/external.js
+++ b/.docs/external.js
@@ -4,11 +4,31 @@
*/
/**
+ * @method ajax
+ * @return {jqXHR}
+ */
+
+/**
* @class jQuery.Event
* @source http://api.jquery.com/category/events/event-object/
*/
/**
+ * @class jQuery.Promise
+ */
+
+/**
+ * @class jQuery.Deferred
+ * @mixins jQuery.Promise
+ */
+
+/**
+ * @class jQuery.jqXHR
+ * @alternateClassName jqXHR
+ */
+
+
+/**
* @class QUnit
* @source http://api.qunitjs.com/
*/
diff --git a/CODING.md b/CODING.md
index 649e478..5ed791c 100644
--- a/CODING.md
+++ b/CODING.md
@@ -59,7 +59,10 @@
* @source Text
* @context {Type} Optional text.
* @param {Type} name Optional text.
+* @emits name
* @returns {Type} Optional text.
+* @chainable
+* @throws {Type}
### Types
diff --git a/modules/ve/ce/ve.ce.BranchNode.js
b/modules/ve/ce/ve.ce.BranchNode.js
index 2bc6c48..7838886 100644
--- a/modules/ve/ce/ve.ce.BranchNode.js
+++ b/modules/ve/ce/ve.ce.BranchNode.js
@@ -42,17 +42,19 @@
this.onSplice.apply( this, [0, 0].concat( model.getChildren() ) );
};
-/**
- * @event rewrap
- * @param {jQuery} $old
- * @param {jQuery} $new
- */
-
/* Inheritance */
ve.inheritClass( ve.ce.BranchNode, ve.ce.Node );
ve.mixinClass( ve.ce.BranchNode, ve.BranchNode );
+
+/* Events */
+
+/**
+ * @event rewrap
+ * @param {jQuery} $old
+ * @param {jQuery} $new
+ */
/* Static Properties */
@@ -285,6 +287,7 @@
*
* @method
* @param {boolean} live New live state
+ * @emits live
*/
ve.ce.BranchNode.prototype.setLive = function ( live ) {
this.live = live;
diff --git a/modules/ve/ce/ve.ce.Node.js b/modules/ve/ce/ve.ce.Node.js
index 6332f14..55fd1fb 100644
--- a/modules/ve/ce/ve.ce.Node.js
+++ b/modules/ve/ce/ve.ce.Node.js
@@ -41,6 +41,12 @@
ve.inheritClass( ve.ce.Node, ve.Node );
+/* Events */
+
+/**
+ * @event live
+ */
+
/* Static Members */
/**
@@ -309,6 +315,7 @@
*
* @method
*
[MediaWiki-commits] [Gerrit] Docgen: Exit with error status code if there are warnings. - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54873 Change subject: Docgen: Exit with error status code if there are warnings. .. Docgen: Exit with error status code if there are warnings. This way the Jenkins job will be marked failure if we introduce regressions in the validity of the syntax. Change-Id: I80ea147b96632412913193600960d1cf4127ed25 --- M .docs/generate.sh 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/73/54873/1 diff --git a/.docs/generate.sh b/.docs/generate.sh index 63e3368..668ddcb 100755 --- a/.docs/generate.sh +++ b/.docs/generate.sh @@ -16,9 +16,22 @@ done ) eg-iframe.tpl | php eg-iframe.html -jsduck --config=config.json -c=$? +warnings=`jsduck --config=config.json 21` +ec=$? + rm eg-iframe.html cd - /dev/null + +echo -e $warnings + +# JSDuck doesn't exit with an error code if there are warnings +# (only when there are fatal errors). We fixed all warnings +# in master so lets consider all warnings errors to ensure +# we don't introduce any new invalid jsduck syntax. +if [[ $ec == 0 $warnings != ]] +then + exit 1 +fi + # Exit with exit code of jsduck command exit $ec -- To view, visit https://gerrit.wikimedia.org/r/54873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80ea147b96632412913193600960d1cf4127ed25 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zuul: Clean up html and css. - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54887
Change subject: Zuul: Clean up html and css.
..
Zuul: Clean up html and css.
- Whitespace
- Relative paths (so it works when testing locally from a different url)
- Drop redundant attributes
- Remove incorrect max-width on pipeline-container:
http://cl.ly/image/0R0u0u1n0p2I
(top: without the max-width, bottom: old version with max-width)
Change-Id: I0ddc7ceb56ebbb230c463a0367c5c454151bad1b
---
M org/wikimedia/integration/zuul/index.html
1 file changed, 74 insertions(+), 68 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/87/54887/1
diff --git a/org/wikimedia/integration/zuul/index.html
b/org/wikimedia/integration/zuul/index.html
index 2889fb4..29a86c1 100644
--- a/org/wikimedia/integration/zuul/index.html
+++ b/org/wikimedia/integration/zuul/index.html
@@ -5,68 +5,75 @@
titleZuul status page - Wikimedia/title
meta name=viewport content=width=device-width, initial-scale=1.0
link rel=shortcut icon href=//bits.wikimedia.org/favicon/wmf.ico
- link rel=stylesheet href=/bootstrap/css/bootstrap.min.css
- link rel=stylesheet
href=/bootstrap/css/bootstrap-responsive.min.css
+ link rel=stylesheet href=../bootstrap/css/bootstrap.min.css
+ link rel=stylesheet
href=../bootstrap/css/bootstrap-responsive.min.css
+ style
+ .change {
+ border: 1px solid #95c7db;
+ margin-top: 10px;
+ padding: 2px;
+ }
- style type=text/css
- #pipeline-container {
- max-width: 950px;
- margin: 0 auto;
- }
- .change {
- border: 1px solid #95c7db;
- margin-top: 10px;
- padding: 2px;
- }
- .change .header {
- background: #E2ECEF;
- color: black;
- margin: -2px -2px 2px -2px;
- padding: 4px;
- }
- .change .header .changeid {
- float: right;
- }
- .job {
- display: block;
- }
- .pipeline {
- float: left;
- width: 25em;
- padding: 4px;
- }
- .pipeline .header {
- background: #cc;
- color: white;
- }
- .arrow {
- text-align: center;
- font-size: 16pt;
- line-height: 1.0;
- }
- .result_success {
- color: #007f00;
- }
- .result_failure {
- color: #cf2f19;
- }
- .result_unstable {
- color: #e39f00;
- }
- a:link {
- color: #204A87;
- }
- #message p{
- margin: 0;
- }
- .alertbox {
- border: 1px solid #e5574d;
- background: #ffaba5;
- color: black;
- padding: 1em;
- font-size: 12pt;
- margin: 0pt;
- }
+ .change .header {
+ background: #E2ECEF;
+ color: black;
+ margin: -2px -2px 2px -2px;
+ padding: 4px;
+ }
+
+ .change .header .changeid {
+ float: right;
+ }
+
+ .job {
+ display: block;
+ }
+
+ .pipeline {
+ float: left;
+ width: 25em;
+ padding: 4px;
+ }
+
+ .pipeline .header {
+ background: #cc;
+ color: white;
+ }
+
+ .arrow {
+ text-align: center;
+ font-size: 16pt;
+ line-height: 1.0;
+ }
+
+ .result_success {
+ color: #007f00;
+ }
+
+ .result_failure {
+ color: #cf2f19;
+ }
+
+ .result_unstable {
+ color: #e39f00;
+ }
+
+ a:link {
+ color: #204A87;
+ }
+
+ #message p {
+ margin: 0;
+ }
+
+ .alertbox {
+ border: 1px solid #e5574d;
+ background: #ffaba5;
+ color: black;
+ padding: 1em;
+ font-size: 12pt;
+ margin: 0pt;
+ }
/style
/head
body
@@ -74,8 +81,8 @@
div class=container
div class=page-header
a
[MediaWiki-commits] [Gerrit] Zuul: Clean up html and css. - change (integration/docroot)
Krinkle has submitted this change and it was merged.
Change subject: Zuul: Clean up html and css.
..
Zuul: Clean up html and css.
- Whitespace
- Relative paths (so it works when testing locally from a different url)
- Drop redundant attributes
- Remove incorrect max-width on pipeline-container:
http://cl.ly/image/0R0u0u1n0p2I
(top: without the max-width, bottom: old version with max-width)
Change-Id: I0ddc7ceb56ebbb230c463a0367c5c454151bad1b
---
M org/wikimedia/integration/zuul/index.html
1 file changed, 74 insertions(+), 68 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/org/wikimedia/integration/zuul/index.html
b/org/wikimedia/integration/zuul/index.html
index 2889fb4..29a86c1 100644
--- a/org/wikimedia/integration/zuul/index.html
+++ b/org/wikimedia/integration/zuul/index.html
@@ -5,68 +5,75 @@
titleZuul status page - Wikimedia/title
meta name=viewport content=width=device-width, initial-scale=1.0
link rel=shortcut icon href=//bits.wikimedia.org/favicon/wmf.ico
- link rel=stylesheet href=/bootstrap/css/bootstrap.min.css
- link rel=stylesheet
href=/bootstrap/css/bootstrap-responsive.min.css
+ link rel=stylesheet href=../bootstrap/css/bootstrap.min.css
+ link rel=stylesheet
href=../bootstrap/css/bootstrap-responsive.min.css
+ style
+ .change {
+ border: 1px solid #95c7db;
+ margin-top: 10px;
+ padding: 2px;
+ }
- style type=text/css
- #pipeline-container {
- max-width: 950px;
- margin: 0 auto;
- }
- .change {
- border: 1px solid #95c7db;
- margin-top: 10px;
- padding: 2px;
- }
- .change .header {
- background: #E2ECEF;
- color: black;
- margin: -2px -2px 2px -2px;
- padding: 4px;
- }
- .change .header .changeid {
- float: right;
- }
- .job {
- display: block;
- }
- .pipeline {
- float: left;
- width: 25em;
- padding: 4px;
- }
- .pipeline .header {
- background: #cc;
- color: white;
- }
- .arrow {
- text-align: center;
- font-size: 16pt;
- line-height: 1.0;
- }
- .result_success {
- color: #007f00;
- }
- .result_failure {
- color: #cf2f19;
- }
- .result_unstable {
- color: #e39f00;
- }
- a:link {
- color: #204A87;
- }
- #message p{
- margin: 0;
- }
- .alertbox {
- border: 1px solid #e5574d;
- background: #ffaba5;
- color: black;
- padding: 1em;
- font-size: 12pt;
- margin: 0pt;
- }
+ .change .header {
+ background: #E2ECEF;
+ color: black;
+ margin: -2px -2px 2px -2px;
+ padding: 4px;
+ }
+
+ .change .header .changeid {
+ float: right;
+ }
+
+ .job {
+ display: block;
+ }
+
+ .pipeline {
+ float: left;
+ width: 25em;
+ padding: 4px;
+ }
+
+ .pipeline .header {
+ background: #cc;
+ color: white;
+ }
+
+ .arrow {
+ text-align: center;
+ font-size: 16pt;
+ line-height: 1.0;
+ }
+
+ .result_success {
+ color: #007f00;
+ }
+
+ .result_failure {
+ color: #cf2f19;
+ }
+
+ .result_unstable {
+ color: #e39f00;
+ }
+
+ a:link {
+ color: #204A87;
+ }
+
+ #message p {
+ margin: 0;
+ }
+
+ .alertbox {
+ border: 1px solid #e5574d;
+ background: #ffaba5;
+ color: black;
+ padding: 1em;
+ font-size: 12pt;
+ margin: 0pt;
+ }
/style
/head
body
@@ -74,8 +81,8 @@
div class=container
div class=page-header
a href=//www.wikimediafoundation.org/
-
[MediaWiki-commits] [Gerrit] Doc: Add mediawiki-core (PHP + JS) and VisualEditor. - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54890 Change subject: Doc: Add mediawiki-core (PHP + JS) and VisualEditor. .. Doc: Add mediawiki-core (PHP + JS) and VisualEditor. Change-Id: I3aeb5a7f59ebd08fe1943e40c15cc6fc6f84cd31 --- M org/wikimedia/doc/index.html 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/90/54890/1 diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html index 28a0184..180609f 100644 --- a/org/wikimedia/doc/index.html +++ b/org/wikimedia/doc/index.html @@ -13,8 +13,9 @@ h2Documentation/h2 /div ul - lia href=/puppet/puppet/a/li - lia href=/puppetsource/puppetsource/a/li + lia href=/mediawiki-core/master/php/html/MediaWiki core/a (a href=/mediawiki-core/master/php/html/PHP/a bull; a href=/mediawiki-core/master/js/JS/a)/li + lia href=/VisualEditor/master/VisualEditor/a/li + lia href=/puppet/Puppet/a (a href=/puppetsource/source/a)/li /ul /div!-- /.container -- /div!-- /.page-wrap -- -- To view, visit https://gerrit.wikimedia.org/r/54890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3aeb5a7f59ebd08fe1943e40c15cc6fc6f84cd31 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc: Add mediawiki-core (PHP + JS) and VisualEditor. - change (integration/docroot)
Krinkle has submitted this change and it was merged. Change subject: Doc: Add mediawiki-core (PHP + JS) and VisualEditor. .. Doc: Add mediawiki-core (PHP + JS) and VisualEditor. Change-Id: I3aeb5a7f59ebd08fe1943e40c15cc6fc6f84cd31 --- M org/wikimedia/doc/index.html 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html index 28a0184..180609f 100644 --- a/org/wikimedia/doc/index.html +++ b/org/wikimedia/doc/index.html @@ -13,8 +13,9 @@ h2Documentation/h2 /div ul - lia href=/puppet/puppet/a/li - lia href=/puppetsource/puppetsource/a/li + lia href=/mediawiki-core/master/php/html/MediaWiki core/a (a href=/mediawiki-core/master/php/html/PHP/a bull; a href=/mediawiki-core/master/js/JS/a)/li + lia href=/VisualEditor/master/VisualEditor/a/li + lia href=/puppet/Puppet/a (a href=/puppetsource/source/a)/li /ul /div!-- /.container -- /div!-- /.page-wrap -- -- To view, visit https://gerrit.wikimedia.org/r/54890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aeb5a7f59ebd08fe1943e40c15cc6fc6f84cd31 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc: Fix lack of margin when window is narrow. - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54891 Change subject: Doc: Fix lack of margin when window is narrow. .. Doc: Fix lack of margin when window is narrow. Change-Id: Iee79d770dedafbd2ee10e5cd1f93d5f779c60430 --- M org/wikimedia/doc/index.html 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/91/54891/1 diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html index 28a0184..ce7354a 100644 --- a/org/wikimedia/doc/index.html +++ b/org/wikimedia/doc/index.html @@ -3,8 +3,10 @@ head meta charset=utf-8 titleDocumentation - Wikimedia/title + meta name=viewport content=width=device-width, initial-scale=1.0 link rel=shortcut icon href=//bits.wikimedia.org/favicon/wmf.ico link rel=stylesheet href=bootstrap/css/bootstrap.min.css + link rel=stylesheet href=bootstrap/css/bootstrap-responsive.min.css /head body div class=page-wrap -- To view, visit https://gerrit.wikimedia.org/r/54891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee79d770dedafbd2ee10e5cd1f93d5f779c60430 Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc: Fix lack of margin when window is narrow. - change (integration/docroot)
Krinkle has submitted this change and it was merged. Change subject: Doc: Fix lack of margin when window is narrow. .. Doc: Fix lack of margin when window is narrow. Change-Id: Iee79d770dedafbd2ee10e5cd1f93d5f779c60430 --- M org/wikimedia/doc/index.html 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html index 180609f..73cd9c8 100644 --- a/org/wikimedia/doc/index.html +++ b/org/wikimedia/doc/index.html @@ -3,8 +3,10 @@ head meta charset=utf-8 titleDocumentation - Wikimedia/title + meta name=viewport content=width=device-width, initial-scale=1.0 link rel=shortcut icon href=//bits.wikimedia.org/favicon/wmf.ico link rel=stylesheet href=bootstrap/css/bootstrap.min.css + link rel=stylesheet href=bootstrap/css/bootstrap-responsive.min.css /head body div class=page-wrap -- To view, visit https://gerrit.wikimedia.org/r/54891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee79d770dedafbd2ee10e5cd1f93d5f779c60430 Gerrit-PatchSet: 2 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Docs: Add more @source links to external.js - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54894
Change subject: Docs: Add more @source links to external.js
..
Docs: Add more @source links to external.js
Change-Id: Ibde8eba9d464d1deb1a7a100fcf79f7ebe347621
---
M .docs/external.js
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/94/54894/1
diff --git a/.docs/external.js b/.docs/external.js
index 038f8e3..f7a312c 100644
--- a/.docs/external.js
+++ b/.docs/external.js
@@ -5,25 +5,29 @@
/**
* @method ajax
+ * @source http://api.jquery.com/jQuery.ajax/
* @return {jqXHR}
*/
/**
* @class jQuery.Event
- * @source http://api.jquery.com/category/events/event-object/
+ * @source http://api.jquery.com/Types/#Event
*/
/**
* @class jQuery.Promise
+ * @source http://api.jquery.com/Types/#Promise
*/
/**
* @class jQuery.Deferred
* @mixins jQuery.Promise
+ * @source http://api.jquery.com/jQuery.Deferred/
*/
/**
* @class jQuery.jqXHR
+ * @source http://api.jquery.com/Types/#jqXHR
* @alternateClassName jqXHR
*/
--
To view, visit https://gerrit.wikimedia.org/r/54894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibde8eba9d464d1deb1a7a100fcf79f7ebe347621
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-VisualEditor-docgen: Don't set --verbose flag for rsync. - change (integration/jenkins-job-builder-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54895 Change subject: mwext-VisualEditor-docgen: Don't set --verbose flag for rsync. .. mwext-VisualEditor-docgen: Don't set --verbose flag for rsync. Change-Id: If0c4a8a666cc1ba9311f9648a0b5095c13561926 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/95/54895/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 951be83..fcadfb1 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -110,7 +110,7 @@ # Ensure the destination exists mkdir -p $DEST_DIR # Publish it (trailing slash is important!) -rsync --verbose --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/docs/ $DEST_DIR/$DEST_VERSIONDIR/ +rsync --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/docs/ $DEST_DIR/$DEST_VERSIONDIR/ - job-group: name: mwext-check-jobs -- To view, visit https://gerrit.wikimedia.org/r/54895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0c4a8a666cc1ba9311f9648a0b5095c13561926 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-VisualEditor-docgen: Don't set --verbose flag for rsync. - change (integration/jenkins-job-builder-config)
Krinkle has submitted this change and it was merged. Change subject: mwext-VisualEditor-docgen: Don't set --verbose flag for rsync. .. mwext-VisualEditor-docgen: Don't set --verbose flag for rsync. Change-Id: If0c4a8a666cc1ba9311f9648a0b5095c13561926 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Verified; Looks good to me, approved diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 951be83..fcadfb1 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -110,7 +110,7 @@ # Ensure the destination exists mkdir -p $DEST_DIR # Publish it (trailing slash is important!) -rsync --verbose --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/docs/ $DEST_DIR/$DEST_VERSIONDIR/ +rsync --recursive --delete-after --force $WORKSPACE/extensions/VisualEditor/docs/ $DEST_DIR/$DEST_VERSIONDIR/ - job-group: name: mwext-check-jobs -- To view, visit https://gerrit.wikimedia.org/r/54895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0c4a8a666cc1ba9311f9648a0b5095c13561926 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New mediawiki-visualeditor.log (filtering VisualEditor product) - change (wikimedia...wikibugs)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54984
Change subject: New mediawiki-visualeditor.log (filtering VisualEditor product)
..
New mediawiki-visualeditor.log (filtering VisualEditor product)
Bug: 42735
Change-Id: I04e82cb392f1ad680db6c469f76fb717d435c20d
---
M wikibugs
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/wikibugs
refs/changes/84/54984/1
diff --git a/wikibugs b/wikibugs
index d27e9fe..1720b6e 100755
--- a/wikibugs
+++ b/wikibugs
@@ -94,6 +94,7 @@
'Wikipedia App'= $opt{'dir'} . '/wikimedia-mobile.log',
'Wiktionary App' = $opt{'dir'} . '/wikimedia-mobile.log',
'Parsoid' = $opt{'dir'} . '/mediawiki-parsoid.log',
+ 'VisualEditor' = $opt{'dir'} . '/mediawiki-visualeditor.log',
'default' = $opt{'dir'} . '/mediawiki.log',
};
--
To view, visit https://gerrit.wikimedia.org/r/54984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04e82cb392f1ad680db6c469f76fb717d435c20d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/wikibugs
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gitignore: Reset to upstream, and add /etc/jenkins_jobs.ini - change (integration/jenkins[master])
Krinkle has uploaded a new change for review. Change subject: Gitignore: Reset to upstream, and add /etc/jenkins_jobs.ini .. Gitignore: Reset to upstream, and add /etc/jenkins_jobs.ini Change-Id: Iaefe10ed2b54d68e7cec74112fa11651bd56ffe7 --- M .gitignore 1 file changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/26/44826/1 -- To view, visit https://gerrit.wikimedia.org/r/44826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaefe10ed2b54d68e7cec74112fa11651bd56ffe7 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gitignore: Reset to upstream, and add /etc/jenkins_jobs.ini - change (integration/jenkins[master])
Krinkle has submitted this change and it was merged. Change subject: Gitignore: Reset to upstream, and add /etc/jenkins_jobs.ini .. Gitignore: Reset to upstream, and add /etc/jenkins_jobs.ini Change-Id: Iaefe10ed2b54d68e7cec74112fa11651bd56ffe7 --- M .gitignore 1 file changed, 14 insertions(+), 7 deletions(-) Approvals: Krinkle: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/44826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaefe10ed2b54d68e7cec74112fa11651bd56ffe7 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Krinkle ttij...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
