[MediaWiki-commits] [Gerrit] mediawiki.ui: Add @activeColor argument to the .button-color... - change (mediawiki/core)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200116
Change subject: mediawiki.ui: Add @activeColor argument to the .button-colors()
mixin
..
mediawiki.ui: Add @activeColor argument to the .button-colors() mixin
Have kept the colors same for now. Can be changed later once the design
team has decided.
Change-Id: I7c418b970c5e5fa95f740ecf3d90622bf7f02364
---
M resources/src/mediawiki.less/mediawiki.ui/mixins.less
M resources/src/mediawiki.less/mediawiki.ui/variables.less
M resources/src/mediawiki.ui/components/buttons.less
3 files changed, 17 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/200116/1
diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index db983a7..56b6811 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -33,7 +33,7 @@
// Button styling
//
-.button-colors(@bgColor, @highlightColor) {
+.button-colors(@bgColor, @highlightColor, @activeColor) {
background: @bgColor;
&:hover {
@@ -55,12 +55,12 @@
&:active,
&.mw-ui-checked {
- background: @highlightColor;
+ background: @activeColor;
box-shadow: none;
}
}
-.button-colors(@bgColor, @highlightColor) when (lightness(@bgColor) >= 70%) {
+.button-colors(@bgColor, @highlightColor, @activeColor) when
(lightness(@bgColor) >= 70%) {
color: @colorButtonText;
border: 1px solid @colorGray12;
@@ -83,7 +83,7 @@
}
}
-.button-colors(@bgColor, @highlightColor) when (lightness(@bgColor) < 70%) {
+.button-colors(@bgColor, @highlightColor, @activeColor) when
(lightness(@bgColor) < 70%) {
color: #fff;
// border of the same color as background so that light background and
// dark background buttons are the same height and width
@@ -103,7 +103,7 @@
}
}
-.button-colors-quiet(@textColor, @highlightColor) {
+.button-colors-quiet(@textColor, @highlightColor, @activeColor) {
// Quiet buttons all start gray, and reveal
// constructive/progressive/destructive color on hover and active.
color: @colorButtonText;
@@ -115,7 +115,7 @@
&:active,
&.mw-ui-checked {
- color: @highlightColor;
+ color: @activeColor;
}
&:disabled {
diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less
b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index f130a68..aed4fd4 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -22,14 +22,17 @@
// Blue; for contextual use of a continuing action
@colorProgressive: #347bff;
@colorProgressiveHighlight: #2962CC;
+@colorProgressiveActive: #2962CC;
// Green; for contextual use of a positive finalizing action
@colorConstructive: #00af89;
@colorConstructiveHighlight: #008C6D;
+@colorConstructiveActive: #008C6D;
// Orange; for contextual use of returning to a past action
@colorRegressive: #FF5D00;
// Red; for contextual use of a negative action of high severity
@colorDestructive: #d11d13;
@colorDestructiveHighlight: #A7170F;
+@colorDestructiveActive: #A7170F;
// Orange; for contextual use of a potentially negative action of medium
severity
@colorMediumSevere: #FF5D00;
// Yellow; for contextual use of a potentially negative action of low severity
@@ -45,6 +48,7 @@
@colorTextLight: @colorGray6;
@colorButtonText: @colorGray5;
@colorButtonTextHighlight: @colorGray7;
+@colorButtonTextActive: @colorGray7;
@colorDisabledText: @colorGray12;
@colorErrorText: #CC;
diff --git a/resources/src/mediawiki.ui/components/buttons.less
b/resources/src/mediawiki.ui/components/buttons.less
index 53e13b7..7d8ba26 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -135,10 +135,10 @@
// Styleguide 2.1.1.
&.mw-ui-progressive,
&.mw-ui-primary {
- .button-colors(@colorProgressive, @colorProgressiveHighlight);
+ .button-colors(@colorProgressive, @colorProgressiveHighlight,
@colorProgressiveActive);
&.mw-ui-quiet {
- .button-colors-quiet(@colorProgressive,
@colorProgressiveHighlight);
+ .button-colors-quiet(@colorProgressive,
@colorProgressiveHighlight, @colorProgressiveActive);
}
}
@@ -158,10 +158,10 @@
//
// Styleguide 2.1.2.
&.mw-ui-constructive {
- .button-colors(@colorConstructive, @colorConstructiveHighlight);
+ .button-colors(@colorConstructive, @colorConst
[MediaWiki-commits] [Gerrit] Made User actually use the mQuickTouched process cache - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200115
Change subject: Made User actually use the mQuickTouched process cache
..
Made User actually use the mQuickTouched process cache
Change-Id: I158eae2dac16b5fdacd095fff7fb031b42804a1e
---
M includes/User.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/200115/1
diff --git a/includes/User.php b/includes/User.php
index 2f9b716..78693c1 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2309,7 +2309,9 @@
if ( $this->mQuickTouched === null ) {
$key = wfMemcKey( 'user-quicktouched', 'id',
$this->mId );
$timestamp = $wgMemc->get( $key );
- if ( !$timestamp ) {
+ if ( $timestamp ) {
+ $this->mQuickTouched = $timestamp;
+ } else {
# Set the timestamp to get HTTP 304
cache hits
$this->touch();
}
--
To view, visit https://gerrit.wikimedia.org/r/200115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I158eae2dac16b5fdacd095fff7fb031b42804a1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Live index update - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Live index update
..
Live index update
* use onPageContentSaveComplete hook
* still quite prototypical
Change-Id: Iff6e07e2276f32c11f4b828e55ba9e27bd33aa5d
---
M MathSearch.hooks.php
M MathSearch.php
A includes/MwsDumpWriter.php
M includes/engines/MathEngineBaseX.php
M includes/engines/MathEngineRest.php
M maintenance/CreateMWSHarvest.php
M maintenance/UpdateMath.php
M tests/MathSearchHooksTest.php
A tests/MwsDumpWriterTest.php
9 files changed, 482 insertions(+), 80 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index de78e6d..5861f5f 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -1,11 +1,11 @@
getDB()->getType();
- if ( $type == "mysql" ) {
- $dir = __DIR__ . '/db/' ;
+ $type = $updater->getDB()->getType();
+ if ( $type == "mysql" ) {
+ $dir = __DIR__ . '/db/';
$updater->addExtensionTable( 'mathindex', $dir .
'mathindex.sql' );
- $updater->addExtensionTable( 'mathobservation', $dir .
'mathobservation.sql' );
+ $updater->addExtensionTable( 'mathobservation', $dir .
'mathobservation.sql' );
$updater->addExtensionTable( 'mathvarstat', $dir .
'mathvarstat.sql' );
$updater->addExtensionTable( 'mathrevisionstat', $dir .
'mathrevisionstat.sql' );
$updater->addExtensionTable( 'mathsemantics', $dir .
'mathsemantics.sql' );
$updater->addExtensionTable( 'mathperformance', $dir .
'mathperformance.sql' );
$updater->addExtensionTable( 'mathidentifier', $dir .
'mathidentifier.sql' );
- if ( $wgMathWmcServer ){
+ if ( $wgMathWmcServer ) {
$wmcDir = $dir . 'wmc/persistent/';
- $updater->addExtensionTable( 'math_wmc_ref',
$wmcDir . "math_wmc_ref.sql");
- $updater->addExtensionTable( 'math_wmc_runs',
$wmcDir . "math_wmc_runs.sql");
- $updater->addExtensionTable(
'math_wmc_results', $wmcDir . "math_wmc_results.sql");
- $updater->addExtensionTable(
'math_wmc_assessed_formula', $wmcDir . "math_wmc_assessed_formula.sql");
- $updater->addExtensionTable(
'math_wmc_assessed_revision', $wmcDir . "math_wmc_assessed_revision.sql");
+ $updater->addExtensionTable( 'math_wmc_ref',
$wmcDir . "math_wmc_ref.sql" );
+ $updater->addExtensionTable( 'math_wmc_runs',
$wmcDir . "math_wmc_runs.sql" );
+ $updater->addExtensionTable(
'math_wmc_results', $wmcDir . "math_wmc_results.sql" );
+ $updater->addExtensionTable(
'math_wmc_assessed_formula',
+ $wmcDir .
"math_wmc_assessed_formula.sql" );
+ $updater->addExtensionTable(
'math_wmc_assessed_revision',
+ $wmcDir .
"math_wmc_assessed_revision.sql" );
}
- } elseif ( $type == 'sqlite' ){
+ } elseif ( $type == 'sqlite' ) {
// Don't scare Jenkins with an exception.
} else {
- throw new Exception( "Math extension does not currently
support $type database." );
- }
+ throw new Exception( "Math extension does not currently
support $type database." );
+ }
return true;
}
@@ -65,8 +67,8 @@
* Checks if the db2 php client is installed
* @return boolean
*/
- public static function isDB2Supported(){
- if ( function_exists('db2_connect') ){
+ public static function isDB2Supported() {
+ if ( function_exists( 'db2_connect' ) ) {
return true;
} else {
return false;
@@ -81,7 +83,7 @@
* @param string $inputHash hash of tex string (used as database entry)
* @param string $tex the user input hash
*/
- private static function updateIndex($revId, $eid, $inputHash, $tex){
+ private static function updateIndex( $revId, $eid, $inputHash, $tex ) {
try {
$dbr = wfGetDB( DB_SLAVE );
$exists = $dbr->selectRow( 'mathindex',
@@ -89,15 +91,17 @@
array(
'mathindex_revision_id' => $revId,
'mathindex_anchor' =
[MediaWiki-commits] [Gerrit] jenkins job validation, do not submit - change (mediawiki...Gather)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200113
Change subject: jenkins job validation, do not submit
..
jenkins job validation, do not submit
Change-Id: I096a4c6eda2d283ed9fd16474fb733a1e94f2b06
---
A test.js
A test.json
A test.php
A test.py
A test.rb
5 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/13/200113/1
diff --git a/test.js b/test.js
new file mode 100644
index 000..6b2b3db
--- /dev/null
+++ b/test.js
@@ -0,0 +1 @@
+console.log("hello world");
diff --git a/test.json b/test.json
new file mode 100644
index 000..0967ef4
--- /dev/null
+++ b/test.json
@@ -0,0 +1 @@
+{}
diff --git a/test.php b/test.php
new file mode 100644
index 000..71625a4
--- /dev/null
+++ b/test.php
@@ -0,0 +1,2 @@
+https://gerrit.wikimedia.org/r/200113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I096a4c6eda2d283ed9fd16474fb733a1e94f2b06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CodeMirror library to version 5.0.0 (v 3.1.1) - change (mediawiki...CodeMirror)
jenkins-bot has submitted this change and it was merged. Change subject: update CodeMirror library to version 5.0.0 (v 3.1.1) .. update CodeMirror library to version 5.0.0 (v 3.1.1) Change-Id: Ifcd1bdcd45c7b6fbb10927d1c6821f8804527ef6 --- M CodeMirror.php M resources/lib/codemirror/AUTHORS M resources/lib/codemirror/CONTRIBUTING.md M resources/lib/codemirror/README.md M resources/lib/codemirror/addon/dialog/dialog.js A resources/lib/codemirror/addon/display/panel.js M resources/lib/codemirror/addon/edit/closebrackets.js M resources/lib/codemirror/addon/edit/closetag.js M resources/lib/codemirror/addon/edit/continuelist.js M resources/lib/codemirror/addon/edit/matchbrackets.js M resources/lib/codemirror/addon/fold/foldcode.js M resources/lib/codemirror/addon/fold/foldgutter.js M resources/lib/codemirror/addon/hint/anyword-hint.js M resources/lib/codemirror/addon/hint/css-hint.js M resources/lib/codemirror/addon/hint/html-hint.js M resources/lib/codemirror/addon/hint/javascript-hint.js D resources/lib/codemirror/addon/hint/python-hint.js M resources/lib/codemirror/addon/hint/show-hint.js M resources/lib/codemirror/addon/hint/sql-hint.js M resources/lib/codemirror/addon/hint/xml-hint.js M resources/lib/codemirror/addon/lint/lint.js M resources/lib/codemirror/addon/merge/merge.css M resources/lib/codemirror/addon/merge/merge.js M resources/lib/codemirror/addon/mode/loadmode.js M resources/lib/codemirror/addon/mode/overlay.js M resources/lib/codemirror/addon/mode/simple.js A resources/lib/codemirror/addon/scroll/annotatescrollbar.js A resources/lib/codemirror/addon/scroll/simplescrollbars.css A resources/lib/codemirror/addon/scroll/simplescrollbars.js A resources/lib/codemirror/addon/search/matchesonscrollbar.css A resources/lib/codemirror/addon/search/matchesonscrollbar.js M resources/lib/codemirror/addon/search/search.js A resources/lib/codemirror/addon/selection/selection-pointer.js M resources/lib/codemirror/addon/tern/tern.js M resources/lib/codemirror/keymap/emacs.js M resources/lib/codemirror/keymap/sublime.js M resources/lib/codemirror/keymap/vim.js M resources/lib/codemirror/lib/codemirror.css M resources/lib/codemirror/lib/codemirror.js M resources/lib/codemirror/mode/clike/clike.js M resources/lib/codemirror/mode/clike/index.html M resources/lib/codemirror/mode/coffeescript/coffeescript.js M resources/lib/codemirror/mode/commonlisp/commonlisp.js M resources/lib/codemirror/mode/css/css.js M resources/lib/codemirror/mode/css/index.html M resources/lib/codemirror/mode/css/test.js M resources/lib/codemirror/mode/cypher/cypher.js A resources/lib/codemirror/mode/dart/dart.js A resources/lib/codemirror/mode/dart/index.html A resources/lib/codemirror/mode/dockerfile/dockerfile.js A resources/lib/codemirror/mode/dockerfile/index.html A resources/lib/codemirror/mode/ebnf/ebnf.js A resources/lib/codemirror/mode/ebnf/index.html A resources/lib/codemirror/mode/forth/forth.js A resources/lib/codemirror/mode/forth/index.html M resources/lib/codemirror/mode/gfm/gfm.js M resources/lib/codemirror/mode/gfm/index.html M resources/lib/codemirror/mode/gfm/test.js M resources/lib/codemirror/mode/go/go.js M resources/lib/codemirror/mode/htmlmixed/htmlmixed.js M resources/lib/codemirror/mode/htmlmixed/index.html A resources/lib/codemirror/mode/idl/idl.js A resources/lib/codemirror/mode/idl/index.html M resources/lib/codemirror/mode/index.html M resources/lib/codemirror/mode/javascript/javascript.js M resources/lib/codemirror/mode/javascript/test.js M resources/lib/codemirror/mode/markdown/markdown.js M resources/lib/codemirror/mode/meta.js M resources/lib/codemirror/mode/perl/perl.js M resources/lib/codemirror/mode/puppet/puppet.js M resources/lib/codemirror/mode/ruby/index.html M resources/lib/codemirror/mode/sass/sass.js M resources/lib/codemirror/mode/shell/shell.js A resources/lib/codemirror/mode/soy/index.html A resources/lib/codemirror/mode/soy/soy.js M resources/lib/codemirror/mode/sparql/index.html M resources/lib/codemirror/mode/sparql/sparql.js A resources/lib/codemirror/mode/spreadsheet/index.html A resources/lib/codemirror/mode/spreadsheet/spreadsheet.js M resources/lib/codemirror/mode/sql/sql.js M resources/lib/codemirror/mode/stex/stex.js A resources/lib/codemirror/mode/stylus/index.html A resources/lib/codemirror/mode/stylus/stylus.js M resources/lib/codemirror/mode/textile/test.js M resources/lib/codemirror/mode/textile/textile.js M resources/lib/codemirror/mode/turtle/turtle.js M resources/lib/codemirror/mode/verilog/verilog.js M resources/lib/codemirror/mode/yaml/yaml.js M resources/lib/codemirror/theme/3024-day.css M resources/lib/codemirror/theme/3024-night.css M resources/lib/codemirror/theme/ambiance.css M resources/lib/codemirror/theme/base16-dark.css M resources/lib/codemirror/theme/base16-light.css M resources/lib/codemirror/theme/blackboard.css M resources/lib/codemirror/theme/cobalt.css A resources/lib/codemirror/theme/colorfor
[MediaWiki-commits] [Gerrit] Don't access context in SpecialPage::__construct(), it's not... - change (mediawiki...Gather)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200112
Change subject: Don't access context in SpecialPage::__construct(), it's not
set yet
..
Don't access context in SpecialPage::__construct(), it's not set yet
Change-Id: I8bf84990ea9c6c16dd08a23c426e6909752f7ad8
---
M includes/specials/SpecialGather.php
1 file changed, 10 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/12/200112/1
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index 3368353..fe717e0 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -21,18 +21,6 @@
public function __construct() {
parent::__construct( 'Gather' );
- $out = $this->getOutput();
- $out->addModules(
- array(
- 'ext.gather.special',
- )
- );
- $out->addModuleStyles( array(
- 'mediawiki.ui.anchor',
- 'mediawiki.ui.icon',
- 'ext.gather.icons',
- 'ext.gather.styles',
- ) );
}
/**
@@ -41,7 +29,16 @@
* @param string $subpage
*/
public function execute( $subpage ) {
-
+ $out = $this->getOutput();
+ $out->addModules( array(
+ 'ext.gather.special',
+ ) );
+ $out->addModuleStyles( array(
+ 'mediawiki.ui.anchor',
+ 'mediawiki.ui.icon',
+ 'ext.gather.icons',
+ 'ext.gather.styles',
+ ) );
if ( preg_match( '/^$/', $subpage ) ) {
// Root subpage. User owned collections.
// For listing own lists, you need to be logged in
--
To view, visit https://gerrit.wikimedia.org/r/200112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bf84990ea9c6c16dd08a23c426e6909752f7ad8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move progressbar to widgets - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200111
Change subject: Move progressbar to widgets
..
Move progressbar to widgets
Change-Id: Id50ac227a4cc909c85673dc8d7d05cc4478d58c5
---
M Resources.php
R modules/widgets/progressbar/ext.cx.progressbar.js
R modules/widgets/progressbar/ext.cx.progressbar.less
3 files changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/11/200111/1
diff --git a/Resources.php b/Resources.php
index 1c959bb..7297639 100644
--- a/Resources.php
+++ b/Resources.php
@@ -464,9 +464,9 @@
) + $resourcePaths;
$wgResourceModules['ext.cx.progressbar'] = array(
- 'scripts' => 'tools/ext.cx.progressbar.js',
+ 'scripts' => 'widgets/progressbar/ext.cx.progressbar.js',
'styles' => array(
- 'tools/styles/ext.cx.progressbar.less',
+ 'widgets/progressbar/ext.cx.progressbar.less',
),
'messages' => array(
'cx-header-progressbar-text',
diff --git a/modules/tools/ext.cx.progressbar.js
b/modules/widgets/progressbar/ext.cx.progressbar.js
similarity index 100%
rename from modules/tools/ext.cx.progressbar.js
rename to modules/widgets/progressbar/ext.cx.progressbar.js
diff --git a/modules/tools/styles/ext.cx.progressbar.less
b/modules/widgets/progressbar/ext.cx.progressbar.less
similarity index 92%
rename from modules/tools/styles/ext.cx.progressbar.less
rename to modules/widgets/progressbar/ext.cx.progressbar.less
index f5f84de..ba7e0b4 100644
--- a/modules/tools/styles/ext.cx.progressbar.less
+++ b/modules/widgets/progressbar/ext.cx.progressbar.less
@@ -1,4 +1,4 @@
-@import "../../widgets/common/ext.cx.common";
+@import "../common/ext.cx.common";
.cx-header__progressbar {
.mw-ui-one-whole;
--
To view, visit https://gerrit.wikimedia.org/r/200111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id50ac227a4cc909c85673dc8d7d05cc4478d58c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] various role classes - indentation fixes - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200110
Change subject: various role classes - indentation fixes
..
various role classes - indentation fixes
about 75 x 'indentation of => is not properly aligned'
puppet-lint 1.1.0
Change-Id: I6ea05a3f0e0074896b42ceb1c0c632eedcf54661
---
M manifests/role/labmon.pp
M manifests/role/nova.pp
M manifests/role/ntp.pp
M manifests/role/osm.pp
M manifests/role/parsoid.pp
M manifests/role/postgres.pp
M manifests/role/redisdb.pp
M manifests/role/releases.pp
M manifests/role/requesttracker.pp
M manifests/role/torrus.pp
M manifests/role/wikimania_scholarships.pp
M manifests/role/zuul.pp
12 files changed, 79 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/200110/1
diff --git a/manifests/role/labmon.pp b/manifests/role/labmon.pp
index b77ccb6..a7cb46c 100644
--- a/manifests/role/labmon.pp
+++ b/manifests/role/labmon.pp
@@ -6,10 +6,10 @@
class { 'role::graphite::labmon': }
file { '/var/lib/carbon':
-ensure => link,
-target => '/srv/carbon',
-owner => '_graphite',
-group => '_graphite',
+ensure => link,
+target => '/srv/carbon',
+owner => '_graphite',
+group => '_graphite',
require => Class['role::graphite::labmon']
}
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index a882d33..a233bde 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -215,8 +215,8 @@
}
class { 'openstack::openstack-manager':
-novaconfig=> $novaconfig,
-certificate => $certificate,
+novaconfig => $novaconfig,
+certificate => $certificate,
}
include ::nutcracker::monitoring
diff --git a/manifests/role/ntp.pp b/manifests/role/ntp.pp
index 73670a5..76d9414 100644
--- a/manifests/role/ntp.pp
+++ b/manifests/role/ntp.pp
@@ -95,9 +95,9 @@
system::role { 'ntp': description => 'NTP server' }
ntp::daemon { 'server':
-servers => $peer_upstreams[$::fqdn],
-peers => delete($wmf_all_peers, $::fqdn),
-time_acl => $our_networks_acl,
+servers => $peer_upstreams[$::fqdn],
+peers => delete($wmf_all_peers, $::fqdn),
+time_acl => $our_networks_acl,
query_acl => $neon_acl,
}
@@ -123,8 +123,8 @@
}
ntp::daemon { 'client':
-servers => $client_upstreams[$::site],
-query_acl => $neon_acl,
+servers => $client_upstreams[$::site],
+query_acl => $neon_acl,
servers_opt => $s_opt,
}
diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index 1d1aa40..278508e 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -7,10 +7,10 @@
file { '/etc/postgresql/9.1/main/tuning.conf':
ensure => 'present',
-owner => 'root',
-group => 'root',
-mode=> '0444',
-source => 'puppet:///files/osm/tuning.conf',
+owner => 'root',
+group => 'root',
+mode => '0444',
+source => 'puppet:///files/osm/tuning.conf',
}
sysctl::parameters { 'postgres_shmem':
@@ -52,8 +52,8 @@
postgresql::spatialdb { 'gis': }
# Import planet.osm
osm::planet_import { 'gis':
-input_pbf_file => '/srv/labsdb/planet-latest-osm.pbf',
-require => Postgresql::Spatialdb['gis']
+input_pbf_file => '/srv/labsdb/planet-latest-osm.pbf',
+require=> Postgresql::Spatialdb['gis']
}
osm::planet_sync { 'gis':
period => 'day',
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 2a72280..3fbaaed 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -53,10 +53,10 @@
}
user { 'parsoid':
-gid => 'parsoid',
-home => '/var/lib/parsoid',
-managehome=> true,
-system=> true,
+gid=> 'parsoid',
+home => '/var/lib/parsoid',
+managehome => true,
+system => true,
}
file { '/var/lib/parsoid/deploy':
@@ -65,11 +65,11 @@
}
file { '/etc/init/parsoid.conf':
-ensure => present,
-owner => root,
-group => root,
-mode=> '0444',
-source => 'puppet:///files/misc/parsoid.upstart',
+ensure => present,
+owner => root,
+group => root,
+mode => '0444',
+source => 'puppet:///files/misc/parsoid.upstart',
}
file { '/var/log/parsoid':
ensure => directory,
@@ -104,12 +104,12 @@
}
cron { 'parsoid-hourly-logrot':
-ensure => present,
-command => '/usr/sbin/logrotate /etc/logrotate.d/parsoid',
-user => 'root',
-hour
[MediaWiki-commits] [Gerrit] Use User::equals() - change (mediawiki...Gather)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200109
Change subject: Use User::equals()
..
Use User::equals()
Change-Id: I7fe3c1c9a7e798d6f063d4c10a1f05444682aacc
---
M includes/specials/SpecialGather.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/09/200109/1
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index ce216c6..f635e41 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -162,7 +162,7 @@
* @return boolean
*/
private function isOwner( User $user ) {
- return $this->getUser()->getName() == $user->getName();
+ return $this->getUser()->equals( $user );
}
// FIXME: Re-evaluate when UI supports editing image of collection.
--
To view, visit https://gerrit.wikimedia.org/r/200109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe3c1c9a7e798d6f063d4c10a1f05444682aacc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't throw a plain \Exception - change (mediawiki...Gather)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200108
Change subject: Don't throw a plain \Exception
..
Don't throw a plain \Exception
Change-Id: I681387914c62d6cfa8048b5681825d4b9c0783cc
---
M includes/specials/SpecialGather.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/08/200108/1
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index 4b8b3dd..ce216c6 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -12,7 +12,7 @@
use \UsageException;
use \DerivativeRequest;
use \ApiMain;
-use \Exception;
+use \InvalidArgumentException;
/**
* Render a collection of articles.
@@ -110,7 +110,7 @@
*/
public function renderUserCollection( User $user, $id ) {
if ( !is_int( $id ) ) {
- throw new Exception( __METHOD__ . ' requires the second
parameter to be an integer, '
+ throw new InvalidArgumentException( __METHOD__ . '
requires the second parameter to be an integer, '
. gettype( $id ) . ' given.' );
}
$collection = models\Collection::newFromApi( $id, $user );
--
To view, visit https://gerrit.wikimedia.org/r/200108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I681387914c62d6cfa8048b5681825d4b9c0783cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make VisualEditor access RESTbase directly on Wikipedias - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/200106 Change subject: Make VisualEditor access RESTbase directly on Wikipedias .. Make VisualEditor access RESTbase directly on Wikipedias Bug: T90374 Change-Id: I81d5509c12fe2049169ec24d5133c24323096e5d --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/06/200106/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index c82cc14..6b80529 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12309,10 +12309,8 @@ // Whether VisualEditor should bypass the MediaWiki layer and contact RESTbase directly for speed 'wmgVisualEditorAccessRESTbaseDirectly' => array( 'default' => false, - 'mediawikiwiki' => true, - 'testwiki' => true, - 'test2wiki' => true, - 'enwiki' => true, + 'group0' => true, + 'wikipedia' => true, ), // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces -- To view, visit https://gerrit.wikimedia.org/r/200106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81d5509c12fe2049169ec24d5133c24323096e5d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make VisualEditor access RESTbase directly on all wikis - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200107
Change subject: Make VisualEditor access RESTbase directly on all wikis
..
Make VisualEditor access RESTbase directly on all wikis
Bug: T90374
Change-Id: I34aee64b217c46b8dd24a36818850e4f09060850
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/07/200107/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 038376e..28d8abe 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2031,9 +2031,7 @@
}
// RESTbase connection configuration
-if ( $wmgVisualEditorAccessRESTbaseDirectly ) {
-$wgVisualEditorRestbaseURL =
"https://rest.wikimedia.org/$wgServerName/v1/page/html/";;
-}
+$wgVisualEditorRestbaseURL =
"https://rest.wikimedia.org/$wgServerName/v1/page/html/";;
// Namespace configuration
if ( !$wmgVisualEditorInContentNamespaces ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 6b80529..61b7de5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12306,13 +12306,6 @@
'svwiktionary' => true, # Per community request
),
-// Whether VisualEditor should bypass the MediaWiki layer and contact RESTbase
directly for speed
-'wmgVisualEditorAccessRESTbaseDirectly' => array(
- 'default' => false,
- 'group0' => true,
- 'wikipedia' => true,
-),
-
// Namespaces for VisualEditor to be active in, as well as wgContentNamespaces
// NS_VISUALEDITOR is added in CommonSettings.php if
wmgUseVisualEditorNamespace is true
'wmgVisualEditorNamespaces' => array(
--
To view, visit https://gerrit.wikimedia.org/r/200107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34aee64b217c46b8dd24a36818850e4f09060850
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make VisualEditor access RESTbase directly on enwiki - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/200105 Change subject: Make VisualEditor access RESTbase directly on enwiki .. Make VisualEditor access RESTbase directly on enwiki Bug: T90374 Change-Id: I544259a4f9ad733bc7e361b68c294b255a47cc01 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/05/200105/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index eade0b7..c82cc14 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12312,6 +12312,7 @@ 'mediawikiwiki' => true, 'testwiki' => true, 'test2wiki' => true, + 'enwiki' => true, ), // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces -- To view, visit https://gerrit.wikimedia.org/r/200105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I544259a4f9ad733bc7e361b68c294b255a47cc01 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update preq dependency - change (mediawiki...deploy)
GWicke has submitted this change and it was merged.
Change subject: Update preq dependency
..
Update preq dependency
Change-Id: I0c0e5519b8ceac71989426810cc9f2647c7849f9
---
M node_modules/istanbul/node_modules/async/package.json
M node_modules/mocha-lcov-reporter/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/preq/index.js
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/preq/package.json
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/package.json
M node_modules/swagger-router/node_modules/bluebird/package.json
M node_modules/swagger-ui/node_modules/shred/package.json
11 files changed, 27 insertions(+), 16 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/node_modules/istanbul/node_modules/async/package.json
b/node_modules/istanbul/node_modules/async/package.json
index 9d15cd7..bdbe740 100644
--- a/node_modules/istanbul/node_modules/async/package.json
+++ b/node_modules/istanbul/node_modules/async/package.json
@@ -41,7 +41,7 @@
"shasum": "ac3613b1da9bed1b47510bb4651b8931e47146c7",
"tarball": "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
},
- "_from": "async@0.9.x",
+ "_from": "async@~0.9.0",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "caolan",
diff --git a/node_modules/mocha-lcov-reporter/package.json
b/node_modules/mocha-lcov-reporter/package.json
index fa47c01..26cfa83 100644
--- a/node_modules/mocha-lcov-reporter/package.json
+++ b/node_modules/mocha-lcov-reporter/package.json
@@ -45,5 +45,9 @@
],
"_shasum": "02670491db57ee6cb1fe7392e813700f6e336a21",
"_from": "mocha-lcov-reporter@0.0.1",
- "_resolved":
"https://registry.npmjs.org/mocha-lcov-reporter/-/mocha-lcov-reporter-0.0.1.tgz";
+ "_resolved":
"https://registry.npmjs.org/mocha-lcov-reporter/-/mocha-lcov-reporter-0.0.1.tgz";,
+ "bugs": {
+"url": "https://github.com/StevenLooman/mocha-lcov-reporter/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/jade/package.json
b/node_modules/mocha/node_modules/jade/package.json
index 14198af..191cb4d 100644
--- a/node_modules/mocha/node_modules/jade/package.json
+++ b/node_modules/mocha/node_modules/jade/package.json
@@ -52,5 +52,9 @@
"directories": {},
"_shasum": "8f10d7977d8d79f2f6ff862a81b0513ccb25686c",
"_from": "jade@0.26.3",
- "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+ "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";,
+ "bugs": {
+"url": "https://github.com/visionmedia/jade/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index a6de8f3..b7fe466 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@~0.5.0",
+ "_from": "mkdirp@0.5.x",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/preq/index.js b/node_modules/preq/index.js
index 0ff933c..a820998 100644
--- a/node_modules/preq/index.js
+++ b/node_modules/preq/index.js
@@ -158,7 +158,8 @@
description: err.toString(),
error: err,
stack: err.stack,
-options: self.options
+uri: self.options.uri,
+method: self.options.method,
},
stack: err.stack
}));
diff --git a/node_modules/preq/node_modules/bluebird/package.json
b/node_modules/preq/node_modules/bluebird/package.json
index bfd096e..90ea2aa 100644
--- a/node_modules/preq/node_modules/bluebird/package.json
+++ b/node_modules/preq/node_modules/bluebird/package.json
@@ -74,7 +74,7 @@
"gitHead": "d5e06c2648b8be3c47cb5b6cb95f2bddf79c4c0a",
"_id": "bluebird@2.9.15",
"_shasum": "80b37137c1dee42efac86486b0afc5f858354ab0",
- "_from": "bluebird@^2.7.1",
+ "_from": "bluebird@^2.3.2",
"_npmVersion": "2.7.0",
"_nodeVersion": "1.5.1",
"_npmUser": {
@@ -92,5 +92,6 @@
"tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.9.15.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.15.tgz";
+ "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.15.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/preq/package.json b/node_modules/preq/package.json
index 995add1..a044a75 100644
--- a/node_modules/preq/package.json
+++ b/node_modules/preq/package.json
@@ -1,6 +1,6 @@
{
"name":
[MediaWiki-commits] [Gerrit] Update preq dependency - change (mediawiki...deploy)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200104
Change subject: Update preq dependency
..
Update preq dependency
Change-Id: I0c0e5519b8ceac71989426810cc9f2647c7849f9
---
M node_modules/istanbul/node_modules/async/package.json
M node_modules/mocha-lcov-reporter/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/preq/index.js
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/preq/package.json
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/package.json
M node_modules/swagger-router/node_modules/bluebird/package.json
M node_modules/swagger-ui/node_modules/shred/package.json
11 files changed, 27 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/04/200104/1
diff --git a/node_modules/istanbul/node_modules/async/package.json
b/node_modules/istanbul/node_modules/async/package.json
index 9d15cd7..bdbe740 100644
--- a/node_modules/istanbul/node_modules/async/package.json
+++ b/node_modules/istanbul/node_modules/async/package.json
@@ -41,7 +41,7 @@
"shasum": "ac3613b1da9bed1b47510bb4651b8931e47146c7",
"tarball": "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
},
- "_from": "async@0.9.x",
+ "_from": "async@~0.9.0",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "caolan",
diff --git a/node_modules/mocha-lcov-reporter/package.json
b/node_modules/mocha-lcov-reporter/package.json
index fa47c01..26cfa83 100644
--- a/node_modules/mocha-lcov-reporter/package.json
+++ b/node_modules/mocha-lcov-reporter/package.json
@@ -45,5 +45,9 @@
],
"_shasum": "02670491db57ee6cb1fe7392e813700f6e336a21",
"_from": "mocha-lcov-reporter@0.0.1",
- "_resolved":
"https://registry.npmjs.org/mocha-lcov-reporter/-/mocha-lcov-reporter-0.0.1.tgz";
+ "_resolved":
"https://registry.npmjs.org/mocha-lcov-reporter/-/mocha-lcov-reporter-0.0.1.tgz";,
+ "bugs": {
+"url": "https://github.com/StevenLooman/mocha-lcov-reporter/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/jade/package.json
b/node_modules/mocha/node_modules/jade/package.json
index 14198af..191cb4d 100644
--- a/node_modules/mocha/node_modules/jade/package.json
+++ b/node_modules/mocha/node_modules/jade/package.json
@@ -52,5 +52,9 @@
"directories": {},
"_shasum": "8f10d7977d8d79f2f6ff862a81b0513ccb25686c",
"_from": "jade@0.26.3",
- "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+ "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";,
+ "bugs": {
+"url": "https://github.com/visionmedia/jade/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index a6de8f3..b7fe466 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@~0.5.0",
+ "_from": "mkdirp@0.5.x",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/preq/index.js b/node_modules/preq/index.js
index 0ff933c..a820998 100644
--- a/node_modules/preq/index.js
+++ b/node_modules/preq/index.js
@@ -158,7 +158,8 @@
description: err.toString(),
error: err,
stack: err.stack,
-options: self.options
+uri: self.options.uri,
+method: self.options.method,
},
stack: err.stack
}));
diff --git a/node_modules/preq/node_modules/bluebird/package.json
b/node_modules/preq/node_modules/bluebird/package.json
index bfd096e..90ea2aa 100644
--- a/node_modules/preq/node_modules/bluebird/package.json
+++ b/node_modules/preq/node_modules/bluebird/package.json
@@ -74,7 +74,7 @@
"gitHead": "d5e06c2648b8be3c47cb5b6cb95f2bddf79c4c0a",
"_id": "bluebird@2.9.15",
"_shasum": "80b37137c1dee42efac86486b0afc5f858354ab0",
- "_from": "bluebird@^2.7.1",
+ "_from": "bluebird@^2.3.2",
"_npmVersion": "2.7.0",
"_nodeVersion": "1.5.1",
"_npmUser": {
@@ -92,5 +92,6 @@
"tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.9.15.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.15.tgz";
+ "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.15.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/preq/package.json b/node_modules/preq/package.json
index 995add1..a044a75 100644
--- a/node_modules/preq/
[MediaWiki-commits] [Gerrit] wikimetrics: lint - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200103
Change subject: wikimetrics: lint
..
wikimetrics: lint
3 x double quoted string containing no variables
4 x indentation of => is not properly aligned
1 x ensure found on line but it's not the first attribute
puppet-lint 1.1.0
Change-Id: I60588381ef15d22d25a90d2f75e8e1fa5c1680c5
---
M manifests/role/wikimetrics.pp
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/200103/1
diff --git a/manifests/role/wikimetrics.pp b/manifests/role/wikimetrics.pp
index 88c6ea4..ff16971 100644
--- a/manifests/role/wikimetrics.pp
+++ b/manifests/role/wikimetrics.pp
@@ -168,11 +168,11 @@
# Setup mysql, put data in /srv
class { 'mysql::server':
-config_hash => {
+config_hash => {
'datadir' => '/srv/mysql'
},
-before => Class['::wikimetrics::database'],
-require => Labs_lvm::Volume['second-local-disk']
+before => Class['::wikimetrics::database'],
+require => Labs_lvm::Volume['second-local-disk']
}
class { '::wikimetrics':
@@ -234,7 +234,7 @@
var_directory=> $var_directory,
public_subdirectory => $public_subdirectory,
-require => Labs_lvm::Volume['second-local-disk'],
+require => Labs_lvm::Volume['second-local-disk'],
}
# Run the wikimetrics/scripts/install script
@@ -270,7 +270,7 @@
class { '::redis':
dir => $redis_dir,
dbfilename => $redis_dbfilename,
-saves => [ "900 1", "300 10", "60 20" ],
+saves => [ '900 1', '300 10', '60 20' ],
stop_writes_on_bgsave_error => true,
}
@@ -299,6 +299,7 @@
$backup_ensure = 'absent'
}
class { '::wikimetrics::backup':
+ensure=> $backup_ensure,
destination => "/data/project/wikimetrics/backup/${::hostname}",
db_user => $db_user_wikimetrics,
db_pass => $db_pass_wikimetrics,
@@ -307,7 +308,6 @@
redis_db_file => "${redis_dir}/${redis_dbfilename}",
public_files => $public_directory,
keep_days => 10,
-ensure=> $backup_ensure,
}
# Link aggregated projectcounts files to public directory
--
To view, visit https://gerrit.wikimedia.org/r/200103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60588381ef15d22d25a90d2f75e8e1fa5c1680c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use standard box-sixing for mw-ui-input as well - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200102
Change subject: Use standard box-sixing for mw-ui-input as well
..
Use standard box-sixing for mw-ui-input as well
Change-Id: I11016f5c242f16af34b61fe393b1aa8d9637423e
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/02/200102/1
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 73b5ccb..392b504 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -9,9 +9,10 @@
.box-sizing(content-box);
}
- // VE and OOjs UI do use other models in some cases, so we
+ // Core, VE and OOjs UI do use other models in some cases, so we
// have to re-override them again as needed.
- .oo-ui-textInputWidget input {
+ .oo-ui-textInputWidget input,
+ .mw-ui-input {
.box-sizing(border-box);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11016f5c242f16af34b61fe393b1aa8d9637423e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'kn' and 'uk' languages - change (analytics/limn-language-data)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200101
Change subject: Add 'kn' and 'uk' languages
..
Add 'kn' and 'uk' languages
Change-Id: I9668cf68727dcb195ad39e27e43d85214abd39e3
---
M language/content_translation_beta.sql
M language/content_translation_beta_manual.sql
M reportgenerator/config/config.json
3 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-language-data
refs/changes/01/200101/1
diff --git a/language/content_translation_beta.sql
b/language/content_translation_beta.sql
index 311b5a7..2d8b270 100644
--- a/language/content_translation_beta.sql
+++ b/language/content_translation_beta.sql
@@ -12,7 +12,9 @@
minwiki,
uzwiki,
kywiki,
- pawiki
+ pawiki,
+ knwiki,
+ ukwiki
from
( select count(*) as cawiki from cawiki.user_properties where up_property =
'cx' and up_value = 1 ) ca
left join
@@ -41,4 +43,8 @@
( select count(*) as kywiki from kywiki.user_properties where up_property =
'cx' and up_value = 1 ) ky on 1=1
left join
( select count(*) as pawiki from pawiki.user_properties where up_property =
'cx' and up_value = 1 ) pa on 1=1
+left join
+( select count(*) as knwiki from knwiki.user_properties where up_property =
'cx' and up_value = 1 ) kn on 1=1
+left join
+( select count(*) as ukwiki from ukwiki.user_properties where up_property =
'cx' and up_value = 1 ) uk on 1=1
;
diff --git a/language/content_translation_beta_manual.sql
b/language/content_translation_beta_manual.sql
index 0e34aa1..98f0d75 100644
--- a/language/content_translation_beta_manual.sql
+++ b/language/content_translation_beta_manual.sql
@@ -12,7 +12,9 @@
minwiki,
uzwiki,
kywiki,
- pawiki
+ pawiki,
+ knwiki,
+ ukwiki
from
( select count(*) as cawiki from cawiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
cawiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) ca
left join
@@ -41,4 +43,8 @@
( select count(*) as kywiki from kywiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
kywiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) ky on 1=1
left join
( select count(*) as pawiki from pawiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
pawiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) pa on 1=1
+left join
+( select count(*) as knwiki from knwiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
knwiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) kn on 1=1
+left join
+( select count(*) as ukwiki from ukwiki.user_properties where up_property =
'cx' and up_value = 1 and up_user not in ( select up_user from
ukwiki.user_properties where up_property = 'betafeatures-auto-enroll' and
up_value = 1 ) ) uk on 1=1
;
diff --git a/reportgenerator/config/config.json
b/reportgenerator/config/config.json
index a915929..c0c6de3 100644
--- a/reportgenerator/config/config.json
+++ b/reportgenerator/config/config.json
@@ -1,3 +1,3 @@
{
- "languages": [ "ca", "da", "eo", "es", "id", "ky", "ms", "nn", "no",
"pa", "pt", "sv", "min", "uz" ]
+ "languages": [ "ca", "da", "eo", "es", "id", "ky", "ms", "nn", "no",
"pa", "pt", "sv", "min", "uz", "kn", "uk" ]
}
--
To view, visit https://gerrit.wikimedia.org/r/200101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9668cf68727dcb195ad39e27e43d85214abd39e3
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-language-data
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Live index update - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200100
Change subject: Live index update
..
Live index update
* use onPageContentSaveComplete hook
* still quite prototypical
Change-Id: Iff6e07e2276f32c11f4b828e55ba9e27bd33aa5d
---
M MathSearch.hooks.php
M MathSearch.php
A includes/MwsDumpWriter.php
M includes/engines/MathEngineBaseX.php
M includes/engines/MathEngineRest.php
M maintenance/CreateMWSHarvest.php
M maintenance/UpdateMath.php
A tests/MwsDumpWriterTest.php
8 files changed, 464 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/00/200100/1
diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index de78e6d..83ae417 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -1,11 +1,11 @@
getDB()->getType();
- if ( $type == "mysql" ) {
- $dir = __DIR__ . '/db/' ;
+ $type = $updater->getDB()->getType();
+ if ( $type == "mysql" ) {
+ $dir = __DIR__ . '/db/';
$updater->addExtensionTable( 'mathindex', $dir .
'mathindex.sql' );
- $updater->addExtensionTable( 'mathobservation', $dir .
'mathobservation.sql' );
+ $updater->addExtensionTable( 'mathobservation', $dir .
'mathobservation.sql' );
$updater->addExtensionTable( 'mathvarstat', $dir .
'mathvarstat.sql' );
$updater->addExtensionTable( 'mathrevisionstat', $dir .
'mathrevisionstat.sql' );
$updater->addExtensionTable( 'mathsemantics', $dir .
'mathsemantics.sql' );
$updater->addExtensionTable( 'mathperformance', $dir .
'mathperformance.sql' );
$updater->addExtensionTable( 'mathidentifier', $dir .
'mathidentifier.sql' );
- if ( $wgMathWmcServer ){
+ if ( $wgMathWmcServer ) {
$wmcDir = $dir . 'wmc/persistent/';
- $updater->addExtensionTable( 'math_wmc_ref',
$wmcDir . "math_wmc_ref.sql");
- $updater->addExtensionTable( 'math_wmc_runs',
$wmcDir . "math_wmc_runs.sql");
- $updater->addExtensionTable(
'math_wmc_results', $wmcDir . "math_wmc_results.sql");
- $updater->addExtensionTable(
'math_wmc_assessed_formula', $wmcDir . "math_wmc_assessed_formula.sql");
- $updater->addExtensionTable(
'math_wmc_assessed_revision', $wmcDir . "math_wmc_assessed_revision.sql");
+ $updater->addExtensionTable( 'math_wmc_ref',
$wmcDir . "math_wmc_ref.sql" );
+ $updater->addExtensionTable( 'math_wmc_runs',
$wmcDir . "math_wmc_runs.sql" );
+ $updater->addExtensionTable(
'math_wmc_results', $wmcDir . "math_wmc_results.sql" );
+ $updater->addExtensionTable(
'math_wmc_assessed_formula',
+ $wmcDir .
"math_wmc_assessed_formula.sql" );
+ $updater->addExtensionTable(
'math_wmc_assessed_revision',
+ $wmcDir .
"math_wmc_assessed_revision.sql" );
}
- } elseif ( $type == 'sqlite' ){
+ } elseif ( $type == 'sqlite' ) {
// Don't scare Jenkins with an exception.
} else {
- throw new Exception( "Math extension does not currently
support $type database." );
- }
+ throw new Exception( "Math extension does not currently
support $type database." );
+ }
return true;
}
@@ -65,8 +67,8 @@
* Checks if the db2 php client is installed
* @return boolean
*/
- public static function isDB2Supported(){
- if ( function_exists('db2_connect') ){
+ public static function isDB2Supported() {
+ if ( function_exists( 'db2_connect' ) ) {
return true;
} else {
return false;
@@ -81,7 +83,7 @@
* @param string $inputHash hash of tex string (used as database entry)
* @param string $tex the user input hash
*/
- private static function updateIndex($revId, $eid, $inputHash, $tex){
+ private static function updateIndex( $revId, $eid, $inputHash, $tex ) {
try {
$dbr = wfGetDB( DB_SLAVE );
$exists = $dbr->selectRow( 'mathindex',
@@ -89,15 +91,17 @@
array(
'mathindex_revision_id' => $revId,
[MediaWiki-commits] [Gerrit] Temporary disable foreign keys for mathindex table - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Temporary disable foreign keys for mathindex table .. Temporary disable foreign keys for mathindex table Bug: T94134 Change-Id: Ic0fbfa14ee655da82181173642206c33458b0655 --- M db/mathindex.sql 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Physikerwelt: Looks good to me, approved jenkins-bot: Verified diff --git a/db/mathindex.sql b/db/mathindex.sql index 42cea75..49d0601 100644 --- a/db/mathindex.sql +++ b/db/mathindex.sql @@ -20,7 +20,7 @@ mathindex_timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (mathindex_revision_id,mathindex_anchor), - FOREIGN KEY ( /*i*/mathindex_inputhash ) REFERENCES mathlatexml( math_inputhash ), + -- FOREIGN KEY ( /*i*/mathindex_inputhash ) REFERENCES mathlatexml( math_inputhash ), FOREIGN KEY ( /*i*/mathindex_revision_id ) REFERENCES revision( rev_id ) ) /*$wgDBTableOptions*/; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/200099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0fbfa14ee655da82181173642206c33458b0655 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MathSearch Gerrit-Branch: master Gerrit-Owner: Physikerwelt Gerrit-Reviewer: Hcohl Gerrit-Reviewer: Physikerwelt Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding $message of caught WikitextException object to displa... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Adding $message of caught WikitextException object to displayed
error
..
Adding $message of caught WikitextException object to displayed error
This commit pulls the $message field of a caught WikitextException object
and forwards it via the dieUsage method call. The message is passed as the
"detail" entry of the error object, meaning it will not be displayed to
the user.
Bug: T69000
Change-Id: I87cb484896ed1ac5369bf8c11b315d5f53ac3e8a
---
M includes/api/ApiParsoidUtilsFlow.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiParsoidUtilsFlow.php
b/includes/api/ApiParsoidUtilsFlow.php
index 695adfa..0d13d8e 100644
--- a/includes/api/ApiParsoidUtilsFlow.php
+++ b/includes/api/ApiParsoidUtilsFlow.php
@@ -15,7 +15,8 @@
$content = Utils::convert( $params['from'],
$params['to'], $params['content'], $page->getTitle() );
} catch ( WikitextException $e ) {
$code = $e->getErrorCode();
- $this->dieUsage( $this->msg( $code
)->inContentLanguage()->useDatabase( false )->plain(), $code );
+ $this->dieUsage( $this->msg( $code
)->inContentLanguage()->useDatabase( false )->plain(), $code,
+ $e->getStatusCode(), array( 'detail' =>
$e->getMessage() ) );
return; // helps static analysis know execution does
not continue past self::dieUsage
}
--
To view, visit https://gerrit.wikimedia.org/r/199816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87cb484896ed1ac5369bf8c11b315d5f53ac3e8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Happy5214
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/200099 Change subject: test .. test Change-Id: Ic0fbfa14ee655da82181173642206c33458b0655 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch refs/changes/99/200099/1 -- To view, visit https://gerrit.wikimedia.org/r/200099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0fbfa14ee655da82181173642206c33458b0655 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MathSearch Gerrit-Branch: master Gerrit-Owner: Physikerwelt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use addModuleStyles for mediawiki.skinning.content.parsoid - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Use addModuleStyles for mediawiki.skinning.content.parsoid
..
Use addModuleStyles for mediawiki.skinning.content.parsoid
Bug: T93723
Change-Id: Ica0ef4987c0de1b84105188d46ba38679a5641fa
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index edc80ba..3c99b76 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -237,7 +237,7 @@
self::parsoidConfig();
// XXX We only need the Parsoid CSS if some content
being
// rendered has getContentFormat() === 'html'.
- $out->addModules( 'mediawiki.skinning.content.parsoid'
);
+ $out->addModuleStyles(
'mediawiki.skinning.content.parsoid' );
} catch ( NoParsoidException $e ) {
// The module is only necessary when we are using
parsoid.
}
--
To view, visit https://gerrit.wikimedia.org/r/199753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica0ef4987c0de1b84105188d46ba38679a5641fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Make VisualEditor access RESTbase directly - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/200098 Change subject: [WIP] Make VisualEditor access RESTbase directly .. [WIP] Make VisualEditor access RESTbase directly Bug: T90374 Change-Id: I74a63bc028fdf098dad69437532adfb48bc533ed --- M wmf-config/InitialiseSettings.php 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/200098/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 61b7de5..cf130ea 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12306,6 +12306,17 @@ 'svwiktionary' => true, # Per community request ), +// OMG the hack; this really should be wmgVisualEditorAccessRESTbaseDirectly or whatever +'wgVisualEditorRestbaseURL' => array( + 'default' => '', + 'dewiki' => 'https://rest.wikimedia.org/de.wikipedia.org/v1/page/html/', + 'enwiki' => 'https://rest.wikimedia.org/en.wikipedia.org/v1/page/html/', + 'eswiki' => 'https://rest.wikimedia.org/es.wikipedia.org/v1/page/html/', + 'frwiki' => 'https://rest.wikimedia.org/fr.wikipedia.org/v1/page/html/', + 'itwiki' => 'https://rest.wikimedia.org/it.wikipedia.org/v1/page/html/', + 'ptwiki' => 'https://rest.wikimedia.org/pt.wikipedia.org/v1/page/html/', +), + // Namespaces for VisualEditor to be active in, as well as wgContentNamespaces // NS_VISUALEDITOR is added in CommonSettings.php if wmgUseVisualEditorNamespace is true 'wmgVisualEditorNamespaces' => array( -- To view, visit https://gerrit.wikimedia.org/r/200098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74a63bc028fdf098dad69437532adfb48bc533ed Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add text filters - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200097
Change subject: Add text filters
..
Add text filters
With 'Exactly', 'Contains', 'Starts with' and 'Ends with'
Change-Id: If2424596ce43afce1f1a40e843d9d54bb16673c2
---
M src/app/startup.js
M src/components/filters/filters.js
A src/components/filters/text-filter/text-filter.html
A src/components/filters/text-filter/text-filter.js
4 files changed, 68 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/97/200097/1
diff --git a/src/app/startup.js b/src/app/startup.js
index 8e90dc0..a7665ea 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -21,6 +21,7 @@
//register filters
ko.components.register( 'filters',{ require:
'components/filters/filters' });
ko.components.register( 'dropdown-filter',{ require:
'components/filters/dropdown-filter/dropdown-filter' });
+ko.components.register( 'text-filter', {
require: 'components/filters/text-filter/text-filter' });
//register individual widgets
ko.components.register( 'fraud-gauge',{ require:
'components/widgets/fraud-gauge/fraud-gauge' });
diff --git a/src/components/filters/filters.js
b/src/components/filters/filters.js
index 6836419..c359c51 100644
--- a/src/components/filters/filters.js
+++ b/src/components/filters/filters.js
@@ -37,11 +37,16 @@
metadata: filterMeta,
queryString: ko.observable('')
};
- if ( filterMeta.type === 'dropdown' ) {
- filter.userChoices =
ko.observableArray( params.userChoices()[name] || [] );
- } else {
- return;//temporarily only doing
dropdown filters
- //filter.userChoices = ko.observable(
params.userChoices()[name] );
+ switch( filterMeta.type ) {
+ case 'dropdown':
+ filter.userChoices =
ko.observableArray( params.userChoices()[name] || [] );
+ break;
+ case 'text':
+ filter.userChoices =
ko.observable( params.userChoices()[name] || {} );
+ break;
+ default:
+ //not yet supported filter type
+ return;
}
filter.queryString.subscribe( self.setChoices );
self.filters.push( filter );
diff --git a/src/components/filters/text-filter/text-filter.html
b/src/components/filters/text-filter/text-filter.html
new file mode 100644
index 000..1821328
--- /dev/null
+++ b/src/components/filters/text-filter/text-filter.html
@@ -0,0 +1,2 @@
+
+
diff --git a/src/components/filters/text-filter/text-filter.js
b/src/components/filters/text-filter/text-filter.js
new file mode 100644
index 000..f194fdf
--- /dev/null
+++ b/src/components/filters/text-filter/text-filter.js
@@ -0,0 +1,55 @@
+define( [
+ 'knockout',
+ 'text!components/filters/text-filter/text-filter.html'
+ ],
+function( ko, template ){
+
+ function TextFilterViewModel( params ){
+ var self = this;
+
+ this.operators = [
+ {
+ value: 'eq',
+ text: 'Exactly'
+ },
+ {
+ value: 'fn|startswith',
+ text: 'Starts with'
+ },
+ {
+ value: 'fn|endswith',
+ text: 'Ends with'
+ },
+ {
+ value: 'fn|substringof',
+ text: 'Contains'
+ }
+ ];
+ this.selectedOperator = ko.observable(
params.userChoices().operator || 'eq' );
+ this.value = ko.observable( params.userChoices().value || '' );
+
+ this.changed = function() {
+ params.userChoices( {
+ operator: self.selectedOperator(),
+ value: self.value()
+ } );
+
+ if ( self.value() === '' ) {
+ params.queryString( '' );
+
[MediaWiki-commits] [Gerrit] TODO Less special-casing in DataValidator - change (mediawiki...DonationInterface)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200096
Change subject: TODO Less special-casing in DataValidator
..
TODO Less special-casing in DataValidator
Change-Id: I2049be40bf41c3db048a0225ac711aefd5ed585e
---
M gateway_common/DataValidator.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/96/200096/1
diff --git a/gateway_common/DataValidator.php b/gateway_common/DataValidator.php
index 111b3ae..52ae1ea 100644
--- a/gateway_common/DataValidator.php
+++ b/gateway_common/DataValidator.php
@@ -347,6 +347,7 @@
}
$result = null;
// Handle special cases.
+ // TODO: Pass $gateway and $results,
eliminating special cases?
switch ( $validation_function ) {
case 'validate_amount':
if (
self::checkValidationPassed( array( 'currency_code', 'gateway' ), $results ) ){
--
To view, visit https://gerrit.wikimedia.org/r/200096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2049be40bf41c3db048a0225ac711aefd5ed585e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove chunk callback from serializeDOM - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200095
Change subject: Remove chunk callback from serializeDOM
..
Remove chunk callback from serializeDOM
* We only ever return one large chunk (accumulation happens internally)
and this process is sync. Just pass it all in the final callback.
Change-Id: I0122f1e015f35badb4598a74b39ebc6a7d8ef377
---
M api/routes.js
M lib/mediawiki.SelectiveSerializer.js
M lib/mediawiki.WikitextSerializer.js
M tests/mocha/parse.js
M tests/parserTests.js
5 files changed, 30 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/95/200095/1
diff --git a/api/routes.js b/api/routes.js
index 97b18ee..3ff6e73 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -124,8 +124,6 @@
};
var roundTripDiff = function( env, req, res, selser, doc ) {
- var out = [];
-
// Re-parse the HTML to uncover foster-parenting issues
doc = domino.createDocument( doc.outerHTML );
@@ -133,17 +131,14 @@
serializer = new Serializer({ env: env });
return Promise.promisify( serializer.serializeDOM, false, serializer )(
- doc.body, function( chunk ) { out.push(chunk); }, false
- ).then(function() {
- var i;
- out = out.join('');
-
+ doc.body, false
+ ).then(function( out ) {
// Strip selser trigger comment
out = out.replace(/\n*$/, '');
// Emit base href so all relative urls resolve properly
var hNodes = doc.body.firstChild.childNodes;
- var headNodes = "";
+ var i, headNodes = "";
for (i = 0; i < hNodes.length; i++) {
if (hNodes[i].nodeName.toLowerCase() === 'base') {
headNodes += DU.serializeNode(hNodes[i]);
@@ -270,7 +265,6 @@
env.conf.parsoid.allowCORS );
}
- var out = [];
var p = new Promise(function( resolve, reject ) {
if ( v2 && v2.original && v2.original.wikitext ) {
env.setPageSrcInfo( v2.original.wikitext.body );
@@ -323,11 +317,10 @@
}
}
return Promise.promisify( serializer.serializeDOM, false,
serializer )(
- doc.body, function( chunk ) { out.push( chunk ); },
false
+ doc.body, false
);
- }).timeout( REQ_TIMEOUT ).then(function() {
- var output = out.join(''),
- contentType =
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0;charset=utf-8';
+ }).timeout( REQ_TIMEOUT ).then(function( output ) {
+ var contentType =
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0;charset=utf-8';
if ( v2 ) {
apiUtils.jsonResponse(res, env, {
wikitext: {
diff --git a/lib/mediawiki.SelectiveSerializer.js
b/lib/mediawiki.SelectiveSerializer.js
index 788a8bf..e525854 100644
--- a/lib/mediawiki.SelectiveSerializer.js
+++ b/lib/mediawiki.SelectiveSerializer.js
@@ -50,11 +50,9 @@
*
* @param {Error} err
* @param {Node} body
- * @param {Function} cb Callback that is called for each chunk.
- * @param {string} cb.res The wikitext of the chunk we've just serialized.
* @param {Function} finalcb The callback for when we've finished serializing
the DOM.
*/
-SSP.doSerializeDOM = function( err, body, cb, finalcb ) {
+SSP.doSerializeDOM = function( err, body, finalcb ) {
var self = this;
var startTimers = new Map();
@@ -64,7 +62,7 @@
}
// If there's no old source, fall back to non-selective
serialization.
- this.wts.serializeDOM( body, cb, false, finalcb );
+ this.wts.serializeDOM( body, false, finalcb );
if ( this.timer ) {
this.timer.timing( 'html2wt.full.serialize', '', (
Date.now() - startTimers.get( 'html2wt.full.serialize' )) );
@@ -97,7 +95,7 @@
}
// Call the WikitextSerializer to do our bidding
- this.wts.serializeDOM( body, cb, true, finalcb );
+ this.wts.serializeDOM( body, true, finalcb );
if ( this.timer ) {
this.timer.timing( 'html2wt.selser.serialize',
'', ( Date.now() - startTimers.get( 'html2wt.selser.serialize' )) );
@@ -105,8 +103,7 @@
} else {
// Nothing was modified, just re-use the original source
- cb( this.env.page.src );
- finalcb();
+ finalcb( null, this.env.page.src );
}
}
}
[MediaWiki-commits] [Gerrit] WIP Kill pre-PCI credit card cruft? - change (mediawiki...DonationInterface)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/200094 Change subject: WIP Kill pre-PCI credit card cruft? .. WIP Kill pre-PCI credit card cruft? Change-Id: I98c8d4054ba88eaee7f6f5c1a074c3a739bb1062 --- M DonationInterface.php M adyen_gateway/forms/html/adyen.html M gateway_common/DataValidator.php M gateway_common/DonationData.php M gateway_common/donation.api.php M gateway_common/gateway.adapter.php M gateway_common/i18n/interface/en.json M gateway_common/i18n/interface/qqq.json M gateway_forms/RapidHtml.php A globalcollect_gateway/forms/html/boletos/boletos.html M globalcollect_gateway/forms/html/bt/bt.html M globalcollect_gateway/forms/html/cc/cc-a.html M globalcollect_gateway/forms/html/cc/cc-vm.html M globalcollect_gateway/forms/html/cc/cc-vma.html M globalcollect_gateway/forms/html/cc/cc-vmad.html M globalcollect_gateway/forms/html/cc/cc-vmaj.html M globalcollect_gateway/forms/html/cc/cc-vmd.html M globalcollect_gateway/forms/html/cc/cc-vmj.html M globalcollect_gateway/forms/html/cc/cc.html A globalcollect_gateway/forms/html/dd/dd-DE.html A globalcollect_gateway/forms/html/dd/dd-IT.html A globalcollect_gateway/forms/html/dd/dd-NL.html M globalcollect_gateway/forms/html/ew/ew-alipay.html M globalcollect_gateway/forms/html/ew/ew-webmoney.html M globalcollect_gateway/forms/html/ew/ew-yandex.html M globalcollect_gateway/forms/html/obt/obt-bpay.html M globalcollect_gateway/forms/html/rcc/rcc-vm.html M globalcollect_gateway/forms/html/rcc/rcc-vma.html M globalcollect_gateway/forms/html/rcc/rcc-vmad.html M globalcollect_gateway/forms/html/rcc/rcc-vmaj.html M globalcollect_gateway/forms/html/rcc/rcc-vmd.html M globalcollect_gateway/forms/html/rcc/rcc-vmj.html M globalcollect_gateway/forms/html/rcc/rcc.html M globalcollect_gateway/forms/html/rtbt/rtbt-enets.html M globalcollect_gateway/forms/html/rtbt/rtbt-eps.html M globalcollect_gateway/forms/html/rtbt/rtbt-ideal-noadd.html M globalcollect_gateway/forms/html/rtbt/rtbt-ideal.html M globalcollect_gateway/forms/html/rtbt/rtbt-sofo-GB.html M globalcollect_gateway/forms/html/rtbt/rtbt-sofo.html M globalcollect_gateway/forms/html/webitects2nd-AU.html M globalcollect_gateway/forms/html/webitects2nd-US.html M globalcollect_gateway/forms/html/webitects2nd-amex.html M globalcollect_gateway/forms/html/webitects2nd.html M globalcollect_gateway/forms/html/webitects2nd_green-US.html M globalcollect_gateway/forms/html/webitects_2_3step-CA.html M globalcollect_gateway/forms/html/webitects_2_3step.html M globalcollect_gateway/forms/html/webitects_2_3stepB-US.html M globalcollect_gateway/forms/js/gc.js M globalcollect_gateway/forms/js/webitects.js M globalcollect_gateway/globalcollect.adapter.php M tests/Adapter/GlobalCollect/GlobalCollectTest.php M tests/DonationDataTest.php M worldpay_gateway/forms/html/worldpay-dd-test.html M worldpay_gateway/forms/html/worldpay-test.html M worldpay_gateway/forms/html/worldpay.html 55 files changed, 606 insertions(+), 205 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/94/200094/1 diff --git a/DonationInterface.php b/DonationInterface.php index d0d2e64..aba5349 100644 --- a/DonationInterface.php +++ b/DonationInterface.php @@ -936,10 +936,6 @@ 'donate_interface-error-msg-zip', 'donate_interface-error-msg-postal', 'donate_interface-error-msg-country', - 'donate_interface-error-msg-card_type', - 'donate_interface-error-msg-card_num', - 'donate_interface-error-msg-expiration', - 'donate_interface-error-msg-cvv', 'donate_interface-error-msg-fiscal_number', 'donate_interface-error-msg-captcha', 'donate_interface-error-msg-captcha-please', diff --git a/adyen_gateway/forms/html/adyen.html b/adyen_gateway/forms/html/adyen.html index e83d213..f35daf2 100644 --- a/adyen_gateway/forms/html/adyen.html +++ b/adyen_gateway/forms/html/adyen.html @@ -3,7 +3,6 @@ // these must go through RapidHTML and thus are inline var amountErrors = ['#general|escape','#retryMsg|escape','#amount|escape']; var billingErrors = ['#fname|escape','#lname|escape','#city|escape','#country|escape','#street|escape','#state|escape','#zip|escape','#emailAdd|escape']; - var paymentErrors = ['#card_num|escape','#card_type|escape','#cvv|escape']; var actionURL = "@action"; var scriptPath = "@script_path"; diff --git a/gateway_common/DataValidator.php b/gateway_common/DataValidator.php index d70b51c..111b3ae 100644 --- a/gateway_common/DataValidator.php +++ b/gateway_common/DataValidator.php @@ -32,9 +32,6 @@ break; case 'amount' : case 'currency_code' : - case 'card_num': - case 'card_type': -
[MediaWiki-commits] [Gerrit] cassandra: firewall hole for port 9042 - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200093
Change subject: cassandra: firewall hole for port 9042
..
cassandra: firewall hole for port 9042
open port 9042/tcp, cassandra's "CQL native transport port"
for connections from all our internal networks for cassandra test hosts
Change-Id: I9a75bc08052e822d4eb0cb79ad25e19b4bc71147
---
M manifests/role/cassandra.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/200093/1
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 758c504..994a9e4 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -15,4 +15,11 @@
description => 'Cassandra database',
nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -u
cassandra -C java -a CassandraDaemon',
}
+
+ferm::service { 'cassandra-cql-native-transport':
+proto => 'tcp',
+port => '9042',
+srange => '$ALL_NETWORKS',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/200093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a75bc08052e822d4eb0cb79ad25e19b4bc71147
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing isBlocked() on ApiEditList - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixing isBlocked() on ApiEditList
..
Fixing isBlocked() on ApiEditList
* There is a special function to test all
permission, use it, don't put such checks
all over the code.
* Establishing a connection to a very busy
master server only to bail out due to permission
issue seems extremely inefficient.
Fixing Change-Id: I4062be5cd307eca41e49fda4c4d7672510f2e94b
Bug: T94105
Change-Id: Id256f214708f78a9d9b268b07f4246719e0e3925
---
M includes/api/ApiEditList.php
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiEditList.php b/includes/api/ApiEditList.php
index 0f7f17b..bff2e16 100644
--- a/includes/api/ApiEditList.php
+++ b/includes/api/ApiEditList.php
@@ -75,9 +75,6 @@
$isWatchlist = $listId === 0;
$dbw = wfGetDB( DB_MASTER, 'api' );
- if ( $user->isBlocked() ) {
- $this->dieUsage( 'You are blocked from editing your
collection', 'blockeduser' );
- }
if ( $isNew || $isWatchlist ) {
// ACTION: create a new list
@@ -172,6 +169,8 @@
$this->dieUsage( 'You must be logged-in to edit a
list', 'notloggedin' );
} elseif ( !$user->isAllowed( 'editmywatchlist' ) ) {
$this->dieUsage( 'You don\'t have permission to edit
your list', 'permissiondenied' );
+ } elseif ( $user->isBlocked() ) {
+ $this->dieUsage( 'You are blocked from editing your
list', 'blocked' );
} elseif ( $label === '' ) {
$this->dieUsage( 'If given, label must not be empty',
'badlabel' );
}
--
To view, visit https://gerrit.wikimedia.org/r/200087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id256f214708f78a9d9b268b07f4246719e0e3925
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Yurik
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add node.extend - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200091
Change subject: Add node.extend
..
Add node.extend
Change-Id: Iedd3aebd549dca32c2c0fa1d6a6d2191ecab567a
---
M node_modules
M package.json
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/91/200091/1
diff --git a/node_modules b/node_modules
index 7014792..6201794 16
--- a/node_modules
+++ b/node_modules
-Subproject commit 7014792e7f66eaf13082d5b2794e646d64239aec
+Subproject commit 62017942f078dae716363b65dd0a5ec52fa48a71
diff --git a/package.json b/package.json
index 3987a01..2b4e953 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
"odata-parser": "~1.0.0",
"passport": "^0.2.1",
"passport-drupal": "0.3.3",
-"passport-oauth": "^1.0.0"
+"passport-oauth": "^1.0.0",
+"node.extend": "1.1.3"
},
"devDependencies": {
"chalk": "^0.5.1",
--
To view, visit https://gerrit.wikimedia.org/r/200091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedd3aebd549dca32c2c0fa1d6a6d2191ecab567a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define common filters in one file - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200092
Change subject: Define common filters in one file
..
Define common filters in one file
Less duplication, easier to add all the filters to all the widgets.
Change-Id: I7bc14b8ba486d23a10c4014060c1a00c23c77105
---
M widgets/big-english.js
A widgets/common-filters.js
M widgets/fraud-gauge.js
M widgets/x-by-y.js
4 files changed, 290 insertions(+), 256 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/92/200092/1
diff --git a/widgets/big-english.js b/widgets/big-english.js
index 22d84f0..10d9ae9 100644
--- a/widgets/big-english.js
+++ b/widgets/big-english.js
@@ -1,34 +1,12 @@
-var config = require( '../config.js' );
+var commonFilters = require( './common-filters.js' ),
+ config = require( '../config.js' );
module.exports = {
name: 'big-english',
query: 'select count(*) as donations, sum(total_amount) as usd_total,\n
IF( day(receive_date) = day(utc_timestamp()) and hour(receive_date) =
hour(utc_timestamp()), CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date),
MAX(receive_date))/60), 60) as minutes, sum(total_amount)/IF( day(receive_date)
= day(utc_timestamp()) and hour(receive_date) = hour(utc_timestamp()),
CEILING(TIMESTAMPDIFF(SECOND, MIN(receive_date), MAX(receive_date))/60), 60)/60
as usd_per_second, DAY(receive_date) as day, HOUR(receive_date) as hour from '
+ config.civicrmDb + '.civicrm_contribution cc [[WHERE]] GROUP BY
DAY(receive_date), HOUR(receive_date) ORDER BY day ASC, hour ASC;',
mainTableAlias: 'cc',
optionalJoins: {},
- filters: {
- Year: {
- table: 'cc',
- func: 'YEAR',
- column: 'receive_date',
- display: 'Year',
- type: 'number'
- },
- Month: {
- table: 'cc',
- func: 'MONTH',
- column: 'receive_date',
- display: 'Month',
- type: 'number'
- },
- Amount: {
- table: 'cc',
- column : 'total_amount',
- display : 'Amount',
- type : 'number',
- min : 0,
- max : 1
- }
- },
+ filters: commonFilters.civicrmContribution,
defaultFilter: {
type: 'and',
left: {
diff --git a/widgets/common-filters.js b/widgets/common-filters.js
new file mode 100644
index 000..1ca2ef9
--- /dev/null
+++ b/widgets/common-filters.js
@@ -0,0 +1,267 @@
+/*
+ * Use these to extend() your widget's filters. Note that some filters are
+ * defined for multiple tables. Extend with the filter set of your primary
+ * table last to make sure you get the correct version.
+ */
+
+module.exports = {
+ civicrmContribution: {
+ DT: {
+ table: 'cc',
+ column : 'receive_date',
+ display: 'Date',
+ type: 'datetime',
+ //TODO: dynamic min/max
+ min: '2005-01-01',
+ max: '2099-12-31'
+ },
+ Year: {
+ table: 'cc',
+ func: 'YEAR',
+ column: 'receive_date',
+ display: 'Year',
+ type: 'number',
+ canGroup: true
+ },
+ Month: {
+ table: 'cc',
+ func: 'MONTH',
+ column: 'receive_date',
+ display: 'Month',
+ type: 'number',
+ canGroup: true
+ },
+ Day: {
+ table: 'cc',
+ func: 'DAY',
+ column: 'receive_date',
+ display: 'Year',
+ type: 'number',
+ canGroup: true
+ },
+ Hour: {
+ table: 'cc',
+ func: 'HOUR',
+ column: 'receive_date',
+ display: 'Hour',
+ type: 'number',
+ canGroup: true
+ },
+ YearsAgo: {
+ table: 'cc',
+ column : 'receive_date',
+ func: 'timestampdiff(YEAR, [[COL]], utc_timestamp())',
+ display: 'Years ago',
+ type: 'number',
+ min: 0,
+ max: 12
+ },
+ MonthsAgo: {
+
[MediaWiki-commits] [Gerrit] Add node.extend - change (wikimedia...node_modules)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200090
Change subject: Add node.extend
..
Add node.extend
Go go gadget arms!
Change-Id: I3bd88e785099b12ba04d2a7fb51e89c3de1757f9
---
A node.extend/.jscs.json
A node.extend/.npmignore
A node.extend/.travis.yml
A node.extend/History.md
A node.extend/Readme.md
A node.extend/index.js
A node.extend/lib/extend.js
A node.extend/node_modules/is/CHANGELOG.md
A node.extend/node_modules/is/LICENSE.md
A node.extend/node_modules/is/Makefile
A node.extend/node_modules/is/README.md
A node.extend/node_modules/is/component.json
A node.extend/node_modules/is/index.js
A node.extend/node_modules/is/package.json
A node.extend/node_modules/is/test/index.js
A node.extend/package.json
16 files changed, 2,043 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/node_modules
refs/changes/90/200090/1
diff --git a/node.extend/.jscs.json b/node.extend/.jscs.json
new file mode 100644
index 000..8bca4f1
--- /dev/null
+++ b/node.extend/.jscs.json
@@ -0,0 +1,66 @@
+{
+ "additionalRules": [],
+
+ "requireCurlyBraces": ["if", "else", "for", "while", "do", "try",
"catch"],
+
+ "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do",
"switch", "return", "try", "catch", "function"],
+
+ "disallowSpaceAfterKeywords": [],
+
+ "requireSpacesInAnonymousFunctionExpression": {
"beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true },
+ "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace":
true },
+ "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace":
true },
+ "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true
},
+ "disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace":
true },
+
+ "disallowSpacesInsideParentheses": true,
+
+ "disallowSpacesInsideArrayBrackets": true,
+
+ "disallowQuotedKeysInObjects": "allButReserved",
+
+ "disallowSpaceAfterObjectKeys": true,
+
+ "requireCommaBeforeLineBreak": true,
+
+ "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~",
"!"],
+ "requireSpaceAfterPrefixUnaryOperators": [],
+
+ "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+ "requireSpaceBeforePostfixUnaryOperators": [],
+
+ "disallowSpaceBeforeBinaryOperators": [],
+ "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==",
"===", "!=", "!=="],
+
+ "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==",
"===", "!=", "!=="],
+ "disallowSpaceAfterBinaryOperators": [],
+
+ "disallowImplicitTypeConversion": ["binary", "string"],
+
+ "disallowKeywords": ["with", "eval"],
+
+ "requireKeywordsOnNewLine": [],
+ "disallowKeywordsOnNewLine": ["else"],
+
+ "requireLineFeedAtFileEnd": true,
+
+ "disallowTrailingWhitespace": true,
+
+ "disallowTrailingComma": true,
+
+ "excludeFiles": ["node_modules/**", "vendor/**"],
+
+ "disallowMultipleLineStrings": true,
+
+ "requireDotNotation": true,
+
+ "requireParenthesesAroundIIFE": true,
+
+ "validateLineBreaks": "LF",
+
+ "validateQuoteMarks": {
+ "escape": true,
+ "mark": "'"
+ }
+}
+
diff --git a/node.extend/.npmignore b/node.extend/.npmignore
new file mode 100644
index 000..f1250e5
--- /dev/null
+++ b/node.extend/.npmignore
@@ -0,0 +1,4 @@
+support
+test
+examples
+*.sock
diff --git a/node.extend/.travis.yml b/node.extend/.travis.yml
new file mode 100644
index 000..912080a
--- /dev/null
+++ b/node.extend/.travis.yml
@@ -0,0 +1,18 @@
+language: node_js
+node_js:
+ - "0.11"
+ - "0.10"
+ - "0.9"
+ - "0.8"
+ - "0.6"
+ - "0.4"
+before_install:
+ - '[ "${TRAVIS_NODE_VERSION}" == "0.6" ] || npm install -g npm@~1.4.6'
+matrix:
+ fast_finish: true
+ allow_failures:
+- node_js: "0.11"
+- node_js: "0.9"
+- node_js: "0.6"
+- node_js: "0.4"
+
diff --git a/node.extend/History.md b/node.extend/History.md
new file mode 100644
index 000..633fb93
--- /dev/null
+++ b/node.extend/History.md
@@ -0,0 +1,21 @@
+## 1.0.1 / 2013-04-02
+
+ - Fix tests
+
+
+
+## 1.0.0 / 2012-02-28
+
+ - Add tests for the stable release
+
+
+
+## 0.0.2 / 2012-01-11
+
+ - Add repository to package.json
+
+
+
+## 0.0.1 / 2012-01-10
+
+ - Initial release
diff --git a/node.extend/Readme.md b/node.extend/Readme.md
new file mode 100644
index 000..df4bf66
--- /dev/null
+++ b/node.extend/Readme.md
@@ -0,0 +1,77 @@
+# node.extend
+
+A port of jQuery.extend that **actually works** on node.js
+
+[![Build Status][travis-svg]][travis-url]
+[![dependency status][deps-svg]][deps-url]
+[![dev dependency status][dev-deps-svg]][dev-deps-url]
+
+[![browser support][testling-png]][testling-url]
+
+
+## Description
+
+None of the existing ones on npm really w
[MediaWiki-commits] [Gerrit] Remove some donation premium language - change (mediawiki...DonationInterface)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200089
Change subject: Remove some donation premium language
..
Remove some donation premium language
Change-Id: Id0402e5d68c31572df192d3af6a9ca798e2b8c1a
---
M gateway_common/i18n/interface/en.json
M gateway_common/i18n/interface/qqq.json
2 files changed, 0 insertions(+), 32 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/89/200089/1
diff --git a/gateway_common/i18n/interface/en.json
b/gateway_common/i18n/interface/en.json
index 62c8435..97bd7ea 100644
--- a/gateway_common/i18n/interface/en.json
+++ b/gateway_common/i18n/interface/en.json
@@ -309,25 +309,9 @@
"donate_interface-email-receipt": "Email receipt to",
"donate_interface-monthly-donation": "Make a monthly donation",
"donate_interface-via-paypal": "(via PayPal)",
- "donate_interface-shirt-size": "T-shirt size:",
- "donate_interface-shirt-size-2": "T-shirt size: $1",
- "donate_interface-language": "Language:",
- "donate_interface-front": "Front",
- "donate_interface-back": "Back",
- "donate_interface-front-of-shirt": "Front of shirt",
- "donate_interface-back-of-shirt": "Back of shirt",
- "donate_interface-select-a-size": "Please select a size.",
"donate_interface-select": "Select",
- "donate_interface-shipping-address": "Shipping address",
- "donate_interface-shipping-address-different": "My shipping address is
different from my billing address.",
- "donate_interface-shipping-address-same": "Shipping address same as
billing address.",
- "donate_interface-only-billing-address": "Shirts can only be shipped to
your billing address.",
"donate_interface-donation-must-equal": "Donation must equal $1 or
more.",
"donate_interface-thank-you": "Thank you! Your donation has been
received.",
- "donate_interface-wikipedia-translation": "Please note: \"Wikipedia\"
on the shirt sleeve will be the \"Wikipedia 10\" graphic, which is not
translated.",
- "donate_interface-on-the-back": "With this on the back:",
- "donate_interface-tshirt-confirmation": "Your t-shirt will be shipped
in the size and language below:",
- "donate_interface-donation-tshirt": "Donation (t-shirt offer)",
"donate_interface-change": "Change",
"donate_interface-select-credit-card": "Select credit card",
"donate_interface-optional": "optional",
diff --git a/gateway_common/i18n/interface/qqq.json
b/gateway_common/i18n/interface/qqq.json
index bf46038..8a8ebf0 100644
--- a/gateway_common/i18n/interface/qqq.json
+++ b/gateway_common/i18n/interface/qqq.json
@@ -333,25 +333,9 @@
"donate_interface-email-receipt": "Label for field which contains the
e-mail address the donor's receipt will be mailed to.",
"donate_interface-monthly-donation": "Button label, 25 characters
maximum",
"donate_interface-via-paypal": "This appears after the monthly donation
button",
- "donate_interface-shirt-size": "This is a label for a select list of
shirt sizes",
- "donate_interface-shirt-size-2": "Label for field to choose t-shirt
size. Parameters:\n* $1 - size",
- "donate_interface-language": "This is a label for a select list of
languages a shirt can be printed in\n{{Identical|Language}}",
- "donate_interface-front": "This is a label for an image of the front of
a shirt.\n{{Identical|Front}}",
- "donate_interface-back": "This is a label for an image of the back of a
shirt\n{{Identical|Back}}",
- "donate_interface-front-of-shirt": "Caption for picture of front of
t-shirt",
- "donate_interface-back-of-shirt": "Caption for picture of back of
t-shirt",
- "donate_interface-select-a-size": "Label for field for choosing t-shirt
size.",
"donate_interface-select": "Action asking the user to choose from a set
of options.\n{{Identical|Select}}",
- "donate_interface-shipping-address": "Label for shipping address for
t-shirt.",
- "donate_interface-shipping-address-different": "Label for check box.",
- "donate_interface-shipping-address-same": "Label for check box.",
- "donate_interface-only-billing-address": "Error message.",
"donate_interface-donation-must-equal": "Error message if donation is
too low.",
"donate_interface-thank-you": "Thank you message for donation.",
- "donate_interface-wikipedia-translation": "Do not translate the two
phrases in quotes: \"Wikipedia\" and \"Wikipedia 10\"",
- "donate_interface-on-the-back": "Label for an image of the localized
Wikipedia wordmark chosen by the donor",
- "donate_interface-tshirt-confirmation": "Header for summary of t-shirt
delivery, shown after the completion of the donation.",
- "donate_interface-donation-tshirt": "This message is about
[MediaWiki-commits] [Gerrit] Fix wgFlowContentFormat docs and note that wikitext may be d... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Fix wgFlowContentFormat docs and note that wikitext may be deprecated .. Fix wgFlowContentFormat docs and note that wikitext may be deprecated Change-Id: I2a2bf6e387b1cd08f22b16fb43274256627cece0 --- M Flow.php 1 file changed, 3 insertions(+), 7 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/Flow.php b/Flow.php index 54a6990..aca2ce8 100644 --- a/Flow.php +++ b/Flow.php @@ -203,17 +203,13 @@ // $wgFlowExternalStore = array( 'DB://cluster24', 'DB://cluster25' ); $wgFlowExternalStore = false; -// By default, Flow will store data in wikitext format. It's also the format supported -// by the most basic "editor": none; in which case no conversion (Parsoid) will be needed. -// the only conversion needed it wikitext -> HTML for outputting the content, which will -// then be handled by the parser. -// On high-volume wikis, it's beneficial to save HTML to the database (to avoid having to -// parse it every time for output), but then you'll have to make sure Parsoid is up and -// running, as it'll be necessary to convert HTML to wikitext for the basic editor. +// By default, Flow will store content in HTML. However, this requires having Parsoid up +// and running, as it'll be necessary to convert HTML to wikitext for the basic editor. // (n.b. to use VisualEditor, you'll definitely need Parsoid, so if you do support VE, // might as well set this to HTML right away) // If $wgFlowParsoidURL is null, $wgFlowContentFormat will be forced to wikitext. // +// The 'wikitext' format is likely to be deprecated in the future. $wgFlowContentFormat = 'html'; // possible values: html|wikitext XXX bug 70148 with wikitext // Flow Parsoid config -- To view, visit https://gerrit.wikimedia.org/r/199817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a2bf6e387b1cd08f22b16fb43274256627cece0 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Matthias Mullie Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't require database access for ContentHandlerTest - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't require database access for ContentHandlerTest
..
Don't require database access for ContentHandlerTest
We can just mark all the titles as non-existent in the LinkCache
Change-Id: Ifd6fdfd0f8318dac8af7f7509705cf30d44c8a4e
---
M tests/phpunit/includes/content/ContentHandlerTest.php
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php
b/tests/phpunit/includes/content/ContentHandlerTest.php
index 1a90d6e..988a59e 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -2,11 +2,6 @@
/**
* @group ContentHandler
- * @group Database
- *
- * @note Declare that we are using the database, because otherwise we'll fail
in
- * the "databaseless" test run. This is because the LinkHolderArray used by the
- * parser needs database access.
*/
class ContentHandlerTest extends MediaWikiTestCase {
@@ -36,6 +31,8 @@
// Reset namespace cache
MWNamespace::getCanonicalNamespaces( true );
$wgContLang->resetNamespaces();
+ // And LinkCache
+ LinkCache::destroySingleton();
}
protected function tearDown() {
@@ -44,6 +41,8 @@
// Reset namespace cache
MWNamespace::getCanonicalNamespaces( true );
$wgContLang->resetNamespaces();
+ // And LinkCache
+ LinkCache::destroySingleton();
parent::tearDown();
}
@@ -83,6 +82,7 @@
*/
public function testGetForTitle( $title, $expectedContentModel ) {
$title = Title::newFromText( $title );
+ LinkCache::singleton()->addBadLinkObj( $title );
$handler = ContentHandler::getForTitle( $title );
$this->assertEquals( $expectedContentModel,
$handler->getModelID() );
}
@@ -139,6 +139,7 @@
public function testGetPageLanguage( $title, $expected ) {
if ( is_string( $title ) ) {
$title = Title::newFromText( $title );
+ LinkCache::singleton()->addBadLinkObj( $title );
}
$expected = wfGetLangObj( $expected );
@@ -292,7 +293,7 @@
$expectedModelId, $expectedNativeData, $shouldFail
) {
$title = Title::newFromText( $title );
-
+ LinkCache::singleton()->addBadLinkObj( $title );
try {
$content = ContentHandler::makeContent( $data, $title,
$modelId, $format );
--
To view, visit https://gerrit.wikimedia.org/r/200078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd6fdfd0f8318dac8af7f7509705cf30d44c8a4e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Block the user from the using the action=delete interface fo... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Block the user from the using the action=delete interface for
topics.
..
Block the user from the using the action=delete interface for topics.
This is not shown in the UI, so it is only accessible by URL-hacking.
This interface has essentially no effect currently. It is deleted as far
as core knows, but it is still fully accessible with the normal URL.
We should probably have this feed into the Flow deletion mechanism
somehow, but in the meantime this avoids confusing users.
Bug: T91150
Change-Id: Ibad375beaae62257bc98c53a6c826605853904fd
---
M Flow.php
M Hooks.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 60 insertions(+), 0 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.php b/Flow.php
index 54a6990..d7d2119 100644
--- a/Flow.php
+++ b/Flow.php
@@ -136,6 +136,8 @@
$wgHooks['NamespaceIsMovable'][] = 'FlowHooks::onNamespaceIsMovable';
$wgHooks['CategoryViewer::doCategoryQuery'][] =
'FlowHooks::onCategoryViewerDoCategoryQuery';
$wgHooks['CategoryViewer::generateLink'][] =
'FlowHooks::onCategoryViewerGenerateLink';
+$wgHooks['ArticleConfirmDelete'][] = 'FlowHooks::onArticleConfirmDelete';
+$wgHooks['ArticleDelete'][] = 'FlowHooks::onArticleDelete';
// Extension:UserMerge support
$wgHooks['UserMergeAccountFields'][] = 'FlowHooks::onUserMergeAccountFields';
diff --git a/Hooks.php b/Hooks.php
index 75fd6e1..bd0698a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1239,4 +1239,60 @@
return true;
}
+
+ /**
+* Gets error HTML for attempted NS_TOPIC deletion using core interface
+*
+* @param Title $title Topic title they are attempting to delete
+* @return string Error html
+*/
+ protected static function getTopicDeletionError( Title $title ) {
+ $error = wfMessage( 'flow-error-core-topic-deletion',
$title->getFullURL() )->parse();
+ $wrappedError = Html::rawElement( 'span', array(
+ 'class' => 'plainlinks',
+ ), $error );
+ return $wrappedError;
+ }
+
+ // This should block them from wasting their time filling the form, but
it won't
+ // without a core change. However, it does show the message.
+ /**
+* Shows an error message when the user visits the deletion form if the
page is in
+* the Topic namespace.
+*
+* @param WikiPage $article Page the user requested to delete
+* @param OutputPage $out Output page
+* @param string &$reason Pre-filled reason given for deletion (note,
this could
+* be used to customize this for boards and/or topics later)
+* @return bool False if it is a Topic; otherwise, true
+*/
+ public static function onArticleConfirmDelete( $article, $output,
&$reason ) {
+ $title = $article->getTitle();
+ if ( $title->inNamespace( NS_TOPIC ) ) {
+ $output->addHTML( FlowHooks::getTopicDeletionError(
$title ) );
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+* Blocks topics from being deleted using the core deletion process,
since it
+* doesn't work.
+*
+* @param WikiPage &$article Page the user requested to delete
+* @param User &$user User who requested to delete the article
+* @param string &$reason Reason given for deletion
+* @param string &$error Error explaining why we are not allowing the
deletion
+* @return bool False if it is a Topic (to block it); otherwise, true
+*/
+ public static function onArticleDelete( WikiPage &$article, User
&$user, &$reason, &$error ) {
+ $title = $article->getTitle();
+ if ( $title->inNamespace( NS_TOPIC ) ) {
+ $error = FlowHooks::getTopicDeletionError( $title );
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/i18n/en.json b/i18n/en.json
index 40c905d..d9f6193 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -154,6 +154,7 @@
"flow-error-missing-prev-revision-identifier": "Previous revision
identifier is missing.",
"flow-error-prev-revision-mismatch": "Another user just edited this
post a few seconds ago. Are {{GENDER:$3|you}} sure you want to overwrite the
recent change?",
"flow-error-prev-revision-does-not-exist": "Could not find the previous
revision.",
+ "flow-error-core-topic-deletion": "To delete a topic, use the ... menu
on the Flow board or [$1 topic page]. Do not visit action=delete for the topic
directly.",
"flow-error-default": "An error has occurred.",
"flow-error-invalid-input": "Invalid value was provided for loadin
[MediaWiki-commits] [Gerrit] Change ConvertLqt -> ConvertLqtPage - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Change ConvertLqt -> ConvertLqtPage
..
Change ConvertLqt -> ConvertLqtPage
We already have another ConvertLqt.
Although these are not autoloaded, still better to not
have the same classname (in the same namespace)
Change-Id: I2a30392275b8aec01de4f96277e864324b38360d
---
M autoload.php
M maintenance/convertLqtPage.php
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index a7c4532..8dc335b 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1,6 +1,6 @@
__DIR__ .
'/tests/phpunit/Notifications/NotifiedUsersTest.php',
'Flow\\Tests\\PagerTest' => __DIR__ . '/tests/phpunit/PagerTest.php',
'Flow\\Tests\\Parsoid\\BadImageRemoverTest' => __DIR__ .
'/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php',
+ 'Flow\\Tests\\Parsoid\\BaseHrefFixerTest' => __DIR__ .
'/tests/phpunit/Parsoid/Fixer/BaseHrefFixerTest.php',
'Flow\\Tests\\Parsoid\\Fixer\\MethodReturnsConstraint' => __DIR__ .
'/tests/phpunit/Parsoid/Fixer/WikiLinkFixerTest.php',
'Flow\\Tests\\Parsoid\\Fixer\\WikiLinkFixerTest' => __DIR__ .
'/tests/phpunit/Parsoid/Fixer/WikiLinkFixerTest.php',
'Flow\\Tests\\Parsoid\\ParsoidUtilsTest' => __DIR__ .
'/tests/phpunit/Parsoid/UtilsTest.php',
diff --git a/maintenance/convertLqtPage.php b/maintenance/convertLqtPage.php
index 2dd7dea..cf57ebc 100644
--- a/maintenance/convertLqtPage.php
+++ b/maintenance/convertLqtPage.php
@@ -12,7 +12,7 @@
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
: dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
-class ConvertLqt extends Maintenance {
+class ConvertLqtPage extends Maintenance {
public function __construct() {
parent::__construct();
$this->mDescription = "Converts LiquidThreads data to Flow
data";
@@ -100,5 +100,5 @@
}
}
-$maintClass = "ConvertLqt";
+$maintClass = "ConvertLqtPage";
require_once ( RUN_MAINTENANCE_IF_MAIN );
--
To view, visit https://gerrit.wikimedia.org/r/197869
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a30392275b8aec01de4f96277e864324b38360d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: SG
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] strongswan: lint fixes - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200088
Change subject: strongswan: lint fixes
..
strongswan: lint fixes
1 x WARNING: class not documented on line 1
4 x WARNING: double quoted string containing no variables
4 x WARNING: indentation of => is not properly aligned
3 x WARNING: ensure found on line but it's not the first attribute
puppet-lint 1.1.0
Change-Id: I5c8b124ae6f1075a915fe03966e2b2e875537b6d
---
M modules/strongswan/manifests/init.pp
1 file changed, 14 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/200088/1
diff --git a/modules/strongswan/manifests/init.pp
b/modules/strongswan/manifests/init.pp
index 906c6aa..9586642 100644
--- a/modules/strongswan/manifests/init.pp
+++ b/modules/strongswan/manifests/init.pp
@@ -1,11 +1,13 @@
+# sets up an IPsec implementation
+# https://en.wikipedia.org/wiki/StrongSwan
class strongswan (
-$puppet_certname = "",
+$puppet_certname = '',
$hosts = [],
)
{
package { 'strongswan': ensure => present }
package { 'ipsec-tools':
-ensure => present,
+ensure => present,
require => Package['strongswan'];
}
@@ -19,8 +21,8 @@
# building CRED_CERTIFICATE - X509 failed, tried 3 builders
# parsing certificate failed
package { 'libstrongswan-standard-plugins':
-ensure => present,
-before => Service['strongswan'],
+ensure => present,
+before => Service['strongswan'],
require => Package['strongswan'],
}
@@ -28,8 +30,8 @@
# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781209
exec { 'strongswan-disable-sysvinit':
command => '/usr/sbin/dpkg-divert --divert
/etc/init.d/ipsec-disabled /etc/init.d/ipsec',
-unless => '/usr/bin/test -f /etc/init.d/ipsec.disabled',
-before => Package['strongswan'],
+unless => '/usr/bin/test -f /etc/init.d/ipsec.disabled',
+before => Package['strongswan'],
}
}
@@ -54,37 +56,37 @@
# For SSL certs, reuse Puppet client's certs.
# Strongswan won't accept symlinks, so make copies.
-file { "/etc/ipsec.d/cacerts/ca.pem":
+file { '/etc/ipsec.d/cacerts/ca.pem':
+ensure => present,
owner => 'root',
group => 'root',
mode=> '0444',
-ensure => present,
-source => "/var/lib/puppet/ssl/certs/ca.pem",
+source => '/var/lib/puppet/ssl/certs/ca.pem',
notify => Service['strongswan'],
require => Package['strongswan'],
}
file { "/etc/ipsec.d/certs/${puppet_certname}.pem":
+ensure => present,
owner => 'root',
group => 'root',
mode=> '0444',
-ensure => present,
source => "/var/lib/puppet/ssl/certs/${puppet_certname}.pem",
notify => Service['strongswan'],
require => Package['strongswan'],
}
file { "/etc/ipsec.d/private/${puppet_certname}.pem":
+ensure => present,
owner => 'root',
group => 'root',
mode=> '0444',
-ensure => present,
source => "/var/lib/puppet/ssl/private_keys/${puppet_certname}.pem",
notify => Service['strongswan'],
require => Package['strongswan'],
}
-file { "/usr/local/sbin/ipsec-global":
+file { '/usr/local/sbin/ipsec-global':
ensure => present,
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/200088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c8b124ae6f1075a915fe03966e2b2e875537b6d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing isBlocked() on ApiEditList - change (mediawiki...Gather)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200087
Change subject: Fixing isBlocked() on ApiEditList
..
Fixing isBlocked() on ApiEditList
* There is a special function to test all
permission, use it, don't put such checks
all over the code.
* Establishing a connection to a very busy
master server only to bail out due to permission
issue seems extremely inefficient.
Bug: T94105
Change-Id: Id256f214708f78a9d9b268b07f4246719e0e3925
---
M includes/api/ApiEditList.php
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/87/200087/1
diff --git a/includes/api/ApiEditList.php b/includes/api/ApiEditList.php
index 0f7f17b..bff2e16 100644
--- a/includes/api/ApiEditList.php
+++ b/includes/api/ApiEditList.php
@@ -75,9 +75,6 @@
$isWatchlist = $listId === 0;
$dbw = wfGetDB( DB_MASTER, 'api' );
- if ( $user->isBlocked() ) {
- $this->dieUsage( 'You are blocked from editing your
collection', 'blockeduser' );
- }
if ( $isNew || $isWatchlist ) {
// ACTION: create a new list
@@ -172,6 +169,8 @@
$this->dieUsage( 'You must be logged-in to edit a
list', 'notloggedin' );
} elseif ( !$user->isAllowed( 'editmywatchlist' ) ) {
$this->dieUsage( 'You don\'t have permission to edit
your list', 'permissiondenied' );
+ } elseif ( $user->isBlocked() ) {
+ $this->dieUsage( 'You are blocked from editing your
list', 'blocked' );
} elseif ( $label === '' ) {
$this->dieUsage( 'If given, label must not be empty',
'badlabel' );
}
--
To view, visit https://gerrit.wikimedia.org/r/200087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id256f214708f78a9d9b268b07f4246719e0e3925
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Yurik
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide slugs in context menus - change (mediawiki...VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200086
Change subject: Hide slugs in context menus
..
Hide slugs in context menus
Use a flag when creating the rendering of the branch node of the
citation context to not render slugs.
Depends on ve-core fix I8105418a357
Bug: T93042
Change-Id: I47ae0ea9af7c5e0e02a52d386c810228aafb4a03
---
M modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/86/200086/1
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
b/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
index d9c144f..1de9e0a 100644
--- a/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js
@@ -50,7 +50,8 @@
ve.ui.MWReferenceContextItem.prototype.getRendering = function () {
var ref = ve.dm.MWReferenceModel.static.newFromReferenceNode(
this.model ),
view = new ve.ce.InternalItemNode(
- this.model.getDocument().getInternalList().getItemNode(
ref.getListIndex() )
+ this.model.getDocument().getInternalList().getItemNode(
ref.getListIndex() ),
+ { ignoreSlugs: true }
);
// HACK: PHP parser doesn't wrap single lines in a paragraph
--
To view, visit https://gerrit.wikimedia.org/r/200086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47ae0ea9af7c5e0e02a52d386c810228aafb4a03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a flag to BranchNode to ignore slugs - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200085
Change subject: Add a flag to BranchNode to ignore slugs
..
Add a flag to BranchNode to ignore slugs
Make it possible to render ve.ce.BranchNode without slugs. This
is particularly useful for preview nodes, like in the context menus.
Bug: T93042
Change-Id: I8105418a3579232df1eb193649170b81ae086f32
---
M src/ce/ve.ce.BranchNode.js
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/85/200085/1
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index 43e8a3a..9caeb50 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -16,13 +16,19 @@
* @constructor
* @param {ve.dm.BranchNode} model Model to observe
* @param {Object} [config] Configuration options
+ * @cfg {boolean} ignoreSlugs Ignore the rendering of slugs
*/
ve.ce.BranchNode = function VeCeBranchNode( model, config ) {
+ config = config || {};
+
// Mixin constructor
ve.BranchNode.call( this );
// Parent constructor
ve.ce.Node.call( this, model, config );
+
+ // Ignore slugs
+ this.ignoreSlugs = !!config.ignoreSlugs;
// DOM changes (keep in sync with #onSetup)
this.$element.addClass( 've-ce-branchNode' );
@@ -221,7 +227,9 @@
}
}
- this.setupSlugs();
+ if ( !this.ignoreSlugs ) {
+ this.setupSlugs();
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/200085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8105418a3579232df1eb193649170b81ae086f32
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I25e4b75aaca5547dc141edbbef900af6c16a233a --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index e52d62d..7cc096e 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit e52d62d1ec79c2d329326245734f7ab655b22a5e +Subproject commit 7cc096ea7284e6dc614530a1a8e5fd4f023a5eb8 -- To view, visit https://gerrit.wikimedia.org/r/200084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25e4b75aaca5547dc141edbbef900af6c16a233a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Awight Gerrit-Reviewer: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/200084 Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I25e4b75aaca5547dc141edbbef900af6c16a233a --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/84/200084/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index e52d62d..7cc096e 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit e52d62d1ec79c2d329326245734f7ab655b22a5e +Subproject commit 7cc096ea7284e6dc614530a1a8e5fd4f023a5eb8 -- To view, visit https://gerrit.wikimedia.org/r/200084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25e4b75aaca5547dc141edbbef900af6c16a233a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge master into deployment - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Merge master into deployment .. Merge master into deployment b145d566f21e3954af5404b2a0127737d596f83a Fix regression with zero-amount error Change-Id: I2fa9fb1845a7a13a21c366ebfaf2ccf7b6948374 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/200082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fa9fb1845a7a13a21c366ebfaf2ccf7b6948374 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Awight Gerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove 'mw-less testing' lines and empty comments - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove 'mw-less testing' lines and empty comments
..
Hygiene: Remove 'mw-less testing' lines and empty comments
I don't think anyone is really trying to test Flow without MW.
Change-Id: I657d267e39706b8ac2274a24e589dcb32254ec50
---
M modules/engine/components/flow-registry.js
M modules/engine/misc/flow-api.js
M modules/engine/misc/flow-baseconvert.js
M modules/engine/misc/flow-handlebars.js
4 files changed, 0 insertions(+), 14 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/engine/components/flow-registry.js
b/modules/engine/components/flow-registry.js
index 08967da..3b2a949 100644
--- a/modules/engine/components/flow-registry.js
+++ b/modules/engine/components/flow-registry.js
@@ -8,7 +8,6 @@
*/
( function ( $, mw ) {
- window.mw = window.mw || {}; // mw-less testing
mw.flow = mw.flow || {}; // create mw.flow globally
var _componentRegistry = new OO.Registry();
diff --git a/modules/engine/misc/flow-api.js b/modules/engine/misc/flow-api.js
index a35efe3..229a255 100644
--- a/modules/engine/misc/flow-api.js
+++ b/modules/engine/misc/flow-api.js
@@ -1,9 +1,3 @@
-/*!
- *
- */
-
-window.mw = window.mw || {}; // mw-less testing
-
( function ( mw, $ ) {
mw.flow = mw.flow || {}; // create mw.flow globally
diff --git a/modules/engine/misc/flow-baseconvert.js
b/modules/engine/misc/flow-baseconvert.js
index 055f8a0..ae6e755 100644
--- a/modules/engine/misc/flow-baseconvert.js
+++ b/modules/engine/misc/flow-baseconvert.js
@@ -1,9 +1,3 @@
-/*!
- *
- */
-
-window.mw = window.mw || {}; // mw-less testing
-
( function ( mw, $ ) {
mw.flow = mw.flow || {}; // create mw.flow globally
diff --git a/modules/engine/misc/flow-handlebars.js
b/modules/engine/misc/flow-handlebars.js
index 0d9d461..b3f2192 100644
--- a/modules/engine/misc/flow-handlebars.js
+++ b/modules/engine/misc/flow-handlebars.js
@@ -3,7 +3,6 @@
*/
( function ( mw, $, moment, Handlebars ) {
- window.mw = window.mw || {}; // mw-less testing
mw.flow = mw.flow || {}; // create mw.flow globally
var _tplcache = {},
--
To view, visit https://gerrit.wikimedia.org/r/200046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I657d267e39706b8ac2274a24e589dcb32254ec50
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Matthias Mullie
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct typo in MediaWiki:Apihelp-paraminfo-param-formatmodules - change (mediawiki/core)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/200083 Change subject: Correct typo in MediaWiki:Apihelp-paraminfo-param-formatmodules .. Correct typo in MediaWiki:Apihelp-paraminfo-param-formatmodules Change-Id: I961b4a6cd7b8f9ea99fb93a2a624d45fe99501a7 --- M includes/api/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/83/200083/1 diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index 1c6af66..507283b 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -259,7 +259,7 @@ "apihelp-paraminfo-param-querymodules": "List of query module names (value of prop, meta or list parameter). Use $1modules=query+foo instead of $1querymodules=foo.", "apihelp-paraminfo-param-mainmodule": "Get information about the main (top-level) module as well. Use $1modules=main instead.", "apihelp-paraminfo-param-pagesetmodule": "Get information about the pageset module (providing titles= and friends) as well.", - "apihelp-paraminfo-param-formatmodules": "List of format module names (value of format parameter). Use $1modules instead.", + "apihelp-paraminfo-param-formatmodules": "List of format module names (value of format parameter). Use $1modules instead.", "apihelp-paraminfo-example-1": "Show info for [[Special:ApiHelp/parse|action=parse]], [[Special:ApiHelp/jsonfm|format=jsonfm]], [[Special:ApiHelp/query+allpages|action=query&list=allpages]], and [[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]].", "apihelp-parse-description": "Parses content and returns parser output.\n\nSee the various prop-modules of [[Special:ApiHelp/query|action=query]] to get information from the current version of a page.\n\nThere are several ways to specify the text to parse:\n# Specify a page or revision, using $1page, $1pageid, or $1oldid.\n# Specify content explicitly, using $1text, $1title, and $1contentmodel.\n# Specify only a summary to parse. $1prop should be given an empty value.", -- To view, visit https://gerrit.wikimedia.org/r/200083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I961b4a6cd7b8f9ea99fb93a2a624d45fe99501a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Purodha ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge master into deployment - change (mediawiki...DonationInterface)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/200082 Change subject: Merge master into deployment .. Merge master into deployment b145d566f21e3954af5404b2a0127737d596f83a Fix regression with zero-amount error Change-Id: I2fa9fb1845a7a13a21c366ebfaf2ccf7b6948374 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/82/200082/1 -- To view, visit https://gerrit.wikimedia.org/r/200082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2fa9fb1845a7a13a21c366ebfaf2ccf7b6948374 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LocalFileTest does not require database access - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/200081 Change subject: LocalFileTest does not require database access .. LocalFileTest does not require database access Change-Id: Iea4a2758a1169b212c15ceb4445b2e2a0458df1a --- M tests/phpunit/includes/filerepo/file/LocalFileTest.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/81/200081/1 diff --git a/tests/phpunit/includes/filerepo/file/LocalFileTest.php b/tests/phpunit/includes/filerepo/file/LocalFileTest.php index 5c5052e..3c5754b 100644 --- a/tests/phpunit/includes/filerepo/file/LocalFileTest.php +++ b/tests/phpunit/includes/filerepo/file/LocalFileTest.php @@ -2,7 +2,6 @@ /** * These tests should work regardless of $wgCapitalLinks - * @group Database * @todo Split tests into providers and test methods */ -- To view, visit https://gerrit.wikimedia.org/r/200081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea4a2758a1169b212c15ceb4445b2e2a0458df1a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SearchUpdateTest does not require database access - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200080
Change subject: SearchUpdateTest does not require database access
..
SearchUpdateTest does not require database access
Change-Id: I2d8515215f52216f463a2b3536bea0e24b7bf5ce
---
M tests/phpunit/includes/deferred/SearchUpdateTest.php
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/80/200080/1
diff --git a/tests/phpunit/includes/deferred/SearchUpdateTest.php
b/tests/phpunit/includes/deferred/SearchUpdateTest.php
index b70880e..90438a0 100644
--- a/tests/phpunit/includes/deferred/SearchUpdateTest.php
+++ b/tests/phpunit/includes/deferred/SearchUpdateTest.php
@@ -17,7 +17,6 @@
/**
* @group Search
- * @group Database
*/
class SearchUpdateTest extends MediaWikiTestCase {
--
To view, visit https://gerrit.wikimedia.org/r/200080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8515215f52216f463a2b3536bea0e24b7bf5ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't lint dist/ if it exists - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200079
Change subject: Don't lint dist/ if it exists
..
Don't lint dist/ if it exists
Change-Id: I6721a29fc5d00d1405ca1df76c9e768ff0a4ca4e
---
M gulpfile.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/79/200079/1
diff --git a/gulpfile.js b/gulpfile.js
index 0082cac..e03809a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -52,7 +52,7 @@
}
});
-var jsfilesToLint = ['**/*.js', '!node_modules/**/*.js',
'!src/bower_modules/**/*.js'];
+var jsfilesToLint = ['**/*.js', '!node_modules/**/*.js',
'!src/bower_modules/**/*.js', '!dist/**/*.js'];
// linting
gulp.task('lint', function () {
--
To view, visit https://gerrit.wikimedia.org/r/200079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6721a29fc5d00d1405ca1df76c9e768ff0a4ca4e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't require Database access for ContentHandlerTest - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200078
Change subject: Don't require Database access for ContentHandlerTest
..
Don't require Database access for ContentHandlerTest
We can just mark all the titles as non-existent in the LinkCache
Change-Id: Ifd6fdfd0f8318dac8af7f7509705cf30d44c8a4e
---
M tests/phpunit/includes/content/ContentHandlerTest.php
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/200078/1
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php
b/tests/phpunit/includes/content/ContentHandlerTest.php
index 1a90d6e..988a59e 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -2,11 +2,6 @@
/**
* @group ContentHandler
- * @group Database
- *
- * @note Declare that we are using the database, because otherwise we'll fail
in
- * the "databaseless" test run. This is because the LinkHolderArray used by the
- * parser needs database access.
*/
class ContentHandlerTest extends MediaWikiTestCase {
@@ -36,6 +31,8 @@
// Reset namespace cache
MWNamespace::getCanonicalNamespaces( true );
$wgContLang->resetNamespaces();
+ // And LinkCache
+ LinkCache::destroySingleton();
}
protected function tearDown() {
@@ -44,6 +41,8 @@
// Reset namespace cache
MWNamespace::getCanonicalNamespaces( true );
$wgContLang->resetNamespaces();
+ // And LinkCache
+ LinkCache::destroySingleton();
parent::tearDown();
}
@@ -83,6 +82,7 @@
*/
public function testGetForTitle( $title, $expectedContentModel ) {
$title = Title::newFromText( $title );
+ LinkCache::singleton()->addBadLinkObj( $title );
$handler = ContentHandler::getForTitle( $title );
$this->assertEquals( $expectedContentModel,
$handler->getModelID() );
}
@@ -139,6 +139,7 @@
public function testGetPageLanguage( $title, $expected ) {
if ( is_string( $title ) ) {
$title = Title::newFromText( $title );
+ LinkCache::singleton()->addBadLinkObj( $title );
}
$expected = wfGetLangObj( $expected );
@@ -292,7 +293,7 @@
$expectedModelId, $expectedNativeData, $shouldFail
) {
$title = Title::newFromText( $title );
-
+ LinkCache::singleton()->addBadLinkObj( $title );
try {
$content = ContentHandler::makeContent( $data, $title,
$modelId, $format );
--
To view, visit https://gerrit.wikimedia.org/r/200078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd6fdfd0f8318dac8af7f7509705cf30d44c8a4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent tutorial from showing if user clicks watchstar prior... - change (mediawiki...Gather)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200077
Change subject: Prevent tutorial from showing if user clicks watchstar prior to
load
..
Prevent tutorial from showing if user clicks watchstar prior to load
Because of the setTimeout, conditions for which we show the tutorial
may have changed by this time. Now evaluating inside timeout.
Also set condition to not show if the overlay is open.
bug: T94113
Change-Id: I28564e2a2f47ea85509fa146483cf34a4cc25bcb
---
M resources/ext.gather.watchstar/CollectionsWatchstar.js
M resources/ext.gather.watchstar/init.js
2 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/77/200077/1
diff --git a/resources/ext.gather.watchstar/CollectionsWatchstar.js
b/resources/ext.gather.watchstar/CollectionsWatchstar.js
index 4b1c78a..21caca0 100644
--- a/resources/ext.gather.watchstar/CollectionsWatchstar.js
+++ b/resources/ext.gather.watchstar/CollectionsWatchstar.js
@@ -70,6 +70,9 @@
$el.addClass( unwatchedClass ).removeClass(
watchedClass );
}
$el.removeClass( 'hidden' );
+ setTimeout( function () {
+ $el.trigger( 'click' );
+ }, 100 );
},
/** @inheritdoc */
onStatusToggleUser: function ( ev ) {
diff --git a/resources/ext.gather.watchstar/init.js
b/resources/ext.gather.watchstar/init.js
index 327e373..7459ca1 100644
--- a/resources/ext.gather.watchstar/init.js
+++ b/resources/ext.gather.watchstar/init.js
@@ -20,6 +20,8 @@
mw.config.get( 'wgNamespaceNumber' ) === 0 &&
// Don't show this when mobile is showing edit tutorial
mw.util.getParamValue( 'article_action' ) !==
'signup-edit' &&
+ // Don't show if the overlay is open as user could have
clicked watchstar
+ !$( 'html' ).hasClass( 'gather-overlay-enabled' ) &&
// Tutorial has never been dismissed
!settings.get( settingOverlayWasDismissed ) &&
// Feature flag is enabled
@@ -76,23 +78,24 @@
*/
function init( page ) {
var $star = $( '#ca-watch' ),
- shouldShow = shouldShowCollectionTutorial(),
watchstar = new CollectionsWatchstar( {
el: $star,
page: page,
isAnon: user.isAnon(),
isWatched: $star.hasClass( 'watched' ),
- wasUserPrompted: shouldShow,
+ wasUserPrompted: false,
isNewlyAuthenticatedUser:
mw.util.getParamValue( 'article_action' ) === 'add_to_collection'
} );
-
- // Determine if we should show the collection tutorial
- if ( $star.length > 0 && shouldShow ) {
- // FIXME: Timeout shouldn't be necessary but T91047
exists.
- setTimeout( function () {
+ // FIXME: Timeout shouldn't be necessary but T91047 exists.
+ setTimeout( function () {
+ // Determine if we should show the collection tutorial
+ // As conditions could have changed between the
watchstar load
+ // and the timeout
+ if ( $star.length > 0 && shouldShowCollectionTutorial()
) {
+ watchstar.defaults.wasUserPrompted = true;
showPointer( watchstar, $star );
- }, 2000 );
- }
+ }
+ }, 2000 );
}
// Only init when current page is an article
if ( !page.inNamespace( 'special' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/200077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28564e2a2f47ea85509fa146483cf34a4cc25bcb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Robmoen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for recent change to WikiEditorHooks::editPageShowEditFo... - change (mediawiki...SemanticForms)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix for recent change to
WikiEditorHooks::editPageShowEditFormInitial()
..
Fix for recent change to WikiEditorHooks::editPageShowEditFormInitial()
Change-Id: I71269a77db1bc5d2efd095e8692f5a303f752c0a
---
M includes/forminputs/SF_TextAreaInput.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/forminputs/SF_TextAreaInput.php
b/includes/forminputs/SF_TextAreaInput.php
index da4b479..9c90168 100644
--- a/includes/forminputs/SF_TextAreaInput.php
+++ b/includes/forminputs/SF_TextAreaInput.php
@@ -152,11 +152,13 @@
if ( $this->mUseWikieditor ) {
// Load modules for all enabled WikiEditor features.
// The header for this function was changed in July
- // 2014 - this call should hopefully work for both
- // earlier and later versions.
- $dummyEditPage = (object) array( 'contentModel' =>
CONTENT_MODEL_WIKITEXT );
- global $wgOut;
- WikiEditorHooks::editPageShowEditFormInitial(
$dummyEditPage, $wgOut );
+ // 2014, and the function itself was changed
+ // significantly in March 2015 - this call should
+ // hopefully work for all versions.
+ global $wgTitle, $wgOut;
+ $article = new Article( $wgTitle );
+ $editPage = new EditPage( $article );
+ WikiEditorHooks::editPageShowEditFormInitial(
$editPage, $wgOut );
$className = 'wikieditor ';
} else {
$className = '';
--
To view, visit https://gerrit.wikimedia.org/r/200075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71269a77db1bc5d2efd095e8692f5a303f752c0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix regression with zero-amount error - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix regression with zero-amount error
..
Fix regression with zero-amount error
Bug: T58657
Change-Id: Ic1d608111f071306024f8623900dd4d760b39981
---
M gateway_common/DataValidator.php
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gateway_common/DataValidator.php b/gateway_common/DataValidator.php
index c6e31ea..d70b51c 100644
--- a/gateway_common/DataValidator.php
+++ b/gateway_common/DataValidator.php
@@ -275,7 +275,7 @@
// Define all default validations.
$validations = array(
'not_empty' => array(
- 'amount',
+ 'amount' => 'validate_non_zero',
'country',
'currency_code',
'gateway',
@@ -628,6 +628,21 @@
}
/**
+* Checks to make sure that the $value is present in the $data array,
and not equivalent to zero.
+* @param string $value The value to check for non-zeroness.
+* @param array $data The whole data set.
+* @return boolean True if the $value is not missing or zero, otherwise
false.
+*/
+ public static function validate_non_zero( $value ) {
+ if ( $value === null || $value === ''
+ || preg_match( '/^0+(\.0+)?$/', $value )
+ ) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
* Analyzes a string to see if any credit card numbers are hiding out
in it
*
* @param $str
--
To view, visit https://gerrit.wikimedia.org/r/200031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1d608111f071306024f8623900dd4d760b39981
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b19104e..6bd5142 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200076 Change subject: Syncronize VisualEditor: b19104e..6bd5142 .. Syncronize VisualEditor: b19104e..6bd5142 Change-Id: I0648f7a834f0c7fff8eb5bb8e2ba3d628cc44126 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/76/200076/1 diff --git a/VisualEditor b/VisualEditor index b19104e..6bd5142 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b19104ed04dd4b1348ce0894ae517d603710f260 +Subproject commit 6bd5142f2a8ecbc160bcad2588b9e73584deecf4 -- To view, visit https://gerrit.wikimedia.org/r/200076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0648f7a834f0c7fff8eb5bb8e2ba3d628cc44126 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b19104e..6bd5142 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: b19104e..6bd5142 .. Syncronize VisualEditor: b19104e..6bd5142 Change-Id: I0648f7a834f0c7fff8eb5bb8e2ba3d628cc44126 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index b19104e..6bd5142 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b19104ed04dd4b1348ce0894ae517d603710f260 +Subproject commit 6bd5142f2a8ecbc160bcad2588b9e73584deecf4 -- To view, visit https://gerrit.wikimedia.org/r/200076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0648f7a834f0c7fff8eb5bb8e2ba3d628cc44126 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When content and metadata have different revids, explicitly ... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: When content and metadata have different revids, explicitly
retry the higher one
..
When content and metadata have different revids, explicitly retry the higher one
It's much less likely we'll get another conflict if we retry
with ?oldid=12345 than if we retry omitting the oldid again.
Change-Id: I10e40f714fd44d7f0ac16c9d0dc6239a95c0ec51
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 99d2cc5..07a67e4 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -354,8 +354,13 @@
);
} else {
this.retriedRevIdConflict = true;
- // Have to retry both until we can access the
document server directly...
+ // TODO this retries both requests, in RESTbase
mode we should only retry
+ // the request that gave us the lower revid
this.loading = false;
+ // HACK: Load with explicit revid to hopefully
prevent this from happening again
+ if ( !this.requestedRevId ) {
+ this.requestedRevId = Math.max(
docRevId, this.revid );
+ }
this.load();
}
return;
--
To view, visit https://gerrit.wikimedia.org/r/200064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10e40f714fd44d7f0ac16c9d0dc6239a95c0ec51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move edit link for posts above moderation actions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Move edit link for posts above moderation actions
..
Move edit link for posts above moderation actions
Bug: T93778
Change-Id: I04f4f646f8a5ee4354a2f3ea0733b5c97e64a134
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_history.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_moderation_actions_list.partial.handlebars
8 files changed, 84 insertions(+), 86 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
Matthias Mullie: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index 61987c7..9910c1a 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -37,7 +37,15 @@
data-flow-api-handler="activateSummarizeTopic"
data-flow-api-target="< .flow-topic-titlebar
.flow-topic-summary-container"
href="'.htmlentities((string)((isset($in['actions']['summarize']['url']) &&
is_array($in['actions']['summarize'])) ? $in['actions']['summarize']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
-
title="'.htmlentities((string)((isset($in['actions']['summarize']['title']) &&
is_array($in['actions']['summarize'])) ? $in['actions']['summarize']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' :
'').''.((LCRun3::ifvar($cx, ((isset($in['summary']) && is_array($in)) ?
$in['summary'] : null))) ? ''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'-action-resummarize-topic'),array()),
'raw')),array()), 'encq').'' : ''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'-action-summarize-topic'),array()),
'raw')),array()), 'encq').'').''.htmlentities((string)((isset($in['noop'])
&& is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'' :
'').'';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'===','post'),array()), $in, false, function($cx,
$in) {return ''.((LCRun3::ifvar($cx, ((isset($in['links']['post']) &&
is_array($in['links'])) ? $in['links']['post'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' :
'').''.((LCRun3::ifvar($cx, ((isset($in['summary']) && is_array($in)) ?
$in['summary'] : null))) ? ''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'-action-resummarize-topic'),array()),
'raw')),array()), 'encq').'' : ''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'-action-summarize-topic'),array()),
'raw')),array()), 'encq').'').''.htmlentities((string)((isset($in['noop'])
&& is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'' :
'').'';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] : null),'===','post'),array()), $in, false, function($cx,
$in) {return ''.((LCRun3::ifvar($cx, ((isset($in['actions']['edit']) &&
is_array($in['actions'])) ? $in['actions']['edit'] : null))) ? '
+ '.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' :
'').''.LCRun3::ch($cx, 'l10n',
array(array('flow-post-action-edit-post'),array()), 'encq').'
+ ' : '').''.((LCRun3::ifvar($cx,
((isset($in['links']['post']) && is_array($in['links'])) ? $in['links']['post']
: null))) ? ''.htmlentities((string)((isset($in['noop']) && is_array($in))
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx, ((isset($in['moderationIcons'])
&& is_array($in)) ? $in['moderationIcons'] : null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(L
[MediaWiki-commits] [Gerrit] LivingStyleGuide skin renamed to Blueprint - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: LivingStyleGuide skin renamed to Blueprint .. LivingStyleGuide skin renamed to Blueprint Change-Id: Ie9f6f2de488fe87e9f965b8d9d7ae3e9006e836f --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e85a0a1..36a8064 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2369,6 +2369,10 @@ template: - name: mw-checks + - name: mediawiki/skins/Blueprint +template: + - name: mw-checks + - name: mediawiki/skins/BlueSky template: - name: mw-checks @@ -2430,10 +2434,6 @@ - name: mw-checks - name: mediawiki/skins/GreyStuff -template: - - name: mw-checks - - - name: mediawiki/skins/LivingStyleGuide template: - name: mw-checks -- To view, visit https://gerrit.wikimedia.org/r/200069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9f6f2de488fe87e9f965b8d9d7ae3e9006e836f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing i18n messages to JS - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing i18n messages to JS .. Add missing i18n messages to JS Change-Id: If65792e572b7d444b69fcea0d6133480542623ef --- M Resources.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Mattflaschen: Looks good to me, approved Matthias Mullie: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 9431315..417368a 100644 --- a/Resources.php +++ b/Resources.php @@ -228,6 +228,9 @@ 'flow-post-undo-hide', 'flow-post-undo-delete', 'flow-post-undo-suppress', + 'flow-topic-undo-hide', + 'flow-topic-undo-delete', + 'flow-topic-undo-suppress', // Timestamps 'flow-edited', 'flow-edited-by', -- To view, visit https://gerrit.wikimedia.org/r/199161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If65792e572b7d444b69fcea0d6133480542623ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: Matthias Mullie Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for recent change to WikiEditorHooks::editPageShowEditFo... - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200075
Change subject: Fix for recent change to
WikiEditorHooks::editPageShowEditFormInitial()
..
Fix for recent change to WikiEditorHooks::editPageShowEditFormInitial()
Change-Id: I71269a77db1bc5d2efd095e8692f5a303f752c0a
---
M includes/forminputs/SF_TextAreaInput.php
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/75/200075/1
diff --git a/includes/forminputs/SF_TextAreaInput.php
b/includes/forminputs/SF_TextAreaInput.php
index da4b479..9c90168 100644
--- a/includes/forminputs/SF_TextAreaInput.php
+++ b/includes/forminputs/SF_TextAreaInput.php
@@ -152,11 +152,13 @@
if ( $this->mUseWikieditor ) {
// Load modules for all enabled WikiEditor features.
// The header for this function was changed in July
- // 2014 - this call should hopefully work for both
- // earlier and later versions.
- $dummyEditPage = (object) array( 'contentModel' =>
CONTENT_MODEL_WIKITEXT );
- global $wgOut;
- WikiEditorHooks::editPageShowEditFormInitial(
$dummyEditPage, $wgOut );
+ // 2014, and the function itself was changed
+ // significantly in March 2015 - this call should
+ // hopefully work for all versions.
+ global $wgTitle, $wgOut;
+ $article = new Article( $wgTitle );
+ $editPage = new EditPage( $article );
+ WikiEditorHooks::editPageShowEditFormInitial(
$editPage, $wgOut );
$className = 'wikieditor ';
} else {
$className = '';
--
To view, visit https://gerrit.wikimedia.org/r/200075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71269a77db1bc5d2efd095e8692f5a303f752c0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump EventLogging submodule in 1.25wmf22 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bump EventLogging submodule in 1.25wmf22 .. Bump EventLogging submodule in 1.25wmf22 Change-Id: I7ab86dda9e99e4d87da4d0558dbe0142a08a1e8e --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/EventLogging b/extensions/EventLogging index 6a3b47f..29f55b8 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 6a3b47f2b17d35d670eba94230fb0007c6b900f9 +Subproject commit 29f55b80a08b9d3f6a08ca7b45f215ed8bd66b53 -- To view, visit https://gerrit.wikimedia.org/r/200073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ab86dda9e99e4d87da4d0558dbe0142a08a1e8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump EventLogging submodule in 1.25wmf23 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bump EventLogging submodule in 1.25wmf23 .. Bump EventLogging submodule in 1.25wmf23 Change-Id: I596b6b3fdb28b3f9f43ef71f5651db240c2ec87b --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/EventLogging b/extensions/EventLogging index 0f91928..3bd8a30 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 0f919288c01cfb5ce7993334676b28fdc894d072 +Subproject commit 3bd8a30c79404302b2536d0678bf85b4de9e5665 -- To view, visit https://gerrit.wikimedia.org/r/200071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I596b6b3fdb28b3f9f43ef71f5651db240c2ec87b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf23 Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...dash)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 787e067 Add an add-widgets button to boards 1b90122 Fix fraud gauge color display 8071b62 Bind amount-per-second-chart to the right div ce38361 Remove default wording and direct new user to lib ...and minify for deploy Change-Id: I1988e778b89ab03f263bc031801447cc503acb76 --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-e49f22ec.js R dist/style-83269124.css 5 files changed, 35 insertions(+), 31 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/200074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1988e778b89ab03f263bc031801447cc503acb76 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/200074 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 787e067 Add an add-widgets button to boards 1b90122 Fix fraud gauge color display 8071b62 Bind amount-per-second-chart to the right div ce38361 Remove default wording and direct new user to lib ...and minify for deploy Change-Id: I1988e778b89ab03f263bc031801447cc503acb76 --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-e49f22ec.js R dist/style-83269124.css 5 files changed, 35 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/74/200074/1 -- To view, visit https://gerrit.wikimedia.org/r/200074 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1988e778b89ab03f263bc031801447cc503acb76 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add an add-widgets button to boards - change (wikimedia...dash)
Ejegg has submitted this change and it was merged. Change subject: Add an add-widgets button to boards .. Add an add-widgets button to boards bug: T93966 Change-Id: Ie2ca0135f0427d5da52cbffb6a3984f8869594ae --- M src/components/boards/generic-board/generic-board.html 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Ejegg: Looks good to me, approved diff --git a/src/components/boards/generic-board/generic-board.html b/src/components/boards/generic-board/generic-board.html index 2c17a5b..dbf2861 100644 --- a/src/components/boards/generic-board/generic-board.html +++ b/src/components/boards/generic-board/generic-board.html @@ -7,9 +7,9 @@ - + + Add widgets + -- To view, visit https://gerrit.wikimedia.org/r/200061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2ca0135f0427d5da52cbffb6a3984f8869594ae Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bind amount-per-second-chart to the right div - change (wikimedia...dash)
jenkins-bot has submitted this change and it was merged. Change subject: Bind amount-per-second-chart to the right div .. Bind amount-per-second-chart to the right div I think this was the cause of the bad positioning. Change-Id: Iae96ac8448eb5465266bf77f216066e8dc412c01 --- M src/components/widgets/amt-per-second-chart/amt-per-second-chart.html 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ssmith: Looks good to me, approved jenkins-bot: Verified diff --git a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html index c08c720..d9eaf85 100644 --- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html +++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.html @@ -11,8 +11,8 @@ No data available. This widget works in tandem with another widget, like Totals Earned. Add the other widget to this board and you'll see the chart. - - + + -- To view, visit https://gerrit.wikimedia.org/r/200048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae96ac8448eb5465266bf77f216066e8dc412c01 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: Ssmith Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "mediawiki.action.edit.preview: Disable if there is n... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "mediawiki.action.edit.preview: Disable if there is no
#wpTextbox1"
..
Revert "mediawiki.action.edit.preview: Disable if there is no #wpTextbox1"
This caused T94089
This reverts commit c890a2fdefaae2551897ce2f1b9f39d82b435dc2.
Change-Id: Ia5e151d12f0ad03ce50802502e661d7499749526
---
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 84bde7d..3bf8e32 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -205,8 +205,7 @@
$( function () {
// Do not enable on user .js/.css pages, as there's no sane way
of "previewing"
// the scripts or styles without reloading the page.
- // Do not enable for ProofreadPage Index page editors, which
have no textbox
- if ( $( '#mw-userjsyoucanpreview' ).length || $(
'#mw-usercssyoucanpreview' ).length || $( '#wpTextbox1' ).length === 0 ) {
+ if ( $( '#mw-userjsyoucanpreview' ).length || $(
'#mw-usercssyoucanpreview' ).length ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/200040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e151d12f0ad03ce50802502e661d7499749526
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed recent items from migrator import count. - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Removed recent items from migrator import count.
..
Removed recent items from migrator import count.
Change-Id: Ib108abc8708f5a7677d1660aa6ed2f00a7cbc5ea
---
M wikipedia/Custom Views/WMFProgressLineView.m
M wikipedia/Data/OldDataSchemaMigrator.h
M wikipedia/Data/OldDataSchemaMigrator.m
M wikipedia/View Controllers/DataMigration/DataMigrationProgressViewController.m
4 files changed, 116 insertions(+), 152 deletions(-)
Approvals:
Fjalapeno: Looks good to me, but someone else must approve
Mhurd: Looks good to me, approved
Bgerstle: Looks good to me, but someone else must approve
diff --git a/wikipedia/Custom Views/WMFProgressLineView.m b/wikipedia/Custom
Views/WMFProgressLineView.m
index b9c5c43..2ac1f75 100644
--- a/wikipedia/Custom Views/WMFProgressLineView.m
+++ b/wikipedia/Custom Views/WMFProgressLineView.m
@@ -21,24 +21,19 @@
return self;
}
-- (void)awakeFromNib{
-
+- (void)awakeFromNib {
[super awakeFromNib];
[self setup];
}
-
-- (void)setup{
-
+- (void)setup {
self.clipsToBounds = YES;
self.backgroundColor = [UIColor clearColor];
self.progressBar = [[UIView alloc] init];
self.progressBar.backgroundColor = [UIColor colorWithRed:0.106 green:0.682
blue:0.541 alpha:1];
self.progress= 0.0;
[self addSubview:self.progressBar];
-
}
-
- (void)setFrame:(CGRect)frame {
//whole pixels for non-retina screens
diff --git a/wikipedia/Data/OldDataSchemaMigrator.h
b/wikipedia/Data/OldDataSchemaMigrator.h
index 626fceb..e028df2 100644
--- a/wikipedia/Data/OldDataSchemaMigrator.h
+++ b/wikipedia/Data/OldDataSchemaMigrator.h
@@ -27,11 +27,11 @@
@protocol OldDataSchemaMigratorProgressDelegate
--(void)oldDataSchema:(OldDataSchemaMigrator *)schema
didUpdateProgressWithArticlesCompleted:(NSUInteger)completed
total:(NSUInteger)total;
+- (void)oldDataSchema:(OldDataSchemaMigrator*)schema
didUpdateProgressWithArticlesCompleted:(NSUInteger)completed
total:(NSUInteger)total;
--(void)oldDataSchemaDidFinishMigration:(OldDataSchemaMigrator *)schema;
+- (void)oldDataSchemaDidFinishMigration:(OldDataSchemaMigrator*)schema;
--(void)oldDataSchema:(OldDataSchemaMigrator *)schema
didFinishWithError:(NSError*)error;
+- (void)oldDataSchema:(OldDataSchemaMigrator*)schema
didFinishWithError:(NSError*)error;
@end
@@ -42,12 +42,12 @@
@property (weak) id delegate;
@property (weak) id progressDelegate;
--(BOOL)exists;
+- (BOOL)exists;
/**
- * This runs asynchronously.
+ * This runs asynchronously.
* Use the progress delegate methods to get notifified when the migration
completes.
*/
--(void)migrateData;
+- (void)migrateData;
@end
diff --git a/wikipedia/Data/OldDataSchemaMigrator.m
b/wikipedia/Data/OldDataSchemaMigrator.m
index a46f57a..bb30296 100644
--- a/wikipedia/Data/OldDataSchemaMigrator.m
+++ b/wikipedia/Data/OldDataSchemaMigrator.m
@@ -15,15 +15,14 @@
@interface OldDataSchemaMigrator ()
-@property (nonatomic, strong) ArticleDataContextSingleton *context;
-@property (nonatomic, strong) NSMutableSet *savedTitles;
+@property (nonatomic, strong) ArticleDataContextSingleton* context;
+@property (nonatomic, strong) NSMutableSet* savedTitles;
@end
@implementation OldDataSchemaMigrator
--(instancetype)init
-{
+- (instancetype)init {
self = [super init];
if (self) {
_savedTitles = [[NSMutableSet alloc] init];
@@ -36,25 +35,22 @@
return self;
}
--(NSString *)sqlitePath
-{
-NSArray *documentPaths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-NSString *documentRootPath = [documentPaths objectAtIndex:0];
-NSString *filePath = [documentRootPath
stringByAppendingPathComponent:@"articleData6.sqlite"];
+- (NSString*)sqlitePath {
+NSArray* documentPaths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+NSString* documentRootPath = [documentPaths objectAtIndex:0];
+NSString* filePath = [documentRootPath
stringByAppendingPathComponent:@"articleData6.sqlite"];
return filePath;
}
--(BOOL)exists
-{
-NSString *filePath = [self sqlitePath];
+- (BOOL)exists {
+NSString* filePath = [self sqlitePath];
return [[NSFileManager defaultManager] fileExistsAtPath:filePath];
}
--(void)removeOldData
-{
-NSString *filePath = [self sqlitePath];
-NSString *backupPath = [filePath stringByAppendingString:@".bak"];
-NSError *err = nil;
+- (void)removeOldData {
+NSString* filePath = [self sqlitePath];
+NSString* backupPath = [filePath stringByAppendingString:@".bak"];
+NSError* err = nil;
[[NSFileManager defaultManager] moveItemAtPath:filePath
toPath:backupPath
er
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9538d4c..b19104e - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200072 Change subject: Syncronize VisualEditor: 9538d4c..b19104e .. Syncronize VisualEditor: 9538d4c..b19104e Change-Id: I55d275d10e59bb45c2582593e7ce35fc496f35b9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/72/200072/1 diff --git a/VisualEditor b/VisualEditor index 9538d4c..b19104e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9538d4c0f3456ae6a5815e15046b3dcaf0b57bb2 +Subproject commit b19104ed04dd4b1348ce0894ae517d603710f260 -- To view, visit https://gerrit.wikimedia.org/r/200072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55d275d10e59bb45c2582593e7ce35fc496f35b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9538d4c..b19104e - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 9538d4c..b19104e .. Syncronize VisualEditor: 9538d4c..b19104e Change-Id: I55d275d10e59bb45c2582593e7ce35fc496f35b9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 9538d4c..b19104e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9538d4c0f3456ae6a5815e15046b3dcaf0b57bb2 +Subproject commit b19104ed04dd4b1348ce0894ae517d603710f260 -- To view, visit https://gerrit.wikimedia.org/r/200072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I55d275d10e59bb45c2582593e7ce35fc496f35b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump EventLogging submodule in 1.25wmf23 - change (mediawiki/core)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/200071 Change subject: Bump EventLogging submodule in 1.25wmf23 .. Bump EventLogging submodule in 1.25wmf23 Change-Id: I596b6b3fdb28b3f9f43ef71f5651db240c2ec87b --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/200071/1 diff --git a/extensions/EventLogging b/extensions/EventLogging index 0f91928..3bd8a30 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 0f919288c01cfb5ce7993334676b28fdc894d072 +Subproject commit 3bd8a30c79404302b2536d0678bf85b4de9e5665 -- To view, visit https://gerrit.wikimedia.org/r/200071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I596b6b3fdb28b3f9f43ef71f5651db240c2ec87b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf23 Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump EventLogging submodule in 1.25wmf22 - change (mediawiki/core)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/200073 Change subject: Bump EventLogging submodule in 1.25wmf22 .. Bump EventLogging submodule in 1.25wmf22 Change-Id: I7ab86dda9e99e4d87da4d0558dbe0142a08a1e8e --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/73/200073/1 diff --git a/extensions/EventLogging b/extensions/EventLogging index 6a3b47f..29f55b8 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 6a3b47f2b17d35d670eba94230fb0007c6b900f9 +Subproject commit 29f55b80a08b9d3f6a08ca7b45f215ed8bd66b53 -- To view, visit https://gerrit.wikimedia.org/r/200073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ab86dda9e99e4d87da4d0558dbe0142a08a1e8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ResourceLoaderSchemaModule: Use definition hash instead of f... - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged.
Change subject: ResourceLoaderSchemaModule: Use definition hash instead of fake
timestamp
..
ResourceLoaderSchemaModule: Use definition hash instead of fake timestamp
Remove old unit tests since this behaviour is already tested in
MediaWiki core. I kept the test for returning a bottom timestamp
of 1 in case we can't fetch the schema.
Bug: T94059
Change-Id: I26f9ab09fc7ee1e5330315f7b9e3d290eff5d79f
---
M includes/ResourceLoaderSchemaModule.php
M tests/ResourceLoaderSchemaModuleTest.php
2 files changed, 21 insertions(+), 78 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ResourceLoaderSchemaModule.php
b/includes/ResourceLoaderSchemaModule.php
index 88fd46f..1c79af4 100644
--- a/includes/ResourceLoaderSchemaModule.php
+++ b/includes/ResourceLoaderSchemaModule.php
@@ -67,31 +67,34 @@
/**
-* Gets the last modified timestamp of this module.
+* Get the last modified timestamp of this module.
+*
* The last modified timestamp controls caching. Because revisions are
-* immutable, we don't need to get the revision's timestamp. We
-* simply return a timestamp of 1 (one second past epoch) if we were
-* unable to retrieve the schema, or the revision id if successful.
-* This ensures that clients will retrieve the schema when it becomes
-* available.
+* immutable, we don't need to fetch the RemoteSchema, nor get the
revision's
+* timestamp. We simply hash our module definition.
+*
* @param ResourceLoaderContext $context
* @return integer: Unix timestamp.
*/
function getModifiedTime( ResourceLoaderContext $context ) {
- global $wgCacheEpoch;
-
- $unixTimeCacheEpoch = wfTimestamp( TS_UNIX, $wgCacheEpoch );
- if ( $this->schema->get() ) {
- // ResourceLoader will set the module's modification
time to be
- // either the value returned by this method, or the
Unix time
- // number of $wgCacheEpoch, whichever is greater. To
ensure that
- // the modification time is always updated whenever the
schema
- // revision changes, we add the revision ID to the Unix
time number
- // of $wgCacheEpoch.
- return $unixTimeCacheEpoch + $this->schema->revision;
- } else {
+ if ( !$this->schema->get() ) {
+ // If we failed to fetch, hold off on rolling over
definition timestamp
return 1;
}
+ return $this->getDefinitionMtime( $context );
+ }
+
+ /**
+* Get the definition summary for this module.
+*
+* @param ResourceLoaderContext $context
+* @return array
+*/
+ public function getDefinitionSummary( ResourceLoaderContext $context ) {
+ return array(
+ 'class' => get_class( $this ),
+ 'revision' => $this->schema->revision,
+ );
}
diff --git a/tests/ResourceLoaderSchemaModuleTest.php
b/tests/ResourceLoaderSchemaModuleTest.php
index cf163e8..e298e72 100644
--- a/tests/ResourceLoaderSchemaModuleTest.php
+++ b/tests/ResourceLoaderSchemaModuleTest.php
@@ -50,22 +50,6 @@
/**
-* When the RemoteSchema dependency cannot be loaded, the modified
-* time should be set to 1.
-* @covers ResourceLoaderSchemaModule::getModifiedTime
-*/
- function testFetchFailureModifiedTime() {
- $this->module->schema
- ->expects( $this->once() )
- ->method( 'get' )
- ->will( $this->returnValue( false ) );
-
- $mtime = $this->module->getModifiedTime( $this->context );
- $this->assertEquals( self::ERROR_VERSION, $mtime );
- }
-
-
- /**
* When the RemoteSchema dependency can be loaded, the modified time
* should be set to sum of $wgCacheEpoch (in UNIX time) and the
revision number.
* @covers ResourceLoaderSchemaModule::getModifiedTime
@@ -94,50 +78,6 @@
$unixTimeCacheEpoch,
$mtime,
'Should be greater than cache epoch, so epoch does not
mask updates'
- );
- }
-
- /*
- Gets the effective modification time, as calculated by
- ResourceLoaderStartupModule. It calculates this as the maximum of
- the module's self-reported modification time and $wgCacheEpoch.
-
- This is not broken into a method in core, so we reproduce it here.
- */
- function getEffectiveModifiedTime
[MediaWiki-commits] [Gerrit] Removed recent items from migrator import count. - change (apps...wikipedia)
Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200070
Change subject: Removed recent items from migrator import count.
..
Removed recent items from migrator import count.
Change-Id: Ib108abc8708f5a7677d1660aa6ed2f00a7cbc5ea
---
M MediaWikiKit/MediaWikiKit/MWKImage.m
M wikipedia/Custom Views/WMFProgressLineView.m
M wikipedia/Data/OldDataSchemaMigrator.h
M wikipedia/Data/OldDataSchemaMigrator.m
M wikipedia/View Controllers/DataMigration/DataMigrationProgressViewController.m
5 files changed, 120 insertions(+), 156 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/70/200070/1
diff --git a/MediaWikiKit/MediaWikiKit/MWKImage.m
b/MediaWikiKit/MediaWikiKit/MWKImage.m
index 0f69510..77dd950 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImage.m
+++ b/MediaWikiKit/MediaWikiKit/MWKImage.m
@@ -157,10 +157,10 @@
NSAssert((![self hasEstimatedSize] || [self
isEstimatedSizeWithinPoints:10.f ofSize:image.size]),
(@"estimatedSize inaccuracy has exceeded acceptable threshold: {
\n"
- "\t" "sourceURL: %@, \n"
- "\t" "estimatedSize: %@ \n"
- "\t" "actualSize: %@ \n"
- "}"),
+ "\t" "sourceURL: %@, \n"
+ "\t" "estimatedSize: %@ \n"
+ "\t" "actualSize: %@ \n"
+ "}"),
self.sourceURL, [self estimatedSizeString],
NSStringFromCGSize(image.size));
return image;
diff --git a/wikipedia/Custom Views/WMFProgressLineView.m b/wikipedia/Custom
Views/WMFProgressLineView.m
index b9c5c43..2ac1f75 100644
--- a/wikipedia/Custom Views/WMFProgressLineView.m
+++ b/wikipedia/Custom Views/WMFProgressLineView.m
@@ -21,24 +21,19 @@
return self;
}
-- (void)awakeFromNib{
-
+- (void)awakeFromNib {
[super awakeFromNib];
[self setup];
}
-
-- (void)setup{
-
+- (void)setup {
self.clipsToBounds = YES;
self.backgroundColor = [UIColor clearColor];
self.progressBar = [[UIView alloc] init];
self.progressBar.backgroundColor = [UIColor colorWithRed:0.106 green:0.682
blue:0.541 alpha:1];
self.progress= 0.0;
[self addSubview:self.progressBar];
-
}
-
- (void)setFrame:(CGRect)frame {
//whole pixels for non-retina screens
diff --git a/wikipedia/Data/OldDataSchemaMigrator.h
b/wikipedia/Data/OldDataSchemaMigrator.h
index 626fceb..e028df2 100644
--- a/wikipedia/Data/OldDataSchemaMigrator.h
+++ b/wikipedia/Data/OldDataSchemaMigrator.h
@@ -27,11 +27,11 @@
@protocol OldDataSchemaMigratorProgressDelegate
--(void)oldDataSchema:(OldDataSchemaMigrator *)schema
didUpdateProgressWithArticlesCompleted:(NSUInteger)completed
total:(NSUInteger)total;
+- (void)oldDataSchema:(OldDataSchemaMigrator*)schema
didUpdateProgressWithArticlesCompleted:(NSUInteger)completed
total:(NSUInteger)total;
--(void)oldDataSchemaDidFinishMigration:(OldDataSchemaMigrator *)schema;
+- (void)oldDataSchemaDidFinishMigration:(OldDataSchemaMigrator*)schema;
--(void)oldDataSchema:(OldDataSchemaMigrator *)schema
didFinishWithError:(NSError*)error;
+- (void)oldDataSchema:(OldDataSchemaMigrator*)schema
didFinishWithError:(NSError*)error;
@end
@@ -42,12 +42,12 @@
@property (weak) id delegate;
@property (weak) id progressDelegate;
--(BOOL)exists;
+- (BOOL)exists;
/**
- * This runs asynchronously.
+ * This runs asynchronously.
* Use the progress delegate methods to get notifified when the migration
completes.
*/
--(void)migrateData;
+- (void)migrateData;
@end
diff --git a/wikipedia/Data/OldDataSchemaMigrator.m
b/wikipedia/Data/OldDataSchemaMigrator.m
index a46f57a..bb30296 100644
--- a/wikipedia/Data/OldDataSchemaMigrator.m
+++ b/wikipedia/Data/OldDataSchemaMigrator.m
@@ -15,15 +15,14 @@
@interface OldDataSchemaMigrator ()
-@property (nonatomic, strong) ArticleDataContextSingleton *context;
-@property (nonatomic, strong) NSMutableSet *savedTitles;
+@property (nonatomic, strong) ArticleDataContextSingleton* context;
+@property (nonatomic, strong) NSMutableSet* savedTitles;
@end
@implementation OldDataSchemaMigrator
--(instancetype)init
-{
+- (instancetype)init {
self = [super init];
if (self) {
_savedTitles = [[NSMutableSet alloc] init];
@@ -36,25 +35,22 @@
return self;
}
--(NSString *)sqlitePath
-{
-NSArray *documentPaths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-NSString *documentRootPath = [documentPaths objectAtIndex:0];
-NSString *filePath = [documentRootPath
stringByAppendingPathComponent:@"articleData6.sqlite"];
+- (NSString*)sqlitePath {
+NSArray* documentPaths =
NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+NSString* documentRootPath = [documentPaths objectAtIndex:0];
+NSString* filePath = [documentRootP
[MediaWiki-commits] [Gerrit] Bump flow submodule in 1.25wmf23 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bump flow submodule in 1.25wmf23 .. Bump flow submodule in 1.25wmf23 Change-Id: Ib650287925c24b27a435973b025052b7843fbf10 --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Flow b/extensions/Flow index 3dd731e..745d500 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit 3dd731e99ee095831830227edda635fb4aefc432 +Subproject commit 745d5006a4ea1089e5f7ee3fe48c7614902f9621 -- To view, visit https://gerrit.wikimedia.org/r/26 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib650287925c24b27a435973b025052b7843fbf10 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf23 Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ResourceLoaderSchemaModule: Use definition hash instead of f... - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged.
Change subject: ResourceLoaderSchemaModule: Use definition hash instead of fake
timestamp
..
ResourceLoaderSchemaModule: Use definition hash instead of fake timestamp
Remove old unit tests since this behaviour is already tested in
MediaWiki core. I kept the test for returning a bottom timestamp
of 1 in case we can't fetch the schema.
Bug: T94059
Change-Id: I26f9ab09fc7ee1e5330315f7b9e3d290eff5d79f
---
M includes/ResourceLoaderSchemaModule.php
M tests/ResourceLoaderSchemaModuleTest.php
2 files changed, 21 insertions(+), 78 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ResourceLoaderSchemaModule.php
b/includes/ResourceLoaderSchemaModule.php
index 88fd46f..1c79af4 100644
--- a/includes/ResourceLoaderSchemaModule.php
+++ b/includes/ResourceLoaderSchemaModule.php
@@ -67,31 +67,34 @@
/**
-* Gets the last modified timestamp of this module.
+* Get the last modified timestamp of this module.
+*
* The last modified timestamp controls caching. Because revisions are
-* immutable, we don't need to get the revision's timestamp. We
-* simply return a timestamp of 1 (one second past epoch) if we were
-* unable to retrieve the schema, or the revision id if successful.
-* This ensures that clients will retrieve the schema when it becomes
-* available.
+* immutable, we don't need to fetch the RemoteSchema, nor get the
revision's
+* timestamp. We simply hash our module definition.
+*
* @param ResourceLoaderContext $context
* @return integer: Unix timestamp.
*/
function getModifiedTime( ResourceLoaderContext $context ) {
- global $wgCacheEpoch;
-
- $unixTimeCacheEpoch = wfTimestamp( TS_UNIX, $wgCacheEpoch );
- if ( $this->schema->get() ) {
- // ResourceLoader will set the module's modification
time to be
- // either the value returned by this method, or the
Unix time
- // number of $wgCacheEpoch, whichever is greater. To
ensure that
- // the modification time is always updated whenever the
schema
- // revision changes, we add the revision ID to the Unix
time number
- // of $wgCacheEpoch.
- return $unixTimeCacheEpoch + $this->schema->revision;
- } else {
+ if ( !$this->schema->get() ) {
+ // If we failed to fetch, hold off on rolling over
definition timestamp
return 1;
}
+ return $this->getDefinitionMtime( $context );
+ }
+
+ /**
+* Get the definition summary for this module.
+*
+* @param ResourceLoaderContext $context
+* @return array
+*/
+ public function getDefinitionSummary( ResourceLoaderContext $context ) {
+ return array(
+ 'class' => get_class( $this ),
+ 'revision' => $this->schema->revision,
+ );
}
diff --git a/tests/ResourceLoaderSchemaModuleTest.php
b/tests/ResourceLoaderSchemaModuleTest.php
index cf163e8..e298e72 100644
--- a/tests/ResourceLoaderSchemaModuleTest.php
+++ b/tests/ResourceLoaderSchemaModuleTest.php
@@ -50,22 +50,6 @@
/**
-* When the RemoteSchema dependency cannot be loaded, the modified
-* time should be set to 1.
-* @covers ResourceLoaderSchemaModule::getModifiedTime
-*/
- function testFetchFailureModifiedTime() {
- $this->module->schema
- ->expects( $this->once() )
- ->method( 'get' )
- ->will( $this->returnValue( false ) );
-
- $mtime = $this->module->getModifiedTime( $this->context );
- $this->assertEquals( self::ERROR_VERSION, $mtime );
- }
-
-
- /**
* When the RemoteSchema dependency can be loaded, the modified time
* should be set to sum of $wgCacheEpoch (in UNIX time) and the
revision number.
* @covers ResourceLoaderSchemaModule::getModifiedTime
@@ -94,50 +78,6 @@
$unixTimeCacheEpoch,
$mtime,
'Should be greater than cache epoch, so epoch does not
mask updates'
- );
- }
-
- /*
- Gets the effective modification time, as calculated by
- ResourceLoaderStartupModule. It calculates this as the maximum of
- the module's self-reported modification time and $wgCacheEpoch.
-
- This is not broken into a method in core, so we reproduce it here.
- */
- function getEffectiveModifiedTime
[MediaWiki-commits] [Gerrit] Send requests to RESTbase directly when so configured - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Send requests to RESTbase directly when so configured
..
Send requests to RESTbase directly when so configured
Also introduces paction=metadata in ApiVisualEditor which
doesn't hit Parsoid but gets all the other information we need.
Bug: T90374
Change-Id: I71edbc0f8dc15a6f8d3672c10ca3c641cc172be7
---
M ApiVisualEditor.php
M VisualEditor.hooks.php
M VisualEditor.php
M extension.json
M modules/ve-mw/init/ve.init.mw.TargetLoader.js
5 files changed, 123 insertions(+), 79 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index f75ecbe..e2cb85c 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -112,54 +112,6 @@
return $response['body'];
}
- protected function getHTML( $title, $parserParams ) {
- $restoring = false;
-
- if ( $title->exists() ) {
- $latestRevision = Revision::newFromTitle( $title );
- if ( $latestRevision === null ) {
- return false;
- }
- $revision = null;
- if ( !isset( $parserParams['oldid'] ) ||
$parserParams['oldid'] === 0 ) {
- $parserParams['oldid'] =
$latestRevision->getId();
- $revision = $latestRevision;
- } else {
- $revision = Revision::newFromId(
$parserParams['oldid'] );
- if ( $revision === null ) {
- return false;
- }
- }
-
- $restoring = $revision && !$revision->isCurrent();
- $oldid = $parserParams['oldid'];
-
- $content = $this->requestParsoid(
- 'GET',
- 'page/' . urlencode( $title->getPrefixedDBkey()
) . '/html',
- $parserParams
- );
-
- if ( $content === false ) {
- return false;
- }
- $timestamp = $latestRevision->getTimestamp();
- } else {
- $content = '';
- $timestamp = wfTimestampNow();
- $oldid = 0;
- }
- return array(
- 'result' => array(
- 'content' => $content,
- 'basetimestamp' => $timestamp,
- 'starttimestamp' => wfTimestampNow(),
- 'oldid' => $oldid,
- ),
- 'restoring' => $restoring,
- );
- }
-
protected function storeInSerializationCache( $title, $oldid, $html ) {
global $wgMemc;
$content = $this->postHTML( $title, $html, array( 'oldid' =>
$oldid ) );
@@ -320,13 +272,56 @@
wfDebugLog( 'visualeditor', "called on '$title' with paction:
'{$params['paction']}'" );
switch ( $params['paction'] ) {
case 'parse':
- $parsed = $this->getHTML( $title, $parserParams
);
-
+ case 'metadata':
// Dirty hack to provide the correct context
for edit notices
global $wgTitle; // FIXME NES
$wgTitle = $title;
RequestContext::getMain()->setTitle( $title );
+
+ // Get information about current revision
+ if ( $title->exists() ) {
+ $latestRevision =
Revision::newFromTitle( $title );
+ if ( $latestRevision === null ) {
+ $this->dieUsage( 'Could not
find latest revision for title', 'latestnotfound' );
+ }
+ $revision = null;
+ if ( !isset( $parserParams['oldid'] )
|| $parserParams['oldid'] === 0 ) {
+ $parserParams['oldid'] =
$latestRevision->getId();
+ $revision = $latestRevision;
+ } else {
+ $revision =
Revision::newFromId( $parserParams['oldid'] );
+ if ( $revision === null ) {
+ $thi
[MediaWiki-commits] [Gerrit] Bump flow submodule in 1.22wmf22 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bump flow submodule in 1.22wmf22 .. Bump flow submodule in 1.22wmf22 Change-Id: Ic7cc8a9a540d3ef93246f65ebf5e39a16f769cb1 --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Flow b/extensions/Flow index 010c3fc..8fc3199 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit 010c3fc6f4ba165534b1d1ec464a2bfc613dd8b4 +Subproject commit 8fc319978ca150805b06ae5bfba3732d8ccc9d91 -- To view, visit https://gerrit.wikimedia.org/r/25 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7cc8a9a540d3ef93246f65ebf5e39a16f769cb1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix fraud gauge color display - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Fix fraud gauge color display
..
Fix fraud gauge color display
Change-Id: I6559cb447e2bb66268a52ba79ed91da6a6215b75
---
M src/components/utils/date-pickers/date-pickers.html
M src/components/utils/date-pickers/date-pickers.js
M src/components/widgets/fraud-gauge/fraud-gauge.js
3 files changed, 4 insertions(+), 7 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/utils/date-pickers/date-pickers.html
b/src/components/utils/date-pickers/date-pickers.html
index 0954875..e7f8128 100644
--- a/src/components/utils/date-pickers/date-pickers.html
+++ b/src/components/utils/date-pickers/date-pickers.html
@@ -4,7 +4,7 @@
Choose Preset Time Period:
-
+
diff --git a/src/components/utils/date-pickers/date-pickers.js
b/src/components/utils/date-pickers/date-pickers.js
index 842ddc6..984ae59 100644
--- a/src/components/utils/date-pickers/date-pickers.js
+++ b/src/components/utils/date-pickers/date-pickers.js
@@ -22,6 +22,7 @@
self.chosenTimePeriodDate = ko.observable('');
self.chosenTimePeriodFromTime = ko.observable('');
self.chosenTimePeriodToTime = ko.observable('');
+self.selectedTimePeriod = params.selectedTimePeriod;
//TODO: handle resetting fields
self.chosenTimePeriod = ko.pureComputed( function (){
@@ -37,10 +38,6 @@
return timePeriod;
-});
-
-self.chosenTimePeriod.subscribe( function(newVal){
-params.selectedTimePeriod(newVal);
});
self.submitTimePeriod = function(){
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 887fa66..5df6df4 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -140,7 +140,7 @@
color: {
pattern: ['#FF', '#F97600',
'#F6C600', '#60B044'], // the three color levels for the percentage values.
threshold: {
- values: [ 0,
self.greenHighRange, self.redLowRange, 100]
+ values: [ 0,
self.greenHighRange(), self.redLowRange(), 100]
}
}
});
@@ -193,7 +193,7 @@
});
var currentDate = new Date();
- switch( userChoices.timespan[0] ){
+ switch( userChoices.timespan ){
case timePresets[0]:
var lfm = new
Date(currentDate.getTime() - (15 * 60 * 1000));
ds += 'DT gt \'' + lfm.toISOString() +
'\'';
--
To view, visit https://gerrit.wikimedia.org/r/14
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6559cb447e2bb66268a52ba79ed91da6a6215b75
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LivingStyleGuide skin renamed to Blueprint - change (integration/config)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/200069 Change subject: LivingStyleGuide skin renamed to Blueprint .. LivingStyleGuide skin renamed to Blueprint Change-Id: Ie9f6f2de488fe87e9f965b8d9d7ae3e9006e836f --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/69/200069/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e85a0a1..36a8064 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2369,6 +2369,10 @@ template: - name: mw-checks + - name: mediawiki/skins/Blueprint +template: + - name: mw-checks + - name: mediawiki/skins/BlueSky template: - name: mw-checks @@ -2430,10 +2434,6 @@ - name: mw-checks - name: mediawiki/skins/GreyStuff -template: - - name: mw-checks - - - name: mediawiki/skins/LivingStyleGuide template: - name: mw-checks -- To view, visit https://gerrit.wikimedia.org/r/200069 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9f6f2de488fe87e9f965b8d9d7ae3e9006e836f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Add padding to the "Apply changes" button scre... - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200068
Change subject: [BrowserTest] Add padding to the "Apply changes" button
screenshot
..
[BrowserTest] Add padding to the "Apply changes" button screenshot
Change-Id: I1a7aaca8013bf671ff39c310d5ad0dd1725b094a
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/68/200068/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index f1ee179..f2b2504 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -294,7 +294,8 @@
Screenshot.capture(
@browser,
"VisualEditor_Apply_Changes-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-[@current_page.settings_apply_button_element]
+[@current_page.settings_apply_button_element],
+3
)
end
--
To view, visit https://gerrit.wikimedia.org/r/200068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a7aaca8013bf671ff39c310d5ad0dd1725b094a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Add padding to screenshots of the page setting... - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200067
Change subject: [BrowserTest] Add padding to screenshots of the page settings
dialog
..
[BrowserTest] Add padding to screenshots of the page settings dialog
Change-Id: I460fc82a10ca5172537a97f28f3a50573c784a93
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/67/200067/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 212fb7c..f1ee179 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -272,13 +272,15 @@
Screenshot.capture(
@browser,
"VisualEditor_Page_Settings_Redirects-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-[@current_page.enable_redirect_element,
@current_page.prevent_redirect_element]
+[@current_page.enable_redirect_element,
@current_page.prevent_redirect_element],
+3
)
Screenshot.capture(
@browser,
"VisualEditor_Page_Settings_TOC-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-[@current_page.table_of_contents_element]
+[@current_page.table_of_contents_element],
+3
)
Screenshot.capture(
--
To view, visit https://gerrit.wikimedia.org/r/200067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I460fc82a10ca5172537a97f28f3a50573c784a93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Add padding to the Edit Links screenshot - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200066
Change subject: [BrowserTest] Add padding to the Edit Links screenshot
..
[BrowserTest] Add padding to the Edit Links screenshot
Change-Id: Ife795e5f34b69fc6790cd04b217f823205737c0c
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/66/200066/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index fb2f531..212fb7c 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -284,7 +284,8 @@
Screenshot.capture(
@browser,
"VisualEditor_Page_Settings_Edit_Links-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-[@current_page.page_settings_editlinks_element]
+[@current_page.page_settings_editlinks_element],
+3
)
Screenshot.zoom_browser(@browser, 3)
--
To view, visit https://gerrit.wikimedia.org/r/200066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife795e5f34b69fc6790cd04b217f823205737c0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Add padding to the page settings item screenshot - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200065
Change subject: [BrowserTest] Add padding to the page settings item screenshot
..
[BrowserTest] Add padding to the page settings item screenshot
Change-Id: I38f9d81cbfaa28c51997105bdc2cbaa81ed02783
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/65/200065/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 1ae8cfe..fb2f531 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -69,7 +69,8 @@
Screenshot.capture(
@browser,
"VisualEditor_page_settings_item-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png",
-[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element]
+[@current_page.hamburger_menu_element,
@current_page.page_option_menu_element],
+3
)
on(VisualEditorPage).page_settings_element.when_present.click
--
To view, visit https://gerrit.wikimedia.org/r/200065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38f9d81cbfaa28c51997105bdc2cbaa81ed02783
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When content and metadata have different revids, explicitly ... - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200064
Change subject: When content and metadata have different revids, explicitly
retry the higher one
..
When content and metadata have different revids, explicitly retry the higher one
It's much less likely we'll get another conflict if we retry
with ?oldid=12345 than if we retry omitting the oldid again.
Change-Id: I10e40f714fd44d7f0ac16c9d0dc6239a95c0ec51
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/64/200064/1
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 99d2cc5..07a67e4 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -354,8 +354,13 @@
);
} else {
this.retriedRevIdConflict = true;
- // Have to retry both until we can access the
document server directly...
+ // TODO this retries both requests, in RESTbase
mode we should only retry
+ // the request that gave us the lower revid
this.loading = false;
+ // HACK: Load with explicit revid to hopefully
prevent this from happening again
+ if ( !this.requestedRevId ) {
+ this.requestedRevId = Math.max(
docRevId, this.revid );
+ }
this.load();
}
return;
--
To view, visit https://gerrit.wikimedia.org/r/200064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10e40f714fd44d7f0ac16c9d0dc6239a95c0ec51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c9cfcc1..9538d4c - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: c9cfcc1..9538d4c .. Syncronize VisualEditor: c9cfcc1..9538d4c Change-Id: I25a9f794eb3c28ffe20e758de6f2a3d5d1366539 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index c9cfcc1..9538d4c 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c9cfcc1a920687af9508681fe38a0e80e3393155 +Subproject commit 9538d4c0f3456ae6a5815e15046b3dcaf0b57bb2 -- To view, visit https://gerrit.wikimedia.org/r/200063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25a9f794eb3c28ffe20e758de6f2a3d5d1366539 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: c9cfcc1..9538d4c - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/200063 Change subject: Syncronize VisualEditor: c9cfcc1..9538d4c .. Syncronize VisualEditor: c9cfcc1..9538d4c Change-Id: I25a9f794eb3c28ffe20e758de6f2a3d5d1366539 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/63/200063/1 diff --git a/VisualEditor b/VisualEditor index c9cfcc1..9538d4c 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit c9cfcc1a920687af9508681fe38a0e80e3393155 +Subproject commit 9538d4c0f3456ae6a5815e15046b3dcaf0b57bb2 -- To view, visit https://gerrit.wikimedia.org/r/200063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25a9f794eb3c28ffe20e758de6f2a3d5d1366539 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiVisualEditor: Rename $page to $title, since it's a Title, ... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: ApiVisualEditor: Rename $page to $title, since it's a Title,
not a WikiPage
..
ApiVisualEditor: Rename $page to $title, since it's a Title, not a WikiPage
Change-Id: I45b23158b87e49c90375ea73635285fdb63a0c1c
---
M ApiVisualEditor.php
1 file changed, 35 insertions(+), 34 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 31d8aad..f75ecbe 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -298,13 +298,13 @@
$user = $this->getUser();
$params = $this->extractRequestParams();
- $page = Title::newFromText( $params['page'] );
- if ( !$page ) {
+ $title = Title::newFromText( $params['page'] );
+ if ( !$title ) {
$this->dieUsageMsg( 'invalidtitle', $params['page'] );
}
- if ( !in_array( $page->getNamespace(), $this->veConfig->get(
'VisualEditorNamespaces' ) ) ) {
+ if ( !in_array( $title->getNamespace(), $this->veConfig->get(
'VisualEditorNamespaces' ) ) ) {
$this->dieUsage( "VisualEditor is not enabled in
namespace " .
- $page->getNamespace(), 'novenamespace' );
+ $title->getNamespace(), 'novenamespace' );
}
$parserParams = array();
@@ -317,15 +317,16 @@
$html = gzinflate( base64_decode( substr( $html, 11 ) )
);
}
- wfDebugLog( 'visualeditor', "called on '$page' with paction:
'{$params['paction']}'" );
+ wfDebugLog( 'visualeditor', "called on '$title' with paction:
'{$params['paction']}'" );
switch ( $params['paction'] ) {
case 'parse':
- $parsed = $this->getHTML( $page, $parserParams
);
+ $parsed = $this->getHTML( $title, $parserParams
);
+
// Dirty hack to provide the correct context
for edit notices
global $wgTitle; // FIXME NES
- $wgTitle = $page;
- RequestContext::getMain()->setTitle( $page );
- $notices = $page->getEditNotices();
+ $wgTitle = $title;
+ RequestContext::getMain()->setTitle( $title );
+ $notices = $title->getEditNotices();
if ( $user->isAnon() ) {
$notices[] = $this->msg(
'anoneditwarning',
@@ -340,7 +341,7 @@
}
// Creating new page
- if ( !$page->exists() ) {
+ if ( !$title->exists() ) {
$notices[] = $this->msg(
$user->isLoggedIn() ?
'newarticletext' : 'newarticletextanon',
Skin::makeInternalOrExternalUrl(
@@ -348,18 +349,18 @@
)
)->parseAsBlock();
// Page protected from creation
- if ( $page->getRestrictions( 'create' )
) {
+ if ( $title->getRestrictions( 'create'
) ) {
$notices[] = $this->msg(
'titleprotectedwarning' )->parseAsBlock();
}
}
// Look at protection status to set up notices
+ surface class(es)
$protectedClasses = array();
- if ( MWNamespace::getRestrictionLevels(
$page->getNamespace() ) !== array( '' ) ) {
+ if ( MWNamespace::getRestrictionLevels(
$title->getNamespace() ) !== array( '' ) ) {
// Page protected from editing
- if ( $page->isProtected( 'edit' ) ) {
+ if ( $title->isProtected( 'edit' ) ) {
# Is the title semi-protected?
- if ( $page->isSemiProtected() )
{
+ if ( $title->isSemiProtected()
) {
$protectedClasses[] =
'mw-textarea-sprotected';
[MediaWiki-commits] [Gerrit] Delete reverse dns entries when the associated host is deleted. - change (sink_nova_fixed_multi)
Andrew Bogott has submitted this change and it was merged.
Change subject: Delete reverse dns entries when the associated host is deleted.
..
Delete reverse dns entries when the associated host is deleted.
Change-Id: Ib437390b43f31387f63fe23ec614d9dc1c810a65
---
M nova_fixed_multi/base.py
M setup.py
2 files changed, 45 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
diff --git a/nova_fixed_multi/base.py b/nova_fixed_multi/base.py
index 286410d..cb4895f 100644
--- a/nova_fixed_multi/base.py
+++ b/nova_fixed_multi/base.py
@@ -77,7 +77,7 @@
recordset = self._find_or_create_recordset(
context, **recordset_values)
-record_values = { 'data': reverse_format % event_data }
+record_values = {'data': reverse_format % event_data}
if managed:
record_values.update({
@@ -88,7 +88,8 @@
'managed_resource_id': resource_id})
LOG.debug('Creating record in %s / %s with values %r',
- reverse_domain['id'], recordset['id'],
record_values)
+ reverse_domain['id'],
+ recordset['id'], record_values)
central_api.create_record(context,
reverse_domain['id'],
recordset['id'],
@@ -120,3 +121,44 @@
domain['id'],
recordset['id'],
record_values)
+
+def _delete(self, managed=True, resource_id=None, resource_type='instance',
+criterion={}):
+"""
+Handle a generic delete of a fixed ip within a domain
+
+:param criterion: Criterion to search and destroy records
+"""
+context = DesignateContext.get_admin_context(all_tenants=True)
+
+criterion.update({'domain_id': cfg.CONF[self.name].domain_id})
+
+if managed:
+criterion.update({
+'managed': managed,
+'managed_plugin_name': self.get_plugin_name(),
+'managed_plugin_type': self.get_plugin_type(),
+'managed_resource_id': resource_id,
+'managed_resource_type': resource_type
+})
+
+records = central_api.find_records(context, criterion)
+
+for record in records:
+LOG.debug('Deleting record %s' % record['id'])
+
+central_api.delete_record(context, cfg.CONF[self.name].domain_id,
+ record['recordset_id'], record['id'])
+
+reverse_domain_id = cfg.CONF[self.name].get('reverse_domain_id')
+if reverse_domain_id:
+criterion.update({'domain_id': reverse_domain_id})
+
+records = central_api.find_records(context, criterion)
+
+for record in records:
+LOG.debug('Deleting record %s' % record['id'])
+
+central_api.delete_record(context,
+ reverse_domain_id,
+ record['recordset_id'], record['id'])
diff --git a/setup.py b/setup.py
index 0e30c6b..90310af 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
setuptools.setup(
name="nova_fixed_multi",
-version="2015.1",
+version="2015.3",
author="Wikimedia Foundation",
author_email="abog...@wikimedia.org",
description="Designate sink handler that supports multiple arecords per
instance",
--
To view, visit https://gerrit.wikimedia.org/r/200060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib437390b43f31387f63fe23ec614d9dc1c810a65
Gerrit-PatchSet: 1
Gerrit-Project: sink_nova_fixed_multi
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Temporarily remove Flow from mediawiki-extensions co... - change (integration/config)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/200062 Change subject: Revert "Temporarily remove Flow from mediawiki-extensions combo group" .. Revert "Temporarily remove Flow from mediawiki-extensions combo group" Problem that promoted this (T93463) is fixed. (Still needs deployment to WMF, but that doesn't block this). This reverts commit c4bb24a6ee947612011d976831792a71eee51ce6. Change-Id: I9150f37685084d7adc17eb1d12d7ffa2bfced172 --- M jjb/mediawiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/62/200062/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 8162270..def2aa2 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -205,6 +205,7 @@ mediawiki/extensions/ConfirmEdit mediawiki/extensions/Echo mediawiki/extensions/EventLogging + mediawiki/extensions/Flow mediawiki/extensions/Gather mediawiki/extensions/JsonConfig mediawiki/extensions/Mantle -- To view, visit https://gerrit.wikimedia.org/r/200062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9150f37685084d7adc17eb1d12d7ffa2bfced172 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Mattflaschen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for crash when thumb fetcher had error. - change (apps...wikipedia)
Dr0ptp4kt has submitted this change and it was merged.
Change subject: Fix for crash when thumb fetcher had error.
..
Fix for crash when thumb fetcher had error.
Was checking for "error" and "info" keys as if the data
retrieved by the thumb fetcher was a dictionary. This
caused a crash because thumb fetcher retrieves
image binary data, not json payload.
Change-Id: Iefc0d18c3b2a03d83bd653f7492947bf62438909
---
M MediaWikiKit/MediaWikiKit/MWKImage.m
M wikipedia/Networking/Fetchers/ThumbnailFetcher.m
2 files changed, 7 insertions(+), 10 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
Fjalapeno: Looks good to me, but someone else must approve
Bgerstle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/MediaWikiKit/MediaWikiKit/MWKImage.m
b/MediaWikiKit/MediaWikiKit/MWKImage.m
index 0f69510..77dd950 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImage.m
+++ b/MediaWikiKit/MediaWikiKit/MWKImage.m
@@ -157,10 +157,10 @@
NSAssert((![self hasEstimatedSize] || [self
isEstimatedSizeWithinPoints:10.f ofSize:image.size]),
(@"estimatedSize inaccuracy has exceeded acceptable threshold: {
\n"
- "\t" "sourceURL: %@, \n"
- "\t" "estimatedSize: %@ \n"
- "\t" "actualSize: %@ \n"
- "}"),
+ "\t" "sourceURL: %@, \n"
+ "\t" "estimatedSize: %@ \n"
+ "\t" "actualSize: %@ \n"
+ "}"),
self.sourceURL, [self estimatedSizeString],
NSStringFromCGSize(image.size));
return image;
diff --git a/wikipedia/Networking/Fetchers/ThumbnailFetcher.m
b/wikipedia/Networking/Fetchers/ThumbnailFetcher.m
index 4c555ab..61a5d3a 100644
--- a/wikipedia/Networking/Fetchers/ThumbnailFetcher.m
+++ b/wikipedia/Networking/Fetchers/ThumbnailFetcher.m
@@ -35,19 +35,16 @@
NSError* error = nil;
if (
-![responseObject isKindOfClass:[NSData class]]
-||
-([responseObject length] == 0)
+![self isDataResponseValid:responseObject]
||
!self.url
||
(self.url.length == 0)
) {
-NSMutableDictionary* errorDict = [responseObject[@"error"]
mutableCopy];
-errorDict[NSLocalizedDescriptionKey] = errorDict[@"info"];
+NSString* errorUrl = self.url ? self.url : @"No URL specified.";
error = [NSError errorWithDomain:@"Thumbnail Fetcher"
code:THUMBNAIL_FETCH_ERROR_NOT_FOUND
-userInfo:errorDict];
+userInfo:@{NSLocalizedDescriptionKey:
[@"Thumbnail not retrieved. URL: " stringByAppendingString:errorUrl]}];
}
[self finishWithError:error
--
To view, visit https://gerrit.wikimedia.org/r/199810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefc0d18c3b2a03d83bd653f7492947bf62438909
Gerrit-PatchSet: 3
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd
Gerrit-Reviewer: Bgerstle
Gerrit-Reviewer: Dr0ptp4kt
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Never serialize a-tag as html - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Never serialize a-tag as html
..
Never serialize a-tag as html
* Regardless of what data-parsoid has to say.
Bug: T93926
Change-Id: I3d8be79e3774bdaad97eac2a8c7424a6fddbdad2
---
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests.txt
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index 06c7361..7ba7394 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -772,14 +772,16 @@
};
// If parent node is a list or table tag in html-syntax, then serialize
// new elements in html-syntax rather than wiki-syntax.
- } else if (dp.stx === 'html' ||
+ // Anchor elements should never serialize as html, regardless of what
+ // data-parsoid has to say about the matter.
+ } else if ( nodeName !== "a" && (dp.stx === 'html' ||
(DU.isNewElt(node) && !DU.atTheTop(node) &&
!DU.isDocumentFragment( node.parentNode ) &&
DU.getDataParsoid( node.parentNode ).stx === 'html' &&
((DU.isList(node.parentNode) && DU.isListItem(node)) ||
(Consts.ParentTableTags.has(node.parentNode.nodeName) &&
Consts.ChildTableTags.has(node.nodeName)))
- )) {
+ ))) {
return { handle: self._htmlElementHandler.bind(self) };
} else if (self.tagHandlers[nodeName]) {
handler = self.tagHandlers[nodeName];
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 85241fa..f63d928 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -23881,6 +23881,16 @@
'''before''' stuff x '''y''' z stuff ''after''
!! end
+!! test
+Never serialize a-tag as html, regardless of what data-parsoid has to say
+!! options
+parsoid=html2wt
+!! html
+Foo
+!! wikitext
+[[Foo]]
+!! end
+
# -
# End of section for Parsoid-only html2wt tests for serialization
# of new content
--
To view, visit https://gerrit.wikimedia.org/r/200057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d8be79e3774bdaad97eac2a8c7424a6fddbdad2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Marcoil
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid needless master queries on page views - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid needless master queries on page views
..
Avoid needless master queries on page views
Bug: T92357
Change-Id: Iab635eed1335ebbf8187c7f68231f375f022b307
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7f61663..58c3029 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -600,6 +600,7 @@
$userId = $rev->getUser();
if ( $userId ) {
$revUser = User::newFromId( $userId );
+ $revUser->load( User::READ_NORMAL );
$link += array(
'data-user-name' => $revUser->getName(),
'data-user-gender' =>
$revUser->getOption( 'gender' ),
--
To view, visit https://gerrit.wikimedia.org/r/200052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab635eed1335ebbf8187c7f68231f375f022b307
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add an add-widgets button to boards - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/200061 Change subject: Add an add-widgets button to boards .. Add an add-widgets button to boards bug: T93966 Change-Id: Ie2ca0135f0427d5da52cbffb6a3984f8869594ae --- M src/components/boards/generic-board/generic-board.html 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/61/200061/1 diff --git a/src/components/boards/generic-board/generic-board.html b/src/components/boards/generic-board/generic-board.html index 2c17a5b..dbf2861 100644 --- a/src/components/boards/generic-board/generic-board.html +++ b/src/components/boards/generic-board/generic-board.html @@ -7,9 +7,9 @@ - + + Add widgets + -- To view, visit https://gerrit.wikimedia.org/r/200061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2ca0135f0427d5da52cbffb6a3984f8869594ae Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delete reverse dns entries when the associated host is deleted. - change (sink_nova_fixed_multi)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200060
Change subject: Delete reverse dns entries when the associated host is deleted.
..
Delete reverse dns entries when the associated host is deleted.
Change-Id: Ib437390b43f31387f63fe23ec614d9dc1c810a65
---
M nova_fixed_multi/base.py
M setup.py
2 files changed, 45 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/sink_nova_fixed_multi
refs/changes/60/200060/1
diff --git a/nova_fixed_multi/base.py b/nova_fixed_multi/base.py
index 286410d..cb4895f 100644
--- a/nova_fixed_multi/base.py
+++ b/nova_fixed_multi/base.py
@@ -77,7 +77,7 @@
recordset = self._find_or_create_recordset(
context, **recordset_values)
-record_values = { 'data': reverse_format % event_data }
+record_values = {'data': reverse_format % event_data}
if managed:
record_values.update({
@@ -88,7 +88,8 @@
'managed_resource_id': resource_id})
LOG.debug('Creating record in %s / %s with values %r',
- reverse_domain['id'], recordset['id'],
record_values)
+ reverse_domain['id'],
+ recordset['id'], record_values)
central_api.create_record(context,
reverse_domain['id'],
recordset['id'],
@@ -120,3 +121,44 @@
domain['id'],
recordset['id'],
record_values)
+
+def _delete(self, managed=True, resource_id=None, resource_type='instance',
+criterion={}):
+"""
+Handle a generic delete of a fixed ip within a domain
+
+:param criterion: Criterion to search and destroy records
+"""
+context = DesignateContext.get_admin_context(all_tenants=True)
+
+criterion.update({'domain_id': cfg.CONF[self.name].domain_id})
+
+if managed:
+criterion.update({
+'managed': managed,
+'managed_plugin_name': self.get_plugin_name(),
+'managed_plugin_type': self.get_plugin_type(),
+'managed_resource_id': resource_id,
+'managed_resource_type': resource_type
+})
+
+records = central_api.find_records(context, criterion)
+
+for record in records:
+LOG.debug('Deleting record %s' % record['id'])
+
+central_api.delete_record(context, cfg.CONF[self.name].domain_id,
+ record['recordset_id'], record['id'])
+
+reverse_domain_id = cfg.CONF[self.name].get('reverse_domain_id')
+if reverse_domain_id:
+criterion.update({'domain_id': reverse_domain_id})
+
+records = central_api.find_records(context, criterion)
+
+for record in records:
+LOG.debug('Deleting record %s' % record['id'])
+
+central_api.delete_record(context,
+ reverse_domain_id,
+ record['recordset_id'], record['id'])
diff --git a/setup.py b/setup.py
index 0e30c6b..90310af 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
setuptools.setup(
name="nova_fixed_multi",
-version="2015.1",
+version="2015.3",
author="Wikimedia Foundation",
author_email="abog...@wikimedia.org",
description="Designate sink handler that supports multiple arecords per
instance",
--
To view, visit https://gerrit.wikimedia.org/r/200060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib437390b43f31387f63fe23ec614d9dc1c810a65
Gerrit-PatchSet: 1
Gerrit-Project: sink_nova_fixed_multi
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed view event from $wgAutopromoteOnce - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200059
Change subject: Removed view event from $wgAutopromoteOnce
..
Removed view event from $wgAutopromoteOnce
* This avoids master queries on view. It could use local jobs, but nothing
was using this by default anyway.
Bug: T92357
Change-Id: Id6353942215a3c704848d3bcc31c2b76225c78be
---
M RELEASE-NOTES-1.25
M includes/DefaultSettings.php
M includes/MediaWiki.php
M includes/page/WikiPage.php
4 files changed, 3 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/200059/1
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 6462767..b7a1a8e 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -45,6 +45,8 @@
* The 'daemonized' flag must be set to true in $wgJobTypeConf for any redis
job queues. This means that mediawiki/services/jobrunner service has to
be installed and running for any such queues to work.
+* $wgAutopromoteOnce no longer supports the 'view' event. For keeping some
+ compatibility, any 'view' event triggers will still trigger on 'edit'.
=== New features in 1.25 ===
* (T64861) Updated plural rules to CLDR 26. Includes incompatible changes
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1df809e..5ab557e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4863,7 +4863,6 @@
* @endcode
* Where event is either:
*- 'onEdit' (when user edits)
- *- 'onView' (when user views the wiki)
*
* Criteria has the same format as $wgAutopromote
*
@@ -4872,7 +4871,6 @@
*/
$wgAutopromoteOnce = array(
'onEdit' => array(),
- 'onView' => array()
);
/**
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 2644023..c086a39 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -199,8 +199,6 @@
throw new PermissionsError( 'read', $permErrors );
}
- $pageView = false; // was an article or special page viewed?
-
// Interwiki redirects
if ( $title->isExternal() ) {
$rdfrom = $request->getVal( 'rdfrom' );
@@ -263,7 +261,6 @@
}
// Special pages
} elseif ( NS_SPECIAL == $title->getNamespace() ) {
- $pageView = true;
// Actions that need to be made when we have a special
pages
SpecialPageFactory::executePath( $title, $this->context
);
} else {
@@ -271,7 +268,6 @@
// may be a redirect to another article or URL.
$article = $this->initializeArticle();
if ( is_object( $article ) ) {
- $pageView = true;
$this->performAction( $article, $requestTitle );
} elseif ( is_string( $article ) ) {
$output->redirect( $article );
@@ -280,12 +276,6 @@
. " returned neither an object nor a
URL" );
}
}
-
- if ( $pageView ) {
- // Promote user to any groups they meet the criteria for
- $user->addAutopromoteOnceGroups( 'onView' );
- }
-
}
/**
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 2315dc7..0452c41 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1992,6 +1992,7 @@
// Promote user to any groups they meet the criteria for
$dbw->onTransactionIdle( function () use ( $user ) {
$user->addAutopromoteOnceGroups( 'onEdit' );
+ $user->addAutopromoteOnceGroups( 'onView' ); // b/c
} );
return $status;
--
To view, visit https://gerrit.wikimedia.org/r/200059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6353942215a3c704848d3bcc31c2b76225c78be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiVisualEditor: Rename $page to $title, since it's a Title, ... - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200058
Change subject: ApiVisualEditor: Rename $page to $title, since it's a Title,
not a WikiPage
..
ApiVisualEditor: Rename $page to $title, since it's a Title, not a WikiPage
Change-Id: I45b23158b87e49c90375ea73635285fdb63a0c1c
---
M ApiVisualEditor.php
1 file changed, 34 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/58/200058/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 31d8aad..259f49d 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -298,13 +298,13 @@
$user = $this->getUser();
$params = $this->extractRequestParams();
- $page = Title::newFromText( $params['page'] );
- if ( !$page ) {
+ $title = Title::newFromText( $params['page'] );
+ if ( !$title ) {
$this->dieUsageMsg( 'invalidtitle', $params['page'] );
}
- if ( !in_array( $page->getNamespace(), $this->veConfig->get(
'VisualEditorNamespaces' ) ) ) {
+ if ( !in_array( $title->getNamespace(), $this->veConfig->get(
'VisualEditorNamespaces' ) ) ) {
$this->dieUsage( "VisualEditor is not enabled in
namespace " .
- $page->getNamespace(), 'novenamespace' );
+ $title->getNamespace(), 'novenamespace' );
}
$parserParams = array();
@@ -317,15 +317,16 @@
$html = gzinflate( base64_decode( substr( $html, 11 ) )
);
}
- wfDebugLog( 'visualeditor', "called on '$page' with paction:
'{$params['paction']}'" );
+ wfDebugLog( 'visualeditor', "called on '$title' with paction:
'{$params['paction']}'" );
switch ( $params['paction'] ) {
case 'parse':
$parsed = $this->getHTML( $page, $parserParams
);
+
// Dirty hack to provide the correct context
for edit notices
global $wgTitle; // FIXME NES
- $wgTitle = $page;
- RequestContext::getMain()->setTitle( $page );
- $notices = $page->getEditNotices();
+ $wgTitle = $title;
+ RequestContext::getMain()->setTitle( $title );
+ $notices = $title->getEditNotices();
if ( $user->isAnon() ) {
$notices[] = $this->msg(
'anoneditwarning',
@@ -340,7 +341,7 @@
}
// Creating new page
- if ( !$page->exists() ) {
+ if ( !$title->exists() ) {
$notices[] = $this->msg(
$user->isLoggedIn() ?
'newarticletext' : 'newarticletextanon',
Skin::makeInternalOrExternalUrl(
@@ -348,18 +349,18 @@
)
)->parseAsBlock();
// Page protected from creation
- if ( $page->getRestrictions( 'create' )
) {
+ if ( $title->getRestrictions( 'create'
) ) {
$notices[] = $this->msg(
'titleprotectedwarning' )->parseAsBlock();
}
}
// Look at protection status to set up notices
+ surface class(es)
$protectedClasses = array();
- if ( MWNamespace::getRestrictionLevels(
$page->getNamespace() ) !== array( '' ) ) {
+ if ( MWNamespace::getRestrictionLevels(
$title->getNamespace() ) !== array( '' ) ) {
// Page protected from editing
- if ( $page->isProtected( 'edit' ) ) {
+ if ( $title->isProtected( 'edit' ) ) {
# Is the title semi-protected?
- if ( $page->isSemiProtected() )
{
+ if ( $title->isSemiProtected()
) {
$protectedClasses[] =
'mw-textarea-sprotected';
$noticeMsg =
'semip
[MediaWiki-commits] [Gerrit] Never serialize a-tag as html - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200057
Change subject: Never serialize a-tag as html
..
Never serialize a-tag as html
* Regardless of what data-parsoid has to say.
Bug: T93926
Change-Id: I3d8be79e3774bdaad97eac2a8c7424a6fddbdad2
---
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests.txt
2 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/57/200057/1
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index 06c7361..90ca613 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -772,14 +772,14 @@
};
// If parent node is a list or table tag in html-syntax, then serialize
// new elements in html-syntax rather than wiki-syntax.
- } else if (dp.stx === 'html' ||
+ } else if ( nodeName !== "a" && (dp.stx === 'html' ||
(DU.isNewElt(node) && !DU.atTheTop(node) &&
!DU.isDocumentFragment( node.parentNode ) &&
DU.getDataParsoid( node.parentNode ).stx === 'html' &&
((DU.isList(node.parentNode) && DU.isListItem(node)) ||
(Consts.ParentTableTags.has(node.parentNode.nodeName) &&
Consts.ChildTableTags.has(node.nodeName)))
- )) {
+ ))) {
return { handle: self._htmlElementHandler.bind(self) };
} else if (self.tagHandlers[nodeName]) {
handler = self.tagHandlers[nodeName];
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 85241fa..f63d928 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -23881,6 +23881,16 @@
'''before''' stuff x '''y''' z stuff ''after''
!! end
+!! test
+Never serialize a-tag as html, regardless of what data-parsoid has to say
+!! options
+parsoid=html2wt
+!! html
+Foo
+!! wikitext
+[[Foo]]
+!! end
+
# -
# End of section for Parsoid-only html2wt tests for serialization
# of new content
--
To view, visit https://gerrit.wikimedia.org/r/200057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d8be79e3774bdaad97eac2a8c7424a6fddbdad2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
