[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1081
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346503 ) Change subject: db-eqiad.php: Depool db1081 .. db-eqiad.php: Depool db1081 Going to migrate db1081 to file per table, to at least has one host ready to be able to clone new servers that just arrived with the correct configuration Bug: T161088 Change-Id: I8fa8e3206855222f04d7216a28ed977af3496595 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 760129b..3718483 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -133,7 +133,7 @@ 'db1059' => 1, # C2 2.8TB 96GB, api 'db1064' => 0, # D1 2.8TB 160GB, vslow, dump #Master for db1095 - new sanitarium 'db1068' => 1, # D1 2.8TB 160GB, api - 'db1081' => 500, # A2 3.6TB 512GB +# 'db1081' => 500, # A2 3.6TB 512GB #T161088 'db1084' => 500, # B1 3.6TB 512GB 'db1091' => 500, # D2 3.6TB 512GB ], -- To view, visit https://gerrit.wikimedia.org/r/346503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fa8e3206855222f04d7216a28ed977af3496595 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: Depool esams due to networking failures
Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346504 ) Change subject: Depool esams due to networking failures .. Depool esams due to networking failures Change-Id: Ie7a80228db754828e198a038a7d84da6f988ec2f --- M admin_state 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/04/346504/1 diff --git a/admin_state b/admin_state index 7295eeb..b16f973 100644 --- a/admin_state +++ b/admin_state @@ -69,3 +69,5 @@ # geoip/text-*/ulsfo => UP # ... this overrides the line above completely # ## + +geoip/generic-map/esams => DOWN -- To view, visit https://gerrit.wikimedia.org/r/346504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7a80228db754828e198a038a7d84da6f988ec2f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Elukey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove access for adavenport
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346502 ) Change subject: Remove access for adavenport .. Remove access for adavenport Change-Id: I5a9b51dd079a41ebbae56aa4fe281998cca14dfa --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 113293b..f7faa02 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2496,11 +2496,8 @@ realname: Asaf Bartov email: abar...@wikimedia.org adavenport: -ensure: present +ensure: absent realname: Allison Davenport -email: adavenp...@wikimedia.org -expiry_date: 2017-04-04 -expiry_contact: rstall...@wikimedia.org apalmer: ensure: present realname: Aeryn Palmer -- To view, visit https://gerrit.wikimedia.org/r/346502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a9b51dd079a41ebbae56aa4fe281998cca14dfa Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1081
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346503 ) Change subject: db-eqiad.php: Depool db1081 .. db-eqiad.php: Depool db1081 Going to migrate db1081 to file per table, to at least has one host ready to be able to clone new servers that just arrived with the correct configuration Bug: T161088 Change-Id: I8fa8e3206855222f04d7216a28ed977af3496595 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/346503/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 760129b..3718483 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -133,7 +133,7 @@ 'db1059' => 1, # C2 2.8TB 96GB, api 'db1064' => 0, # D1 2.8TB 160GB, vslow, dump #Master for db1095 - new sanitarium 'db1068' => 1, # D1 2.8TB 160GB, api - 'db1081' => 500, # A2 3.6TB 512GB +# 'db1081' => 500, # A2 3.6TB 512GB #T161088 'db1084' => 500, # B1 3.6TB 512GB 'db1091' => 500, # D2 3.6TB 512GB ], -- To view, visit https://gerrit.wikimedia.org/r/346503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fa8e3206855222f04d7216a28ed977af3496595 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove access for adavenport
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346502 ) Change subject: Remove access for adavenport .. Remove access for adavenport Change-Id: I5a9b51dd079a41ebbae56aa4fe281998cca14dfa --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/346502/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 113293b..f7faa02 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2496,11 +2496,8 @@ realname: Asaf Bartov email: abar...@wikimedia.org adavenport: -ensure: present +ensure: absent realname: Allison Davenport -email: adavenp...@wikimedia.org -expiry_date: 2017-04-04 -expiry_contact: rstall...@wikimedia.org apalmer: ensure: present realname: Aeryn Palmer -- To view, visit https://gerrit.wikimedia.org/r/346502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a9b51dd079a41ebbae56aa4fe281998cca14dfa Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSVisualEditor: Changed default font size
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346501 )
Change subject: BSVisualEditor: Changed default font size
..
BSVisualEditor: Changed default font size
* Using default MediaWiki font size for page content
* See https://sourceforge.net/p/bluespice/discussion/1249667/thread/9428d78a
Change-Id: I192d39acd9086feea024922940e32445dc379780
---
M VisualEditor/resources/bluespice.visualEditor.css
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/01/346501/1
diff --git a/VisualEditor/resources/bluespice.visualEditor.css
b/VisualEditor/resources/bluespice.visualEditor.css
index 9f80454..aa67480 100644
--- a/VisualEditor/resources/bluespice.visualEditor.css
+++ b/VisualEditor/resources/bluespice.visualEditor.css
@@ -23,6 +23,7 @@
padding: 0 !important;
/* reset height 100% of bluespice.skin.main.css, otherwise resize will
not work */
height: auto;
+ font-size: 0.875em;
}
td.mceToolbar {
--
To view, visit https://gerrit.wikimedia.org/r/346501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I192d39acd9086feea024922940e32445dc379780
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Take out the blue highlight for cursor location
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346493 ) Change subject: Take out the blue highlight for cursor location .. Take out the blue highlight for cursor location Bug: T162204 Change-Id: I6aca0103a2603bf37ff856a7dd6f2aa4137ee53c --- M resources/ext.CodeMirror.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Kaldari: Looks good to me, approved diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index edab896..3d48d0b 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -369,7 +369,7 @@ mwextDoubleUnderscore: mw.config.get( 'extCodeMirrorDoubleUnderscore' ), mwextUrlProtocols: mw.config.get( 'extCodeMirrorUrlProtocols' ), mwextModes: mw.config.get( 'extCodeMirrorExtModes' ), - styleActiveLine: true, + // styleActiveLine: true, // disabled since Bug: T162204, maybe should be optional lineWrapping: true, readOnly: $textbox1[ 0 ].readOnly, // select mediawiki as text input mode -- To view, visit https://gerrit.wikimedia.org/r/346493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aca0103a2603bf37ff856a7dd6f2aa4137ee53c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Pastakhov Gerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: CX2: Consolidate the init methods of ui translation units
Santhosh has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346500 )
Change subject: CX2: Consolidate the init methods of ui translation units
..
CX2: Consolidate the init methods of ui translation units
Change-Id: I5f98f2d5eacc85681de754ddea4beed78ef2688f
---
M modules/ui/mw.cx.ui.TranslationView.js
M modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.SectionTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.SentenceTranslationUnit.js
M modules/ui/translationunits/mw.cx.ui.TranslationUnit.js
8 files changed, 18 insertions(+), 42 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/00/346500/1
diff --git a/modules/ui/mw.cx.ui.TranslationView.js
b/modules/ui/mw.cx.ui.TranslationView.js
index 051e4f6..e5868bc 100644
--- a/modules/ui/mw.cx.ui.TranslationView.js
+++ b/modules/ui/mw.cx.ui.TranslationView.js
@@ -97,7 +97,7 @@
);
// Initialize the translation unit
- translationUnit.render();
+ translationUnit.init();
// Make the sections visible
this.columns.sourceColumn.add(
translationUnit.getSourceSection(), i );
diff --git a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
index 1693038..9b1dd22 100644
--- a/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ImageTranslationUnit.js
@@ -23,16 +23,6 @@
mw.cx.ui.ImageTranslationUnit.static.highlightClass = 'cx-image-highlight';
mw.cx.ui.ImageTranslationUnit.static.tools = {};
-mw.cx.ui.ImageTranslationUnit.prototype.init = function () {
- if ( !this.model.sourceDocument.id ) {
- throw Error( '[CX] Invalid source document' );
- }
- this.$sourceSection = $( this.model.sourceDocument );
- this.$translationSection = this.getTranslationSection();
- this.adapt();
- this.listen();
-};
-
mw.cx.ui.ImageTranslationUnit.prototype.adapt = function () {
// Adapt in general will be asynchronous operation
this.model.adapt();
diff --git a/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
index f59a425..b54d681 100644
--- a/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.LinkTranslationUnit.js
@@ -34,16 +34,6 @@
return !!node.id;
};
-mw.cx.ui.LinkTranslationUnit.prototype.init = function () {
- if ( !this.model.sourceDocument.id ) {
- throw Error( '[CX] Invalid source document' );
- }
- this.$sourceSection = this.getSourceSection();
- this.$translationSection = this.getTranslationSection();
- this.adapt();
- this.listen();
-};
-
mw.cx.ui.LinkTranslationUnit.prototype.getPlaceholderSection = function () {
return $( '' )
.addClass( 'cx-link-placeholder' );
diff --git a/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
index 8c46511..db83b02 100644
--- a/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.PoemTranslationUnit.js
@@ -20,15 +20,6 @@
mw.cx.ui.PoemTranslationUnit.static.highlightClass = 'cx-highlight--lightblue';
mw.cx.ui.PoemTranslationUnit.static.tools = {};
-mw.cx.ui.PoemTranslationUnit.prototype.init = function () {
- // XXX: Why does this need to be repeated in every subclass?
- this.$sourceSection = $( this.model.sourceDocument );
- this.$translationSection =
this.parentTranslationUnit.$translationSection.find( '#' +
this.model.sourceDocument.id );
-
- this.adapt();
- this.listen();
-};
-
mw.cx.ui.PoemTranslationUnit.prototype.adapt = function () {
this.model.adapt();
};
diff --git a/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
b/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
index d2278fb..9157b7d 100644
--- a/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
+++ b/modules/ui/translationunits/mw.cx.ui.ReferenceTranslationUnit.js
@@ -27,7 +27,7 @@
if ( !this.model.sourceDocument.id ) {
throw Error( '[CX] Invalid source document' );
}
- this.$sourceSection = $( this.model.sourceDocument );
+ this.$sourceSection = this.getSourceSection();
this.$translationSection = this.getTranslationSection();
this.adapt();
this.listen();
diff --git a/modules/ui/translationunits/mw.cx.ui.SectionTrans
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2054
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346498 ) Change subject: db-codfw.php: Depool db2054 .. db-codfw.php: Depool db2054 db2054 needs an ALTER table pool db2068 temporarily for vslow traffic Bug: T160390 Change-Id: Iba18630c397eb93321d276c75ea5bc6308615f52 --- M wmf-config/db-codfw.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 1f7e24b..f052897 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -146,9 +146,9 @@ 'db2029' => 0, # B6 2.9TB 96GB, master 'db2040' => 200, # C6 2.9TB 160GB, rc, log 'db2047' => 400, # C6 2.9TB 160GB - 'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow +# 'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow T160390 'db2061' => 200, # D6 3.3TB 160GB, api - 'db2068' => 300, # D6 3.3TB 160GB + 'db2068' => 200, # D6 3.3TB 160GB #temporary vslow T160390 ], 'silver' => [ 'silver' => 100, # I have no idea if this is right @@ -401,10 +401,10 @@ 'db2040' => 1, ], 'dump' => [ - 'db2054' => 1, + 'db2068' => 1, ], 'vslow' => [ - 'db2054' => 1, + 'db2068' => 1, ], 'api' => [ 'db2061' => 1, -- To view, visit https://gerrit.wikimedia.org/r/346498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba18630c397eb93321d276c75ea5bc6308615f52 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Syntax highlighting: make , tags green
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346499 )
Change subject: Syntax highlighting: make , tags green
..
Syntax highlighting: make , tags green
Added class cm-mw-ext-{extension tag name} to tag brackets,
attributes and names for allow the extensions to decorate own tags
Bug: T161694
Change-Id: I499e1e4b2e1e4fa972e28fc05a65047ecadc204c
---
M resources/mode/mediawiki/mediawiki.css
M resources/mode/mediawiki/mediawiki.js
2 files changed, 17 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/99/346499/1
diff --git a/resources/mode/mediawiki/mediawiki.css
b/resources/mode/mediawiki/mediawiki.css
index 74783e9..823d552 100644
--- a/resources/mode/mediawiki/mediawiki.css
+++ b/resources/mode/mediawiki/mediawiki.css
@@ -45,6 +45,14 @@
.cm-mw-exttag-bracket { color: #70a; font-weight: normal; }
.cm-mw-exttag-attribute { color: #70a; font-weight: normal; }
+.cm-mw-ext-nowiki.cm-mw-exttag-name { color: #170; font-weight: bold; }
+.cm-mw-ext-nowiki.cm-mw-exttag-bracket { color: #170; font-weight: normal; }
+.cm-mw-ext-nowiki.cm-mw-exttag-attribute { color: #170; font-weight: normal; }
+
+.cm-mw-ext-pre.cm-mw-exttag-name { color: #170; font-weight: bold; }
+.cm-mw-ext-pre.cm-mw-exttag-bracket { color: #170; font-weight: normal; }
+.cm-mw-ext-pre.cm-mw-exttag-attribute { color: #170; font-weight: normal; }
+
.cm-mw-htmltag-name { color: #170; font-weight: bold; }
.cm-mw-htmltag-bracket { color: #170; font-weight: normal; }
.cm-mw-htmltag-attribute { color: #170; font-weight: normal; }
diff --git a/resources/mode/mediawiki/mediawiki.js
b/resources/mode/mediawiki/mediawiki.js
index 985ce5a..293a497 100644
--- a/resources/mode/mediawiki/mediawiki.js
+++ b/resources/mode/mediawiki/mediawiki.js
@@ -410,11 +410,11 @@
return makeLocalStyle(
'mw-htmltag-name', state );
} // it is the extension tag
if ( isCloseTag ) {
- state.tokenize = eatChar( '>',
'mw-exttag-bracket' );
+ state.tokenize = eatChar( '>',
'mw-exttag-bracket mw-ext-' + name );
} else {
state.tokenize = eatExtTagAttribute(
name );
}
- return makeLocalStyle( 'mw-exttag-name', state
);
+ return makeLocalStyle( 'mw-exttag-name mw-ext-'
+ name, state );
};
}
@@ -439,7 +439,7 @@
function eatExtTagAttribute( name ) {
return function ( stream, state ) {
if ( stream.match( /[^>\/<\{\&~]+/ ) ) {
- return makeLocalStyle(
'mw-exttag-attribute', state );
+ return makeLocalStyle(
'mw-exttag-attribute mw-ext-' + name, state );
}
if ( stream.eat( '>' ) ) {
state.extName = name;
@@ -448,13 +448,13 @@
state.extState =
CodeMirror.startState( state.extMode );
}
state.tokenize = eatExtTagArea( name );
- return makeLocalStyle(
'mw-exttag-bracket', state );
+ return makeLocalStyle(
'mw-exttag-bracket mw-ext-' + name, state );
}
if ( stream.match( '/>' ) ) {
state.tokenize = state.stack.pop();
- return makeLocalStyle(
'mw-exttag-bracket', state );
+ return makeLocalStyle(
'mw-exttag-bracket mw-ext-' + name, state );
}
- return eatWikiText( 'mw-exttag-attribute', ''
)( stream, state );
+ return eatWikiText( 'mw-exttag-attribute
mw-ext-' + name, '' )( stream, state );
};
}
@@ -492,7 +492,7 @@
stream.next(); // eat <
stream.next(); // eat /
state.tokenize = eatTagName( name.length, true,
false );
- return makeLocalStyle( 'mw-exttag-bracket',
state );
+ return makeLocalStyle( 'mw-exttag-bracket
mw-ext-' + name, state );
};
}
@@ -773,7 +773,7 @@
case '<':
isCloseTa
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2054
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346498 ) Change subject: db-codfw.php: Depool db2054 .. db-codfw.php: Depool db2054 db2054 needs an ALTER table pool db2068 temporarily for vslow traffic Bug: T160390 Change-Id: Iba18630c397eb93321d276c75ea5bc6308615f52 --- M wmf-config/db-codfw.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/346498/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 1f7e24b..f052897 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -146,9 +146,9 @@ 'db2029' => 0, # B6 2.9TB 96GB, master 'db2040' => 200, # C6 2.9TB 160GB, rc, log 'db2047' => 400, # C6 2.9TB 160GB - 'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow +# 'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow T160390 'db2061' => 200, # D6 3.3TB 160GB, api - 'db2068' => 300, # D6 3.3TB 160GB + 'db2068' => 200, # D6 3.3TB 160GB #temporary vslow T160390 ], 'silver' => [ 'silver' => 100, # I have no idea if this is right @@ -401,10 +401,10 @@ 'db2040' => 1, ], 'dump' => [ - 'db2054' => 1, + 'db2068' => 1, ], 'vslow' => [ - 'db2054' => 1, + 'db2068' => 1, ], 'api' => [ 'db2061' => 1, -- To view, visit https://gerrit.wikimedia.org/r/346498 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba18630c397eb93321d276c75ea5bc6308615f52 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-codfw.php: Depool db2061"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346497 ) Change subject: Revert "db-codfw.php: Depool db2061" .. Revert "db-codfw.php: Depool db2061" This reverts commit cb4045cbb90877d47d482b9d08153d6103944c86. Change-Id: Iee46f0968857bed305696d6cbbd7ad0e736cc923 --- M wmf-config/db-codfw.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index dafe5e7..1f7e24b 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -147,8 +147,8 @@ 'db2040' => 200, # C6 2.9TB 160GB, rc, log 'db2047' => 400, # C6 2.9TB 160GB 'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow -# 'db2061' => 200, # D6 3.3TB 160GB, api T160390 - 'db2068' => 200, # D6 3.3TB 160GB #temporary api T160390 + 'db2061' => 200, # D6 3.3TB 160GB, api + 'db2068' => 300, # D6 3.3TB 160GB ], 'silver' => [ 'silver' => 100, # I have no idea if this is right @@ -407,7 +407,7 @@ 'db2054' => 1, ], 'api' => [ - 'db2068' => 1, + 'db2061' => 1, ], ], ], -- To view, visit https://gerrit.wikimedia.org/r/346497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee46f0968857bed305696d6cbbd7ad0e736cc923 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-codfw.php: Depool db2061"
Hello jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/346497 to review the following change. Change subject: Revert "db-codfw.php: Depool db2061" .. Revert "db-codfw.php: Depool db2061" This reverts commit cb4045cbb90877d47d482b9d08153d6103944c86. Change-Id: Iee46f0968857bed305696d6cbbd7ad0e736cc923 --- M wmf-config/db-codfw.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/346497/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index dafe5e7..1f7e24b 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -147,8 +147,8 @@ 'db2040' => 200, # C6 2.9TB 160GB, rc, log 'db2047' => 400, # C6 2.9TB 160GB 'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow -# 'db2061' => 200, # D6 3.3TB 160GB, api T160390 - 'db2068' => 200, # D6 3.3TB 160GB #temporary api T160390 + 'db2061' => 200, # D6 3.3TB 160GB, api + 'db2068' => 300, # D6 3.3TB 160GB ], 'silver' => [ 'silver' => 100, # I have no idea if this is right @@ -407,7 +407,7 @@ 'db2054' => 1, ], 'api' => [ - 'db2068' => 1, + 'db2061' => 1, ], ], ], -- To view, visit https://gerrit.wikimedia.org/r/346497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee46f0968857bed305696d6cbbd7ad0e736cc923 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Replace Interwiki::selectFields() with the supported equival...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346496 )
Change subject: Replace Interwiki::selectFields() with the supported equivalent
in 1.28+
..
Replace Interwiki::selectFields() with the supported equivalent in 1.28+
Keep compat with 1.27.
This change was caused by
https://github.com/wikimedia/mediawiki/commit/025f15a208a75de47a71d3d8515e4b2b975fae1d
Fixed with alot of help from @Reedy
Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
---
M InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
1 file changed, 14 insertions(+), 10 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
index effdc17..c58fad7 100644
--- a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
+++ b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
@@ -311,17 +311,21 @@
if ( isset( $this->aIWLexists[$sPrefix] ) ) {
return $this->aIWLexists[$sPrefix];
}
- $row = $this->getDB()->selectRow(
- 'interwiki',
- Interwiki::selectFields(),
- [ 'iw_prefix' => $sPrefix ],
- __METHOD__
- );
-
- if( !$row ) {
- $this->aIWLexists[$sPrefix] = false;
+ if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
+ $this->aIWLexists[$sPrefix] =
\MediaWiki\MediaWikiServices::getInstance()->getInterwikiLookup()->isValidInterwiki(
$sPrefix );
} else {
- $this->aIWLexists[$sPrefix] = true;
+ $row = $this->getDB()->selectRow(
+ 'interwiki',
+ Interwiki::selectFields(),
+ [ 'iw_prefix' => $sPrefix ],
+ __METHOD__
+ );
+
+ if( !$row ) {
+ $this->aIWLexists[$sPrefix] = false;
+ } else {
+ $this->aIWLexists[$sPrefix] = true;
+ }
}
return $this->aIWLexists[$sPrefix];
--
To view, visit https://gerrit.wikimedia.org/r/346496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Replace TestUser::$user with TestUser::getUser()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346300 )
Change subject: Replace TestUser::$user with TestUser::getUser()
..
Replace TestUser::$user with TestUser::getUser()
TestUser::$user was made private and was also deprecated and instead
recommended to use TestUser::getUser()
This TestUser::getUser() was introduced in 1.25 so we don't need any
compat here for 1.27.
I had a lot of help from Reedy to do this.
Change-Id: Iffa7b6c839264b82dc9b2fafa7043c663dc2b29d
---
M UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
1 file changed, 19 insertions(+), 13 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
index bb426c3..ab0e3e9 100644
--- a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
+++ b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
@@ -35,8 +35,9 @@
}
public function testEditUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'editUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId(),
+ 'userID' => $userId,
'realname' => 'Some Other Name',
'password' => 'pass123',
'rePassword' => 'pass123',
@@ -50,44 +51,48 @@
$this->assertSelect(
'user',
array( 'user_real_name'),
- array( "user_id = '" . self::$users[ 'uploader'
]->user->getId() . "'" ),
- array( array( 'Some Other Name' ) )
+ array( "user_id = '" . $userId . "'" ),
+ array( array( 'Some Other Name' ) )
);
}
public function testDisableUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'disableUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId ()
+ 'userID' => $userId
) );
$this->assertEquals ( true, $data->success );
- $this->assertTrue( $this->userIsBlocked( self::$users[
'uploader' ]->user->getId() ) );
+ $this->assertTrue( $this->userIsBlocked( $userId ) );
}
public function testEnableUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'enableUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId ()
+ 'userID' => $userId
) );
$this->assertEquals ( true, $data->success );
- $this->assertFalse( $this->userIsBlocked( self::$users[
'uploader' ]->user->getId() ) );
+ $this->assertFalse( $this->userIsBlocked( $userId ) );
}
public function testDeleteUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'deleteUser', array (
- 'userIDs' => [ self::$users[ 'uploader' ]->user->getId
() ]
+ 'userIDs' => [ $userId ]
) );
$this->assertEquals ( true, $data->success );
- $this->assertFalse( $this->existsInDb( self::$users[ 'uploader'
]->user->getId() ) );
+ $this->assertFalse( $this->existsInDb( $userId ) );
}
public function setUserGroups () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'addUser', array (
- 'userIDs' => [ self::$users[ 'uploader' ]->user->getId
() ],
+ 'userIDs' => [ $userId ],
'groups' => array ( 'bot' )
) );
@@ -96,14 +101,15 @@
$this->assertSelect(
'user_groups',
array( 'ug_group'),
- array( "ug_user = '" . self::$users[ 'uploader'
]->user->getId() . "'" ),
- array( array( 'bot' ) )
+ array( "ug_user = '" . $userId . "'" ),
+ array( array( 'bot' ) )
);
}
public function editPassword () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'addUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId (),
+ 'userID' => $userId,
'password' => 'pass1234',
'rePassword' => 'pass1234'
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Replace Interwiki::selectFields() with the supported equival...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346297 )
Change subject: Replace Interwiki::selectFields() with the supported equivalent
in 1.28+
..
Replace Interwiki::selectFields() with the supported equivalent in 1.28+
Keep compat with 1.27.
This change was caused by
https://github.com/wikimedia/mediawiki/commit/025f15a208a75de47a71d3d8515e4b2b975fae1d
Fixed with alot of help from @Reedy
Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
---
M InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
1 file changed, 14 insertions(+), 10 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
index effdc17..c58fad7 100644
--- a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
+++ b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
@@ -311,17 +311,21 @@
if ( isset( $this->aIWLexists[$sPrefix] ) ) {
return $this->aIWLexists[$sPrefix];
}
- $row = $this->getDB()->selectRow(
- 'interwiki',
- Interwiki::selectFields(),
- [ 'iw_prefix' => $sPrefix ],
- __METHOD__
- );
-
- if( !$row ) {
- $this->aIWLexists[$sPrefix] = false;
+ if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
+ $this->aIWLexists[$sPrefix] =
\MediaWiki\MediaWikiServices::getInstance()->getInterwikiLookup()->isValidInterwiki(
$sPrefix );
} else {
- $this->aIWLexists[$sPrefix] = true;
+ $row = $this->getDB()->selectRow(
+ 'interwiki',
+ Interwiki::selectFields(),
+ [ 'iw_prefix' => $sPrefix ],
+ __METHOD__
+ );
+
+ if( !$row ) {
+ $this->aIWLexists[$sPrefix] = false;
+ } else {
+ $this->aIWLexists[$sPrefix] = true;
+ }
}
return $this->aIWLexists[$sPrefix];
--
To view, visit https://gerrit.wikimedia.org/r/346297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Replace Interwiki::selectFields() with the supported equival...
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346496 )
Change subject: Replace Interwiki::selectFields() with the supported equivalent
in 1.28+
..
Replace Interwiki::selectFields() with the supported equivalent in 1.28+
Keep compat with 1.27.
This change was caused by
https://github.com/wikimedia/mediawiki/commit/025f15a208a75de47a71d3d8515e4b2b975fae1d
Fixed with alot of help from @Reedy
Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
---
M InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
1 file changed, 14 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/96/346496/1
diff --git a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
index effdc17..c58fad7 100644
--- a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
+++ b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
@@ -311,17 +311,21 @@
if ( isset( $this->aIWLexists[$sPrefix] ) ) {
return $this->aIWLexists[$sPrefix];
}
- $row = $this->getDB()->selectRow(
- 'interwiki',
- Interwiki::selectFields(),
- [ 'iw_prefix' => $sPrefix ],
- __METHOD__
- );
-
- if( !$row ) {
- $this->aIWLexists[$sPrefix] = false;
+ if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
+ $this->aIWLexists[$sPrefix] =
\MediaWiki\MediaWikiServices::getInstance()->getInterwikiLookup()->isValidInterwiki(
$sPrefix );
} else {
- $this->aIWLexists[$sPrefix] = true;
+ $row = $this->getDB()->selectRow(
+ 'interwiki',
+ Interwiki::selectFields(),
+ [ 'iw_prefix' => $sPrefix ],
+ __METHOD__
+ );
+
+ if( !$row ) {
+ $this->aIWLexists[$sPrefix] = false;
+ } else {
+ $this->aIWLexists[$sPrefix] = true;
+ }
}
return $this->aIWLexists[$sPrefix];
--
To view, visit https://gerrit.wikimedia.org/r/346496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Paladox
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Replace TestUser::$user with TestUser::getUser()
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346495 )
Change subject: Replace TestUser::$user with TestUser::getUser()
..
Replace TestUser::$user with TestUser::getUser()
TestUser::$user was made private and was also deprecated and instead
recommended to use TestUser::getUser()
This TestUser::getUser() was introduced in 1.25 so we don't need any
compat here for 1.27.
I had a lot of help from Reedy to do this.
Change-Id: Iffa7b6c839264b82dc9b2fafa7043c663dc2b29d
---
M UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
1 file changed, 19 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/95/346495/1
diff --git a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
index bb426c3..ab0e3e9 100644
--- a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
+++ b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
@@ -35,8 +35,9 @@
}
public function testEditUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'editUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId(),
+ 'userID' => $userId,
'realname' => 'Some Other Name',
'password' => 'pass123',
'rePassword' => 'pass123',
@@ -50,44 +51,48 @@
$this->assertSelect(
'user',
array( 'user_real_name'),
- array( "user_id = '" . self::$users[ 'uploader'
]->user->getId() . "'" ),
- array( array( 'Some Other Name' ) )
+ array( "user_id = '" . $userId . "'" ),
+ array( array( 'Some Other Name' ) )
);
}
public function testDisableUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'disableUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId ()
+ 'userID' => $userId
) );
$this->assertEquals ( true, $data->success );
- $this->assertTrue( $this->userIsBlocked( self::$users[
'uploader' ]->user->getId() ) );
+ $this->assertTrue( $this->userIsBlocked( $userId ) );
}
public function testEnableUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'enableUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId ()
+ 'userID' => $userId
) );
$this->assertEquals ( true, $data->success );
- $this->assertFalse( $this->userIsBlocked( self::$users[
'uploader' ]->user->getId() ) );
+ $this->assertFalse( $this->userIsBlocked( $userId ) );
}
public function testDeleteUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'deleteUser', array (
- 'userIDs' => [ self::$users[ 'uploader' ]->user->getId
() ]
+ 'userIDs' => [ $userId ]
) );
$this->assertEquals ( true, $data->success );
- $this->assertFalse( $this->existsInDb( self::$users[ 'uploader'
]->user->getId() ) );
+ $this->assertFalse( $this->existsInDb( $userId ) );
}
public function setUserGroups () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'addUser', array (
- 'userIDs' => [ self::$users[ 'uploader' ]->user->getId
() ],
+ 'userIDs' => [ $userId ],
'groups' => array ( 'bot' )
) );
@@ -96,14 +101,15 @@
$this->assertSelect(
'user_groups',
array( 'ug_group'),
- array( "ug_user = '" . self::$users[ 'uploader'
]->user->getId() . "'" ),
- array( array( 'bot' ) )
+ array( "ug_user = '" . $userId . "'" ),
+ array( array( 'bot' ) )
);
}
public function editPassword () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'addUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId (),
+ 'userID' => $userId,
'password' => 'pass1234',
'
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Replace TestUser::$user with TestUser::getUser()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346495 )
Change subject: Replace TestUser::$user with TestUser::getUser()
..
Replace TestUser::$user with TestUser::getUser()
TestUser::$user was made private and was also deprecated and instead
recommended to use TestUser::getUser()
This TestUser::getUser() was introduced in 1.25 so we don't need any
compat here for 1.27.
I had a lot of help from Reedy to do this.
Change-Id: Iffa7b6c839264b82dc9b2fafa7043c663dc2b29d
---
M UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
1 file changed, 19 insertions(+), 13 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
index bb426c3..ab0e3e9 100644
--- a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
+++ b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
@@ -35,8 +35,9 @@
}
public function testEditUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'editUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId(),
+ 'userID' => $userId,
'realname' => 'Some Other Name',
'password' => 'pass123',
'rePassword' => 'pass123',
@@ -50,44 +51,48 @@
$this->assertSelect(
'user',
array( 'user_real_name'),
- array( "user_id = '" . self::$users[ 'uploader'
]->user->getId() . "'" ),
- array( array( 'Some Other Name' ) )
+ array( "user_id = '" . $userId . "'" ),
+ array( array( 'Some Other Name' ) )
);
}
public function testDisableUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'disableUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId ()
+ 'userID' => $userId
) );
$this->assertEquals ( true, $data->success );
- $this->assertTrue( $this->userIsBlocked( self::$users[
'uploader' ]->user->getId() ) );
+ $this->assertTrue( $this->userIsBlocked( $userId ) );
}
public function testEnableUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'enableUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId ()
+ 'userID' => $userId
) );
$this->assertEquals ( true, $data->success );
- $this->assertFalse( $this->userIsBlocked( self::$users[
'uploader' ]->user->getId() ) );
+ $this->assertFalse( $this->userIsBlocked( $userId ) );
}
public function testDeleteUser () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'deleteUser', array (
- 'userIDs' => [ self::$users[ 'uploader' ]->user->getId
() ]
+ 'userIDs' => [ $userId ]
) );
$this->assertEquals ( true, $data->success );
- $this->assertFalse( $this->existsInDb( self::$users[ 'uploader'
]->user->getId() ) );
+ $this->assertFalse( $this->existsInDb( $userId ) );
}
public function setUserGroups () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'addUser', array (
- 'userIDs' => [ self::$users[ 'uploader' ]->user->getId
() ],
+ 'userIDs' => [ $userId ],
'groups' => array ( 'bot' )
) );
@@ -96,14 +101,15 @@
$this->assertSelect(
'user_groups',
array( 'ug_group'),
- array( "ug_user = '" . self::$users[ 'uploader'
]->user->getId() . "'" ),
- array( array( 'bot' ) )
+ array( "ug_user = '" . $userId . "'" ),
+ array( array( 'bot' ) )
);
}
public function editPassword () {
+ $userId = self::$users[ 'uploader' ]->getUser()->getId();
$data = $this->executeTask ( 'addUser', array (
- 'userID' => self::$users[ 'uploader' ]->user->getId (),
+ 'userID' => $userId,
'password' => 'pass1234',
'rePassword' => 'pass1234'
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Add some extra spacing around H1s and H2s
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346494 )
Change subject: Add some extra spacing around H1s and H2s
..
Add some extra spacing around H1s and H2s
Bug: T161559
Change-Id: I0d10d39313c11fddefadff7ab13c262bd6606ed0
---
M resources/mode/mediawiki/mediawiki.css
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/94/346494/1
diff --git a/resources/mode/mediawiki/mediawiki.css
b/resources/mode/mediawiki/mediawiki.css
index 74783e9..55aec4a 100644
--- a/resources/mode/mediawiki/mediawiki.css
+++ b/resources/mode/mediawiki/mediawiki.css
@@ -14,8 +14,8 @@
.cm-mw-comment { color: #aaa; font-weight: normal; }
.cm-mw-apostrophes-bold, .cm-mw-apostrophes-italic { color: #08f; }
-pre.cm-mw-section-1 { font-size: 1.8em; }
-pre.cm-mw-section-2 { font-size: 1.5em; }
+pre.cm-mw-section-1 { font-size: 1.8em; line-height: 1.2em; }
+pre.cm-mw-section-2 { font-size: 1.5em; line-height: 1.2em; }
pre.cm-mw-section-3 { font-weight: bold; }
pre.cm-mw-section-4 { font-weight: bold; }
pre.cm-mw-section-5 { font-weight: bold; }
--
To view, visit https://gerrit.wikimedia.org/r/346494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d10d39313c11fddefadff7ab13c262bd6606ed0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Pastakhov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Convert RebaseServer tests to data provider
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346232 )
Change subject: Convert RebaseServer tests to data provider
..
Convert RebaseServer tests to data provider
Also use a document and a surface in TestRebaseClient
to make things easier.
Change-Id: Ib565de328606ed9024256674b9fd197ecb4e7c0e
---
M tests/dm/ve.dm.RebaseServer.test.js
M tests/dm/ve.dm.TestRebaseClient.js
2 files changed, 267 insertions(+), 192 deletions(-)
Approvals:
Catrope: Looks good to me, but someone else must approve
Divec: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/tests/dm/ve.dm.RebaseServer.test.js
b/tests/dm/ve.dm.RebaseServer.test.js
index b83763d..fae3933 100644
--- a/tests/dm/ve.dm.RebaseServer.test.js
+++ b/tests/dm/ve.dm.RebaseServer.test.js
@@ -6,195 +6,244 @@
QUnit.module( 've.dm.RebaseServer' );
-QUnit.test( 'Rebase', 43, function ( assert ) {
- var origData = [ { type: 'paragraph' }, { type: '/paragraph' } ],
- newSurface = function () {
- return new ve.dm.Surface(
- ve.dm.example.createExampleDocumentFromData(
origData )
- );
+QUnit.test( 'Rebase', function ( assert ) {
+ var cases = [
+ {
+ name: 'Concurrent insertions',
+ initialData: [ { type: 'paragraph' }, { type:
'/paragraph' } ],
+ clients: [ '1', '2' ],
+ ops: [
+ // Client 1 submits abc
+ [ '1', 'apply', [
+ [ 'insert', 1, [ 'a' ], 3 ],
+ [ 'insert', 2, [ 'b' ], 3 ],
+ [ 'insert', 3, [ 'c' ], 3 ]
+ ] ],
+ // Client getHistorySummary() output looks
like: confirmed/sent?/unsent!
+ // Obviously, the server only has confirmed
items
+ [ '1', 'assertHist', 'abc!' ],
+ [ '1', 'submit' ],
+ [ '1', 'assertHist', 'abc?' ],
+ [ '1', 'deliver' ],
+ [ 'server', 'assertHist', 'abc' ],
+
+ // Client 2 submits AB
+ [ '2', 'apply', [
+ [ 'insert', 1, [ 'A' ], 3 ],
+ [ 'insert', 2, [ 'B' ], 3 ]
+ ] ],
+ [ '2', 'assertHist', 'AB!' ],
+ [ '2', 'submit' ],
+ [ '2', 'deliver' ],
+ // Server puts client 2's insertion after
client 1's
+ [ 'server', 'assertHist', 'abcAB' ],
+
+ // Client 1 inserts bolded def
+ [ '1', 'apply', [
+ [ 'insert', 4, [ 'd', 'e', 'f' ], 3 ]
+ ] ],
+ [ '1', 'assertHist', 'abc?/def!' ],
+ // Client 1 receives confirmation of abc
+ [ '1', 'receive' ],
+ [ '1', 'assertHist', 'abc/def!' ],
+ // Client 1 submits def
+ [ '1', 'submit' ],
+ [ '1', 'assertHist', 'abc/def?' ],
+ [ '1', 'deliver' ],
+ // The summary order shows that def arrived
after AB in the
+ // history (even though it lies before AB in
document order)
+ [ 'server', 'assertHist', 'abcABdef' ],
+
+ // Client 2 inserts underlined CD
+ [ '2', 'apply', [
+ [ 'insert', 3, [ 'C', 'D' ], 3 ]
+ ] ],
+ [ '2', 'assertHist', 'AB?/CD!' ],
+ // Client 2 receives abc and rebases over it
+ [ '2', 'receive' ],
+ [ '2', 'assertHist', 'abc/AB?/CD!' ],
+ // Client 2 receives confirmation of AB
+ [ '2', 'receive' ],
+ [ '2', 'assertHist', 'abcAB/CD!' ],
+ // Client 2 submits CD
+ [ '2', 'submit' ],
+ [ '2', 'assertHist', 'abcAB/CD?' ],
+ [ '2', 'deliver' ],
+ [ 's
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Take out the blue highlight for cursor location
Pastakhov has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346493 ) Change subject: Take out the blue highlight for cursor location .. Take out the blue highlight for cursor location Bug: T162204 Change-Id: I6aca0103a2603bf37ff856a7dd6f2aa4137ee53c --- M resources/ext.CodeMirror.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/93/346493/1 diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index edab896..3d48d0b 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -369,7 +369,7 @@ mwextDoubleUnderscore: mw.config.get( 'extCodeMirrorDoubleUnderscore' ), mwextUrlProtocols: mw.config.get( 'extCodeMirrorUrlProtocols' ), mwextModes: mw.config.get( 'extCodeMirrorExtModes' ), - styleActiveLine: true, + // styleActiveLine: true, // disabled since Bug: T162204, maybe should be optional lineWrapping: true, readOnly: $textbox1[ 0 ].readOnly, // select mediawiki as text input mode -- To view, visit https://gerrit.wikimedia.org/r/346493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6aca0103a2603bf37ff856a7dd6f2aa4137ee53c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Pastakhov ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace deprecated jQuery.isArray by Array.isArray
Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346492 )
Change subject: Replace deprecated jQuery.isArray by Array.isArray
..
Replace deprecated jQuery.isArray by Array.isArray
jQuery.isArray is deprecated since jQuery 3.2.0. [1]
Array.isArray is part of ES5 and is supported since the following browser
versions: [2]
* Chrome 5
* Firefox (Gecko) 4.0 (2.0)
* Internet Explorer 9
* Opera 10.5
* Safari 5
This change requires MediaWiki 1.29+ which ensures that JavaScript is only
used when the browser supports ES5.
Performed using:
find . -type f -name \*.js -exec sed -i -e 's/\$\.isArray/Array.isArray/g' {} \;
[1] https://blog.jquery.com/2017/03/16/jquery-3-2-0-is-out/
[2]
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray#Browser_compatibility
Change-Id: Ia0549722934ee4dbe4649d97073032c332be22f5
---
M lib/tests/qunit/wikibase.sites.tests.js
M view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
M
view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
M view/resources/wikibase/templates.js
M view/resources/wikibase/view/ViewFactory.js
M view/tests/qunit/wikibase/templates.tests.js
7 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/92/346492/1
diff --git a/lib/tests/qunit/wikibase.sites.tests.js
b/lib/tests/qunit/wikibase.sites.tests.js
index b98e60b..7a1f807 100644
--- a/lib/tests/qunit/wikibase.sites.tests.js
+++ b/lib/tests/qunit/wikibase.sites.tests.js
@@ -150,7 +150,7 @@
var siteGroups = wb.sites.getSiteGroups();
assert.strictEqual(
- $.isArray( siteGroups ),
+ Array.isArray( siteGroups ),
true,
'getSiteGroups() returns Array'
);
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
b/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
index 565ad3b..006ec5c 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
@@ -138,7 +138,7 @@
+ 'be specified.' );
}
this.options.source = this._initDefaultSource();
- } else if ( !$.isFunction( this.options.source ) && !$.isArray(
this.options.source ) ) {
+ } else if ( !$.isFunction( this.options.source ) &&
!Array.isArray( this.options.source ) ) {
throw new Error( 'Source needs to be a function or an
array' );
}
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 8eb4c5b..91dfb59 100644
---
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -70,7 +70,7 @@
*/
_create: function() {
if ( !( this.options.value instanceof wb.datamodel.Fingerprint )
- || !$.isArray( this.options.userLanguages )
+ || !Array.isArray( this.options.userLanguages )
) {
throw new Error( 'Required option(s) missing' );
}
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
index 1830270..a0ce17b 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
@@ -85,7 +85,7 @@
*/
_create: function() {
if ( !( this.options.value instanceof wb.datamodel.Fingerprint )
- || !$.isArray( this.options.userLanguages )
+ || !Array.isArray( this.options.userLanguages )
) {
throw new Error( 'Required option(s) missing' );
}
diff --git a/view/resources/wikibase/templates.js
b/view/resources/wikibase/templates.js
index 040f0bc..c5a0c24 100644
--- a/view/resources/wikibase/templates.js
+++ b/view/resources/wikibase/templates.js
@@ -236,7 +236,7 @@
delayedParams = [];
if ( parameter1 !== undefined ) {
- if ( $.isArray( parameter1 ) ) {
+ if ( Array.isArray( parameter1 ) ) {
params = parameter1;
} else { // support variadic arguments
params = Array.prototype.slice.call( arguments
[MediaWiki-commits] [Gerrit] oojs/core[master]: util: Simplify isPlainObject and fix two false positives
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346491 )
Change subject: util: Simplify isPlainObject and fix two false positives
..
util: Simplify isPlainObject and fix two false positives
We already covered the following cases properly:
* Objects that inherited from any user class or built-in class
other than Object.prototype. (= not plain)
* Objects that inherited from another plain object. (= not plain)
* Objects created that inherit Object.prototype via 'new Object()'
or literal '{}'. (= plain)
* Objects created without inheritance via Object.create(null)
(= plain)
The following cases were broken, however:
* Objects that inherit an object that has no inheritance.
> var defaults = Object.create(null);
> // assign props to defaults
> options = Object.create(defaults);
This is not plain, but was wrongly detected as plain.
Also fixed in jQuery 3.
* Objects that inherit an object that is plain.
> var defaults = { /* .. */ };
> options = Object.create(defaults);
This is not plain, but was wrongly detected as plain.
Also fixed in jQuery 3.
Also:
* Remove IE8 compat code that is now redundant.
* Upgrade from jQuery 1 to jQuery 3 must be before this
commit as otherwise the new unit tests will fail for
oojs.jquery.js.
Change-Id: Ibc67bbfaa35e88abcc68e09977bb7c390b1fe388
---
M src/util.js
M tests/unit/util.test.js
2 files changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/91/346491/1
diff --git a/src/util.js b/src/util.js
index 349436f..5fdafb2 100644
--- a/src/util.js
+++ b/src/util.js
@@ -8,25 +8,20 @@
* @return {boolean}
*/
oo.isPlainObject = function ( obj ) {
- // Any object or value whose internal [[Class]] property is not
"[object Object]"
- // Support IE8: Explicitly filter out DOM nodes
- // Support IE8: Explicitly filter out Window object (needs loose
comparison)
- // eslint-disable-next-line eqeqeq
- if ( !obj || toString.call( obj ) !== '[object Object]' || obj.nodeType
|| ( obj != null && obj == obj.window ) ) {
+ var proto;
+
+ // Optimise for common case where internal [[Class]] property is not
"Object"
+ if ( !obj || toString.call( obj ) !== '[object Object]' ) {
return false;
}
- // The try/catch suppresses exceptions thrown when attempting to access
- // the "constructor" property of certain host objects such as Location
- // in Firefox < 20 (https://bugzilla.mozilla.org/814622)
- try {
- if ( obj.constructor &&
- !hasOwn.call( obj.constructor.prototype,
'isPrototypeOf' ) ) {
- return false;
- }
- } catch ( e ) {
- return false;
+ proto = Object.getPrototypeOf( obj );
+
+ // Objects without prototype (e.g., `Object.create( null )`) are
considered plain
+ if ( !proto ) {
+ return true;
}
- return true;
+ // The 'isPrototypeOf' method is set on Object.prototype.
+ return hasOwn.call( proto, 'isPrototypeOf' );
};
diff --git a/tests/unit/util.test.js b/tests/unit/util.test.js
index 3ae382d..0e505ae 100644
--- a/tests/unit/util.test.js
+++ b/tests/unit/util.test.js
@@ -3,19 +3,24 @@
QUnit.module( 'util' );
QUnit.test( 'isPlainObject', function ( assert ) {
+ var obj;
function Thing() {}
// Plain objects
assert.strictEqual( oo.isPlainObject( {} ), true, 'empty plain
object' );
assert.strictEqual( oo.isPlainObject( { a: 1 } ), true,
'non-empty plain object' );
- if ( !Object.create ) {
- // We test Object.create(null) when the environment
supports it for modern browsers
- // However Object.create(null) itself is not an OOjs
feature and if the environment
- // doesn't support it, we skip the test.
- assert.strictEqual( true, true, '[skipped] Objects with
no prototype from Object.create( null )' );
- } else {
- assert.strictEqual( oo.isPlainObject( Object.create(
null ) ), true, 'Objects with no prototype from Object.create( null )' );
- }
+ assert.strictEqual( oo.isPlainObject( Object.create( null ) ),
true, 'empty object with no prototype, via Object.create( null )' );
+ obj = Object.create( null );
+ obj.foo = true;
+ assert.strictEqual( oo.isPlainObject( obj ), true, 'non-empty
object with no prototype' );
+
+ // Non-plain objects (any inheritance other than
Object.prototype is not plain)
+ obj = Object.create( Object.create( null ) );
+ assert.strictEqual( oo.isPlainObject( obj ), false,
[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Update to jQuery 3
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346490 ) Change subject: build: Update to jQuery 3 .. build: Update to jQuery 3 Change-Id: I96da155143654de4e94c6f828eb260997bd9b20c --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/90/346490/1 diff --git a/package.json b/package.json index 1d17cae..dc24d1b 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "grunt-contrib-watch": "1.0.0", "grunt-eslint": "19.0.0", "grunt-karma": "2.0.0", -"jquery": "1.11.3", +"jquery": "3.2.1", "karma": "1.5.0", "karma-chrome-launcher": "2.0.0", "karma-coverage": "1.1.1", -- To view, visit https://gerrit.wikimedia.org/r/346490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96da155143654de4e94c6f828eb260997bd9b20c Gerrit-PatchSet: 1 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] dependencies: Drop support for ES3 browser...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346467 )
Change subject: [BREAKING CHANGE] dependencies: Drop support for ES3 browsers
via es5-shim
..
[BREAKING CHANGE] dependencies: Drop support for ES3 browsers via es5-shim
Change-Id: I7579c40a77a3b890cb1526db0a70d0c24e0822c1
---
M Gruntfile.js
M demos/demos.php
M demos/index.html
M jsduck.eg-iframe.html
M package.json
M tests/index.php
6 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 058621c..9045a0f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -304,7 +304,7 @@
},
demos: {
// Make sure you update this if dependencies
are added
- src:
'{node_modules/{jquery,oojs}/dist/**/*,node_modules/es5-shim/*.js,composer.json,dist/**/*,php/**/*}',
+ src:
'{node_modules/{jquery,oojs}/dist/**/*,composer.json,dist/**/*,php/**/*}',
dest: 'demos/',
expand: true
},
diff --git a/demos/demos.php b/demos/demos.php
index a727a39..d3ba067 100644
--- a/demos/demos.php
+++ b/demos/demos.php
@@ -112,7 +112,6 @@
-
diff --git a/demos/index.html b/demos/index.html
index b0e9929..2391065 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -11,7 +11,6 @@
-
diff --git a/jsduck.eg-iframe.html b/jsduck.eg-iframe.html
index 7e7fbd6..1e4ffe5 100644
--- a/jsduck.eg-iframe.html
+++ b/jsduck.eg-iframe.html
@@ -15,7 +15,6 @@
-
diff --git a/package.json b/package.json
index 28fa48c..e5674bc 100644
--- a/package.json
+++ b/package.json
@@ -22,9 +22,8 @@
"jenkins": "npm test && jsduck && npm run postdoc"
},
"dependencies": {
-"es5-shim": "4.5.8",
"jquery": "1.11.3",
-"oojs": "1.1.10"
+"oojs": "2.0.0"
},
"devDependencies": {
"eslint-config-wikimedia": "0.3.0",
diff --git a/tests/index.php b/tests/index.php
index 8ef56cc..c498781 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -27,7 +27,6 @@
-
--
To view, visit https://gerrit.wikimedia.org/r/346467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7579c40a77a3b890cb1526db0a70d0c24e0822c1
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/core[master]: Tag v2.0.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342144 )
Change subject: Tag v2.0.0
..
Tag v2.0.0
Change-Id: I7a8d55d622c1dbfeb4db16766d50509cee5b50e8
---
M History.md
M package.json
2 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/History.md b/History.md
index 8e48467..fac32bc 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,27 @@
# OOjs Release History
+## v2.0.0 / 2017-04-04
+
+This release drops support for ES3 environments. Where previously OOjs was
+supported in IE 6-8 with an ES5 shim, it is no longer.
+
+* [BREAKING CHANGE] core: Drop support for ES3 environments (James D.
Forrester)
+* core: Add `OO.isSubclass`, to test class inheritance (David Chan)
+* core: Guard `OO.setProp()` against insufficient arguments (Ed Sanders)
+* core: Implement `OO.deleteProp` (Ed Sanders)
+* core: Improve error message for `inheritClass`/`mixinClass` called with
undefined (Bartosz Dziewoński)
+* core: Switch from `.parent` hack to use `.super` directly (James D.
Forrester)
+* EmitterList: Change insertItem from `@private` to `@protected` (Moriel
Schottlender)
+* SortedEmitterList: Emit the actual inserted index (Ed Sanders)
+* doc: Make OO uppercase (Prateek Saxena)
+* doc: Update Phabricator URL (James D. Forrester)
+* doc: Replace git.wikimedia.org URL with Phabricator one (Paladox)
+* tests: Correct order of expected/actual in setProp tests (Ed Sanders)
+* tests: Remove IE6/IE8 compat in QUnit.tmpIframe() utility (Timo Tijhof)
+* build: Bump development dependencies to latest (James D. Forrester)
+* build: Bump file copyright notices for year change (James D. Forrester)
+* build: Replace jscs+jshint with eslint (Ed Sanders)
+
## v1.1.10 / 2015-11-11
* EventEmitter: Allow disconnecting event handlers given by array (Moriel
Schottlender)
* Add EmitterList class (Moriel Schottlender)
diff --git a/package.json b/package.json
index 3e222a2..1d17cae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs",
- "version": "1.1.10",
+ "version": "2.0.0",
"description": "Power for object oriented JavaScript libraries.",
"keywords": [
"oo",
--
To view, visit https://gerrit.wikimedia.org/r/342144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a8d55d622c1dbfeb4db16766d50509cee5b50e8
Gerrit-PatchSet: 4
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Keystonehooks: Create and delete sudoer rules in ldap
Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346489 )
Change subject: Keystonehooks: Create and delete sudoer rules in ldap
..
Keystonehooks: Create and delete sudoer rules in ldap
On creation, we add some default, permissive rules.
On deletion, we delete all sudo rules and the 'project' record
which isn't used for anything but this.
Bug: T150091
Change-Id: I89f5be2eeec348063de0a3f9662e30897f6590d7
---
M modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
M modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
A modules/openstack/files/mitaka/keystone/wmfkeystonehooks/ldapgroups.py
M modules/openstack/files/mitaka/keystone/wmfkeystonehooks/wmfkeystonehooks.py
4 files changed, 398 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/346489/1
diff --git
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
index 8f4bced..2ebe90d 100644
--- a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
+++ b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/ldapgroups.py
@@ -113,7 +113,23 @@
LOG.error("Failed to connect to ldap; Leak a project group.")
raise exception.ValidationError()
-ds.delete_s(dn)
+try:
+ds.delete_s(dn)
+except ldap.LDAPError as e:
+LOG.warning("Failed to delete %s from ldap: %s" % (dn, e))
+
+# delete everything under the project subtree
+basedn = cfg.CONF.wmfhooks.ldap_project_base_dn
+projectbase = "cn=%s,%s" % (project_id, basedn)
+
+search = ds.search_s(projectbase, ldap.SCOPE_SUBTREE)
+delete_list = [record for record, _ in search]
+delete_list.reverse()
+for record in delete_list:
+try:
+ds.delete_s(record)
+except ldap.LDAPError as e:
+LOG.warning("Failed to delete %s from ldap" % (record, e))
def sync_ldap_project_group(project_id, keystone_assignments):
@@ -167,3 +183,59 @@
except ldap.LDAPError:
LOG.warning("Failed to create group, attempt number %s: %s" %
(i, modlist))
+
+
+def create_sudo_defaults(project_id):
+ds = _open_ldap()
+if not ds:
+LOG.error("Failed to connect to ldap; Unable to create sudo rules.")
+raise exception.ValidationError()
+
+userbasedn = cfg.CONF.wmfhooks.ldap_user_base_dn
+basedn = cfg.CONF.wmfhooks.ldap_project_base_dn
+projectbase = "cn=%s,%s" % (project_id, basedn)
+# We may or may not already have one of these... if it fails just move on.
+projectEntry = {}
+projectEntry['objectClass'] = ['extensibleobject', 'groupofnames', 'top']
+projectEntry['member'] = ["uid=%s,%s" % (cfg.CONF.wmfhooks.admin_user,
userbasedn)]
+modlist = ldap.modlist.addModlist(projectEntry)
+try:
+ds.add_s(projectbase, modlist)
+except ldap.LDAPError as e:
+LOG.warning("Failed to create project base %s in ldap: %s" %
(projectbase, e))
+
+sudoerbase = "ou=sudoers,%s" % projectbase
+sudoEntry = {}
+sudoEntry['objectClass'] = ['organizationalunit', 'top']
+modlist = ldap.modlist.addModlist(sudoEntry)
+try:
+ds.add_s(sudoerbase, modlist)
+except ldap.LDAPError as e:
+LOG.error("Failed to create base sudoer group: %s" % e)
+return
+
+sudoEntry = {}
+defaultdn = "cn=default-sudo,%s" % sudoerbase
+sudoEntry['objectClass'] = ['sudoRole']
+sudoEntry['sudoUser'] = ['%%project-%s' % project_id.encode('utf8')]
+sudoEntry['sudoCommand'] = ['ALL']
+sudoEntry['sudoOption'] = ['!authenticate']
+sudoEntry['sudoHost'] = ['ALL']
+sudoEntry['cn'] = ['default-sudo']
+modlist = ldap.modlist.addModlist(sudoEntry)
+try:
+ds.add_s(defaultdn, modlist)
+except ldap.LDAPError as e:
+LOG.error("Failed to create default sudoer entry: %s" % e)
+return
+
+defaultasdn = "cn=default-sudo-as,%s" % sudoerbase
+# The runas entry is the same as the default entry, plus one field
+sudoEntry['sudoRunAsUser'] = ["%%project-%s" % project_id.encode('utf8')]
+sudoEntry['cn'] = ['default-sudo-as']
+modlist = ldap.modlist.addModlist(sudoEntry)
+try:
+ds.add_s(defaultasdn, modlist)
+except ldap.LDAPError as e:
+LOG.error("Failed to create default sudo-as entry: %s" % e)
+return
diff --git
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
index 85c7f22..284b8a5 100644
---
a/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
+++
b/modules/openstack/files/liberty/keystone/wmfkeystonehooks/wmfkeystonehooks.py
@@ -65,6 +65,9 @@
cfg.Str
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Use full qualified names in @uses/@covers in PHPUnit
Krinkle has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345628 ) Change subject: Use full qualified names in @uses/@covers in PHPUnit .. Use full qualified names in @uses/@covers in PHPUnit Bug: T161720 Change-Id: I68baebe6ea0af658c84c075ea17b758999ff8249 --- M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php M tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php M tests/phpunit/Checker/QualifierChecker/QualifiersCheckerTest.php M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/ValueCountCheckerHelperTest.php M tests/phpunit/ConstraintReportFactoryTest.php M tests/phpunit/ConstraintRepositoryTest.php M tests/phpunit/ConstraintTest.php M tests/phpunit/DelegatingConstraintCheckerTest.php M tests/phpunit/Helper/ConstraintParameterParserTest.php M tests/phpunit/Maintenance/UpdateConstraintsTableTest.php M tests/phpunit/Result/CheckResultTest.php M tests/phpunit/Specials/SpecialConstraintReportTest.php 30 files changed, 95 insertions(+), 95 deletions(-) Approvals: Krinkle: Looks good to me, approved Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php index d711fe9..156d888 100644 --- a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php +++ b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php @@ -14,14 +14,14 @@ use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterParser; /** - * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker + * @covers \WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker * * @group WikibaseQualityConstraints * @group Database * @group medium * - * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult - * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterParser + * @uses \WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult + * @uses \WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterParser * * @author BP2014N1 * @license GNU GPL v2+ diff --git a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php index cb32cad..4b9834c 100644 --- a/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php @@ -14,12 +14,12 @@ use WikibaseQuality\Tests\Helper\JsonFileEntityLookup; /** - * @covers WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ConflictsWithChecker + * @covers \WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ConflictsWithChecker * * @group WikibaseQualityConstraints * - * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult - * @uses WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\constraintParameterParser + * @uses \WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult + * @uses \WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\constraintParameterParser * * @author BP2014N1 * @license GNU GPL v2+ diff --git a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php index 84336b3..a29e722 100644 --- a/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php +++ b/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php @@ -13,12 +13,12 @@ use WikibaseQuality\ConstraintReport\Cons
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQuality[master]: Use full qualified names in @uses/@covers in PHPUnit
Krinkle has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345627 ) Change subject: Use full qualified names in @uses/@covers in PHPUnit .. Use full qualified names in @uses/@covers in PHPUnit Bug: T161721 Change-Id: Icba834e26d759c28055d5c2b0f2b12b057954693 --- M tests/phpunit/Html/HtmlTableBuilderTest.php M tests/phpunit/Html/HtmlTableCellBuilderTest.php M tests/phpunit/Html/HtmlTableHeaderBuilderTest.php 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/Html/HtmlTableBuilderTest.php b/tests/phpunit/Html/HtmlTableBuilderTest.php index 973f2a5..1f51e7b 100644 --- a/tests/phpunit/Html/HtmlTableBuilderTest.php +++ b/tests/phpunit/Html/HtmlTableBuilderTest.php @@ -9,12 +9,12 @@ use WikibaseQuality\Html\HtmlTableHeaderBuilder; /** - * @covers WikibaseQuality\Html\HtmlTableBuilder + * @covers \WikibaseQuality\Html\HtmlTableBuilder * * @group WikibaseQuality * - * @uses WikibaseQuality\Html\HtmlTableHeaderBuilder - * @uses WikibaseQuality\Html\HtmlTableCellBuilder + * @uses \WikibaseQuality\Html\HtmlTableHeaderBuilder + * @uses \WikibaseQuality\Html\HtmlTableCellBuilder * * @author BP2014N1 * @license GNU GPL v2+ diff --git a/tests/phpunit/Html/HtmlTableCellBuilderTest.php b/tests/phpunit/Html/HtmlTableCellBuilderTest.php index a22fcd5..bf40126 100644 --- a/tests/phpunit/Html/HtmlTableCellBuilderTest.php +++ b/tests/phpunit/Html/HtmlTableCellBuilderTest.php @@ -7,7 +7,7 @@ use WikibaseQuality\Html\HtmlTableCellBuilder; /** - * @covers WikibaseQuality\Html\HtmlTableCellBuilder + * @covers \WikibaseQuality\Html\HtmlTableCellBuilder * * @group WikibaseQuality * diff --git a/tests/phpunit/Html/HtmlTableHeaderBuilderTest.php b/tests/phpunit/Html/HtmlTableHeaderBuilderTest.php index 1cf2f8b..b374dc5 100644 --- a/tests/phpunit/Html/HtmlTableHeaderBuilderTest.php +++ b/tests/phpunit/Html/HtmlTableHeaderBuilderTest.php @@ -7,7 +7,7 @@ use WikibaseQuality\Html\HtmlTableHeaderBuilder; /** - * @covers WikibaseQuality\Html\HtmlTableHeaderBuilder + * @covers \WikibaseQuality\Html\HtmlTableHeaderBuilder * * @group WikibaseQuality * -- To view, visit https://gerrit.wikimedia.org/r/345627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icba834e26d759c28055d5c2b0f2b12b057954693 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQuality Gerrit-Branch: master Gerrit-Owner: Reedy Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Use full qualified names in @uses/@covers in PHPUnit
Krinkle has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345629 ) Change subject: Use full qualified names in @uses/@covers in PHPUnit .. Use full qualified names in @uses/@covers in PHPUnit Bug: T161718 Change-Id: Ic6ddead820d1ffbb6df799ee07b586b9e33eff21 --- M tests/phpunit/Api/RunCrossCheckTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckInteractorTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/CrossCheck/ReferenceCheckerTest.php M tests/phpunit/CrossCheck/Result/ComparisonResultTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php M tests/phpunit/CrossCheck/Result/ReferenceResultTest.php M tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php M tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php M tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php M tests/phpunit/DumpMetaInformation/DumpMetaInformationTest.php M tests/phpunit/DumpMetaInformation/SqlDumpMetaInformationRepoTest.php M tests/phpunit/ExternalDataRepoTest.php M tests/phpunit/ExternalValidationServicesTest.php M tests/phpunit/Serializer/ComparisonResultSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php M tests/phpunit/Serializer/ReferenceResultSerializerTest.php M tests/phpunit/Serializer/SerializerFactoryTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php M tests/phpunit/Specials/SpecialExternalDatabasesTest.php M tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php M tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php 35 files changed, 103 insertions(+), 103 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/Api/RunCrossCheckTest.php b/tests/phpunit/Api/RunCrossCheckTest.php index 00dacfb..42fdcb0 100644 --- a/tests/phpunit/Api/RunCrossCheckTest.php +++ b/tests/phpunit/Api/RunCrossCheckTest.php @@ -19,29 +19,29 @@ use WikibaseQuality\ExternalValidation\ExternalDataRepo; /** - * @covers WikibaseQuality\ExternalValidation\Api\RunCrossCheck + * @covers \WikibaseQuality\ExternalValidation\Api\RunCrossCheck * * @group WikibaseQualityExternalValidation * @group Database * @group API * @group medium * - * @uses WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation - * @uses WikibaseQuality\ExternalValidation\CrossCheck\CrossChecker - * @uses WikibaseQuality\ExternalValidation\CrossCheck\ReferenceChecker - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringValueComparer - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResult - * @uses WikibaseQuality\ExternalValidation\CrossCheck\Result\CrossCheckResultList - * @uses WikibaseQuality\ExternalValidation\Serializer\IndexedTagsSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\ComparisonResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\ReferenceResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\CrossCheckResultListSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\DumpMetaInformationSerializer - * @uses WikibaseQuality\ExternalValidation\Serializer\SerializerFactory + * @uses \WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation + * @uses \WikibaseQuality\ExternalValidation\CrossCheck\CrossChecker + * @uses \WikibaseQuality\ExternalValidation\CrossCheck\ReferenceChecker + * @uses \WikibaseQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparer + * @uses \WikibaseQuality\ExternalValidation\CrossCheck\Comparer\StringValueComparer + * @uses \WikibaseQuality\ExternalValidation\CrossChe
[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Bump file copyright notices for 2017
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346487 ) Change subject: build: Bump file copyright notices for 2017 .. build: Bump file copyright notices for 2017 Change-Id: Ia6cb5d07e5a09abd39ef38297455077cfe3e8aba --- M LICENSE-MIT 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/LICENSE-MIT b/LICENSE-MIT index acbe708..c6bbee2 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright 2011-2016 OOjs Team and other contributors. +Copyright 2011-2017 OOjs Team and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the -- To view, visit https://gerrit.wikimedia.org/r/346487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6cb5d07e5a09abd39ef38297455077cfe3e8aba Gerrit-PatchSet: 2 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/core[master]: build: Bump development dependencies to latest
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346486 ) Change subject: build: Bump development dependencies to latest .. build: Bump development dependencies to latest grunt-contrib-uglify 2.2.0 → 2.3.0 qunitjs2.1.1 → 2.3.0 Change-Id: If82d978eec158f1398820aa5bd0645adc8a42e5d --- M package.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 2338350..3e222a2 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "grunt": "1.0.1", "grunt-contrib-clean": "1.0.0", "grunt-contrib-concat": "1.0.1", -"grunt-contrib-uglify": "2.2.0", +"grunt-contrib-uglify": "2.3.0", "grunt-contrib-watch": "1.0.0", "grunt-eslint": "19.0.0", "grunt-karma": "2.0.0", @@ -40,6 +40,6 @@ "karma-qunit": "1.2.1", "karma-sauce-launcher": "1.1.0", "qunit": "1.0.0", -"qunitjs": "2.1.1" +"qunitjs": "2.3.0" } } -- To view, visit https://gerrit.wikimedia.org/r/346486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If82d978eec158f1398820aa5bd0645adc8a42e5d Gerrit-PatchSet: 2 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Send integer ms to DB lag time guage instead of seconds
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344472 )
Change subject: Send integer ms to DB lag time guage instead of seconds
..
Send integer ms to DB lag time guage instead of seconds
Previously, this sent the floating point value in seconds,
which is not what statsd expects here.
Bug: T149210
Change-Id: I8fcd58d7c9e183952df1257b1520d9426a42fd26
---
M maintenance/getLagTimes.php
1 file changed, 27 insertions(+), 20 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/getLagTimes.php b/maintenance/getLagTimes.php
index 677bfa2..ad2fdf8 100644
--- a/maintenance/getLagTimes.php
+++ b/maintenance/getLagTimes.php
@@ -38,30 +38,37 @@
}
public function execute() {
- $lbFactory =
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
- $stats =
MediaWikiServices::getInstance()->getStatsdDataFactory();
+ $services = MediaWikiServices::getInstance();
+ $lbFactory = $services->getDBLoadBalancerFactory();
+ $stats = $services->getStatsdDataFactory();
+ $lbsByType = [
+ 'main' => $lbFactory->getAllMainLBs(),
+ 'external' => $lbFactory->getAllExternalLBs()
+ ];
- $lbs = $lbFactory->getAllMainLBs() +
$lbFactory->getAllExternalLBs();
- foreach ( $lbs as $cluster => $lb ) {
- if ( $lb->getServerCount() <= 1 ) {
- continue;
- }
- $lags = $lb->getLagTimes();
- foreach ( $lags as $serverIndex => $lag ) {
- $host = $lb->getServerName( $serverIndex );
- if ( IP::isValid( $host ) ) {
- $ip = $host;
- $host = gethostbyaddr( $host );
- } else {
- $ip = gethostbyname( $host );
+ foreach ( $lbsByType as $type => $lbs ) {
+ foreach ( $lbs as $cluster => $lb ) {
+ if ( $lb->getServerCount() <= 1 ) {
+ continue;
}
+ $lags = $lb->getLagTimes();
+ foreach ( $lags as $serverIndex => $lag ) {
+ $host = $lb->getServerName(
$serverIndex );
+ if ( IP::isValid( $host ) ) {
+ $ip = $host;
+ $host = gethostbyaddr( $host );
+ } else {
+ $ip = gethostbyname( $host );
+ }
- $starLen = min( intval( $lag ), 40 );
- $stars = str_repeat( '*', $starLen );
- $this->output( sprintf( "%10s %20s %3d %s\n",
$ip, $host, $lag, $stars ) );
+ $starLen = min( intval( $lag ), 40 );
+ $stars = str_repeat( '*', $starLen );
+ $this->output( sprintf( "%10s %20s %3d
%s\n", $ip, $host, $lag, $stars ) );
- if ( $this->hasOption( 'report' ) ) {
- $stats->gauge(
"loadbalancer.lag.$cluster.$host", $lag );
+ if ( $this->hasOption( 'report' ) ) {
+ $group = ( $type === 'external'
) ? 'external' : $cluster;
+ $stats->gauge(
"loadbalancer.lag.$group.$host", intval( $lag * 1e3 ) );
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/344472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fcd58d7c9e183952df1257b1520d9426a42fd26
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add LoginNotify role
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346488 )
Change subject: Add LoginNotify role
..
Add LoginNotify role
Bug: T162103
Change-Id: Id46204f9b9a814bba1d6820632426638cead83c5
---
A puppet/modules/role/manifests/loginnotify.pp
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/role/manifests/loginnotify.pp
b/puppet/modules/role/manifests/loginnotify.pp
new file mode 100644
index 000..6329d59
--- /dev/null
+++ b/puppet/modules/role/manifests/loginnotify.pp
@@ -0,0 +1,5 @@
+# == Class: role::loginnotify
+class role::loginnotify {
+include ::role::echo
+mediawiki::extension { 'LoginNotify': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/346488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id46204f9b9a814bba1d6820632426638cead83c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add LoginNotify role
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346488 )
Change subject: Add LoginNotify role
..
Add LoginNotify role
Bug: T162103
Change-Id: Id46204f9b9a814bba1d6820632426638cead83c5
---
A puppet/modules/role/manifests/loginnotify.pp
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/88/346488/1
diff --git a/puppet/modules/role/manifests/loginnotify.pp
b/puppet/modules/role/manifests/loginnotify.pp
new file mode 100644
index 000..6329d59
--- /dev/null
+++ b/puppet/modules/role/manifests/loginnotify.pp
@@ -0,0 +1,5 @@
+# == Class: role::loginnotify
+class role::loginnotify {
+include ::role::echo
+mediawiki::extension { 'LoginNotify': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/346488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id46204f9b9a814bba1d6820632426638cead83c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Add host name to failmail subject
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346482 )
Change subject: Add host name to failmail subject
..
Add host name to failmail subject
Would be cool to template this stuff. What else would we want?
Bug: T162214
Change-Id: Ie72e3b10f5b5b2de84a548ceaa3e769946112712
---
M processcontrol/mailer.py
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/processcontrol/mailer.py b/processcontrol/mailer.py
index 08bb432..2d74472 100644
--- a/processcontrol/mailer.py
+++ b/processcontrol/mailer.py
@@ -1,5 +1,6 @@
from email.mime.text import MIMEText
import smtplib
+import socket
class Mailer(object):
@@ -17,7 +18,10 @@
msg = MIMEText(body)
-msg["Subject"] = "Fail Mail : " + subject
+msg["Subject"] = "Fail Mail ({host}) run-job: {subject}".format(
+host=socket.gethostname(), # Why not os.gethostname?
+subject=subject
+)
msg["From"] = self.from_address
msg["To"] = self.to_address
--
To view, visit https://gerrit.wikimedia.org/r/346482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie72e3b10f5b5b2de84a548ceaa3e769946112712
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Ejegg
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] oojs/core[master]: build: Bump file copyright notices for 2017
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346487 ) Change subject: build: Bump file copyright notices for 2017 .. build: Bump file copyright notices for 2017 Change-Id: Ia6cb5d07e5a09abd39ef38297455077cfe3e8aba --- M LICENSE-MIT 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/87/346487/1 diff --git a/LICENSE-MIT b/LICENSE-MIT index acbe708..c6bbee2 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright 2011-2016 OOjs Team and other contributors. +Copyright 2011-2017 OOjs Team and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the -- To view, visit https://gerrit.wikimedia.org/r/346487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6cb5d07e5a09abd39ef38297455077cfe3e8aba Gerrit-PatchSet: 1 Gerrit-Project: oojs/core 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] oojs/core[master]: build: Bump development dependencies to latest
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346486 ) Change subject: build: Bump development dependencies to latest .. build: Bump development dependencies to latest grunt-contrib-uglify 2.2.0 → 2.3.0 qunitjs2.1.1 → 2.3.0 Change-Id: If82d978eec158f1398820aa5bd0645adc8a42e5d --- M package.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/86/346486/1 diff --git a/package.json b/package.json index 2338350..3e222a2 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "grunt": "1.0.1", "grunt-contrib-clean": "1.0.0", "grunt-contrib-concat": "1.0.1", -"grunt-contrib-uglify": "2.2.0", +"grunt-contrib-uglify": "2.3.0", "grunt-contrib-watch": "1.0.0", "grunt-eslint": "19.0.0", "grunt-karma": "2.0.0", @@ -40,6 +40,6 @@ "karma-qunit": "1.2.1", "karma-sauce-launcher": "1.1.0", "qunit": "1.0.0", -"qunitjs": "2.1.1" +"qunitjs": "2.3.0" } } -- To view, visit https://gerrit.wikimedia.org/r/346486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If82d978eec158f1398820aa5bd0645adc8a42e5d Gerrit-PatchSet: 1 Gerrit-Project: oojs/core 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] oojs/core[master]: EventEmitter#disconnect: Correct documentation for second pa...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346485 )
Change subject: EventEmitter#disconnect: Correct documentation for second
parameter
..
EventEmitter#disconnect: Correct documentation for second parameter
The documentation suggested that would work, but it didn't.
We may add this as a feature in future (T100731) but for now we shouldn't
mislead.
Change-Id: I5e8575d8006e44eaacfc7e4c51177244f8c3947d
---
M src/EventEmitter.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/85/346485/1
diff --git a/src/EventEmitter.js b/src/EventEmitter.js
index 169f3a8..852256d 100644
--- a/src/EventEmitter.js
+++ b/src/EventEmitter.js
@@ -216,9 +216,9 @@
* Disconnect event handlers from an object.
*
* @param {Object} context Object to disconnect methods from
-* @param
{Object.|Object.|Object.}
[methods] List of
-* event bindings keyed by event name. Values can be either method
names or functions, but must be
-* consistent with those used in the corresponding call to "connect".
+* @param {Object.|Object.} [methods]
List of event bindings
+* keyed by event name. Values can be either method names or functions,
but must be consistent
+* with those used in the corresponding call to "connect".
* @chainable
*/
oo.EventEmitter.prototype.disconnect = function ( context, methods ) {
--
To view, visit https://gerrit.wikimedia.org/r/346485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e8575d8006e44eaacfc7e4c51177244f8c3947d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
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] operations/mediawiki-config[master]: Scap clean: ensure proper quotation of deletion commands in ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346481 ) Change subject: Scap clean: ensure proper quotation of deletion commands in keep-static .. Scap clean: ensure proper quotation of deletion commands in keep-static Change-Id: If745960cc82309c63031c2b33b873dc917ce08d5 --- M scap/plugins/clean.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py index c10ed43..bf1b5c5 100644 --- a/scap/plugins/clean.py +++ b/scap/plugins/clean.py @@ -80,7 +80,8 @@ ) # Update active master (passive gets it on next sync) -subprocess.check_call(self.clean_command(stage_dir, keep_static)) +master_command = ' '.join(self.clean_command(stage_dir, keep_static)) +subprocess.check_call(master_command, shell=True) # Update apaches self.execute_remote( -- To view, visit https://gerrit.wikimedia.org/r/346481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If745960cc82309c63031c2b33b873dc917ce08d5 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuSelectWidget: Highlight the first result when searching
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346484 )
Change subject: MenuSelectWidget: Highlight the first result when searching
..
MenuSelectWidget: Highlight the first result when searching
When we search for an item, highlight the first result found.
This is similar to what happens when we move with the arrow keys
and makes sense for highlighting the first search. It also gives
the option to the user of this widget to call on
this.getHighligtedItem() to pick the first result of the search.
Similar also to an autocomplete feature.
Change-Id: I66339c2efaf9b7b9a3ea88d59ad087ae102dbbad
---
M src/widgets/MenuSelectWidget.js
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/346484/1
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index e71f34b..15dbd57 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -134,6 +134,7 @@
*/
OO.ui.MenuSelectWidget.prototype.updateItemVisibility = function () {
var i, item, visible, section, sectionEmpty,
+ firstItemFound = false,
anyVisible = false,
len = this.items.length,
showAll = !this.isVisible(),
@@ -155,6 +156,11 @@
anyVisible = anyVisible || visible;
sectionEmpty = sectionEmpty && !visible;
item.toggle( visible );
+ if ( visible && !firstItemFound ) {
+ // Highlight the first item in the list
+ this.highlightItem( item );
+ firstItemFound = true;
+ }
}
}
// Process the final section
--
To view, visit https://gerrit.wikimedia.org/r/346484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66339c2efaf9b7b9a3ea88d59ad087ae102dbbad
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] operations/dns[master]: Adding mgmt dns entries for new hadoop nodes analytics1058-1069
Cmjohnson has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346483 )
Change subject: Adding mgmt dns entries for new hadoop nodes analytics1058-1069
..
Adding mgmt dns entries for new hadoop nodes analytics1058-1069
Change-Id: I089bff293657f4a611a6372e062d5559ddc2086c
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 49 insertions(+), 1 deletion(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index caeb026..e1ebd2b 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2048,6 +2048,30 @@
94 1H IN PTR wmf7026.mgmt.eqiad.wmnet.
95 1H IN PTR ms-be1039.mgmt.eqiad.wmnet.
95 1H IN PTR wmf7027.mgmt.eqiad.wmnet.
+96 1H IN PTR analytics1058.mgmt.eqiad.wmnet.
+96 1H IN PTR wmf7030.mgmt.eqiad.wmnet.
+97 1H IN PTR analytics1059.mgmt.eqiad.wmnet.
+97 1H IN PTR wmf7031.mgmt.eqiad.wmnet.
+98 1H IN PTR analytics1060.mgmt.eqiad.wmnet.
+98 1H IN PTR wmf7032.mgmt.eqiad.wmnet.
+99 1H IN PTR analytics1061.mgmt.eqiad.wmnet.
+99 1H IN PTR wmf7033.mgmt.eqiad.wmnet.
+100 1H IN PTR analytics1062.mgmt.eqiad.wmnet.
+100 1H IN PTR wmf7034.mgmt.eqiad.wmnet.
+101 1H IN PTR analytics1063.mgmt.eqiad.wmnet.
+101 1H IN PTR wmf7035.mgmt.eqiad.wmnet.
+102 1H IN PTR analytics1064.mgmt.eqiad.wmnet.
+102 1H IN PTR wmf7036.mgmt.eqiad.wmnet.
+103 1H IN PTR analytics1065.mgmt.eqiad.wmnet.
+103 1H IN PTR wmf7037.mgmt.eqiad.wmnet.
+104 1H IN PTR analytics1066.mgmt.eqiad.wmnet.
+104 1H IN PTR wmf7038.mgmt.eqiad.wmnet.
+105 1H IN PTR analytics1067.mgmt.eqiad.wmnet.
+105 1H IN PTR wmf7039.mgmt.eqiad.wmnet.
+106 1H IN PTR analytics1068.mgmt.eqiad.wmnet.
+106 1H IN PTR wmf7040.mgmt.eqiad.wmnet.
+107 1H IN PTR analytics1069.mgmt.eqiad.wmnet.
+107 1H IN PTR wmf7041.mgmt.eqiad.wmnet.
$ORIGIN 5.65.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 9efbe8f..39382ce 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1156,6 +1156,30 @@
analytics1056 1H IN A10.65.4.34
wmf4703 1H IN A10.65.4.35
analytics1057 1H IN A10.65.4.35
+wmf7030 1H IN A10.65.4.96
+analytics1058 1H IN A10.65.4.96
+wmf7031 1H IN A10.65.4.97
+analytics1059 1H IN A10.65.4.97
+wmf7032 1H IN A10.65.4.98
+analytics1060 1H IN A10.65.4.98
+wmf7033 1H IN A10.65.4.99
+analytics1061 1H IN A10.65.4.99
+wmf7034 1H IN A10.65.4.100
+analytics1062 1H IN A10.65.4.100
+wmf7035 1H IN A10.65.4.101
+analytics1063 1H IN A10.65.4.101
+wmf7036 1H IN A10.65.4.102
+analytics1064 1H IN A10.65.4.102
+wmf7037 1H IN A10.65.4.103
+analytics1065 1H IN A10.65.4.103
+wmf7038 1H IN A10.65.4.104
+analytics1066 1H IN A10.65.4.104
+wmf7039 1H IN A10.65.4.105
+analytics1067 1H IN A10.65.4.105
+wmf7040 1H IN A10.65.4.106
+analytics1068 1H IN A10.65.4.106
+wmf7041 1H IN A10.65.4.107
+analytics1069 1H IN A10.65.4.107
dataset1001 1H IN A10.65.3.85
wmf3471 1H IN A10.65.3.85
db1001 1H IN A10.65.6.1
@@ -1174,7 +1198,7 @@
wmf3080 1H IN A10.65.6.11
stat10021H IN A10.65.6.12
wmf3079 1H IN A10.65.6.12
-stat10031H IN A10.65.5.182
+stat10031H IN A10.65.5.182
wmf4542 1H IN A10.65.5.182
tungsten1H IN A10.65.6.14
wmf3077 1H IN A10.65.6.14
--
To view, visit https://gerrit.wikimedia.org/r/346483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I089bff293657f4a611a6372e062d5559ddc2086c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson
Gerrit-Reviewer: Cmjohnson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: Adding mgmt dns entries for new hadoop nodes analytics1058-1069
Cmjohnson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346483 )
Change subject: Adding mgmt dns entries for new hadoop nodes analytics1058-1069
..
Adding mgmt dns entries for new hadoop nodes analytics1058-1069
Change-Id: I089bff293657f4a611a6372e062d5559ddc2086c
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 49 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/83/346483/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index caeb026..e1ebd2b 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2048,6 +2048,30 @@
94 1H IN PTR wmf7026.mgmt.eqiad.wmnet.
95 1H IN PTR ms-be1039.mgmt.eqiad.wmnet.
95 1H IN PTR wmf7027.mgmt.eqiad.wmnet.
+96 1H IN PTR analytics1058.mgmt.eqiad.wmnet.
+96 1H IN PTR wmf7030.mgmt.eqiad.wmnet.
+97 1H IN PTR analytics1059.mgmt.eqiad.wmnet.
+97 1H IN PTR wmf7031.mgmt.eqiad.wmnet.
+98 1H IN PTR analytics1060.mgmt.eqiad.wmnet.
+98 1H IN PTR wmf7032.mgmt.eqiad.wmnet.
+99 1H IN PTR analytics1061.mgmt.eqiad.wmnet.
+99 1H IN PTR wmf7033.mgmt.eqiad.wmnet.
+100 1H IN PTR analytics1062.mgmt.eqiad.wmnet.
+100 1H IN PTR wmf7034.mgmt.eqiad.wmnet.
+101 1H IN PTR analytics1063.mgmt.eqiad.wmnet.
+101 1H IN PTR wmf7035.mgmt.eqiad.wmnet.
+102 1H IN PTR analytics1064.mgmt.eqiad.wmnet.
+102 1H IN PTR wmf7036.mgmt.eqiad.wmnet.
+103 1H IN PTR analytics1065.mgmt.eqiad.wmnet.
+103 1H IN PTR wmf7037.mgmt.eqiad.wmnet.
+104 1H IN PTR analytics1066.mgmt.eqiad.wmnet.
+104 1H IN PTR wmf7038.mgmt.eqiad.wmnet.
+105 1H IN PTR analytics1067.mgmt.eqiad.wmnet.
+105 1H IN PTR wmf7039.mgmt.eqiad.wmnet.
+106 1H IN PTR analytics1068.mgmt.eqiad.wmnet.
+106 1H IN PTR wmf7040.mgmt.eqiad.wmnet.
+107 1H IN PTR analytics1069.mgmt.eqiad.wmnet.
+107 1H IN PTR wmf7041.mgmt.eqiad.wmnet.
$ORIGIN 5.65.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 9efbe8f..39382ce 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1156,6 +1156,30 @@
analytics1056 1H IN A10.65.4.34
wmf4703 1H IN A10.65.4.35
analytics1057 1H IN A10.65.4.35
+wmf7030 1H IN A10.65.4.96
+analytics1058 1H IN A10.65.4.96
+wmf7031 1H IN A10.65.4.97
+analytics1059 1H IN A10.65.4.97
+wmf7032 1H IN A10.65.4.98
+analytics1060 1H IN A10.65.4.98
+wmf7033 1H IN A10.65.4.99
+analytics1061 1H IN A10.65.4.99
+wmf7034 1H IN A10.65.4.100
+analytics1062 1H IN A10.65.4.100
+wmf7035 1H IN A10.65.4.101
+analytics1063 1H IN A10.65.4.101
+wmf7036 1H IN A10.65.4.102
+analytics1064 1H IN A10.65.4.102
+wmf7037 1H IN A10.65.4.103
+analytics1065 1H IN A10.65.4.103
+wmf7038 1H IN A10.65.4.104
+analytics1066 1H IN A10.65.4.104
+wmf7039 1H IN A10.65.4.105
+analytics1067 1H IN A10.65.4.105
+wmf7040 1H IN A10.65.4.106
+analytics1068 1H IN A10.65.4.106
+wmf7041 1H IN A10.65.4.107
+analytics1069 1H IN A10.65.4.107
dataset1001 1H IN A10.65.3.85
wmf3471 1H IN A10.65.3.85
db1001 1H IN A10.65.6.1
@@ -1174,7 +1198,7 @@
wmf3080 1H IN A10.65.6.11
stat10021H IN A10.65.6.12
wmf3079 1H IN A10.65.6.12
-stat10031H IN A10.65.5.182
+stat10031H IN A10.65.5.182
wmf4542 1H IN A10.65.5.182
tungsten1H IN A10.65.6.14
wmf3077 1H IN A10.65.6.14
--
To view, visit https://gerrit.wikimedia.org/r/346483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I089bff293657f4a611a6372e062d5559ddc2086c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Add host name to failmail subject
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346482 )
Change subject: Add host name to failmail subject
..
Add host name to failmail subject
Would be cool to template this stuff. What else would we want?
Bug: T162214
Change-Id: Ie72e3b10f5b5b2de84a548ceaa3e769946112712
---
M processcontrol/mailer.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/82/346482/1
diff --git a/processcontrol/mailer.py b/processcontrol/mailer.py
index 08bb432..d5be249 100644
--- a/processcontrol/mailer.py
+++ b/processcontrol/mailer.py
@@ -1,5 +1,6 @@
from email.mime.text import MIMEText
import smtplib
+import socket
class Mailer(object):
@@ -17,7 +18,10 @@
msg = MIMEText(body)
-msg["Subject"] = "Fail Mail : " + subject
+msg["Subject"] = "Fail Mail ({host}) run-job: {subject}".format(
+host=socket.gethostname(), # Why not os.gethostname?
+subject=subject
+)
msg["From"] = self.from_address
msg["To"] = self.to_address
--
To view, visit https://gerrit.wikimedia.org/r/346482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie72e3b10f5b5b2de84a548ceaa3e769946112712
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
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] operations/mediawiki-config[master]: Scap clean: ensure proper quotation of deletion commands in ...
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346481 ) Change subject: Scap clean: ensure proper quotation of deletion commands in keep-static .. Scap clean: ensure proper quotation of deletion commands in keep-static Change-Id: If745960cc82309c63031c2b33b873dc917ce08d5 --- M scap/plugins/clean.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/346481/1 diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py index 21411e6..8f7df3c 100644 --- a/scap/plugins/clean.py +++ b/scap/plugins/clean.py @@ -80,7 +80,8 @@ ) # Update active master (passive gets it on next sync) -subprocess.check_call(self.clean_command(stage_dir, keep_static)) +master_command = ' '.join(self.clean_command(stage_dir, keep_static)) +subprocess.check_call(master_command, shell=True) # Update apaches self.execute_remote( -- To view, visit https://gerrit.wikimedia.org/r/346481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If745960cc82309c63031c2b33b873dc917ce08d5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Syslogs point at syslogd
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346480 ) Change subject: Syslogs point at syslogd .. Syslogs point at syslogd Change-Id: I3a9e64b7c0500edb57d2c7565b507770046494fc --- M process-control.example.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/process-control.example.yaml b/process-control.example.yaml index 223d92a..5623336 100644 --- a/process-control.example.yaml +++ b/process-control.example.yaml @@ -36,6 +36,8 @@ handlers: syslog: +# Give the file or network socket where your syslogd is listening. +address: /dev/log class: logging.handlers.SysLogHandler level: DEBUG facility: daemon -- To view, visit https://gerrit.wikimedia.org/r/346480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a9e64b7c0500edb57d2c7565b507770046494fc Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight 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] mediawiki/core[master]: RCFilters: Work around IE11 rendering issues
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346210 )
Change subject: RCFilters: Work around IE11 rendering issues
..
RCFilters: Work around IE11 rendering issues
Bug: T162098
Change-Id: Ia9410f2c41036f263decd47290899f20144e0a51
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
index 0e38942..3d63831 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less
@@ -44,6 +44,11 @@
// Override margin-top and -bottom rules from
FieldLayout
margin: 0 !important; /* stylelint-disable-line
declaration-no-important */
}
+
+ .oo-ui-checkboxInputWidget {
+ // Workaround for IE11 rendering issues. T162098
+ display: block;
+ }
}
&-highlightButton {
--
To view, visit https://gerrit.wikimedia.org/r/346210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9410f2c41036f263decd47290899f20144e0a51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Mooeypoo
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RelatedArticles[master]: Remove Related Articles from desktop beta features
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344723 )
Change subject: Remove Related Articles from desktop beta features
..
Remove Related Articles from desktop beta features
This change removes RelatedArticles from beta features.
It repurposes the BlacklistSkins config to be a whitelist that describes
when related pages should be shown in the footer.
To avoid enabling related pages on desktop, this depends on a config
change that makes use of the new configuration option.
Simplify browser tests to reflect the new status quo.
Bug: T146436
Bug: T160076
Depends-On: I522e0182d1c3d9261bd0561c3ec0c789b6431c7a
Change-Id: I84da1fb33a901a6365375d00d192af35422ff0b0
---
M extension.json
M i18n/en.json
M i18n/qqq.json
D images/BetaFeatures/wb-readmore-beta-ltr.svg
D images/BetaFeatures/wb-readmore-beta-rtl.svg
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
M tests/browser/LocalSettings.php
M tests/browser/features/read_more.feature
9 files changed, 10 insertions(+), 202 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/extension.json b/extension.json
index e5f8202..470e9f4 100644
--- a/extension.json
+++ b/extension.json
@@ -35,9 +35,6 @@
"RelatedArticles\\SidebarHooks::onSidebarBeforeOutput"
],
- "GetBetaFeaturePreferences": [
-
"RelatedArticles\\FooterHooks::onGetBetaFeaturePreferences"
- ],
"MakeGlobalVariablesScript": [
"RelatedArticles\\FooterHooks::onMakeGlobalVariablesScript"
],
@@ -127,8 +124,8 @@
"RelatedArticlesOnlyUseCirrusSearch": false,
"RelatedArticlesLoggingSamplingRate": 0.01,
"RelatedArticlesEnabledSamplingRate": 1,
- "@RelatedArticlesFooterBlacklistedSkins": "List of skin names
(e.g. 'minerva') where related articles won't be shown in the footer. If absent
related articles will show in stable on Minerva or beta on all other skins.",
- "RelatedArticlesFooterBlacklistedSkins": []
+ "@RelatedArticlesFooterWhitelistedSkins": "List of skin names
(e.g. 'minerva') where related articles will be shown in the footer.",
+ "RelatedArticlesFooterWhitelistedSkins": [ "minerva" ]
},
"ConfigRegistry": {
"RelatedArticles": "GlobalVarConfig::newInstance"
diff --git a/i18n/en.json b/i18n/en.json
index 194fdaf..58a3897 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,7 +4,5 @@
},
"relatedarticles-title": "Related pages",
"relatedarticles-desc": "Adds a link to related pages on the sidebar or
in the footer, if the user enables the beta feature.",
- "relatedarticles-read-more-heading": "Related pages",
- "relatedarticles-read-more-beta-feature-title": "Related pages",
- "relatedarticles-read-more-beta-feature-description": "Suggests related
pages at the bottom of a page."
+ "relatedarticles-read-more-heading": "Related pages"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5d65f67..9c37aeb 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,7 +9,5 @@
},
"relatedarticles-title": "Title shown on the sidebar",
"relatedarticles-desc": "{{desc|name=Related
Articles|url=https://www.mediawiki.org/wiki/Extension:RelatedArticles}}";,
- "relatedarticles-read-more-heading": "The heading of section, added at
the end of the page, that lists the related pages",
- "relatedarticles-read-more-beta-feature-title": "Title of the related
pages feature in
Special:Preferences#mw-prefsection-betafeatures.\n{{Identical|Read more}}",
- "relatedarticles-read-more-beta-feature-description": "Description of
the related pages feature in Special:Preferences#mw-prefsection-betafeatures"
+ "relatedarticles-read-more-heading": "The heading of section, added at
the end of the page, that lists the related pages"
}
diff --git a/images/BetaFeatures/wb-readmore-beta-ltr.svg
b/images/BetaFeatures/wb-readmore-beta-ltr.svg
deleted file mode 100644
index a46b91c..000
--- a/images/BetaFeatures/wb-readmore-beta-ltr.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="264" height="162" viewBox="0
0 264 162" id="svg2">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Syslogs point at syslogd
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346480 ) Change subject: Syslogs point at syslogd .. Syslogs point at syslogd Change-Id: I3a9e64b7c0500edb57d2c7565b507770046494fc --- M process-control.example.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/80/346480/1 diff --git a/process-control.example.yaml b/process-control.example.yaml index d1ad3cb..7f8a8c0 100644 --- a/process-control.example.yaml +++ b/process-control.example.yaml @@ -36,6 +36,8 @@ handlers: syslog: +# Give the file or network socket where your syslogd is listening. +address: /dev/log class: logging.handlers.SysLogHandler level: DEBUG facility: daemon -- To view, visit https://gerrit.wikimedia.org/r/346480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a9e64b7c0500edb57d2c7565b507770046494fc Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control 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] wikimedia...process-control[master]: Add run-job[pid] to example syslog format
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346479 ) Change subject: Add run-job[pid] to example syslog format .. Add run-job[pid] to example syslog format Bug: T162189 Change-Id: I904415b8d3ea94484680602f7f2d8d73f059fc9b --- M process-control.example.yaml 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Awight: Checked; Looks good to me, approved diff --git a/process-control.example.yaml b/process-control.example.yaml index f89ed3c..d1ad3cb 100644 --- a/process-control.example.yaml +++ b/process-control.example.yaml @@ -27,8 +27,9 @@ # Python logging config, https://docs.python.org/2/library/logging.config.html#logging-config-dictschema logging: version: 1 -#formatters: -#- +formatters: +runjob: +format: 'run-job[%(process)d]: %(message)s' #filters: #- @@ -38,6 +39,7 @@ class: logging.handlers.SysLogHandler level: DEBUG facility: daemon +formatter: runjob loggers: process-control: -- To view, visit https://gerrit.wikimedia.org/r/346479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I904415b8d3ea94484680602f7f2d8d73f059fc9b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Ejegg 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] wikimedia...process-control[master]: Timeout should be given in minutes
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346344 )
Change subject: Timeout should be given in minutes
..
Timeout should be given in minutes
DEPLOYMENT NOTE: Convert deployed jobs from seconds to minutes.
Change-Id: I61aa8d4d5ec8a5956d3bd67a59d95483290b2b60
---
M README.md
M process-control.example.yaml
M processcontrol/job_wrapper.py
M tests/data/global_config/global_defaults.yaml
M tests/data/timeout.yaml
M tests/test_job_wrapper.py
6 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/README.md b/README.md
index f530113..60b662e 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@
# can still be run as a single-shot.
disabled: true
-# Optional timeout in seconds, after which your job will be
-# aborted. Defaults to 10 minutes, JobWrapper.DEFAULT_TIMEOUT
+# Optional timeout in minutes, after which your job will be
+# aborted. Defaults to no timeout.
timeout: 30
# Optional environment variables.
diff --git a/process-control.example.yaml b/process-control.example.yaml
index f89ed3c..2ae7a8b 100644
--- a/process-control.example.yaml
+++ b/process-control.example.yaml
@@ -20,7 +20,7 @@
from_address: "Fail Mail "
to_address: "fr-t...@wikimedia.org"
-timeout: 600
+timeout: 10
job_directory: /var/lib/process-control
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 4f9ff6c..7d9817a 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -81,7 +81,9 @@
# Spawn timeout monitor thread.
if self.timeout > 0:
-timer = threading.Timer(self.timeout, self.fail_timeout)
+# Convert minutes to seconds.
+timeout_seconds = self.timeout * 60
+timer = threading.Timer(timeout_seconds, self.fail_timeout)
timer.start()
command = self.config.get("command")
@@ -138,7 +140,7 @@
def fail_timeout(self):
self.process.kill()
-message = "Job {name} timed out after {timeout}
seconds".format(name=self.name, timeout=self.timeout)
+message = "Job {name} timed out after {timeout}
minutes".format(name=self.name, timeout=self.timeout)
config.log.error(message)
self.mailer.fail_mail(message)
# FIXME: Job will return SIGKILL now, fail_exitcode should ignore that
signal now?
diff --git a/tests/data/global_config/global_defaults.yaml
b/tests/data/global_config/global_defaults.yaml
index daca679..00c6fd7 100644
--- a/tests/data/global_config/global_defaults.yaml
+++ b/tests/data/global_config/global_defaults.yaml
@@ -13,7 +13,7 @@
from_address: "Fail Mail "
to_address: "fr-t...@wikimedia.org"
-timeout: 600
+timeout: 10
# NOTE: `job_directory` is calculated by test setup.
diff --git a/tests/data/timeout.yaml b/tests/data/timeout.yaml
index 9e01920..5511c7a 100644
--- a/tests/data/timeout.yaml
+++ b/tests/data/timeout.yaml
@@ -1,3 +1,3 @@
name: Timing out job
command: /bin/sleep 10
-timeout: 0.1
+timeout: 0.005
diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index 7efa177..31e3e9d 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -63,7 +63,7 @@
run_job("timeout")
loglines = caplog.actual()
-assert ("root", "ERROR", "Job Timing out job timed out after 0.1 seconds")
in loglines
+assert ("root", "ERROR", "Job Timing out job timed out after 0.005
minutes") in loglines
assert ("root", "ERROR", "Job Timing out job failed with code -9") in
loglines
MockSmtp().sendmail.assert_called_once()
--
To view, visit https://gerrit.wikimedia.org/r/346344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61aa8d4d5ec8a5956d3bd67a59d95483290b2b60
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight
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] mediawiki...ParserMigration[wmf/1.29.0-wmf.18]: [1.29.0-wmf.18] Don't run tidy twice
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346478 )
Change subject: [1.29.0-wmf.18] Don't run tidy twice
..
[1.29.0-wmf.18] Don't run tidy twice
It defeats the purpose.
Change-Id: Ie6de3842731da2a2d74af03a42de0632085b4c6b
(cherry picked from commit 7b61c8899040393fef10b6a898f086bf3749e6bf)
---
M includes/MigrationEditPage.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MigrationEditPage.php b/includes/MigrationEditPage.php
index dc015d7..a42ad14 100644
--- a/includes/MigrationEditPage.php
+++ b/includes/MigrationEditPage.php
@@ -24,6 +24,12 @@
return true;
}
+ protected function getPreviewParserOptions() {
+ $parserOptions = parent::getPreviewParserOptions();
+ $parserOptions->setTidy( false );
+ return $parserOptions;
+ }
+
protected function doPreviewParse( \Content $content ) {
$user = $this->context->getUser();
$parserOptions = $this->getPreviewParserOptions();
--
To view, visit https://gerrit.wikimedia.org/r/346478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6de3842731da2a2d74af03a42de0632085b4c6b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ParserMigration
Gerrit-Branch: wmf/1.29.0-wmf.18
Gerrit-Owner: Tim Starling
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Add run-job[pid] to example syslog format
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346479 ) Change subject: Add run-job[pid] to example syslog format .. Add run-job[pid] to example syslog format Bug: T162189 Change-Id: I904415b8d3ea94484680602f7f2d8d73f059fc9b --- M process-control.example.yaml 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/79/346479/1 diff --git a/process-control.example.yaml b/process-control.example.yaml index f89ed3c..d1ad3cb 100644 --- a/process-control.example.yaml +++ b/process-control.example.yaml @@ -27,8 +27,9 @@ # Python logging config, https://docs.python.org/2/library/logging.config.html#logging-config-dictschema logging: version: 1 -#formatters: -#- +formatters: +runjob: +format: 'run-job[%(process)d]: %(message)s' #filters: #- @@ -38,6 +39,7 @@ class: logging.handlers.SysLogHandler level: DEBUG facility: daemon +formatter: runjob loggers: process-control: -- To view, visit https://gerrit.wikimedia.org/r/346479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I904415b8d3ea94484680602f7f2d8d73f059fc9b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control 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] mediawiki...ParserMigration[wmf/1.29.0-wmf.18]: Don't run tidy twice
Tim Starling has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346478 )
Change subject: Don't run tidy twice
..
Don't run tidy twice
It defeats the purpose.
Change-Id: Ie6de3842731da2a2d74af03a42de0632085b4c6b
(cherry picked from commit 7b61c8899040393fef10b6a898f086bf3749e6bf)
---
M includes/MigrationEditPage.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserMigration
refs/changes/78/346478/1
diff --git a/includes/MigrationEditPage.php b/includes/MigrationEditPage.php
index dc015d7..a42ad14 100644
--- a/includes/MigrationEditPage.php
+++ b/includes/MigrationEditPage.php
@@ -24,6 +24,12 @@
return true;
}
+ protected function getPreviewParserOptions() {
+ $parserOptions = parent::getPreviewParserOptions();
+ $parserOptions->setTidy( false );
+ return $parserOptions;
+ }
+
protected function doPreviewParse( \Content $content ) {
$user = $this->context->getUser();
$parserOptions = $this->getPreviewParserOptions();
--
To view, visit https://gerrit.wikimedia.org/r/346478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6de3842731da2a2d74af03a42de0632085b4c6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserMigration
Gerrit-Branch: wmf/1.29.0-wmf.18
Gerrit-Owner: Tim Starling
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Prepare for related pages configuration change
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346452 ) Change subject: Prepare for related pages configuration change .. Prepare for related pages configuration change Bug: T160076 Change-Id: I522e0182d1c3d9261bd0561c3ec0c789b6431c7a --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4f3a735..8d07d50 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16963,8 +16963,14 @@ 'frwikinews' => true, // T143480 ], -'wmgRelatedArticlesFooterBlacklistedSkins' => [ +'wgRelatedArticlesFooterWhitelistedSkins' => [ // T144812 + 'default' => [ 'minerva' ], + 'related-articles-footer-blacklisted-skins' => [], +], + +// Can be removed when T160076 is deployed everywhere +'wmgRelatedArticlesFooterBlacklistedSkins' => [ 'default' => [], 'related-articles-footer-blacklisted-skins' => [ 'minerva' ], ], -- To view, visit https://gerrit.wikimedia.org/r/346452 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I522e0182d1c3d9261bd0561c3ec0c789b6431c7a Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson 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] oojs/ui[master]: TextInputWidget: Use .prop() rather than .attr() for 'required'
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346468 )
Change subject: TextInputWidget: Use .prop() rather than .attr() for 'required'
..
TextInputWidget: Use .prop() rather than .attr() for 'required'
jQuery Migrate erroneously complains about this:
jQuery.fn.removeAttr no longer sets boolean properties: required
But in fact, the property is automatically bidirectionally synchronized
with the attribute, this code works just fine with jQuery 3, that
message is therefore wrong, and this change is completely unnecessary
other than to appease jQuery Migrate.
Effectively, this changes the attribute we set from `required="required"`
to `required=""`. The getDomElementSummary() function used in our tests
is updated to handle this change. This could be a breaking change for
CSS using the `[required='required']` selector (although such code
should have used just `[required]`, which will still work).
Bug: T160802
Change-Id: I8179eb3f1cef1996f2d837d1493a5217ce4171b3
---
M src/widgets/TextInputWidget.js
M tests/QUnit.assert.equalDomElement.js
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index f1137e6..d127529 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -358,14 +358,14 @@
this.required = !!state;
if ( this.required ) {
this.$input
- .attr( 'required', 'required' )
+ .prop( 'required', true )
.attr( 'aria-required', 'true' );
if ( this.getIndicator() === null ) {
this.setIndicator( 'required' );
}
} else {
this.$input
- .removeAttr( 'required' )
+ .prop( 'required', false )
.removeAttr( 'aria-required' );
if ( this.getIndicator() === 'required' ) {
this.setIndicator( null );
diff --git a/tests/QUnit.assert.equalDomElement.js
b/tests/QUnit.assert.equalDomElement.js
index 9cae0f6..b139442 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -37,6 +37,7 @@
propertyAttributes = {
value: 'value',
readOnly: 'readonly',
+ required: 'required',
checked: 'checked',
disabled: 'disabled',
tabIndex: 'tabindex',
--
To view, visit https://gerrit.wikimedia.org/r/346468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8179eb3f1cef1996f2d837d1493a5217ce4171b3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Exemplified application in mediawiki.ui
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346477 ) Change subject: [WIP] Exemplified application in mediawiki.ui .. [WIP] Exemplified application in mediawiki.ui Depends-on: Ibcdc2e78eb7fe72c57b384ef79be1c7c1af9facd Change-Id: Ia3692f5a270860f9a0c67633abe2791c82a1caf0 --- M resources/src/mediawiki.less/mediawiki.ui/variables.less 1 file changed, 17 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/77/346477/1 diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less b/resources/src/mediawiki.less/mediawiki.ui/variables.less index d4937c6..0b3be9b 100644 --- a/resources/src/mediawiki.less/mediawiki.ui/variables.less +++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less @@ -1,4 +1,6 @@ -// Colors for use in mediawiki.ui and elsewhere +@import 'themes/theme'; + +// Colors for use in mediawiki.ui // Although this defines many shades, be parsimonious in your own use of grays. Prefer // colors already in use in MediaWiki. Prefer semantic color names such as "@colorText". @@ -20,15 +22,15 @@ // Semantic background colors // Blue; for contextual use of a continuing action -@colorProgressive: #36c; -@colorProgressiveHighlight: #447ff5; -@colorProgressiveActive: #2a4b8d; +@colorProgressive: @color-primary; +@colorProgressiveHighlight: @color-primary--hover; +@colorProgressiveActive: @color-primary--active; // Orange; for contextual use of returning to a past action @colorRegressive: #ff5d00; // Red; for contextual use of a negative action of high severity -@colorDestructive: #d33; -@colorDestructiveHighlight: #ff4242; -@colorDestructiveActive: #b32424; +@colorDestructive: @color-destructive; +@colorDestructiveHighlight: @color-destructive--hover; +@colorDestructiveActive: @color-destructive--active; // 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 @@ -40,23 +42,22 @@ @colorLightenPercentage: 13.5%; // Text colors -@colorText: @colorGray2; +@colorText: @color-base; @colorTextLight: @colorGray6; -@colorButtonText: @colorGray2; -@colorButtonTextHighlight: @colorGray4; -@colorButtonTextActive: @colorGray1; +@colorButtonText: @color-base; +@colorButtonTextHighlight: @color-base--hover; +@colorButtonTextActive: @color-base--active; @colorDisabledText: @colorGray12; -@colorErrorText: #c00; +@colorErrorText: @color-destructive; @colorWarningText: #705000; // UI colors -@colorFieldBorder: #a2a9b1; +@colorFieldBorder: @border-color-base; @colorShadow: @colorGray14; -@colorPlaceholder: @colorGray10; -@colorNeutral: @colorGray7; +@colorNeutral: @color-base--subtle; // Global border radius to be used to buttons and inputs -@borderRadius: 2px; +@borderRadius: @border-radius-base; // Icon related variables @iconSize: 1.5em; -- To view, visit https://gerrit.wikimedia.org/r/346477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3692f5a270860f9a0c67633abe2791c82a1caf0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Dashiki[master]: Move as much config in extension.json as possible
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344007 )
Change subject: Move as much config in extension.json as possible
..
Move as much config in extension.json as possible
Bug: T161038
Change-Id: Ie19aac0e1467a1a86a957325230a124530abe46a
---
M README
M extension.json
2 files changed, 7 insertions(+), 11 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README b/README
index 370bfe6..0e60bd5 100644
--- a/README
+++ b/README
@@ -5,14 +5,4 @@
To install, add the following to LocalSettings.php
-// Configure Dashiki sub-namespace with JsonConfig
-$wgJsonConfigs['JsonConfig.Dashiki'] = array(
- 'pattern' => '/^Dashiki\:./',
- 'isLocal' => true,
-);
-
-// register the custom view implemented by the Dashiki extension
-$wgJsonConfigModels['JsonConfig.Dashiki'] = array(
-'class' => null,
-'view' => 'Dashiki\DashikiView',
-);
+ wfLoadExtension( 'Dashiki' );
diff --git a/extension.json b/extension.json
index 3379d6d..2dff856 100644
--- a/extension.json
+++ b/extension.json
@@ -21,5 +21,11 @@
"view": "Dashiki\\DashikiView"
}
},
+ "JsonConfigs": {
+ "Dashiki": {
+ "pattern": "/^Dashiki\\:./",
+ "isLocal": true
+ }
+ },
"manifest_version": 2
}
--
To view, visit https://gerrit.wikimedia.org/r/344007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie19aac0e1467a1a86a957325230a124530abe46a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[wmf/1.29.0-wmf.18]: Revert "Start implementing Quiz generation using TemplatePar...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346274 )
Change subject: Revert "Start implementing Quiz generation using TemplateParser"
..
Revert "Start implementing Quiz generation using TemplateParser"
This change caused all feedback to be displayed before the quiz was
submitted.
This reverts commit d1aa33a9299d48959bfe6dfe46357dcbbe01afaa.
Change-Id: I75df22893c711979059d7c2376ae922e8aa57e1e
(cherry picked from commit dbb953a05b3784983018444bf822bef6b3641853)
---
M Quiz.class.php
M modules/ext.quiz.css
D templates/Quiz.mustache
3 files changed, 33 insertions(+), 46 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Quiz.class.php b/Quiz.class.php
index ff2fa0a..a04e8a0 100755
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -112,7 +112,6 @@
* @return string
*/
function parseQuiz( $input ) {
-
// Ouput the style and the script to the header once for all.
if ( $this->mQuizId == 0 ) {
global $wgOut;
@@ -123,8 +122,10 @@
$input = $this->parseQuestions( $this->parseIncludes( $input )
);
// Generates the output.
-
- $templateParser = new TemplateParser( __DIR__ . '/templates' );
+ // TODO: Use TemplateParser instead of HTML tags in code to
improve code readability in the future
+ $classHide = ( $this->mBeingCorrected ) ? '' : '
class="hideCorrection"';
+ $output = '' . "\n";
+ $output .= '' . "\n";
// Determine the content of the settings table.
$settings = array_fill( 0, 4, '' );
@@ -172,27 +173,33 @@
}
}
- $quiz_score = wfMessage( 'quiz_score' )->rawParams(
+ if ( !empty( $settingsTable ) ) {
+ $output .= '' . "\n";
+ $output .= $settingsTable . "\n";
+ $output .= '' . "\n";
+ }
+ $output .= '' . "\n";
+
+ $output .= '' . "\n";
+ $output .= $input . "\n";
+ $output .= '' . "\n";
+
+ $output .= '';
+ if ( $this->mBeingCorrected ) {
+ $output .= '';
+ }
+ $output .= '' . "\n";
+
+ $output .= '';
+ $output .= wfMessage( 'quiz_score' )->rawParams(
'' . $this->mScore . '',
- '' . $this->mTotal .
'')->escaped();
+ '' . $this->mTotal . ''
+ )->escaped();
+ $output .= '' . "\n";
- return $templateParser->processTemplate(
- 'Quiz',
- array(
- 'quiz' => array(
- 'id' => $this->mQuizId,
- 'beingCorrected' =>
$this->mBeingCorrected,
- 'questions' => $input
- ),
- 'settingsTable' => $settingsTable,
- 'wfMessage' => array(
- 'quiz_correction' => wfMessage(
'quiz_correction' )->escaped(),
- 'quiz_reset' => wfMessage( 'quiz_reset'
)->escaped(),
- 'quiz_score' => $quiz_score
- )
- )
- );
-
+ $output .= '' . "\n";
+ $output .= '' . "\n";
return $output;
}
diff --git a/modules/ext.quiz.css b/modules/ext.quiz.css
index 2060bcb..c03834c 100644
--- a/modules/ext.quiz.css
+++ b/modules/ext.quiz.css
@@ -10,6 +10,10 @@
background-color: transparent;
}
+.quiz .hideCorrection .correction {
+ display: none;
+}
+
.quiz .settings td {
padding: 0.1em 0.4em 0.1em 0.4em;
}
diff --git a/templates/Quiz.mustache b/templates/Quiz.mustache
deleted file mode 100644
index 3ad1d03..000
--- a/templates/Quiz.mustache
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- {{#settingsTable}}
-
- {{{ . }}}
-
- {{/settingsTable}}
-
-
- {{{ quiz.questions }}}
-
-
-
- {{#if quiz.beingCorrected }}
-
- {{/if}}
-
- {{#if quiz.beingCorrected }}
-
- {{{ wfMessage.quiz_score }}}
-
- {{/if}}
-
-
\ No newline at end of file
--
To vi
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set $wgOresThresholds on wikis where both ORES and rcfilters...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346470 ) Change subject: Set $wgOresThresholds on wikis where both ORES and rcfilters are enabled .. Set $wgOresThresholds on wikis where both ORES and rcfilters are enabled Change-Id: Ia2a47473558d9a5cff002d341358dbff876b9fa1 --- M wmf-config/InitialiseSettings.php 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index c5cca91..4f3a735 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18094,6 +18094,35 @@ 'cswiki' => [ 'hard' => 0.45, 'soft' => 0.8, 'softest' => 0.88 ], // T151611 'etwiki' => [ 'hard' => 0.34, 'soft' => 0.62, 'softest' => 0.95 ], // T159609 ], +'wgOresFiltersThresholds' => [ + 'default' => [], + 'plwiki' => [ + 'damaging' => [ + 'likelygood' => [ 'min' => 0, 'max' => 0.700 ], // ~98% precision at 0.861, lowered to 0.700 to avoid overlap with likelybad + 'maybebad' => [ 'min' => 0.373, 'max' => 1 ], // ~45% precision + 'likelybad' => [ 'min' => 0.733, 'max' => 1 ], // ~90% precision + 'verylikelybad' => [ 'min' => 0.851, 'max' => 1 ], // ~98% precision + ], + 'goodfaith' => [ + 'good' => [ 'min' => 0.720, 'max' => 1 ], // ~98% precision at 0.302, raised to 0.720 to avoid overlap with bad + 'maybebad' => [ 'min' => 0, 'max' => 0.938 ], // ~45% precision + 'bad' => [ 'min' => 0, 'max' => 0.708 ], // ~90% precision + ], + ], + 'ptwiki' => [ + 'damaging' => [ + 'likelygood' => [ 'min' => 0, 'max' => 0.546 ], // ~98% precision + 'maybebad' => [ 'min' => 0.290, 'max' => 1 ], // ~90% recall + 'likelybad' => [ 'min' => 0.739, 'max' => 1 ], // ~45% precision + 'verylikelybad' => [ 'min' => 0.950, 'max' => 1 ], // ~90% precision + ], + 'goodfaith' => [ + 'good' => [ 'min' => 0.403, 'max' => 1 ], // ~98% precision + 'maybebad' => [ 'min' => 0, 'max' => 0.256 ], // ~45% precision + 'bad' => [ 'min' => 0, 'max' => 0.047 ], // ~90% precision + ], + ], +], 'wgOresEnabledNamespaces' => [ 'default' => [], 'wikidatawiki' => [ 0 => true, 120 => true ], // T139660 -- To view, visit https://gerrit.wikimedia.org/r/346470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2a47473558d9a5cff002d341358dbff876b9fa1 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope 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] operations/mediawiki-config[master]: Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346464 )
Change subject: Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing
easier
..
Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing easier
Bug: T160094
Change-Id: I6ca70ac3b2dc908bb7f739c196b23da363bbec6c
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5cfb670..1b2fb8d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -348,6 +348,7 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
+ $wgLoginNotifyAttemptsKnownIP = 4;
}
$wgMessageCacheType = CACHE_ACCEL;
--
To view, visit https://gerrit.wikimedia.org/r/346464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ca70ac3b2dc908bb7f739c196b23da363bbec6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Make a copy of the result of $.fn.offset() before changing i...
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346476 )
Change subject: Make a copy of the result of $.fn.offset() before changing its
properties
..
Make a copy of the result of $.fn.offset() before changing its properties
Some versions of jQuery 3 may return a native ClientRect object in
some cases and we can't modify its properties.
Bug: T160802
Change-Id: I27dde7b75a526618879b96d276fa7758b01fe4de
---
M src/Element.js
M src/mixins/FloatableElement.js
M src/widgets/PopupWidget.js
3 files changed, 18 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/76/346476/1
diff --git a/src/Element.js b/src/Element.js
index c33f6fa..b3cec8a 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -430,6 +430,10 @@
elementDocument = this.getDocument( $element ),
anchorDocument = this.getDocument( $anchor );
+ // Some versions of jQuery 3 may return a native ClientRect object in
some cases and we can't
+ // modify its properties. Change it to a plain object.
+ pos = { top: pos.top, left: pos.left };
+
// If $element isn't in the same document as $anchor, traverse up
while ( elementDocument !== anchorDocument ) {
iframe = elementDocument.defaultView.frameElement;
diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index dc74067..1bea134 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -322,9 +322,14 @@
// Avoid passing the to getRelativePosition(), because it won't
return what we expect
// if the has a margin
- containerPos = isBody ?
- this.$floatableContainer.offset() :
- OO.ui.Element.static.getRelativePosition(
this.$floatableContainer, $offsetParent );
+ if ( isBody ) {
+ containerPos = this.$floatableContainer.offset();
+ // Some versions of jQuery 3 may return a native ClientRect
object in some cases and we can't
+ // modify its properties. Change it to a plain object.
+ containerPos = { top: containerPos.top, left: containerPos.left
};
+ } else {
+ containerPos = OO.ui.Element.static.getRelativePosition(
this.$floatableContainer, $offsetParent );
+ }
containerPos.bottom = containerPos.top +
this.$floatableContainer.outerHeight();
containerPos.right = containerPos.left +
this.$floatableContainer.outerWidth();
containerPos.start = direction === 'rtl' ? containerPos.right :
containerPos.left;
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 885ec1e..95fba2e 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -457,6 +457,9 @@
// Figure out where the near and far edges of the popup and
$floatableContainer are
floatablePos = this.$floatableContainer.offset();
+ // Some versions of jQuery 3 may return a native ClientRect object in
some cases and we can't
+ // modify its properties. Change it to a plain object.
+ floatablePos = { top: floatablePos.top, left: floatablePos.left };
floatablePos[ far ] = floatablePos[ near ] + this.$floatableContainer[
'outer' + sizeProp ]();
// Measure where the offsetParent is and compute our position based on
that and parentPosition
offsetParentPos = this.$element.offsetParent().offset();
@@ -492,6 +495,9 @@
// Check if the popup will go beyond the edge of this.$container
containerPos = this.$container.offset();
+ // Some versions of jQuery 3 may return a native ClientRect object in
some cases and we can't
+ // modify its properties. Change it to a plain object.
+ containerPos = { top: containerPos.top, left: containerPos.left };
containerPos[ far ] = containerPos[ near ] + this.$container[ 'inner' +
sizeProp ]();
// Take into account how much the popup will move because of the
adjustments we're going to make
popupPos[ near ] += ( positionProp === near ? 1 : -1 ) *
positionAdjustment;
--
To view, visit https://gerrit.wikimedia.org/r/346476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27dde7b75a526618879b96d276fa7758b01fe4de
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Remove old USERINFO tool
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344418 )
Change subject: Remove old USERINFO tool
..
Remove old USERINFO tool
Tool used to generate a mailmap from USERINFO repository. That
repository is archived and nobody uses it anymore.
Change-Id: Ib184ced6becbc5c800cdf475139ee84015fe9747
---
D gitmailmap/userinfo.py
1 file changed, 0 insertions(+), 53 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gitmailmap/userinfo.py b/gitmailmap/userinfo.py
deleted file mode 100644
index 3f02366..000
--- a/gitmailmap/userinfo.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2015, Antoine Musso
-# Copyright 2015, Wikimedia Foundation Inc.
-#
-# Generate mailmap for users.mediawiki.org emails from USERINFO
-#
-# Take a list of name
-# Attempt to find the foo email in USERINFO files
-# Output a mailmap rule such as:
-# First Last
-#
-# Output can then be appended to an existing mailmap and the concatenation
-# sorted with sort --ignore-case.
-
-import os
-import os.path
-
-USERINFO_DIR = '/Users/amusso/projects/USERINFO'
-
-info_files = [f for f in os.listdir(USERINFO_DIR)
- if not f.startswith('.')]
-
-
-def parse_userinfo(user):
-try:
-with open(os.path.join(USERINFO_DIR, user)) as f:
-lines = f.readlines()
-except IOError:
-return None
-
-rows = [l.split(':') for l in lines if l.find(':') != -1]
-
-return {user:
-{row[0]: row[1].strip() for row in rows}}
-
-
-userinfos = {}
-for userinfo in info_files:
-userinfos.update(parse_userinfo(userinfo))
-
-with open('users.mediawiki.org', mode='r') as f:
-users_mw_org = f.readlines()
-
-for (name, mwemail) in [u.split(' <') for u in users_mw_org]:
-mwemail = mwemail.strip()[:-1]
-mwuser = mwemail.split('@')[0]
-if mwuser in userinfos:
-if 'email' in userinfos[mwuser]:
-uemail = userinfos[mwuser]['email']
-if uemail.find(' ') == -1:
-print("%s <%s> <%s>" % (name, userinfos[mwuser]['email'],
-mwemail))
--
To view, visit https://gerrit.wikimedia.org/r/344418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib184ced6becbc5c800cdf475139ee84015fe9747
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: EddieGP
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: [BREAKING CHANGE] Drop support for Internet Explorer 9
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346475 )
Change subject: [BREAKING CHANGE] Drop support for Internet Explorer 9
..
[BREAKING CHANGE] Drop support for Internet Explorer 9
Change-Id: I81047e95cabab7e6509a02729860368b6579d08e
---
M .eslintrc.json
M bin/update-oojs-ui.sh
M src/ce/styles/annotations/ve.ce.LinkAnnotation.css
M src/init/ve.init.SupportCheck.js
M src/ve.debug.js
M src/ve.track.js
M src/ve.utils.js
7 files changed, 13 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/75/346475/1
diff --git a/.eslintrc.json b/.eslintrc.json
index f77ab1d..f2d8af6 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,6 +5,9 @@
"jquery": true,
"qunit": true
},
+ "parserOptions": {
+ "ecmaVersion": 5
+ },
"globals": {
"ve": true,
"VisualEditorSupportCheck": false,
diff --git a/bin/update-oojs-ui.sh b/bin/update-oojs-ui.sh
index d132dcd..b30bc5a 100755
--- a/bin/update-oojs-ui.sh
+++ b/bin/update-oojs-ui.sh
@@ -37,11 +37,8 @@
fi
# Copy files
-# - Exclude the minimised distribution files
-# - Support: IE9
-# VE requires SVG support, but IE9 doesn't support the CSS background
fallback
-# so ends up using the PNGs. Otherwise they would not be required.
-rsync --force --recursive --delete --exclude 'oojs-ui*.min.*' --exclude
'oojs-ui.js' ./node_modules/oojs-ui/dist/ "$REPO_DIR/$TARGET_DIR"
+# - Exclude the minimised distribution files and PNG image assets (VE requires
SVG support)
+-rsync --force --recursive --delete --exclude 'oojs-ui*.min.*' --exclude
'oojs-ui.js' --exclude 'images/*/*.png' ./node_modules/oojs-ui/dist/
"$REPO_DIR/$TARGET_DIR"
# Clean up temporary area
rm -rf "$NPM_DIR"
diff --git a/src/ce/styles/annotations/ve.ce.LinkAnnotation.css
b/src/ce/styles/annotations/ve.ce.LinkAnnotation.css
index 7d6d51d..9ca34cd 100644
--- a/src/ce/styles/annotations/ve.ce.LinkAnnotation.css
+++ b/src/ce/styles/annotations/ve.ce.LinkAnnotation.css
@@ -12,12 +12,6 @@
background-color: #e6f1ff;
}
-.ve-ce-nail {
- /* Support: IE9 */
- /* IE9 adds borders to linked images */
- border: 0;
-}
-
.ve-ce-nail:not( .ve-ce-nail-debug ) {
width: 0;
height: 0;
diff --git a/src/init/ve.init.SupportCheck.js b/src/init/ve.init.SupportCheck.js
index a6372a9..38b77e3 100644
--- a/src/init/ve.init.SupportCheck.js
+++ b/src/init/ve.init.SupportCheck.js
@@ -4,8 +4,6 @@
* @copyright 2011-2017 VisualEditor Team and others; see
http://ve.mit-license.org
*/
-/* eslint-ecmaVersion 3 */
-
( function () {
/**
* Check whether the environment has the needed features to load
VisualEditor.
@@ -20,24 +18,10 @@
window.VisualEditorSupportCheck = function () {
return (
/* ES5 */
- !!(
- // It would be much easier to do a quick inline
function that asserts "use strict"
- // works, but since IE9 doesn't support strict
mode (and we don't use strict mode)
- // we have to instead list all the ES5 features
individually.
- Array.isArray &&
- Array.prototype.filter &&
- Array.prototype.indexOf &&
- Array.prototype.map &&
- Date.now &&
- Date.prototype.toJSON &&
- Object.create &&
- Object.keys &&
- String.prototype.trim &&
- window.JSON &&
- JSON.parse &&
- JSON.stringify &&
- Function.prototype.bind
- ) &&
+ ( function () {
+ 'use strict';
+ return !this && !!Function.prototype.bind &&
!!window.JSON;
+ }() ) &&
/* contentEditable */
!!( 'contentEditable' in document.createElement( 'div'
) ) &&
diff --git a/src/ve.debug.js b/src/ve.debug.js
index c349447..bb59c10 100644
--- a/src/ve.debug.js
+++ b/src/ve.debug.js
@@ -26,13 +26,7 @@
* @method
* @param {...Mixed} [data] Data to log
*/
-ve.log = function () {
- // Support: IE9
- // In IE9 console methods are not real functions and as such do not
inherit
- // from Function.prototype, thus console.log.apply does not exist.
- // However it is function-like enough that passing it to Function#apply
does work.
- Function.prototype.apply.call( console.log, console, arguments );
-};
+ve.log = conso
[MediaWiki-commits] [Gerrit] css-sanitizer[master]: Add CSSObject::toComponentValueArray()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346349 )
Change subject: Add CSSObject::toComponentValueArray()
..
Add CSSObject::toComponentValueArray()
And also forbid ComponentValueList from containing the tokens that begin
a CSSFunction or a SimpleBlock.
Change-Id: Idaf62806c085990f8e199aa93da3aab26bf6b428
---
M src/Objects/AtRule.php
M src/Objects/CSSObject.php
M src/Objects/CSSObjectList.php
M src/Objects/ComponentValue.php
M src/Objects/ComponentValueList.php
M src/Objects/Declaration.php
M src/Objects/QualifiedRule.php
M src/Objects/SimpleBlock.php
M src/Objects/Stylesheet.php
M src/Objects/Token.php
M src/Objects/TokenList.php
M tests/Objects/AtRuleTest.php
M tests/Objects/CSSFunctionTest.php
M tests/Objects/CSSObjectListTest.php
A tests/Objects/ComponentValueListTest.php
M tests/Objects/DeclarationTest.php
M tests/Objects/QualifiedRuleTest.php
M tests/Objects/SimpleBlockTest.php
M tests/Objects/StylesheetTest.php
M tests/Objects/TokenListTest.php
M tests/Objects/TokenTest.php
21 files changed, 397 insertions(+), 36 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Objects/AtRule.php b/src/Objects/AtRule.php
index 30102b7..1dfc26e 100644
--- a/src/Objects/AtRule.php
+++ b/src/Objects/AtRule.php
@@ -89,21 +89,20 @@
}
/**
-* Return an array of Tokens that correspond to this object.
-* @return Token[]
+* @param string $function Function to call, toTokenArray() or
toComponentValueArray()
*/
- public function toTokenArray() {
+ private function toTokenOrCVArray( $function ) {
$ret = [];
$ret[] = new Token(
Token::T_AT_KEYWORD, [ 'value' => $this->name,
'position' => [ $this->line, $this->pos ] ]
);
// Manually looping and appending turns out to be noticably
faster than array_merge.
- foreach ( $this->prelude->toTokenArray() as $v ) {
+ foreach ( $this->prelude->$function() as $v ) {
$ret[] = $v;
}
if ( $this->block ) {
- foreach ( $this->block->toTokenArray() as $v ) {
+ foreach ( $this->block->$function() as $v ) {
$ret[] = $v;
}
} else {
@@ -113,6 +112,14 @@
return $ret;
}
+ public function toTokenArray() {
+ return $this->toTokenOrCVArray( __FUNCTION__ );
+ }
+
+ public function toComponentValueArray() {
+ return $this->toTokenOrCVArray( __FUNCTION__ );
+ }
+
public function __toString() {
return Util::stringify( $this );
}
diff --git a/src/Objects/CSSObject.php b/src/Objects/CSSObject.php
index 9d4cf0e..9a1bbcc 100644
--- a/src/Objects/CSSObject.php
+++ b/src/Objects/CSSObject.php
@@ -29,4 +29,11 @@
* @return Token[]
*/
public function toTokenArray();
+
+ /**
+* Return an array of ComponentValues that correspond to this object.
+* @warning Do not return any Tokens that aren't valid in a
ComponentValueList.
+* @return ComponentValue[]
+*/
+ public function toComponentValueArray();
}
diff --git a/src/Objects/CSSObjectList.php b/src/Objects/CSSObjectList.php
index 137ddd3..42ecac5 100644
--- a/src/Objects/CSSObjectList.php
+++ b/src/Objects/CSSObjectList.php
@@ -23,10 +23,18 @@
protected $offset = 0;
/**
+* Additional validation for objects
+* @param CSSObject[] $objects
+*/
+ protected static function testObjects( array $objects ) {
+ }
+
+ /**
* @param CSSObject[] $objects
*/
public function __construct( array $objects = [] ) {
- Util::assertAllInstanceOf( $objects, static::$objectType,
get_class( $this ) );
+ Util::assertAllInstanceOf( $objects, static::$objectType,
static::class );
+ static::testObjects( $objects );
$this->objects = array_values( $objects );
}
@@ -40,15 +48,17 @@
if ( $objects instanceof static ) {
$objects = $objects->objects;
} elseif ( is_array( $objects ) ) {
- Util::assertAllInstanceOf( $objects,
static::$objectType, get_class( $this ) );
+ Util::assertAllInstanceOf( $objects,
static::$objectType, static::class );
$objects = array_values( $objects );
+ static::testObjects( $objects );
} else {
if ( !$objects instanceof static::$objectType ) {
throw new \InvalidArgumentException(
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: React to popup 'ready' event
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346474 )
Change subject: RCFilters: React to popup 'ready' event
..
RCFilters: React to popup 'ready' event
The new 'ready' event is emitted after the popup is already positioned
and clipped, we should respond to that event when displaying and
manipulating the elements rather than 'toggle', which is emitted
before the popup is placed correctly.
Change-Id: I84a74a10eb4d88e14899752019214633d9f41cb8
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
1 file changed, 21 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/74/346474/1
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 761fc65..c81b685 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -71,7 +71,10 @@
enter: 'onTextInputEnter'
} );
this.capsule.connect( this, { capsuleItemClick:
'onCapsuleItemClick' } );
- this.capsule.popup.connect( this, { toggle:
'onCapsulePopupToggle' } );
+ this.capsule.popup.connect( this, {
+ toggle: 'onCapsulePopupToggle',
+ ready: 'onCapsulePopupReady'
+ } );
// Initialize
this.$element
@@ -103,25 +106,28 @@
};
/**
+* Respond to capsule popup ready event, fired after the popup is
visible, positioned and clipped
+*/
+ mw.rcfilters.ui.FilterWrapperWidget.prototype.onCapsulePopupReady =
function () {
+ mw.hook( 'RcFilters.popup.open' ).fire(
this.filterPopup.getSelectedFilter() );
+
+ this.scrollToTop( this.capsule.$element, 10 );
+ if ( !this.filterPopup.getSelectedFilter() ) {
+ // No selection, scroll the popup list to top
+ setTimeout( function () {
this.capsule.popup.$body.scrollTop( 0 ); }.bind( this ), 0 );
+ }
+ };
+
+ /**
* Respond to popup toggle event. Reset selection in the list when the
popup is closed.
*
* @param {boolean} isVisible Popup is visible
*/
mw.rcfilters.ui.FilterWrapperWidget.prototype.onCapsulePopupToggle =
function ( isVisible ) {
- if ( !isVisible ) {
- if ( !this.textInput.getValue() ) {
- // Only reset selection if we are not filtering
- this.filterPopup.resetSelection();
- this.capsule.resetSelection();
- }
- } else {
- mw.hook( 'RcFilters.popup.open' ).fire(
this.filterPopup.getSelectedFilter() );
-
- this.scrollToTop( this.capsule.$element, 10 );
- if ( !this.filterPopup.getSelectedFilter() ) {
- // No selection, scroll the popup list to top
- setTimeout( function () {
this.capsule.popup.$body.scrollTop( 0 ); }.bind( this ), 0 );
- }
+ if ( !isVisible && !this.textInput.getValue() ) {
+ // Only reset selection if we are not filtering
+ this.filterPopup.resetSelection();
+ this.capsule.resetSelection();
}
};
--
To view, visit https://gerrit.wikimedia.org/r/346474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84a74a10eb4d88e14899752019214633d9f41cb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki/core[master]: mw.loader: Remove redundant compat code for IE <= 9
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346471 )
Change subject: mw.loader: Remove redundant compat code for IE <= 9
..
mw.loader: Remove redundant compat code for IE <= 9
Follows-up 09fcee6110. Search for "Support: " in resources/src/.
* addEmbeddedCSS(): Remove IE9 compat code.
Also remove now-unused variables.
* addLink(): Remove IE7-8 compat comment.
Keep code as-is since properties are preferable in general.
Change-Id: I8a31ac96441ee78dfa2f4f2b49e0e91181430237
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 2 insertions(+), 31 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 0daac5b..0c8e8fe 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -857,7 +857,6 @@
cssBuffer = '',
cssBufferTimer = null,
cssCallbacks = $.Callbacks(),
- isIE9 = document.documentMode === 9,
rAF = window.requestAnimationFrame ||
setTimeout;
function getMarker() {
@@ -906,8 +905,6 @@
* @param {Function} [callback]
*/
function addEmbeddedCSS( cssText, callback ) {
- var $style, styleEl;
-
function fireCallbacks() {
var oldCallbacks = cssCallbacks;
// Reset cssCallbacks variable so it's
not polluted by any calls to
@@ -950,29 +947,7 @@
cssBuffer = '';
}
- // By default, always create a new
[MediaWiki-commits] [Gerrit] integration/config[master]: qunit: Remove obsolete 'tac|tac' hack
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345392 )
Change subject: qunit: Remove obsolete 'tac|tac' hack
..
qunit: Remove obsolete 'tac|tac' hack
Follows-up bc110f8b8241.
Aside from this being redundant (we can simply 'head' the file instead),
it also ensures the curl-error really is gone.
Most times when I try this locally, 'head' will close the pipe and
this *does* go through 'tee' to affect 'curl' in some cases.
Bug: T153597
Bug: T99854
Change-Id: I02fdc9166cdad56b7855672dcf95c9f8d3ccb7dc
---
M jjb/macro.yaml
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index dffc693..598fd02 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -309,10 +309,11 @@
ln -s "$MW_INSTALL_PATH" "$PUBLIC_DIR"
# Fetch headers and content preview for debugging (HTTP 500 Error,
Database error, ResourceLoader etc.)
-# NB: Uses 'tac' twice to exhaust buffer before using 'head' to avoid
"curl: Failed writing body" error.
-curl --include
"${MW_SERVER}${MW_SCRIPT_PATH}/index.php/Special:BlankPage" | tee
log/curl-SpecialBlankPage.log | tac|tac | head -n42
-curl --include
"${MW_SERVER}${MW_SCRIPT_PATH}/load.php?debug=true&modules=startup&only=scripts"
| tee log/curl-load-startup.log | tac|tac | head -n42
-curl --include
"${MW_SERVER}${MW_SCRIPT_PATH}/index.php?title=Special:JavaScriptTest/qunit/export"
| tee log/curl-SpecialJavaScriptTest.log | tac|tac | head -n11
+# NB: Avoid "curl: Failed writing body" error when using 'head'.
Either by using 'tac|tac', or by ignoring stderr,
+# or by writing to a file first and running 'head' on that.
+curl --include
"${MW_SERVER}${MW_SCRIPT_PATH}/index.php/Special:BlankPage" >
log/curl-SpecialBlankPage.log; head -n42 log/curl-SpecialBlankPage.log
+curl --include
"${MW_SERVER}${MW_SCRIPT_PATH}/load.php?debug=true&modules=startup&only=scripts"
> log/curl-load-startup.log; head -n42 log/curl-load-startup.log
+curl --include
"${MW_SERVER}${MW_SCRIPT_PATH}/index.php?title=Special:JavaScriptTest/qunit/export"
> log/curl-SpecialJavaScriptTest.log; head -n11
log/curl-SpecialJavaScriptTest.log
# qunit
#
--
To view, visit https://gerrit.wikimedia.org/r/345392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02fdc9166cdad56b7855672dcf95c9f8d3ccb7dc
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add class for service discovery using DNS SRV records
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345404 )
Change subject: Add class for service discovery using DNS SRV records
..
Add class for service discovery using DNS SRV records
The SrvDiscoverer class can be used to find services (e.g. etcd) using
DNS SRV records.
Change-Id: Ia636d02535a3bb592eb896137cfb787a9ce6442a
---
M autoload.php
A includes/libs/DnsSrvDiscoverer.php
A tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
3 files changed, 181 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index b53c7ae..a11ba8a 100644
--- a/autoload.php
+++ b/autoload.php
@@ -383,6 +383,7 @@
'Digit2Html' => __DIR__ . '/maintenance/language/digit2html.php',
'DjVuHandler' => __DIR__ . '/includes/media/DjVu.php',
'DjVuImage' => __DIR__ . '/includes/media/DjVuImage.php',
+ 'DnsSrvDiscoverer' => __DIR__ . '/includes/libs/DnsSrvDiscoverer.php',
'DoubleRedirectJob' => __DIR__ .
'/includes/jobqueue/jobs/DoubleRedirectJob.php',
'DoubleRedirectsPage' => __DIR__ .
'/includes/specials/SpecialDoubleRedirects.php',
'DoubleReplacer' => __DIR__ .
'/includes/libs/replacers/DoubleReplacer.php',
diff --git a/includes/libs/DnsSrvDiscoverer.php
b/includes/libs/DnsSrvDiscoverer.php
new file mode 100644
index 000..c33264d
--- /dev/null
+++ b/includes/libs/DnsSrvDiscoverer.php
@@ -0,0 +1,92 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @since 1.29
+ */
+class DnsSrvDiscoverer {
+ /**
+* @var string
+*/
+ private $domain;
+
+ /**
+* @param string $domain
+*/
+ public function __construct( $domain ) {
+ $this->domain = $domain;
+ }
+
+ /**
+* Fetch the servers with a DNS SRV request
+*
+* @return array
+*/
+ public function getServers() {
+ $result = [];
+ foreach ( $this->getDnsRecords() as $record ) {
+ $result[] = [
+ 'target' => $record['target'],
+ 'port' => $record['port'],
+ 'pri' => $record['pri'],
+ 'weight' => $record['weight'],
+ ];
+ }
+
+ return $result;
+ }
+
+ /**
+* Pick a server according to the priority fields.
+* Note that weight is currently ignored.
+*
+* @param array $servers from getServers
+* @return array|bool
+*/
+ public function pickServer( array $servers ) {
+ if ( !$servers ) {
+ return false;
+ }
+
+ $srvsByPrio = [];
+ foreach ( $servers as $server ) {
+ $srvsByPrio[$server['pri']][] = $server;
+ }
+
+ $min = min( array_keys( $srvsByPrio ) );
+ if ( count( $srvsByPrio[$min] ) == 1 ) {
+ return $srvsByPrio[$min][0];
+ } else {
+ // Choose randomly
+ $rand = mt_rand( 0, count( $srvsByPrio[$min] ) - 1 );
+
+ return $srvsByPrio[$min][$rand];
+ }
+ }
+
+ /**
+* @return array[]
+*/
+ protected function getDnsRecords() {
+ return dns_get_record( $this->domain, DNS_SRV );
+ }
+}
diff --git a/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
new file mode 100644
index 000..f768d06
--- /dev/null
+++ b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
@@ -0,0 +1,88 @@
+pickServer( $params );
+
+ $this->assertEquals( $expected, $record );
+
+ }
+
+ public static function provideRecords() {
+ return [
+ [
+ [ // record list
+ [
+ 'target' =>
'conf1003.eqiad.wmnet',
+ 'port' => 'SRV',
+ 'pri' => 0,
+ 'weight' => 1,
+ ],
+ [
+ 'target' =>
'conf1002.eqiad.wmnet',
+ 'port' => 'SRV',
+ 'pri' => 1,
+ 'weight' => 1,
+ ],
+ [
+ 'target' =>
'conf1001.eqiad.wmnet',
+
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Bring in spyc via composer
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346472 )
Change subject: Bring in spyc via composer
..
Bring in spyc via composer
Bug: T75945
Change-Id: I0aa993aaf072f744e820b4175f20a29e3e062149
---
M Translate.php
D libs/spyc/COPYING
D libs/spyc/spyc.php
M utils/TranslateYaml.php
4 files changed, 4 insertions(+), 1,175 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/72/346472/1
diff --git a/Translate.php b/Translate.php
index 5df15ab..ac38de1 100644
--- a/Translate.php
+++ b/Translate.php
@@ -673,3 +673,7 @@
}
/** @defgroup TranslateSpecialPage Special pages of Translate extension */
+
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ require_once __DIR__ . '/vendor/autoload.php';
+}
diff --git a/libs/spyc/COPYING b/libs/spyc/COPYING
deleted file mode 100644
index 8e7ddbc..000
--- a/libs/spyc/COPYING
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2011 Vladimir Andersen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/libs/spyc/spyc.php b/libs/spyc/spyc.php
deleted file mode 100644
index fcc7200..000
--- a/libs/spyc/spyc.php
+++ /dev/null
@@ -1,1148 +0,0 @@
-
- * @author Chris Wanstrath
- * @link http://code.google.com/p/spyc/
- * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
- * @package Spyc
- */
-
-if (!function_exists('spyc_load')) {
- /**
- * Parses YAML to array.
- * @param string $string YAML string.
- * @return array
- */
- function spyc_load ($string) {
-return Spyc::YAMLLoadString($string);
- }
-}
-
-if (!function_exists('spyc_load_file')) {
- /**
- * Parses YAML to array.
- * @param string $file Path to YAML file.
- * @return array
- */
- function spyc_load_file ($file) {
-return Spyc::YAMLLoad($file);
- }
-}
-
-if (!function_exists('spyc_dump')) {
- /**
- * Dumps array to YAML.
- * @param array $data Array.
- * @return string
- */
- function spyc_dump ($data) {
-return Spyc::YAMLDump($data, false, false, true);
- }
-}
-
-/**
- * The Simple PHP YAML Class.
- *
- * This class can be used to read a YAML file and convert its contents
- * into a PHP array. It currently supports a very limited subsection of
- * the YAML spec.
- *
- * Usage:
- *
- * $Spyc = new Spyc;
- * $array = $Spyc->load($file);
- *
- * or:
- *
- * $array = Spyc::YAMLLoad($file);
- *
- * or:
- *
- * $array = spyc_load_file($file);
- *
- * @package Spyc
- */
-class Spyc {
-
- // SETTINGS
-
- const REMPTY = "\0\0\0\0\0";
-
- /**
- * Setting this to true will force YAMLDump to enclose any string value in
- * quotes. False by default.
- *
- * @var bool
- */
- public $setting_dump_force_quotes = false;
-
- /**
- * Setting this to true will forse YAMLLoad to use syck_load function when
- * possible. False by default.
- * @var bool
- */
- public $setting_use_syck_is_possible = false;
-
-
-
- /**#@+
- * @access private
- * @var mixed
- */
- private $_dumpIndent;
- private $_dumpWordWrap;
- private $_containsGroupAnchor = false;
- private $_containsGroupAlias = false;
- private $path;
- private $result;
- private $LiteralPlaceHolder = '___YAML_Literal_Block___';
- private $SavedGroups = array();
- private $indent;
- /**
- * Path modifier that should be applied after adding current element.
- * @var array
- */
- private $delayedPath = array();
-
- /**#@+
- * @access public
- * @var mixed
- */
- public $_nodeId;
-
-/**
- * Load a valid YAML string to Spyc.
- * @param string $input
- * @return array
- */
- public function load ($input) {
-return $this->__loadString($input);
- }
-
- /**
- * Load a valid YAML file to Spyc.
- * @param string $file
- * @return ar
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.loader: Remove redundant compat code for IE <= 9
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346471 )
Change subject: mw.loader: Remove redundant compat code for IE <= 9
..
mw.loader: Remove redundant compat code for IE <= 9
Follows-up 09fcee6110. Search for "Support: " in resources/src/.
* addEmbeddedCSS(): Remove IE9 compat code.
Also remove now-unused variables.
* addLink(): Remove IE7-8 compat comment.
Keep code as-is since properties are preferable in general.
Change-Id: I8a31ac96441ee78dfa2f4f2b49e0e91181430237
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 2 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/346471/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 0daac5b..0c8e8fe 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -857,7 +857,6 @@
cssBuffer = '',
cssBufferTimer = null,
cssCallbacks = $.Callbacks(),
- isIE9 = document.documentMode === 9,
rAF = window.requestAnimationFrame ||
setTimeout;
function getMarker() {
@@ -906,8 +905,6 @@
* @param {Function} [callback]
*/
function addEmbeddedCSS( cssText, callback ) {
- var $style, styleEl;
-
function fireCallbacks() {
var oldCallbacks = cssCallbacks;
// Reset cssCallbacks variable so it's
not polluted by any calls to
@@ -950,29 +947,7 @@
cssBuffer = '';
}
- // By default, always create a new
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set $wgOresThresholds now that it exists in wmf.19
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346470 ) Change subject: Set $wgOresThresholds now that it exists in wmf.19 .. Set $wgOresThresholds now that it exists in wmf.19 Change-Id: Ia2a47473558d9a5cff002d341358dbff876b9fa1 --- M wmf-config/InitialiseSettings.php 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/70/346470/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index c773bba..fc33f1a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18042,6 +18042,35 @@ 'cswiki' => [ 'hard' => 0.45, 'soft' => 0.8, 'softest' => 0.88 ], // T151611 'etwiki' => [ 'hard' => 0.34, 'soft' => 0.62, 'softest' => 0.95 ], // T159609 ], +'wgOresFiltersThresholds' => [ + 'default' => [], + 'plwiki' => [ + 'damaging' => [ + 'likelygood' => [ 'min' => 0, 'max' => 0.700 ], // ~98% precision at 0.861, lowered to 0.700 to avoid overlap with likelybad + 'maybebad' => [ 'min' => 0.373, 'max' => 1 ], // ~45% precision + 'likelybad' => [ 'min' => 0.733, 'max' => 1 ], // ~90% precision + 'verylikelybad' => [ 'min' => 0.851, 'max' => 1 ], // ~98% precision + ], + 'goodfaith' => [ + 'good' => [ 'min' => 0.720, 'max' => 1 ], // ~98% precision at 0.302, raised to 0.720 to avoid overlap with bad + 'maybebad' => [ 'min' => 0, 'max' => 0.938 ], // ~45% precision + 'bad' => [ 'min' => 0, 'max' => 0.708 ], // ~90% precision + ], + ], + 'ptwiki' => [ + 'damaging' => [ + 'likelygood' => [ 'min' => 0, 'max' => 0.546 ], // ~98% precision + 'maybebad' => [ 'min' => 0.290, 'max' => 1 ], // ~90% recall + 'likelybad' => [ 'min' => 0.739, 'max' => 1 ], // ~45% precision + 'verylikelybad' => [ 'min' => 0.950, 'max' => 1 ], // ~90% precision + ], + 'goodfaith' => [ + 'good' => [ 'min' => 0.403, 'max' => 1 ], // ~98% precision + 'maybebad' => [ 'min' => 0, 'max' => 0.256 ], // ~45% precision + 'bad' => [ 'min' => 0, 'max' => 0.047 ], // ~90% precision + ], + ], +], 'wgOresEnabledNamespaces' => [ 'default' => [], 'wikidatawiki' => [ 0 => true, 120 => true ], // T139660 -- To view, visit https://gerrit.wikimedia.org/r/346470 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2a47473558d9a5cff002d341358dbff876b9fa1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] mediawiki...OpenStackManager[master]: Bring in spyc via composer
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346469 )
Change subject: Bring in spyc via composer
..
Bring in spyc via composer
Bug: T75945
Change-Id: Ie675d75240db00453f3eef887d8358d80c2859e6
---
M OpenStackManager.php
D Spyc.php
M composer.json
3 files changed, 7 insertions(+), 1,147 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/69/346469/1
diff --git a/OpenStackManager.php b/OpenStackManager.php
index f9172fb..7376d2a 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -413,3 +413,7 @@
}
return true;
}
+
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ require_once __DIR__ . '/vendor/autoload.php';
+}
diff --git a/Spyc.php b/Spyc.php
deleted file mode 100644
index 1e161f7..000
--- a/Spyc.php
+++ /dev/null
@@ -1,1147 +0,0 @@
-
- * @author Chris Wanstrath
- * @link https://github.com/mustangostang/spyc/
- * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
- * @package Spyc
- */
-
-if (!function_exists('spyc_load')) {
- /**
- * Parses YAML to array.
- * @param string $string YAML string.
- * @return array
- */
- function spyc_load ($string) {
-return Spyc::YAMLLoadString($string);
- }
-}
-
-if (!function_exists('spyc_load_file')) {
- /**
- * Parses YAML to array.
- * @param string $file Path to YAML file.
- * @return array
- */
- function spyc_load_file ($file) {
-return Spyc::YAMLLoad($file);
- }
-}
-
-if (!function_exists('spyc_dump')) {
- /**
- * Dumps array to YAML.
- * @param array $data Array.
- * @return string
- */
- function spyc_dump ($data) {
-return Spyc::YAMLDump($data, false, false, true);
- }
-}
-
-/**
- * The Simple PHP YAML Class.
- *
- * This class can be used to read a YAML file and convert its contents
- * into a PHP array. It currently supports a very limited subsection of
- * the YAML spec.
- *
- * Usage:
- *
- * $Spyc = new Spyc;
- * $array = $Spyc->load($file);
- *
- * or:
- *
- * $array = Spyc::YAMLLoad($file);
- *
- * or:
- *
- * $array = spyc_load_file($file);
- *
- * @package Spyc
- */
-class Spyc {
-
- // SETTINGS
-
- const REMPTY = "\0\0\0\0\0";
-
- /**
- * Setting this to true will force YAMLDump to enclose any string value in
- * quotes. False by default.
- *
- * @var bool
- */
- public $setting_dump_force_quotes = false;
-
- /**
- * Setting this to true will forse YAMLLoad to use syck_load function when
- * possible. False by default.
- * @var bool
- */
- public $setting_use_syck_is_possible = false;
-
-
-
- /**#@+
- * @access private
- * @var mixed
- */
- private $_dumpIndent;
- private $_dumpWordWrap;
- private $_containsGroupAnchor = false;
- private $_containsGroupAlias = false;
- private $path;
- private $result;
- private $LiteralPlaceHolder = '___YAML_Literal_Block___';
- private $SavedGroups = array();
- private $indent;
- /**
- * Path modifier that should be applied after adding current element.
- * @var array
- */
- private $delayedPath = array();
-
- /**#@+
- * @access public
- * @var mixed
- */
- public $_nodeId;
-
-/**
- * Load a valid YAML string to Spyc.
- * @param string $input
- * @return array
- */
- public function load ($input) {
-return $this->__loadString($input);
- }
-
- /**
- * Load a valid YAML file to Spyc.
- * @param string $file
- * @return array
- */
- public function loadFile ($file) {
-return $this->__load($file);
- }
-
- /**
- * Load YAML into a PHP array statically
- *
- * The load method, when supplied with a YAML stream (string or file),
- * will do its best to convert YAML in a file into a PHP array. Pretty
- * simple.
- * Usage:
- *
- * $array = Spyc::YAMLLoad('lucky.yaml');
- * print_r($array);
- *
- * @access public
- * @return array
- * @param string $input Path of YAML file or string containing YAML
- */
- public static function YAMLLoad($input) {
-$Spyc = new Spyc;
-return $Spyc->__load($input);
- }
-
- /**
- * Load a string of YAML into a PHP array statically
- *
- * The load method, when supplied with a YAML string, will do its best
- * to convert YAML in a string into a PHP array. Pretty simple.
- *
- * Note: use this function if you don't want files from the file system
- * loaded and processed as YAML. This is of interest to people concerned
- * about security whose input is from a string.
- *
- * Usage:
- *
- * $array = Spyc::YAMLLoadString("---\n0: hello world\n");
- * print_r($array);
- *
- * @access public
- * @return array
- * @param string $input String containing YAML
- */
-
[MediaWiki-commits] [Gerrit] oojs/ui[master]: TextInputWidget: Use .prop() rather than .attr() for 'required'
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346468 )
Change subject: TextInputWidget: Use .prop() rather than .attr() for 'required'
..
TextInputWidget: Use .prop() rather than .attr() for 'required'
jQuery Migrate erroneously complains about this:
jQuery.fn.removeAttr no longer sets boolean properties: required
But in fact, the property is automatically bidirectionally synchronized
with the attribute, this code works just fine with jQuery 3, that
message is therefore wrong, and this change is completely unnecessary
other than to appease jQuery Migrate.
Effectively, this changes the attribute we set from `required="required"`
to `required=""`. The getDomElementSummary() function used in our tests
is updated to handle this change. This could be a breaking change for
CSS using the `[required='required']` selector (although such code
should have used just `[required]`, which will still work).
Bug: T160802
Change-Id: I8179eb3f1cef1996f2d837d1493a5217ce4171b3
---
M src/widgets/TextInputWidget.js
M tests/QUnit.assert.equalDomElement.js
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/68/346468/1
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index f1137e6..d127529 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -358,14 +358,14 @@
this.required = !!state;
if ( this.required ) {
this.$input
- .attr( 'required', 'required' )
+ .prop( 'required', true )
.attr( 'aria-required', 'true' );
if ( this.getIndicator() === null ) {
this.setIndicator( 'required' );
}
} else {
this.$input
- .removeAttr( 'required' )
+ .prop( 'required', false )
.removeAttr( 'aria-required' );
if ( this.getIndicator() === 'required' ) {
this.setIndicator( null );
diff --git a/tests/QUnit.assert.equalDomElement.js
b/tests/QUnit.assert.equalDomElement.js
index 9cae0f6..b139442 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -37,6 +37,7 @@
propertyAttributes = {
value: 'value',
readOnly: 'readonly',
+ required: 'required',
checked: 'checked',
disabled: 'disabled',
tabIndex: 'tabindex',
--
To view, visit https://gerrit.wikimedia.org/r/346468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8179eb3f1cef1996f2d837d1493a5217ce4171b3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.log: Improve documentation
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346465 )
Change subject: mediawiki.log: Improve documentation
..
mediawiki.log: Improve documentation
* Clarify that all mw.log submethods use the native console
when available and are otherwise no-ops. Their behaviour is
not influenced by whether or not debug mode is enabled.
* Move mw.log() method doc to mediawiki.js and clarify that it
is for verbose logging in debug mode (no-op in production mode).
Behaviour is not changed in this commit, only documentation.
Change-Id: Ie6e2382632654430dc57ee8c0a6222d6ad80663d
---
M resources/src/mediawiki/mediawiki.js
M resources/src/mediawiki/mediawiki.log.js
2 files changed, 27 insertions(+), 23 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 0daac5b..5e180b5 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -419,19 +419,35 @@
/* eslint-disable no-console */
log = ( function () {
- // Also update the restoration of methods in mediawiki.log.js
- // when adding or removing methods here.
+ /**
+* Write a verbose message to the browser's console in debug
mode.
+*
+* This method is mainly intended for verbose logging. It is a
no-op in production mode.
+* In ResourceLoader debug mode, it will use the browser's
console if available, with
+* fallback to creating a console interface in the DOM and
logging messages there.
+*
+* See {@link mw.log} for other logging methods.
+*
+* @member mw
+* @param {...string} msg Messages to output to console.
+*/
var log = function () {},
console = window.console;
+ // Note: Keep list of methods in sync with restoration in
mediawiki.log.js
+ // when adding or removing mw.log methods below!
+
/**
+* Collection of methods to help log messages to the console.
+*
* @class mw.log
* @singleton
*/
/**
-* Write a message to the console's warning channel.
-* Actions not supported by the browser console are silently
ignored.
+* Write a message to the browser console's warning channel.
+*
+* This method is a no-op in browsers that don't implement the
Console API.
*
* @param {...string} msg Messages to output to console
*/
@@ -440,10 +456,12 @@
$.noop;
/**
-* Write a message to the console's error channel.
+* Write a message to the browser console's error channel.
*
-* Most browsers provide a stacktrace by default if the argument
-* is a caught Error object.
+* Most browsers also print a stacktrace when calling this
method if the
+* argument is an Error object.
+*
+* This method is a no-op in browsers that don't implement the
Console API.
*
* @since 1.26
* @param {Error|...string} msg Messages to output to console
@@ -453,7 +471,7 @@
$.noop;
/**
-* Create a property in a host object that, when accessed, will
produce
+* Create a property on a host object that, when accessed, will
produce
* a deprecation warning in the console.
*
* @param {Object} obj Host object of deprecated property
@@ -702,11 +720,7 @@
return mw.message.apply( mw.message, arguments
).toString();
},
- /**
-* No-op dummy placeholder for {@link mw.log} in debug mode.
-*
-* @method
-*/
+ // Expose mw.log
log: log,
/**
diff --git a/resources/src/mediawiki/mediawiki.log.js
b/resources/src/mediawiki/mediawiki.log.js
index 4d23604..969e872 100644
--- a/resources/src/mediawiki/mediawiki.log.js
+++ b/resources/src/mediawiki/mediawiki.log.js
@@ -13,16 +13,6 @@
var original = mw.log,
slice = Array.prototype.slice;
- /**
-* Logs a message to the console in debug mode.
-*
-* In the case the browser does not have a console API, a console is
created on-the-fly by appending
-* a `` element to the bottom of
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: rlfeature: Remove es5strict support tracking
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346466 )
Change subject: rlfeature: Remove es5strict support tracking
..
rlfeature: Remove es5strict support tracking
We've been collecting data for about 8 months (since eecb3a2).
Last month we made the decision to drop ES3 support, and has
since then landed in MediaWiki master (09fcee611061), that makes
this test obsolete since it will soon match 100% of all users.
This is also the last entry in rlfeature, so remove the file
until another test comes along.
Bug: T128115
Change-Id: I94b1f2364774cf2c9ee5cd10ded8a6f9480f7b00
---
M extension.json
D modules/ext.wikimediaEvents.rlfeature.js
2 files changed, 0 insertions(+), 29 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/extension.json b/extension.json
index bc61629..f5580c9 100644
--- a/extension.json
+++ b/extension.json
@@ -150,7 +150,6 @@
"ext.wikimediaEvents.statsd.js",
"ext.wikimediaEvents.kartographer.js",
"ext.wikimediaEvents.readingDepth.js",
- "ext.wikimediaEvents.rlfeature.js",
"ext.wikimediaEvents.geoFeatures.js"
],
"skinScripts": {
diff --git a/modules/ext.wikimediaEvents.rlfeature.js
b/modules/ext.wikimediaEvents.rlfeature.js
deleted file mode 100644
index 28cbad0..000
--- a/modules/ext.wikimediaEvents.rlfeature.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
- * Measure pass/fail rate of a proposed feature test for ResourceLoader.
- */
-( function ( mw ) {
- var passES5;
- // Filter: Sample 1 in 1000 page views
- if ( !mw.eventLog.inSample( 1000 ) ) {
- return;
- }
-
- // Task: https://phabricator.wikimedia.org/T128115
- // Based on mediawiki-core:/resources/src/es5-skip.js
- passES5 = ( function () {
- 'use strict';
- // In ES5 strict mode, 'this' defaults to undefined.
- // In older engines, 'this' defaults to the global window
object.
- // There are no known browsers that support strict mode, but
lack other
- // ES5 features. Except PhantomJS v1.x, which lacked
Function#bind().
- return !this && !!Function.prototype.bind;
- }() );
-
- if ( passES5 ) {
- mw.track( 'counter.mw.js.es5strict.pass', 1 );
- } else {
- mw.track( 'counter.mw.js.es5strict.fail', 1 );
- }
-
-}( mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/346466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94b1f2364774cf2c9ee5cd10ded8a6f9480f7b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] dependencies: Drop support for ES3 browser...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346467 )
Change subject: [BREAKING CHANGE] dependencies: Drop support for ES3 browsers
via es5-shim
..
[BREAKING CHANGE] dependencies: Drop support for ES3 browsers via es5-shim
Change-Id: I7579c40a77a3b890cb1526db0a70d0c24e0822c1
---
M Gruntfile.js
M demos/demos.php
M demos/index.html
M jsduck.eg-iframe.html
M package.json
M tests/index.php
6 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/67/346467/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 058621c..9045a0f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -304,7 +304,7 @@
},
demos: {
// Make sure you update this if dependencies
are added
- src:
'{node_modules/{jquery,oojs}/dist/**/*,node_modules/es5-shim/*.js,composer.json,dist/**/*,php/**/*}',
+ src:
'{node_modules/{jquery,oojs}/dist/**/*,composer.json,dist/**/*,php/**/*}',
dest: 'demos/',
expand: true
},
diff --git a/demos/demos.php b/demos/demos.php
index a727a39..d3ba067 100644
--- a/demos/demos.php
+++ b/demos/demos.php
@@ -112,7 +112,6 @@
-
diff --git a/demos/index.html b/demos/index.html
index b0e9929..2391065 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -11,7 +11,6 @@
-
diff --git a/jsduck.eg-iframe.html b/jsduck.eg-iframe.html
index 7e7fbd6..1e4ffe5 100644
--- a/jsduck.eg-iframe.html
+++ b/jsduck.eg-iframe.html
@@ -15,7 +15,6 @@
-
diff --git a/package.json b/package.json
index 28fa48c..3ef3f54 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
"jenkins": "npm test && jsduck && npm run postdoc"
},
"dependencies": {
-"es5-shim": "4.5.8",
"jquery": "1.11.3",
"oojs": "1.1.10"
},
diff --git a/tests/index.php b/tests/index.php
index 8ef56cc..c498781 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -27,7 +27,6 @@
-
--
To view, visit https://gerrit.wikimedia.org/r/346467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7579c40a77a3b890cb1526db0a70d0c24e0822c1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] mediawiki...WikimediaEvents[master]: rlfeature: Remove es5strict support tracking
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346466 )
Change subject: rlfeature: Remove es5strict support tracking
..
rlfeature: Remove es5strict support tracking
We've been collecting data for about 8 months (since eecb3a2).
Last month we made the decision to drop ES3 support, and has
since then landed in MediaWiki master (09fcee611061), that makes
this test obsolete since it will soon match 100% of all users.
This is also the last entry in rlfeature, so remove the file
until another test comes along.
Bug: T128115
Change-Id: I94b1f2364774cf2c9ee5cd10ded8a6f9480f7b00
---
M extension.json
D modules/ext.wikimediaEvents.rlfeature.js
2 files changed, 0 insertions(+), 29 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/66/346466/1
diff --git a/extension.json b/extension.json
index bc61629..f5580c9 100644
--- a/extension.json
+++ b/extension.json
@@ -150,7 +150,6 @@
"ext.wikimediaEvents.statsd.js",
"ext.wikimediaEvents.kartographer.js",
"ext.wikimediaEvents.readingDepth.js",
- "ext.wikimediaEvents.rlfeature.js",
"ext.wikimediaEvents.geoFeatures.js"
],
"skinScripts": {
diff --git a/modules/ext.wikimediaEvents.rlfeature.js
b/modules/ext.wikimediaEvents.rlfeature.js
deleted file mode 100644
index 28cbad0..000
--- a/modules/ext.wikimediaEvents.rlfeature.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
- * Measure pass/fail rate of a proposed feature test for ResourceLoader.
- */
-( function ( mw ) {
- var passES5;
- // Filter: Sample 1 in 1000 page views
- if ( !mw.eventLog.inSample( 1000 ) ) {
- return;
- }
-
- // Task: https://phabricator.wikimedia.org/T128115
- // Based on mediawiki-core:/resources/src/es5-skip.js
- passES5 = ( function () {
- 'use strict';
- // In ES5 strict mode, 'this' defaults to undefined.
- // In older engines, 'this' defaults to the global window
object.
- // There are no known browsers that support strict mode, but
lack other
- // ES5 features. Except PhantomJS v1.x, which lacked
Function#bind().
- return !this && !!Function.prototype.bind;
- }() );
-
- if ( passES5 ) {
- mw.track( 'counter.mw.js.es5strict.pass', 1 );
- } else {
- mw.track( 'counter.mw.js.es5strict.fail', 1 );
- }
-
-}( mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/346466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94b1f2364774cf2c9ee5cd10ded8a6f9480f7b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add some common functions to BaseTemplate
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344804 )
Change subject: Add some common functions to BaseTemplate
..
Add some common functions to BaseTemplate
Breaks any skins with same-name functions with different
visibility/functionality. Should mostly only be anything
based on Example, because that had everything set to private
for some reason. Normal skin practice for most others is to
use totally different names anyway. (eg 'render...' instead
of 'get...', and visualClear output done directly)
* clear: returns a visualClear
* getFooter: calls getFooterIcons and getFooterLinks and
handles all the output; format is common to nearly every
skin since MonoBook
* getAfterPortlet: same as renderAfterPortlet, but doesn't
directly print content
* getTrail: same as printTrail, but doesn't directly print
content
Also made the existing print versions for the last two use
the new getters.
Change-Id: I5621f585b501e47b40ae80e9cb12e6a32da72275
---
M includes/skins/BaseTemplate.php
1 file changed, 101 insertions(+), 9 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index e571c58..dc0a703 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -287,12 +287,31 @@
* @param string $name
*/
protected function renderAfterPortlet( $name ) {
+ echo $this->getAfterPortlet( $name );
+ }
+
+ /**
+* Allows extensions to hook into known portlets and add stuff to them
+*
+* @param string $name
+*
+* @return string html
+* @since 1.29
+*/
+ protected function getAfterPortlet( $name ) {
+ $html = '';
$content = '';
Hooks::run( 'BaseTemplateAfterPortlet', [ $this, $name,
&$content ] );
if ( $content !== '' ) {
- echo "$content";
+ $html = Html::rawElement(
+ 'div',
+ [ 'class' => [ 'after-portlet',
'after-portlet-' . $name ] ],
+ $content
+ );
}
+
+ return $html;
}
/**
@@ -633,6 +652,69 @@
}
/**
+* Renderer for getFooterIcons and getFooterLinks
+*
+* @param string $iconStyle $option for getFooterIcons: "icononly",
"nocopyright"
+* @param string $linkStyle $option for getFooterLinks: "flat"
+*
+* @return string html
+* @since 1.29
+*/
+ protected function getFooter( $iconStyle = 'icononly', $linkStyle =
'flat' ) {
+ $validFooterIcons = $this->getFooterIcons( $iconStyle );
+ $validFooterLinks = $this->getFooterLinks( $linkStyle );
+
+ $html = '';
+
+ if ( count( $validFooterIcons ) + count( $validFooterLinks ) >
0 ) {
+ $html .= Html::openElement( 'div', [
+ 'id' => 'footer-bottom',
+ 'role' => 'contentinfo',
+ 'lang' => $this->get( 'userlang' ),
+ 'dir' => $this->get( 'dir' )
+ ] );
+ $footerEnd = Html::closeElement( 'div' );
+ } else {
+ $footerEnd = '';
+ }
+ foreach ( $validFooterIcons as $blockName => $footerIcons ) {
+ $html .= Html::openElement( 'div', [
+ 'id' => 'f-' . Sanitizer::escapeId( $blockName
) . 'ico',
+ 'class' => 'footer-icons'
+ ] );
+ foreach ( $footerIcons as $icon ) {
+ $html .= $this->getSkin()->makeFooterIcon(
$icon );
+ }
+ $html .= Html::closeElement( 'div' );
+ }
+ if ( count( $validFooterLinks ) > 0 ) {
+ $html .= Html::openElement( 'ul', [ 'id' => 'f-list',
'class' => 'footer-places' ] );
+ foreach ( $validFooterLinks as $aLink ) {
+ $html .= Html::rawElement(
+ 'li',
+ [ 'id' => Sanitizer::escapeId( $aLink )
],
+ $this->get( $aLink )
+ );
+ }
+ $html .= Html::closeElement( 'ul' );
+ }
+
+ $html .= $this->clear() . $footerEnd;
+
+ return $html;
+ }
+
+ /**
+* Get a div with the core visualClear class, for clea
[MediaWiki-commits] [Gerrit] wikimedia...rainbow[master]: Hide regex searches' ZRR
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345875 )
Change subject: Hide regex searches' ZRR
..
Hide regex searches' ZRR
- Makes regex searches' ZRR optional
- Also! Fixes value formatting (JS) for
percentage data
Bug: T161876
Change-Id: I9f6b17fcce20a5f48544427869753b9c0abf9d95
---
M server.R
M ui.R
2 files changed, 37 insertions(+), 28 deletions(-)
Approvals:
Chelsyx: Verified; Looks good to me, approved
diff --git a/server.R b/server.R
index 5ec500e..2c0bd92 100644
--- a/server.R
+++ b/server.R
@@ -95,7 +95,7 @@
dyRangeSelector %>%
dyLegend(labelsDiv = "paulscore_approx_legend", show = "always")
if (input$paulscore_relative) {
- dyOut <- dyAxis(dyOut, "y", axisLabelFormatter = "function(x) { return
Math.round(100*x, 2) + '%'; }", valueFormatter = "function(x) { return
Math.round(100*x, 2) + '%'; }")
+ dyOut <- dyAxis(dyOut, "y", axisLabelFormatter = "function(x) { return
Math.round(100 * x, 3) + '%'; }", valueFormatter = "function(x) { return
Math.round(100 * x, 3) + '%'; }")
}
return(dyOut)
})
@@ -113,7 +113,7 @@
dyRangeSelector %>%
dyLegend(labelsDiv = "paulscore_approx_legend", show = "always")
if (input$paulscore_relative) {
- dyOut <- dyAxis(dyOut, "y", axisLabelFormatter = "function(x) { return
Math.round(100*x, 2) + '%'; }", valueFormatter = "function(x) { return
Math.round(100*x, 2) + '%'; }")
+ dyOut <- dyAxis(dyOut, "y", axisLabelFormatter = "function(x) { return
Math.round(100 * x, 3) + '%'; }", valueFormatter = "function(x) { return
Math.round(100 * x, 3) + '%'; }")
}
return(dyOut)
})
@@ -228,7 +228,7 @@
position_prop %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_app_click_position)) %>%
polloi::make_dygraph(xlab = "", ylab = "Proportion of Clicks (%)", title
= "Proportion of Clicks on Nth Result") %>%
- dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return x + '%'; }") %>%
+ dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return Math.round(x, 3) + '%'; }") %>%
dyAxis("x", ticker = "Dygraph.dateTicker", axisLabelFormatter =
polloi::custom_axis_formatter,
axisLabelWidth = 100, pixelsPerLabel = 80) %>%
dyLegend(labelsDiv = "app_click_position_legend") %>%
@@ -239,7 +239,7 @@
source_prop %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_app_invoke_source)) %>%
polloi::make_dygraph(xlab = "", ylab = "Proportion of Search Sessions
(%)", title = "Proportion of Search Sessions, by Invoke Source") %>%
- dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return x + '%'; }") %>%
+ dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return Math.round(x, 3) + '%'; }") %>%
dyAxis("x", ticker = "Dygraph.dateTicker", axisLabelFormatter =
polloi::custom_axis_formatter,
axisLabelWidth = 100, pixelsPerLabel = 80) %>%
dyLegend(labelsDiv = "app_invoke_source_legend") %>%
@@ -295,7 +295,7 @@
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global, input$smoothing_failure_rate)) %>%
polloi::make_dygraph(xlab = "Date", ylab = "Zero Results Rate (%)",
title = "Zero Results Rate, by day",
legend_name = "ZRR") %>%
- dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return x + '%'; }") %>%
+ dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return Math.round(x, 3) + '%'; }") %>%
dyRangeSelector(fillColor = "") %>%
dyEvent(as.Date("2016-02-01"), "A (format switch)", labelLoc = "bottom")
%>%
dyEvent(as.Date("2016-03-16"), "Completion Suggester Deployed", labelLoc
= "bottom") %>%
@@ -314,29 +314,30 @@
})
output$failure_breakdown_plot <- renderDygraph({
-xts_data <- input$failure_breakdown_automata %>%
+xts_data <- ("automata" %in% input$failure_breakdown_include) %>%
polloi::data_select(failure_breakdown_with_automata,
failure_breakdown_no_automata) %>%
- polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_failure_breakdown)) %>%
+ polloi::data_select("regex" %in% input$failure_breakdown_include, .,
dplyr::select(., -Regex)) %>%
+ polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_failure_breakdown), rename = FALSE) %>%
{ xts::xts(.[, -1], order.by = .$date) }
-xts_data %>% dygraph(xlab = "Date", ylab = "Zero Results Rate",
- main
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.log: Improve documentation
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346465 )
Change subject: mediawiki.log: Improve documentation
..
mediawiki.log: Improve documentation
* Clarify that all mw.log submethods use the native console
when available and are otherwise no-ops. Their behaviour is
not influenced by whether or not debug mode is enabled.
* Move mw.log() method doc to mediawiki.js and clarify that it
is for verbose logging in debug mode (no-op in production mode).
Behaviour is not changed in this commit, only documentation.
Change-Id: Ie6e2382632654430dc57ee8c0a6222d6ad80663d
---
M resources/src/mediawiki/mediawiki.js
M resources/src/mediawiki/mediawiki.log.js
2 files changed, 27 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/346465/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 0daac5b..5e180b5 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -419,19 +419,35 @@
/* eslint-disable no-console */
log = ( function () {
- // Also update the restoration of methods in mediawiki.log.js
- // when adding or removing methods here.
+ /**
+* Write a verbose message to the browser's console in debug
mode.
+*
+* This method is mainly intended for verbose logging. It is a
no-op in production mode.
+* In ResourceLoader debug mode, it will use the browser's
console if available, with
+* fallback to creating a console interface in the DOM and
logging messages there.
+*
+* See {@link mw.log} for other logging methods.
+*
+* @member mw
+* @param {...string} msg Messages to output to console.
+*/
var log = function () {},
console = window.console;
+ // Note: Keep list of methods in sync with restoration in
mediawiki.log.js
+ // when adding or removing mw.log methods below!
+
/**
+* Collection of methods to help log messages to the console.
+*
* @class mw.log
* @singleton
*/
/**
-* Write a message to the console's warning channel.
-* Actions not supported by the browser console are silently
ignored.
+* Write a message to the browser console's warning channel.
+*
+* This method is a no-op in browsers that don't implement the
Console API.
*
* @param {...string} msg Messages to output to console
*/
@@ -440,10 +456,12 @@
$.noop;
/**
-* Write a message to the console's error channel.
+* Write a message to the browser console's error channel.
*
-* Most browsers provide a stacktrace by default if the argument
-* is a caught Error object.
+* Most browsers also print a stacktrace when calling this
method if the
+* argument is an Error object.
+*
+* This method is a no-op in browsers that don't implement the
Console API.
*
* @since 1.26
* @param {Error|...string} msg Messages to output to console
@@ -453,7 +471,7 @@
$.noop;
/**
-* Create a property in a host object that, when accessed, will
produce
+* Create a property on a host object that, when accessed, will
produce
* a deprecation warning in the console.
*
* @param {Object} obj Host object of deprecated property
@@ -702,11 +720,7 @@
return mw.message.apply( mw.message, arguments
).toString();
},
- /**
-* No-op dummy placeholder for {@link mw.log} in debug mode.
-*
-* @method
-*/
+ // Expose mw.log
log: log,
/**
diff --git a/resources/src/mediawiki/mediawiki.log.js
b/resources/src/mediawiki/mediawiki.log.js
index 4d23604..969e872 100644
--- a/resources/src/mediawiki/mediawiki.log.js
+++ b/resources/src/mediawiki/mediawiki.log.js
@@ -13,16 +13,6 @@
var original = mw.log,
slice = Array.prototype.slice;
- /**
-* Logs a message to the console in debug mode.
-*
-* In the case the browser does not have a console API, a console is
created on-the-fly by appending
-* a `` element to the bottom of the
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update graphoid to 95e38d2
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346463 ) Change subject: Update graphoid to 95e38d2 .. Update graphoid to 95e38d2 List of changes: 95e38d2 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: Ib90a73db89e74778c6da1c4c08d636d087f878d9 --- D node_modules/.bin/har-validator A node_modules/ajv/.tonic_example.js A node_modules/ajv/LICENSE A node_modules/ajv/dist/ajv.bundle.js A node_modules/ajv/dist/ajv.min.js A node_modules/ajv/dist/ajv.min.js.map A node_modules/ajv/dist/nodent.min.js A node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/ajv.d.ts A node_modules/ajv/lib/ajv.js A node_modules/ajv/lib/async.js A node_modules/ajv/lib/cache.js A node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/formats.js A node_modules/ajv/lib/compile/index.js A node_modules/ajv/lib/compile/resolve.js A node_modules/ajv/lib/compile/rules.js A node_modules/ajv/lib/compile/schema_obj.js A node_modules/ajv/lib/compile/ucs2length.js A node_modules/ajv/lib/compile/util.js A node_modules/ajv/lib/compile/validation_error.js A node_modules/ajv/lib/dot/_limit.jst A node_modules/ajv/lib/dot/_limitItems.jst A node_modules/ajv/lib/dot/_limitLength.jst A node_modules/ajv/lib/dot/_limitProperties.jst A node_modules/ajv/lib/dot/allOf.jst A node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/coerce.def A node_modules/ajv/lib/dot/custom.jst A node_modules/ajv/lib/dot/defaults.def A node_modules/ajv/lib/dot/definitions.def A node_modules/ajv/lib/dot/dependencies.jst A node_modules/ajv/lib/dot/enum.jst A node_modules/ajv/lib/dot/errors.def A node_modules/ajv/lib/dot/format.jst A node_modules/ajv/lib/dot/items.jst A node_modules/ajv/lib/dot/missing.def A node_modules/ajv/lib/dot/multipleOf.jst A node_modules/ajv/lib/dot/not.jst A node_modules/ajv/lib/dot/oneOf.jst A node_modules/ajv/lib/dot/pattern.jst A node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/ref.jst A node_modules/ajv/lib/dot/required.jst A node_modules/ajv/lib/dot/uniqueItems.jst A node_modules/ajv/lib/dot/v5/_formatLimit.jst A node_modules/ajv/lib/dot/v5/constant.jst A node_modules/ajv/lib/dot/v5/patternRequired.jst A node_modules/ajv/lib/dot/v5/switch.jst A node_modules/ajv/lib/dot/validate.jst A node_modules/ajv/lib/dotjs/_formatLimit.js A node_modules/ajv/lib/dotjs/_limit.js A node_modules/ajv/lib/dotjs/_limitItems.js A node_modules/ajv/lib/dotjs/_limitLength.js A node_modules/ajv/lib/dotjs/_limitProperties.js A node_modules/ajv/lib/dotjs/allOf.js A node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/custom.js A node_modules/ajv/lib/dotjs/dependencies.js A node_modules/ajv/lib/dotjs/enum.js A node_modules/ajv/lib/dotjs/format.js A node_modules/ajv/lib/dotjs/items.js A node_modules/ajv/lib/dotjs/multipleOf.js A node_modules/ajv/lib/dotjs/not.js A node_modules/ajv/lib/dotjs/oneOf.js A node_modules/ajv/lib/dotjs/pattern.js A node_modules/ajv/lib/dotjs/patternRequired.js A node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/ref.js A node_modules/ajv/lib/dotjs/required.js A node_modules/ajv/lib/dotjs/switch.js A node_modules/ajv/lib/dotjs/uniqueItems.js A node_modules/ajv/lib/dotjs/validate.js A node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/refs/json-schema-draft-04.json A node_modules/ajv/lib/refs/json-schema-v5.json A node_modules/ajv/lib/v5.js A node_modules/ajv/package.json A node_modules/ajv/scripts/.eslintrc.yml A node_modules/ajv/scripts/bundle.js A node_modules/ajv/scripts/compile-dots.js A node_modules/ajv/scripts/info A node_modules/ajv/scripts/prepare-tests A node_modules/ajv/scripts/travis-gh-pages M node_modules/ansi-regex/package.json D node_modules/ansi-styles/index.js D node_modules/ansi-styles/license D node_modules/ansi-styles/package.json M node_modules/asap/package.json M node_modules/aws4/aws4.js M node_modules/aws4/package.json M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/bluebird/LICENSE M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/finally.js M node_modules/bluebird/js/release/generators.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/promise_array.js M node_modules/bluebird/js/release/props.js M node_modules/bluebird/js/release/schedule.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/package.json A node_modules/bunyan/.travis.yml M node_modules/bunyan/AUTHORS M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/pa
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346464 )
Change subject: Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing
easier
..
Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing easier
Bug: T160094
Change-Id: I6ca70ac3b2dc908bb7f739c196b23da363bbec6c
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/64/346464/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5cfb670..1b2fb8d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -348,6 +348,7 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
+ $wgLoginNotifyAttemptsKnownIP = 4;
}
$wgMessageCacheType = CACHE_ACCEL;
--
To view, visit https://gerrit.wikimedia.org/r/346464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ca70ac3b2dc908bb7f739c196b23da363bbec6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update graphoid to 95e38d2
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346463 ) Change subject: Update graphoid to 95e38d2 .. Update graphoid to 95e38d2 List of changes: 95e38d2 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: Ib90a73db89e74778c6da1c4c08d636d087f878d9 --- D node_modules/.bin/har-validator A node_modules/ajv/.tonic_example.js A node_modules/ajv/LICENSE A node_modules/ajv/dist/ajv.bundle.js A node_modules/ajv/dist/ajv.min.js A node_modules/ajv/dist/ajv.min.js.map A node_modules/ajv/dist/nodent.min.js A node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/ajv.d.ts A node_modules/ajv/lib/ajv.js A node_modules/ajv/lib/async.js A node_modules/ajv/lib/cache.js A node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/formats.js A node_modules/ajv/lib/compile/index.js A node_modules/ajv/lib/compile/resolve.js A node_modules/ajv/lib/compile/rules.js A node_modules/ajv/lib/compile/schema_obj.js A node_modules/ajv/lib/compile/ucs2length.js A node_modules/ajv/lib/compile/util.js A node_modules/ajv/lib/compile/validation_error.js A node_modules/ajv/lib/dot/_limit.jst A node_modules/ajv/lib/dot/_limitItems.jst A node_modules/ajv/lib/dot/_limitLength.jst A node_modules/ajv/lib/dot/_limitProperties.jst A node_modules/ajv/lib/dot/allOf.jst A node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/coerce.def A node_modules/ajv/lib/dot/custom.jst A node_modules/ajv/lib/dot/defaults.def A node_modules/ajv/lib/dot/definitions.def A node_modules/ajv/lib/dot/dependencies.jst A node_modules/ajv/lib/dot/enum.jst A node_modules/ajv/lib/dot/errors.def A node_modules/ajv/lib/dot/format.jst A node_modules/ajv/lib/dot/items.jst A node_modules/ajv/lib/dot/missing.def A node_modules/ajv/lib/dot/multipleOf.jst A node_modules/ajv/lib/dot/not.jst A node_modules/ajv/lib/dot/oneOf.jst A node_modules/ajv/lib/dot/pattern.jst A node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/ref.jst A node_modules/ajv/lib/dot/required.jst A node_modules/ajv/lib/dot/uniqueItems.jst A node_modules/ajv/lib/dot/v5/_formatLimit.jst A node_modules/ajv/lib/dot/v5/constant.jst A node_modules/ajv/lib/dot/v5/patternRequired.jst A node_modules/ajv/lib/dot/v5/switch.jst A node_modules/ajv/lib/dot/validate.jst A node_modules/ajv/lib/dotjs/_formatLimit.js A node_modules/ajv/lib/dotjs/_limit.js A node_modules/ajv/lib/dotjs/_limitItems.js A node_modules/ajv/lib/dotjs/_limitLength.js A node_modules/ajv/lib/dotjs/_limitProperties.js A node_modules/ajv/lib/dotjs/allOf.js A node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/custom.js A node_modules/ajv/lib/dotjs/dependencies.js A node_modules/ajv/lib/dotjs/enum.js A node_modules/ajv/lib/dotjs/format.js A node_modules/ajv/lib/dotjs/items.js A node_modules/ajv/lib/dotjs/multipleOf.js A node_modules/ajv/lib/dotjs/not.js A node_modules/ajv/lib/dotjs/oneOf.js A node_modules/ajv/lib/dotjs/pattern.js A node_modules/ajv/lib/dotjs/patternRequired.js A node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/ref.js A node_modules/ajv/lib/dotjs/required.js A node_modules/ajv/lib/dotjs/switch.js A node_modules/ajv/lib/dotjs/uniqueItems.js A node_modules/ajv/lib/dotjs/validate.js A node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/refs/json-schema-draft-04.json A node_modules/ajv/lib/refs/json-schema-v5.json A node_modules/ajv/lib/v5.js A node_modules/ajv/package.json A node_modules/ajv/scripts/.eslintrc.yml A node_modules/ajv/scripts/bundle.js A node_modules/ajv/scripts/compile-dots.js A node_modules/ajv/scripts/info A node_modules/ajv/scripts/prepare-tests A node_modules/ajv/scripts/travis-gh-pages M node_modules/ansi-regex/package.json D node_modules/ansi-styles/index.js D node_modules/ansi-styles/license D node_modules/ansi-styles/package.json M node_modules/asap/package.json M node_modules/aws4/aws4.js M node_modules/aws4/package.json M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/bluebird/LICENSE M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/finally.js M node_modules/bluebird/js/release/generators.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/promise_array.js M node_modules/bluebird/js/release/props.js M node_modules/bluebird/js/release/schedule.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/package.json A node_modules/bunyan/.travis.yml M node_modules/bunyan/AUTHORS M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.js
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to fe2a4f4
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346462 ) Change subject: Update trending-edits to fe2a4f4 .. Update trending-edits to fe2a4f4 List of changes: 3a3a050 Warn when fallback purge strategy is invoked fe2a4f4 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: I0cf61247677f34b5afa7415f076ccca7cb7a13cc --- A node_modules/bunyan/.travis.yml M node_modules/bunyan/AUTHORS M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/compressible/package.json M node_modules/debug/package.json M node_modules/finalhandler/index.js A node_modules/finalhandler/node_modules/debug/.coveralls.yml A node_modules/finalhandler/node_modules/debug/.eslintrc A node_modules/finalhandler/node_modules/debug/.npmignore A node_modules/finalhandler/node_modules/debug/.travis.yml A node_modules/finalhandler/node_modules/debug/LICENSE A node_modules/finalhandler/node_modules/debug/Makefile A node_modules/finalhandler/node_modules/debug/bower.json A node_modules/finalhandler/node_modules/debug/component.json A node_modules/finalhandler/node_modules/debug/karma.conf.js A node_modules/finalhandler/node_modules/debug/node.js A node_modules/finalhandler/node_modules/debug/package.json A node_modules/finalhandler/node_modules/debug/src/browser.js A node_modules/finalhandler/node_modules/debug/src/debug.js A node_modules/finalhandler/node_modules/debug/src/index.js A node_modules/finalhandler/node_modules/debug/src/node.js M node_modules/finalhandler/package.json M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/heapdump/lib/main.js M node_modules/heapdump/package.json M node_modules/hosted-git-info/git-host-info.js M node_modules/hosted-git-info/git-host.js M node_modules/hosted-git-info/index.js M node_modules/hosted-git-info/package.json A node_modules/hot-shots/.snyk M node_modules/hot-shots/lib/statsd.js M node_modules/hot-shots/package.json M node_modules/ipaddr.js/bower.json M node_modules/ipaddr.js/ipaddr.min.js M node_modules/ipaddr.js/lib/ipaddr.js M node_modules/ipaddr.js/package.json M node_modules/ipaddr.js/src/ipaddr.coffee M node_modules/ipaddr.js/test/ipaddr.test.coffee M node_modules/kad/package.json M node_modules/mime-db/db.json M node_modules/mime-db/package.json M node_modules/mime-types/index.js M node_modules/mime-types/package.json M node_modules/moment/min/moment-with-locales.js M node_modules/moment/min/moment-with-locales.min.js M node_modules/moment/min/moment.min.js M node_modules/moment/moment.js M node_modules/moment/package.json M node_modules/moment/src/lib/locale/set.js M node_modules/moment/src/moment.js M node_modules/ms/package.json M node_modules/node-rdkafka/build/Makefile M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/binding.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/callbacks.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/common.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/config.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/connection.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/consumer.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/errors.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/producer.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/topic.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/workers.o.d M node_modules/node-rdkafka/build/config.gypi M node_modules/node-rdkafka/build/node-librdkafka.target.mk M node_modules/proxy-addr/index.js M node_modules/proxy-addr/package.json M node_modules/service-runner/package.json M node_modules/type-is/package.json M node_modules/wikipedia-edits-scorer/index.js M node_modules/wikipedia-edits-scorer/package.json M node_modules/wikipedia-edits-scorer/tests/examples.js M node_modules/wikipedia-edits-scorer/tests/test_scoring.js M src 78 files changed, 1,801 insertions(+), 653 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/346462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0cf61247677f34b5afa7415f076ccca7cb7a13cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/trending-edits/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac _
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to fe2a4f4
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346462 ) Change subject: Update trending-edits to fe2a4f4 .. Update trending-edits to fe2a4f4 List of changes: 3a3a050 Warn when fallback purge strategy is invoked fe2a4f4 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: I0cf61247677f34b5afa7415f076ccca7cb7a13cc --- A node_modules/bunyan/.travis.yml M node_modules/bunyan/AUTHORS M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/compressible/package.json M node_modules/debug/package.json M node_modules/finalhandler/index.js A node_modules/finalhandler/node_modules/debug/.coveralls.yml A node_modules/finalhandler/node_modules/debug/.eslintrc A node_modules/finalhandler/node_modules/debug/.npmignore A node_modules/finalhandler/node_modules/debug/.travis.yml A node_modules/finalhandler/node_modules/debug/LICENSE A node_modules/finalhandler/node_modules/debug/Makefile A node_modules/finalhandler/node_modules/debug/bower.json A node_modules/finalhandler/node_modules/debug/component.json A node_modules/finalhandler/node_modules/debug/karma.conf.js A node_modules/finalhandler/node_modules/debug/node.js A node_modules/finalhandler/node_modules/debug/package.json A node_modules/finalhandler/node_modules/debug/src/browser.js A node_modules/finalhandler/node_modules/debug/src/debug.js A node_modules/finalhandler/node_modules/debug/src/index.js A node_modules/finalhandler/node_modules/debug/src/node.js M node_modules/finalhandler/package.json M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/heapdump/lib/main.js M node_modules/heapdump/package.json M node_modules/hosted-git-info/git-host-info.js M node_modules/hosted-git-info/git-host.js M node_modules/hosted-git-info/index.js M node_modules/hosted-git-info/package.json A node_modules/hot-shots/.snyk M node_modules/hot-shots/lib/statsd.js M node_modules/hot-shots/package.json M node_modules/ipaddr.js/bower.json M node_modules/ipaddr.js/ipaddr.min.js M node_modules/ipaddr.js/lib/ipaddr.js M node_modules/ipaddr.js/package.json M node_modules/ipaddr.js/src/ipaddr.coffee M node_modules/ipaddr.js/test/ipaddr.test.coffee M node_modules/kad/package.json M node_modules/mime-db/db.json M node_modules/mime-db/package.json M node_modules/mime-types/index.js M node_modules/mime-types/package.json M node_modules/moment/min/moment-with-locales.js M node_modules/moment/min/moment-with-locales.min.js M node_modules/moment/min/moment.min.js M node_modules/moment/moment.js M node_modules/moment/package.json M node_modules/moment/src/lib/locale/set.js M node_modules/moment/src/moment.js M node_modules/ms/package.json M node_modules/node-rdkafka/build/Makefile M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/binding.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/callbacks.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/common.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/config.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/connection.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/consumer.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/errors.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/producer.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/topic.o.d M node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/workers.o.d M node_modules/node-rdkafka/build/config.gypi M node_modules/node-rdkafka/build/node-librdkafka.target.mk M node_modules/proxy-addr/index.js M node_modules/proxy-addr/package.json M node_modules/service-runner/package.json M node_modules/type-is/package.json M node_modules/wikipedia-edits-scorer/index.js M node_modules/wikipedia-edits-scorer/package.json M node_modules/wikipedia-edits-scorer/tests/examples.js M node_modules/wikipedia-edits-scorer/tests/test_scoring.js M src 78 files changed, 1,801 insertions(+), 653 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits/deploy refs/changes/62/346462/1 -- To view, visit https://gerrit.wikimedia.org/r/346462 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cf61247677f34b5afa7415f076ccca7cb7a13cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/trending-edits/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac
[MediaWiki-commits] [Gerrit] wikimedia...rainbow[master]: Implement the wiki/language selector in more search dashboards
Chelsyx has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346461 )
Change subject: Implement the wiki/language selector in more search dashboards
..
Implement the wiki/language selector in more search dashboards
Three new dashboards are added:
- CTR by Language/Project
- Events by Language/Project
- PaulScore by Language/Project
Bug: T150410
Change-Id: Ie04762d747a9dcbec1564d8945f8949ed8c52adc
---
M server.R
A tab_documentation/desktop_events_langproj.md
A tab_documentation/kpi_ctr_langproj.md
A tab_documentation/paulscore_langproj.html
M ui.R
M utils.R
6 files changed, 520 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow
refs/changes/61/346461/1
diff --git a/server.R b/server.R
index 5ec500e..79a7846 100644
--- a/server.R
+++ b/server.R
@@ -26,6 +26,7 @@
read_failures(existing_date)
progress$set(message = "Downloading engagement data", value = 0.7)
read_augmented_clickthrough()
+read_augmented_clickthrough_langproj()
progress$set(message = "Downloading survival data", value = 0.8)
read_lethal_dose()
progress$set(message = "Downloading PaulScore data", value = 0.9)
@@ -877,6 +878,191 @@
dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
})
+ output$ctr_language_selector_container <- renderUI({
+if (input$ctr_language_order == "alphabet") {
+ languages_to_display <- as.list(sort(available_languages_ctr$language))
+ names(languages_to_display) <-
available_languages_ctr$label[order(available_languages_ctr$language)]
+} else {
+ languages_to_display <- available_languages_ctr$language
+ names(languages_to_display) <- available_languages_ctr$label
+}
+
+# e.g. if user sorts projects alphabetically and the selected project is
"10th Anniversary of Wikipeda"
+# then automatically select the language "(None)" to avoid giving
user an error. This also works if
+# the user selects a project that is not multilingual, so this
automatically chooses the "(None)"
+# option for the user.
+if (any(input$ctr_project_selector %in%
projects_db$project[!projects_db$multilingual])) {
+ if (any(input$ctr_project_selector %in%
projects_db$project[projects_db$multilingual])) {
+if (!is.null(input$ctr_language_selector)) {
+ selected_language <- union("(None)", input$ctr_language_selector)
+} else {
+ selected_language <- c("(None)", languages_to_display[[1]])
+}
+ } else {
+selected_language <- "(None)"
+ }
+} else {
+ if (!is.null(input$ctr_language_selector)) {
+selected_language <- input$ctr_language_selector
+ } else {
+selected_language <- languages_to_display[[1]]
+ }
+}
+return(selectInput("ctr_language_selector", "Language", multiple =
TRUE,selectize = FALSE, size = 19,
+ choices = languages_to_display, selected =
selected_language))
+ })
+
+ output$ctr_project_selector_container <- renderUI({
+if (input$ctr_project_order == "alphabet") {
+ projects_to_display <- as.list(sort(available_projects_ctr$project))
+ names(projects_to_display) <-
available_projects_ctr$label[order(available_projects_ctr$project)]
+} else {
+ projects_to_display <- available_projects_ctr$project
+ names(projects_to_display) <- available_projects_ctr$label
+}
+return(selectInput("ctr_project_selector", "Project", multiple =
TRUE,selectize = FALSE, size = 19,
+ choices = projects_to_display, selected =
projects_to_display[[1]]))
+ })
+
+ output$kpi_ctr_langproj_plot <- renderDygraph({
+augmented_clickthroughs_langproj %>%
+ kpi_ctr_aggregate_wikis(input$ctr_language_selector,
input$ctr_project_selector) %>%
+ dplyr::select_(.dots=c("date", "wiki",
paste0("`",input$ctr_metrics,"`"))) %>%
+ tidyr::spread_(., key_col="wiki", value_col=input$ctr_metrics, fill=0)
%>%
+ polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_kpi_ctr_langproj)) %>%
+ polloi::make_dygraph(xlab = "Date", ylab = input$ctr_metrics, title =
paste0(input$ctr_metrics, ", by day")) %>%
+ dyAxis("y", axisLabelFormatter = "function(x) { return x + '%'; }",
valueFormatter = "function(x) { return x + '%'; }") %>%
+ dyLegend(show = "always", width = 400, labelsDiv =
"kpi_ctr_langproj_legend") %>%
+ dyAxis("x", axisLabelFormatter = polloi::custom_axis_formatter) %>%
+ dyRangeSelector(fillColor = "")
+ })
+
+ output$desktop_events_language_selector_container <- renderUI({
+if (input$desktop_events_language_order == "alphabet") {
+ languages_to_display <-
as.list(sort(available_languages_desktop$language))
+ names(languages_to_display) <-
available_languages_desktop$label[order(available_languages_
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 0742f79
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346459 ) Change subject: Update mobileapps to 0742f79 .. Update mobileapps to 0742f79 List of changes: 0742f79 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: I69e93d154a879a05459f6b4279c036baa23edb57 --- M node_modules/cryptiles/.npmignore M node_modules/cryptiles/.travis.yml M node_modules/hawk/.npmignore M node_modules/hawk/.travis.yml M node_modules/hawk/bower.json M node_modules/hawk/component.json M node_modules/hawk/dist/client.js M node_modules/hawk/example/usage.js M node_modules/hawk/lib/browser.js M node_modules/hawk/lib/client.js M node_modules/hawk/lib/crypto.js M node_modules/hawk/lib/index.js M node_modules/hawk/lib/server.js M node_modules/hawk/lib/utils.js M node_modules/hawk/test/browser.js M node_modules/hawk/test/client.js M node_modules/hawk/test/crypto.js M node_modules/hawk/test/index.js M node_modules/hawk/test/readme.js M node_modules/hawk/test/server.js M node_modules/hawk/test/uri.js M node_modules/hawk/test/utils.js M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/heapdump/lib/main.js M node_modules/heapdump/package.json M node_modules/jodid25519/LICENSE M node_modules/json-schema/draft-00/hyper-schema M node_modules/json-schema/draft-00/json-ref M node_modules/json-schema/draft-00/links M node_modules/json-schema/draft-00/schema M node_modules/json-schema/draft-01/hyper-schema M node_modules/json-schema/draft-01/json-ref M node_modules/json-schema/draft-01/links M node_modules/json-schema/draft-01/schema M node_modules/json-schema/draft-02/hyper-schema M node_modules/json-schema/draft-02/json-ref M node_modules/json-schema/draft-02/links M node_modules/json-schema/draft-02/schema M node_modules/json-schema/draft-03/examples/address M node_modules/json-schema/draft-03/examples/calendar M node_modules/json-schema/draft-03/examples/card M node_modules/json-schema/draft-03/examples/geo M node_modules/json-schema/draft-03/examples/interfaces M node_modules/json-schema/draft-03/hyper-schema M node_modules/json-schema/draft-03/json-ref M node_modules/json-schema/draft-03/links M node_modules/json-schema/draft-03/schema M node_modules/json-schema/draft-04/hyper-schema M node_modules/json-schema/draft-04/links M node_modules/json-schema/draft-04/schema M node_modules/json-schema/draft-zyp-json-schema-03.xml M node_modules/json-schema/draft-zyp-json-schema-04.xml M node_modules/json-schema/lib/links.js M node_modules/json-schema/lib/validate.js M node_modules/json-schema/test/tests.js M node_modules/kad/package.json M node_modules/long/.npmignore M node_modules/long/.travis.yml M node_modules/long/LICENSE M node_modules/long/bower.json M node_modules/long/dist/Long.js M node_modules/long/externs/Long.js M node_modules/long/index.js M node_modules/long/jsdoc.json M node_modules/long/scripts/build.js M node_modules/long/src/Long.js M node_modules/long/src/bower.json M node_modules/long/src/wrap.js M node_modules/long/tests/goog.math.long.js M node_modules/long/tests/suite.js M node_modules/merge/LICENSE M node_modules/merge/merge.js M node_modules/merge/merge.min.js M node_modules/service-runner/package.json M src 78 files changed, 15,469 insertions(+), 15,462 deletions(-) Approvals: Mobrovac: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/346459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69e93d154a879a05459f6b4279c036baa23edb57 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: BearND Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: jsduck: Unbreak live demos (mwNow undefined)
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346454 )
Change subject: jsduck: Unbreak live demos (mwNow undefined)
..
jsduck: Unbreak live demos (mwNow undefined)
* Update the mock startup.js in jsduck/eg-iframe.html
to define mwNow.
* Remove dead reference to sha1.js.
* Remove dead reference to mediawiki.startUp.js.
* Fix broken reference to oojs-ui-local.css.
Test plan:
* Exec `npm install && npm run doc` (requires 'jsduck')
* View /w/docs/js/#!/api/mw.html
* Verify that "Live Preview" works and no JS or 404 errors
in the console.
Change-Id: Ie891eaae70021ba5fbcddeb4eec7c929ccd8707d
---
M maintenance/jsduck/eg-iframe.html
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/maintenance/jsduck/eg-iframe.html
b/maintenance/jsduck/eg-iframe.html
index 2b59735..e7fdd7d 100644
--- a/maintenance/jsduck/eg-iframe.html
+++ b/maintenance/jsduck/eg-iframe.html
@@ -34,18 +34,17 @@
};
- // Emulate startup.js
- var mwPerformance = { mark: function () {} };
+ // Mock startup.js
+ var mwPerformance = { mark: function () {} },
+ mwNow = Date.now;
function startUp() {
mw.config = new mw.Map();
}
-
-
@@ -88,7 +87,7 @@
background: #fff;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/346454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie891eaae70021ba5fbcddeb4eec7c929ccd8707d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 75a7850
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346457 ) Change subject: Update cxserver to 75a7850 .. Update cxserver to 75a7850 List of changes: 75a7850 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: Ie284cfab1cad37c6464ab907d3a50458c8438178 --- D node_modules/.bin/har-validator D node_modules/.bin/window-size A node_modules/ajv/.tonic_example.js A node_modules/ajv/LICENSE A node_modules/ajv/dist/ajv.bundle.js A node_modules/ajv/dist/ajv.min.js A node_modules/ajv/dist/ajv.min.js.map A node_modules/ajv/dist/nodent.min.js A node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/ajv.d.ts A node_modules/ajv/lib/ajv.js A node_modules/ajv/lib/async.js A node_modules/ajv/lib/cache.js A node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/formats.js A node_modules/ajv/lib/compile/index.js A node_modules/ajv/lib/compile/resolve.js A node_modules/ajv/lib/compile/rules.js A node_modules/ajv/lib/compile/schema_obj.js A node_modules/ajv/lib/compile/ucs2length.js A node_modules/ajv/lib/compile/util.js A node_modules/ajv/lib/compile/validation_error.js A node_modules/ajv/lib/dot/_limit.jst A node_modules/ajv/lib/dot/_limitItems.jst A node_modules/ajv/lib/dot/_limitLength.jst A node_modules/ajv/lib/dot/_limitProperties.jst A node_modules/ajv/lib/dot/allOf.jst A node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/coerce.def A node_modules/ajv/lib/dot/custom.jst A node_modules/ajv/lib/dot/defaults.def A node_modules/ajv/lib/dot/definitions.def A node_modules/ajv/lib/dot/dependencies.jst A node_modules/ajv/lib/dot/enum.jst A node_modules/ajv/lib/dot/errors.def A node_modules/ajv/lib/dot/format.jst A node_modules/ajv/lib/dot/items.jst A node_modules/ajv/lib/dot/missing.def A node_modules/ajv/lib/dot/multipleOf.jst A node_modules/ajv/lib/dot/not.jst A node_modules/ajv/lib/dot/oneOf.jst A node_modules/ajv/lib/dot/pattern.jst A node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/ref.jst A node_modules/ajv/lib/dot/required.jst A node_modules/ajv/lib/dot/uniqueItems.jst A node_modules/ajv/lib/dot/v5/_formatLimit.jst A node_modules/ajv/lib/dot/v5/constant.jst A node_modules/ajv/lib/dot/v5/patternRequired.jst A node_modules/ajv/lib/dot/v5/switch.jst A node_modules/ajv/lib/dot/validate.jst A node_modules/ajv/lib/dotjs/_formatLimit.js A node_modules/ajv/lib/dotjs/_limit.js A node_modules/ajv/lib/dotjs/_limitItems.js A node_modules/ajv/lib/dotjs/_limitLength.js A node_modules/ajv/lib/dotjs/_limitProperties.js A node_modules/ajv/lib/dotjs/allOf.js A node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/custom.js A node_modules/ajv/lib/dotjs/dependencies.js A node_modules/ajv/lib/dotjs/enum.js A node_modules/ajv/lib/dotjs/format.js A node_modules/ajv/lib/dotjs/items.js A node_modules/ajv/lib/dotjs/multipleOf.js A node_modules/ajv/lib/dotjs/not.js A node_modules/ajv/lib/dotjs/oneOf.js A node_modules/ajv/lib/dotjs/pattern.js A node_modules/ajv/lib/dotjs/patternRequired.js A node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/ref.js A node_modules/ajv/lib/dotjs/required.js A node_modules/ajv/lib/dotjs/switch.js A node_modules/ajv/lib/dotjs/uniqueItems.js A node_modules/ajv/lib/dotjs/validate.js A node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/refs/json-schema-draft-04.json A node_modules/ajv/lib/refs/json-schema-v5.json A node_modules/ajv/lib/v5.js A node_modules/ajv/package.json A node_modules/ajv/scripts/.eslintrc.yml A node_modules/ajv/scripts/bundle.js A node_modules/ajv/scripts/compile-dots.js A node_modules/ajv/scripts/info A node_modules/ajv/scripts/prepare-tests A node_modules/ajv/scripts/travis-gh-pages M node_modules/ansi-regex/package.json D node_modules/ansi-styles/index.js D node_modules/ansi-styles/license D node_modules/ansi-styles/package.json A node_modules/asap/asap.js A node_modules/asap/browser-asap.js A node_modules/asap/browser-raw.js A node_modules/asap/package.json A node_modules/asap/raw.js M node_modules/aws4/aws4.js M node_modules/aws4/package.json M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/bluebird/LICENSE M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/finally.js M node_modules/bluebird/js/release/generators.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/promise_array.js M node_modules/bluebird/js/release/props.js M node_modules/bluebird/js/release/schedule.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/package.json
[MediaWiki-commits] [Gerrit] mediawiki...graphoid[master]: Bump service-runner version to v2.2.5
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346449 ) Change subject: Bump service-runner version to v2.2.5 .. Bump service-runner version to v2.2.5 The new service-runner, amongst other improvements, brings 5s DNS caching, which allows us to easily re-route traffic to the other data centre on the back-end without needing changes to the service's config. Change-Id: If413be838ad4a39d17e5cc50c6b91caa1343a042 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 9b33a93..5ac47de 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "express": "^4.14.0", "js-yaml": "^3.6.1", "preq": "^0.5.2", -"service-runner": "^2.0.4", +"service-runner": "^2.2.5", "swagger-router": "^0.4.6" , -- To view, visit https://gerrit.wikimedia.org/r/346449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If413be838ad4a39d17e5cc50c6b91caa1343a042 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/graphoid Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Hashar Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clarify release notes for Opera 12.0-12.10 being Grade C
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346460 ) Change subject: Clarify release notes for Opera 12.0-12.10 being Grade C .. Clarify release notes for Opera 12.0-12.10 being Grade C Follow-up to 09fcee61106146adbc8889f3950a2ea02cda0da6. Change-Id: Ibbdaa85a35af4e5560e092deaede626bc0a504e6 --- M RELEASE-NOTES-1.29 M resources/src/startup.js 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/60/346460/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index 6dbc749..f9e76c1 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -283,7 +283,7 @@ rather than tags. The old class name, "selflink", was deprecated and will be removed in a future release. (T160480) * (T156184) $wgRawHtml will no longer apply to internationalization messages. -* Browser support for non-ES5 JavaScript browsers, including Android 2, Opera 12, +* Browser support for non-ES5 JavaScript browsers, including Android 2, Opera 12.0-12.10, and Internet Explorer 9, was lowered from Grade A to Grade C. == Compatibility == diff --git a/resources/src/startup.js b/resources/src/startup.js index e8ccba0..ad06b34 100644 --- a/resources/src/startup.js +++ b/resources/src/startup.js @@ -36,7 +36,7 @@ * - IE 10+ * - Firefox 4+ * - Safari 5+ - * - Opera 15+ + * - Opera 12.10+ * - Mobile Safari 5.1+ (iOS 5+) * - Android 4.1+ * -- To view, visit https://gerrit.wikimedia.org/r/346460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibbdaa85a35af4e5560e092deaede626bc0a504e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to 24b660f09
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346456 ) Change subject: Update mathoid to 24b660f09 .. Update mathoid to 24b660f09 List of changes: 24b660f09 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: I551148c82615f119174b5ba1f473dd97db07b7f8 --- D node_modules/.bin/har-validator A node_modules/ajv/.tonic_example.js A node_modules/ajv/LICENSE A node_modules/ajv/dist/ajv.bundle.js A node_modules/ajv/dist/ajv.min.js A node_modules/ajv/dist/ajv.min.js.map A node_modules/ajv/dist/nodent.min.js A node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/ajv.d.ts A node_modules/ajv/lib/ajv.js A node_modules/ajv/lib/async.js A node_modules/ajv/lib/cache.js A node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/formats.js A node_modules/ajv/lib/compile/index.js A node_modules/ajv/lib/compile/resolve.js A node_modules/ajv/lib/compile/rules.js A node_modules/ajv/lib/compile/schema_obj.js A node_modules/ajv/lib/compile/ucs2length.js A node_modules/ajv/lib/compile/util.js A node_modules/ajv/lib/compile/validation_error.js A node_modules/ajv/lib/dot/_limit.jst A node_modules/ajv/lib/dot/_limitItems.jst A node_modules/ajv/lib/dot/_limitLength.jst A node_modules/ajv/lib/dot/_limitProperties.jst A node_modules/ajv/lib/dot/allOf.jst A node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/coerce.def A node_modules/ajv/lib/dot/custom.jst A node_modules/ajv/lib/dot/defaults.def A node_modules/ajv/lib/dot/definitions.def A node_modules/ajv/lib/dot/dependencies.jst A node_modules/ajv/lib/dot/enum.jst A node_modules/ajv/lib/dot/errors.def A node_modules/ajv/lib/dot/format.jst A node_modules/ajv/lib/dot/items.jst A node_modules/ajv/lib/dot/missing.def A node_modules/ajv/lib/dot/multipleOf.jst A node_modules/ajv/lib/dot/not.jst A node_modules/ajv/lib/dot/oneOf.jst A node_modules/ajv/lib/dot/pattern.jst A node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/ref.jst A node_modules/ajv/lib/dot/required.jst A node_modules/ajv/lib/dot/uniqueItems.jst A node_modules/ajv/lib/dot/v5/_formatLimit.jst A node_modules/ajv/lib/dot/v5/constant.jst A node_modules/ajv/lib/dot/v5/patternRequired.jst A node_modules/ajv/lib/dot/v5/switch.jst A node_modules/ajv/lib/dot/validate.jst A node_modules/ajv/lib/dotjs/_formatLimit.js A node_modules/ajv/lib/dotjs/_limit.js A node_modules/ajv/lib/dotjs/_limitItems.js A node_modules/ajv/lib/dotjs/_limitLength.js A node_modules/ajv/lib/dotjs/_limitProperties.js A node_modules/ajv/lib/dotjs/allOf.js A node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/custom.js A node_modules/ajv/lib/dotjs/dependencies.js A node_modules/ajv/lib/dotjs/enum.js A node_modules/ajv/lib/dotjs/format.js A node_modules/ajv/lib/dotjs/items.js A node_modules/ajv/lib/dotjs/multipleOf.js A node_modules/ajv/lib/dotjs/not.js A node_modules/ajv/lib/dotjs/oneOf.js A node_modules/ajv/lib/dotjs/pattern.js A node_modules/ajv/lib/dotjs/patternRequired.js A node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/ref.js A node_modules/ajv/lib/dotjs/required.js A node_modules/ajv/lib/dotjs/switch.js A node_modules/ajv/lib/dotjs/uniqueItems.js A node_modules/ajv/lib/dotjs/validate.js A node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/refs/json-schema-draft-04.json A node_modules/ajv/lib/refs/json-schema-v5.json A node_modules/ajv/lib/v5.js A node_modules/ajv/package.json A node_modules/ajv/scripts/.eslintrc.yml A node_modules/ajv/scripts/bundle.js A node_modules/ajv/scripts/compile-dots.js A node_modules/ajv/scripts/info A node_modules/ajv/scripts/prepare-tests A node_modules/ajv/scripts/travis-gh-pages M node_modules/ansi-regex/package.json A node_modules/asap/asap.js A node_modules/asap/browser-asap.js A node_modules/asap/browser-raw.js A node_modules/asap/package.json A node_modules/asap/raw.js M node_modules/aws4/aws4.js M node_modules/aws4/package.json M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/bluebird/LICENSE M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/finally.js M node_modules/bluebird/js/release/generators.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/promise_array.js M node_modules/bluebird/js/release/props.js M node_modules/bluebird/js/release/schedule.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/package.json A node_modules/bunyan/.travis.yml M node_modules/bunyan/AUTHORS M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M nod
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 0742f79
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346459 ) Change subject: Update mobileapps to 0742f79 .. Update mobileapps to 0742f79 List of changes: 0742f79 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: I69e93d154a879a05459f6b4279c036baa23edb57 --- M node_modules/cryptiles/.npmignore M node_modules/cryptiles/.travis.yml M node_modules/hawk/.npmignore M node_modules/hawk/.travis.yml M node_modules/hawk/bower.json M node_modules/hawk/component.json M node_modules/hawk/dist/client.js M node_modules/hawk/example/usage.js M node_modules/hawk/lib/browser.js M node_modules/hawk/lib/client.js M node_modules/hawk/lib/crypto.js M node_modules/hawk/lib/index.js M node_modules/hawk/lib/server.js M node_modules/hawk/lib/utils.js M node_modules/hawk/test/browser.js M node_modules/hawk/test/client.js M node_modules/hawk/test/crypto.js M node_modules/hawk/test/index.js M node_modules/hawk/test/readme.js M node_modules/hawk/test/server.js M node_modules/hawk/test/uri.js M node_modules/hawk/test/utils.js M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/heapdump/lib/main.js M node_modules/heapdump/package.json M node_modules/jodid25519/LICENSE M node_modules/json-schema/draft-00/hyper-schema M node_modules/json-schema/draft-00/json-ref M node_modules/json-schema/draft-00/links M node_modules/json-schema/draft-00/schema M node_modules/json-schema/draft-01/hyper-schema M node_modules/json-schema/draft-01/json-ref M node_modules/json-schema/draft-01/links M node_modules/json-schema/draft-01/schema M node_modules/json-schema/draft-02/hyper-schema M node_modules/json-schema/draft-02/json-ref M node_modules/json-schema/draft-02/links M node_modules/json-schema/draft-02/schema M node_modules/json-schema/draft-03/examples/address M node_modules/json-schema/draft-03/examples/calendar M node_modules/json-schema/draft-03/examples/card M node_modules/json-schema/draft-03/examples/geo M node_modules/json-schema/draft-03/examples/interfaces M node_modules/json-schema/draft-03/hyper-schema M node_modules/json-schema/draft-03/json-ref M node_modules/json-schema/draft-03/links M node_modules/json-schema/draft-03/schema M node_modules/json-schema/draft-04/hyper-schema M node_modules/json-schema/draft-04/links M node_modules/json-schema/draft-04/schema M node_modules/json-schema/draft-zyp-json-schema-03.xml M node_modules/json-schema/draft-zyp-json-schema-04.xml M node_modules/json-schema/lib/links.js M node_modules/json-schema/lib/validate.js M node_modules/json-schema/test/tests.js M node_modules/kad/package.json M node_modules/long/.npmignore M node_modules/long/.travis.yml M node_modules/long/LICENSE M node_modules/long/bower.json M node_modules/long/dist/Long.js M node_modules/long/externs/Long.js M node_modules/long/index.js M node_modules/long/jsdoc.json M node_modules/long/scripts/build.js M node_modules/long/src/Long.js M node_modules/long/src/bower.json M node_modules/long/src/wrap.js M node_modules/long/tests/goog.math.long.js M node_modules/long/tests/suite.js M node_modules/merge/LICENSE M node_modules/merge/merge.js M node_modules/merge/merge.min.js M node_modules/service-runner/package.json M src 78 files changed, 15,469 insertions(+), 15,462 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy refs/changes/59/346459/1 -- To view, visit https://gerrit.wikimedia.org/r/346459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69e93d154a879a05459f6b4279c036baa23edb57 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Bump service-runner version to v2.2.5
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346458 ) Change subject: Bump service-runner version to v2.2.5 .. Bump service-runner version to v2.2.5 The new service-runner, amongst other improvements, brings 5s DNS caching, which allows us to easily re-route traffic to the other data centre on the back-end without needing changes to the service's config. Change-Id: Id76b09d63c5e5b317d5039a650e4b81f48ee6c46 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/package.json b/package.json index 3b0fd14..f6525d1 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "express": "^4.14.0", "js-yaml": "^3.6.1", "preq": "^0.4.10", -"service-runner": "^2.1.10", +"service-runner": "^2.2.5", "swagger-router": "^0.4.6", "node-rdkafka": "^0.8.0", "wikipedia-edits-scorer": "^1.4.0" -- To view, visit https://gerrit.wikimedia.org/r/346458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id76b09d63c5e5b317d5039a650e4b81f48ee6c46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/trending-edits Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 75a7850
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346457 ) Change subject: Update cxserver to 75a7850 .. Update cxserver to 75a7850 List of changes: 75a7850 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: Ie284cfab1cad37c6464ab907d3a50458c8438178 --- D node_modules/.bin/har-validator D node_modules/.bin/window-size A node_modules/ajv/.tonic_example.js A node_modules/ajv/LICENSE A node_modules/ajv/dist/ajv.bundle.js A node_modules/ajv/dist/ajv.min.js A node_modules/ajv/dist/ajv.min.js.map A node_modules/ajv/dist/nodent.min.js A node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/ajv.d.ts A node_modules/ajv/lib/ajv.js A node_modules/ajv/lib/async.js A node_modules/ajv/lib/cache.js A node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/formats.js A node_modules/ajv/lib/compile/index.js A node_modules/ajv/lib/compile/resolve.js A node_modules/ajv/lib/compile/rules.js A node_modules/ajv/lib/compile/schema_obj.js A node_modules/ajv/lib/compile/ucs2length.js A node_modules/ajv/lib/compile/util.js A node_modules/ajv/lib/compile/validation_error.js A node_modules/ajv/lib/dot/_limit.jst A node_modules/ajv/lib/dot/_limitItems.jst A node_modules/ajv/lib/dot/_limitLength.jst A node_modules/ajv/lib/dot/_limitProperties.jst A node_modules/ajv/lib/dot/allOf.jst A node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/coerce.def A node_modules/ajv/lib/dot/custom.jst A node_modules/ajv/lib/dot/defaults.def A node_modules/ajv/lib/dot/definitions.def A node_modules/ajv/lib/dot/dependencies.jst A node_modules/ajv/lib/dot/enum.jst A node_modules/ajv/lib/dot/errors.def A node_modules/ajv/lib/dot/format.jst A node_modules/ajv/lib/dot/items.jst A node_modules/ajv/lib/dot/missing.def A node_modules/ajv/lib/dot/multipleOf.jst A node_modules/ajv/lib/dot/not.jst A node_modules/ajv/lib/dot/oneOf.jst A node_modules/ajv/lib/dot/pattern.jst A node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/ref.jst A node_modules/ajv/lib/dot/required.jst A node_modules/ajv/lib/dot/uniqueItems.jst A node_modules/ajv/lib/dot/v5/_formatLimit.jst A node_modules/ajv/lib/dot/v5/constant.jst A node_modules/ajv/lib/dot/v5/patternRequired.jst A node_modules/ajv/lib/dot/v5/switch.jst A node_modules/ajv/lib/dot/validate.jst A node_modules/ajv/lib/dotjs/_formatLimit.js A node_modules/ajv/lib/dotjs/_limit.js A node_modules/ajv/lib/dotjs/_limitItems.js A node_modules/ajv/lib/dotjs/_limitLength.js A node_modules/ajv/lib/dotjs/_limitProperties.js A node_modules/ajv/lib/dotjs/allOf.js A node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/custom.js A node_modules/ajv/lib/dotjs/dependencies.js A node_modules/ajv/lib/dotjs/enum.js A node_modules/ajv/lib/dotjs/format.js A node_modules/ajv/lib/dotjs/items.js A node_modules/ajv/lib/dotjs/multipleOf.js A node_modules/ajv/lib/dotjs/not.js A node_modules/ajv/lib/dotjs/oneOf.js A node_modules/ajv/lib/dotjs/pattern.js A node_modules/ajv/lib/dotjs/patternRequired.js A node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/ref.js A node_modules/ajv/lib/dotjs/required.js A node_modules/ajv/lib/dotjs/switch.js A node_modules/ajv/lib/dotjs/uniqueItems.js A node_modules/ajv/lib/dotjs/validate.js A node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/refs/json-schema-draft-04.json A node_modules/ajv/lib/refs/json-schema-v5.json A node_modules/ajv/lib/v5.js A node_modules/ajv/package.json A node_modules/ajv/scripts/.eslintrc.yml A node_modules/ajv/scripts/bundle.js A node_modules/ajv/scripts/compile-dots.js A node_modules/ajv/scripts/info A node_modules/ajv/scripts/prepare-tests A node_modules/ajv/scripts/travis-gh-pages M node_modules/ansi-regex/package.json D node_modules/ansi-styles/index.js D node_modules/ansi-styles/license D node_modules/ansi-styles/package.json A node_modules/asap/asap.js A node_modules/asap/browser-asap.js A node_modules/asap/browser-raw.js A node_modules/asap/package.json A node_modules/asap/raw.js M node_modules/aws4/aws4.js M node_modules/aws4/package.json M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/bluebird/LICENSE M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/finally.js M node_modules/bluebird/js/release/generators.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/promise_array.js M node_modules/bluebird/js/release/props.js M node_modules/bluebird/js/release/schedule.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/package.json A node_
[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Bump service-runner version to v2.2.5
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346458 ) Change subject: Bump service-runner version to v2.2.5 .. Bump service-runner version to v2.2.5 The new service-runner, amongst other improvements, brings 5s DNS caching, which allows us to easily re-route traffic to the other data centre on the back-end without needing changes to the service's config. Change-Id: Id76b09d63c5e5b317d5039a650e4b81f48ee6c46 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits refs/changes/58/346458/1 diff --git a/package.json b/package.json index 3b0fd14..f6525d1 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "express": "^4.14.0", "js-yaml": "^3.6.1", "preq": "^0.4.10", -"service-runner": "^2.1.10", +"service-runner": "^2.2.5", "swagger-router": "^0.4.6", "node-rdkafka": "^0.8.0", "wikipedia-edits-scorer": "^1.4.0" -- To view, visit https://gerrit.wikimedia.org/r/346458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id76b09d63c5e5b317d5039a650e4b81f48ee6c46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/trending-edits Gerrit-Branch: master Gerrit-Owner: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to 24b660f09
Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346456 ) Change subject: Update mathoid to 24b660f09 .. Update mathoid to 24b660f09 List of changes: 24b660f09 Bump service-runner version to v2.2.5 xxx Update node module dependencies Change-Id: I551148c82615f119174b5ba1f473dd97db07b7f8 --- D node_modules/.bin/har-validator A node_modules/ajv/.tonic_example.js A node_modules/ajv/LICENSE A node_modules/ajv/dist/ajv.bundle.js A node_modules/ajv/dist/ajv.min.js A node_modules/ajv/dist/ajv.min.js.map A node_modules/ajv/dist/nodent.min.js A node_modules/ajv/dist/regenerator.min.js A node_modules/ajv/lib/ajv.d.ts A node_modules/ajv/lib/ajv.js A node_modules/ajv/lib/async.js A node_modules/ajv/lib/cache.js A node_modules/ajv/lib/compile/_rules.js A node_modules/ajv/lib/compile/equal.js A node_modules/ajv/lib/compile/formats.js A node_modules/ajv/lib/compile/index.js A node_modules/ajv/lib/compile/resolve.js A node_modules/ajv/lib/compile/rules.js A node_modules/ajv/lib/compile/schema_obj.js A node_modules/ajv/lib/compile/ucs2length.js A node_modules/ajv/lib/compile/util.js A node_modules/ajv/lib/compile/validation_error.js A node_modules/ajv/lib/dot/_limit.jst A node_modules/ajv/lib/dot/_limitItems.jst A node_modules/ajv/lib/dot/_limitLength.jst A node_modules/ajv/lib/dot/_limitProperties.jst A node_modules/ajv/lib/dot/allOf.jst A node_modules/ajv/lib/dot/anyOf.jst A node_modules/ajv/lib/dot/coerce.def A node_modules/ajv/lib/dot/custom.jst A node_modules/ajv/lib/dot/defaults.def A node_modules/ajv/lib/dot/definitions.def A node_modules/ajv/lib/dot/dependencies.jst A node_modules/ajv/lib/dot/enum.jst A node_modules/ajv/lib/dot/errors.def A node_modules/ajv/lib/dot/format.jst A node_modules/ajv/lib/dot/items.jst A node_modules/ajv/lib/dot/missing.def A node_modules/ajv/lib/dot/multipleOf.jst A node_modules/ajv/lib/dot/not.jst A node_modules/ajv/lib/dot/oneOf.jst A node_modules/ajv/lib/dot/pattern.jst A node_modules/ajv/lib/dot/properties.jst A node_modules/ajv/lib/dot/ref.jst A node_modules/ajv/lib/dot/required.jst A node_modules/ajv/lib/dot/uniqueItems.jst A node_modules/ajv/lib/dot/v5/_formatLimit.jst A node_modules/ajv/lib/dot/v5/constant.jst A node_modules/ajv/lib/dot/v5/patternRequired.jst A node_modules/ajv/lib/dot/v5/switch.jst A node_modules/ajv/lib/dot/validate.jst A node_modules/ajv/lib/dotjs/_formatLimit.js A node_modules/ajv/lib/dotjs/_limit.js A node_modules/ajv/lib/dotjs/_limitItems.js A node_modules/ajv/lib/dotjs/_limitLength.js A node_modules/ajv/lib/dotjs/_limitProperties.js A node_modules/ajv/lib/dotjs/allOf.js A node_modules/ajv/lib/dotjs/anyOf.js A node_modules/ajv/lib/dotjs/constant.js A node_modules/ajv/lib/dotjs/custom.js A node_modules/ajv/lib/dotjs/dependencies.js A node_modules/ajv/lib/dotjs/enum.js A node_modules/ajv/lib/dotjs/format.js A node_modules/ajv/lib/dotjs/items.js A node_modules/ajv/lib/dotjs/multipleOf.js A node_modules/ajv/lib/dotjs/not.js A node_modules/ajv/lib/dotjs/oneOf.js A node_modules/ajv/lib/dotjs/pattern.js A node_modules/ajv/lib/dotjs/patternRequired.js A node_modules/ajv/lib/dotjs/properties.js A node_modules/ajv/lib/dotjs/ref.js A node_modules/ajv/lib/dotjs/required.js A node_modules/ajv/lib/dotjs/switch.js A node_modules/ajv/lib/dotjs/uniqueItems.js A node_modules/ajv/lib/dotjs/validate.js A node_modules/ajv/lib/keyword.js A node_modules/ajv/lib/refs/json-schema-draft-04.json A node_modules/ajv/lib/refs/json-schema-v5.json A node_modules/ajv/lib/v5.js A node_modules/ajv/package.json A node_modules/ajv/scripts/.eslintrc.yml A node_modules/ajv/scripts/bundle.js A node_modules/ajv/scripts/compile-dots.js A node_modules/ajv/scripts/info A node_modules/ajv/scripts/prepare-tests A node_modules/ajv/scripts/travis-gh-pages M node_modules/ansi-regex/package.json A node_modules/asap/asap.js A node_modules/asap/browser-asap.js A node_modules/asap/browser-raw.js A node_modules/asap/package.json A node_modules/asap/raw.js M node_modules/aws4/aws4.js M node_modules/aws4/package.json M node_modules/bcrypt-pbkdf/index.js M node_modules/bcrypt-pbkdf/package.json M node_modules/bluebird/LICENSE M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/finally.js M node_modules/bluebird/js/release/generators.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/promise_array.js M node_modules/bluebird/js/release/props.js M node_modules/bluebird/js/release/schedule.js M node_modules/bluebird/package.json M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/package.json A node_modules/bunyan/.travis.yml M node_modules/bunyan/AUTHORS M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_module
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Bump service-runner version to v2.2.5
Mobrovac has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346455 ) Change subject: Bump service-runner version to v2.2.5 .. Bump service-runner version to v2.2.5 The new service-runner, amongst other improvements, brings 5s DNS caching, which allows us to easily re-route traffic to the other data centre on the back-end without needing changes to the service's config. Change-Id: Ib5dc97e5a8d0b23f9800400e0fc65ef419d57618 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mobrovac: Verified; Looks good to me, approved diff --git a/package.json b/package.json index 61cf087..bf5c027 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "locutus": "^2.0.5", "mediawiki-title": "^0.5.6", "preq": "^0.5.1", -"service-runner": "^2.1.11", +"service-runner": "^2.2.5", "swagger-router": "^0.5.5", "underscore": "^1.8.3" }, -- To view, visit https://gerrit.wikimedia.org/r/346455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5dc97e5a8d0b23f9800400e0fc65ef419d57618 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: Mobrovac Gerrit-Reviewer: BearND Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Mobrovac ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
