[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Stop using abandoned blue

[Siddparmar (Code Review)]

Siddparmar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337217 )

Change subject: Stop using abandoned blue
..

Stop using abandoned blue

Change-Id: I3d17308cc0afdeb204b096613aa0dbdcbac4196b
---
M build/javascripts/privacy.js
M build/stylesheets/graph.css
M build/stylesheets/master.css
M source/javascripts/privacy.js
M source/stylesheets/variables.css.scss
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private 
refs/changes/17/337217/1

diff --git a/build/javascripts/privacy.js b/build/javascripts/privacy.js
index c3b8fb4..e2f8f74 100644
--- a/build/javascripts/privacy.js
+++ b/build/javascripts/privacy.js
@@ -1 +1 @@
-!function(t,e){function a(){}var 
r={Argentina:"ar",Bangladesh:"bd",Austria:"at",Australia:"au",Belgium:"be",Bulgaria:"bg",Chile:"cl",Denmark:"dk","Hong
 Kong":"hk",Ireland:"ie",Israel:"il",Iran:"ir",Italy:"it","South 
Korea":"kr",Korea:"kr",Luxembourg:"lu",Latvia:"lv",Mexico:"mx",Malaysia:"my",Netherlands:"nl",Norway:"no",Peru:"pe",Poland:"pl","Puerto
 Rico":"pr",Russia:"ru","Saudi 
Arabia":"sa",Serbia:"rs",Slovenia:"si",Slovakia:"sk",Senegal:"sn",USA:"us",France:"fr","United
 Kingdom":"gb",Spain:"es",India:"in","Sri 
Lanka":"lk",Germany:"de",Canada:"ca",Nepal:"np",Pakistan:"pk",Brazil:"br",China:"cn",Switzerland:"ch",Singapore:"sg","New
 Zealand":"nz",Japan:"jp","Czech 
Republic":"cz",Sweden:"se",Turkey:"tr",Greece:"gr",Cyprus:"cy",Ukraine:"ua",Taiwan:"tw",Suriname:"sr",Romania:"ro",Indonesia:"id",Liechtenstein:"li",Philippines:"ph","South
 
Africa":"za",Tanzania:"tz",Portugal:"pt",Hungary:"hu",Venezuela:"ve",Croatia:"hr",Ecuador:"ec",Egypt:"eg",Estonia:"ee",Finland:"fi",Georgia:"ge",Malta:"mt",Morocco:"ma","Dominican
 Republic":"do"};a.prototype.init=function(t){if(0===t.length)throw new 
Error("Empty 
dataset");this.data=t.requests,this.filters={}},a.prototype.groupBy=function(t,e){function
 a(t,e){l[t[e]]||(l[t[e]]=[0,0,0])}function r(t,e){a(t,e);var 
r;switch(t.disclosed){case"All":r=0;break;case"No":r=1;break;case"Partial":r=2}l[t[e]][r]+=1}if(!this.data[0][t])throw
 new Error('No such column in dataset: "'+t+'" in: 
'+Object.keys(this.data[0]).join(", "));var n=this.data,l={};for(var i in 
n){var o=n[i],s=!1;if(void 
0===this.filters||0===this.filters.length)s=!0;else{var u=!0;for(var c in 
this.filters){var 
p=this.filters[c];p!==o[c]&&(u=!1)}u&&(s=!0)}s?r(o,t):("undefined"==typeof 
this.filters.duration||o.duration===this.filters.duration)&(o,t)}if(e){var 
d=[];for(var i in l)d.push({key:i,value:l[i]});return d}return 
l},horizontalGraph=function(a,n,l,i,o){function s(a,l,i,s,u,d,y){function 
m(t,e){return k.filter(function(a){return a.key===t&===e})[0]}var 
h=40*l.length+40;c.height(h),v.attr("height",h),y===!0&&(C=t.scale.linear().domain([0,t.max(l,function(t){var
 e=t.value.reduce(function(t,e){return t+e});return 
e})]).range([20,f]));for(var _=[],g=0;g

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Stop using abandoned blue

[Siddparmar (Code Review)]

Siddparmar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337217 )

Change subject: Stop using abandoned blue
..


Stop using abandoned blue

Change-Id: I3d17308cc0afdeb204b096613aa0dbdcbac4196b
---
M build/javascripts/privacy.js
M build/stylesheets/graph.css
M build/stylesheets/master.css
M source/javascripts/privacy.js
M source/stylesheets/variables.css.scss
5 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Siddparmar: Verified; Looks good to me, approved



diff --git a/build/javascripts/privacy.js b/build/javascripts/privacy.js
index c3b8fb4..e2f8f74 100644
--- a/build/javascripts/privacy.js
+++ b/build/javascripts/privacy.js
@@ -1 +1 @@
-!function(t,e){function a(){}var 
r={Argentina:"ar",Bangladesh:"bd",Austria:"at",Australia:"au",Belgium:"be",Bulgaria:"bg",Chile:"cl",Denmark:"dk","Hong
 Kong":"hk",Ireland:"ie",Israel:"il",Iran:"ir",Italy:"it","South 
Korea":"kr",Korea:"kr",Luxembourg:"lu",Latvia:"lv",Mexico:"mx",Malaysia:"my",Netherlands:"nl",Norway:"no",Peru:"pe",Poland:"pl","Puerto
 Rico":"pr",Russia:"ru","Saudi 
Arabia":"sa",Serbia:"rs",Slovenia:"si",Slovakia:"sk",Senegal:"sn",USA:"us",France:"fr","United
 Kingdom":"gb",Spain:"es",India:"in","Sri 
Lanka":"lk",Germany:"de",Canada:"ca",Nepal:"np",Pakistan:"pk",Brazil:"br",China:"cn",Switzerland:"ch",Singapore:"sg","New
 Zealand":"nz",Japan:"jp","Czech 
Republic":"cz",Sweden:"se",Turkey:"tr",Greece:"gr",Cyprus:"cy",Ukraine:"ua",Taiwan:"tw",Suriname:"sr",Romania:"ro",Indonesia:"id",Liechtenstein:"li",Philippines:"ph","South
 
Africa":"za",Tanzania:"tz",Portugal:"pt",Hungary:"hu",Venezuela:"ve",Croatia:"hr",Ecuador:"ec",Egypt:"eg",Estonia:"ee",Finland:"fi",Georgia:"ge",Malta:"mt",Morocco:"ma","Dominican
 Republic":"do"};a.prototype.init=function(t){if(0===t.length)throw new 
Error("Empty 
dataset");this.data=t.requests,this.filters={}},a.prototype.groupBy=function(t,e){function
 a(t,e){l[t[e]]||(l[t[e]]=[0,0,0])}function r(t,e){a(t,e);var 
r;switch(t.disclosed){case"All":r=0;break;case"No":r=1;break;case"Partial":r=2}l[t[e]][r]+=1}if(!this.data[0][t])throw
 new Error('No such column in dataset: "'+t+'" in: 
'+Object.keys(this.data[0]).join(", "));var n=this.data,l={};for(var i in 
n){var o=n[i],s=!1;if(void 
0===this.filters||0===this.filters.length)s=!0;else{var u=!0;for(var c in 
this.filters){var 
p=this.filters[c];p!==o[c]&&(u=!1)}u&&(s=!0)}s?r(o,t):("undefined"==typeof 
this.filters.duration||o.duration===this.filters.duration)&(o,t)}if(e){var 
d=[];for(var i in l)d.push({key:i,value:l[i]});return d}return 
l},horizontalGraph=function(a,n,l,i,o){function s(a,l,i,s,u,d,y){function 
m(t,e){return k.filter(function(a){return a.key===t&===e})[0]}var 
h=40*l.length+40;c.height(h),v.attr("height",h),y===!0&&(C=t.scale.linear().domain([0,t.max(l,function(t){var
 e=t.value.reduce(function(t,e){return t+e});return 
e})]).range([20,f]));for(var _=[],g=0;g

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Refresh build

[Siddparmar (Code Review)]

Siddparmar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337216 )

Change subject: Refresh build
..


Refresh build

Change-Id: Id5bc29a44d294334163d198de9cfc4c711762a25
---
M build/javascripts/privacy.js
M build/stylesheets/graph.css
M build/stylesheets/master.css
3 files changed, 27 insertions(+), 27 deletions(-)

Approvals:
  Siddparmar: Verified; Looks good to me, approved



diff --git a/build/javascripts/privacy.js b/build/javascripts/privacy.js
index 09dd6c7..d949769 100644
--- a/build/javascripts/privacy.js
+++ b/build/javascripts/privacy.js
@@ -841,7 +841,7 @@
svg.append('g')
.attr('class', 'labels')
 
-   var colors = ['#347bff', '#3464bc', '#344e7a', '#343838'];
+   var colors = ['#36c', '#3464bc', '#344e7a', '#343838'];
 
var pie = d3.layout.pie()
.value(function(d) {
@@ -864,7 +864,7 @@
'class': 'pieChart__slice'
})
 
-   // this will come handy in positioning our 
+   // this will come handy in positioning our
// lables and lines outside the chart
function midAngle(d) {
return d.startAngle + (d.endAngle - d.startAngle) / 2;
@@ -920,7 +920,7 @@
pos[0] = polylineFactor * (midAngle(d) < 3.14 ? 
1 : -1);
return [arc.centroid(d), outerArc.centroid(d), 
pos];
},
-   'class': 'pieChart__line' 
+   'class': 'pieChart__line'
})
 
}
@@ -985,7 +985,7 @@
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'All', d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'No', d[ 'Informal Request' ] - d['Informal Request 
Complied (Partial)'] - d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'Partial', d[ 'Informal Request Complied (Partial)' ] 
);
-   
+
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'All', d[ 'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'No', d[ 'Government' ] - d['Government Complied (Partial)'] - d[ 
'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'Partial', d[ 'Government Complied (Partial)' ] );
@@ -1038,7 +1038,7 @@
graphTooltip = $('.graph_tooltip')
 
function updateFlagBorder() {
-   
+
$('.flagBorder').remove()
 
var flags = 
document.querySelectorAll('#bar_graph_by_country .flag')
@@ -,7 +,7 @@
} );
} );
 
-   d3.csv('./data/number_of_disclosures.csv', function( data ) {   

+   d3.csv('./data/number_of_disclosures.csv', function( data ) {
 
var transformedData = data.map(function(o) {
return [o.key, o.value]
diff --git a/build/stylesheets/graph.css b/build/stylesheets/graph.css
index 5cd59ef..fc57d38 100644
--- a/build/stylesheets/graph.css
+++ b/build/stylesheets/graph.css
@@ -1,10 +1,10 @@
-.analytics { border: 1px solid #375baf; border-top: 6px solid #347bff; 
box-shadow: none; background: #ff; margin: 40px 0; }
-@media all and (min-width: 992px) { .analytics { border: none; border-top: 6px 
solid #347bff; box-shadow: 0 17px 35px -17px #375baf; } }
+.analytics { border: 1px solid #375baf; border-top: 6px solid #3366cc; 
box-shadow: none; background: #ff; margin: 40px 0; }
+@media all and (min-width: 992px) { .analytics { border: none; border-top: 6px 
solid #3366cc; box-shadow: 0 17px 35px -17px #375baf; } }
 .analytics h2 { margin: 20px; }
 .analytics ul.tabs { list-style: none; padding: 0; border-bottom: 1px solid 
#d1d1d1; }
 .analytics ul.tabs li { display: inline; }
 .analytics ul.tabs li a { display: inline-block; padding: 3px 10px; 
text-transform: uppercase; font-size: 12px; font-weight: 400; color: #666; 
border-bottom: 4px solid transparent; }
-.analytics ul.tabs li a.active, .analytics ul.tabs li a:hover { 
text-decoration: none; border-color: #347bff; }
+.analytics ul.tabs li a.active, .analytics ul.tabs li a:hover { 
text-decoration: none; border-color: #3366cc; }
 .analytics ul.tabs li:first-child { margin-left: 10px; }
 .analytics .bar_graph_horizontal.rect.gray_bars, .analytics 
.bar_graph_horizontal.rect.blue_bars { cursor: pointer; }
 .analytics h3 { font-family: serif; font-size: 20px; margin: 20px; 
margin-bottom: 0; }
@@ -37,20 

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Refresh build

[Siddparmar (Code Review)]

Siddparmar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337216 )

Change subject: Refresh build
..

Refresh build

Change-Id: Id5bc29a44d294334163d198de9cfc4c711762a25
---
M build/javascripts/privacy.js
M build/stylesheets/graph.css
M build/stylesheets/master.css
3 files changed, 27 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/16/337216/1

diff --git a/build/javascripts/privacy.js b/build/javascripts/privacy.js
index 09dd6c7..d949769 100644
--- a/build/javascripts/privacy.js
+++ b/build/javascripts/privacy.js
@@ -841,7 +841,7 @@
svg.append('g')
.attr('class', 'labels')
 
-   var colors = ['#347bff', '#3464bc', '#344e7a', '#343838'];
+   var colors = ['#36c', '#3464bc', '#344e7a', '#343838'];
 
var pie = d3.layout.pie()
.value(function(d) {
@@ -864,7 +864,7 @@
'class': 'pieChart__slice'
})
 
-   // this will come handy in positioning our 
+   // this will come handy in positioning our
// lables and lines outside the chart
function midAngle(d) {
return d.startAngle + (d.endAngle - d.startAngle) / 2;
@@ -920,7 +920,7 @@
pos[0] = polylineFactor * (midAngle(d) < 3.14 ? 
1 : -1);
return [arc.centroid(d), outerArc.centroid(d), 
pos];
},
-   'class': 'pieChart__line' 
+   'class': 'pieChart__line'
})
 
}
@@ -985,7 +985,7 @@
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'All', d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'No', d[ 'Informal Request' ] - d['Informal Request 
Complied (Partial)'] - d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'Partial', d[ 'Informal Request Complied (Partial)' ] 
);
-   
+
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'All', d[ 'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'No', d[ 'Government' ] - d['Government Complied (Partial)'] - d[ 
'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'Partial', d[ 'Government Complied (Partial)' ] );
@@ -1038,7 +1038,7 @@
graphTooltip = $('.graph_tooltip')
 
function updateFlagBorder() {
-   
+
$('.flagBorder').remove()
 
var flags = 
document.querySelectorAll('#bar_graph_by_country .flag')
@@ -,7 +,7 @@
} );
} );
 
-   d3.csv('./data/number_of_disclosures.csv', function( data ) {   

+   d3.csv('./data/number_of_disclosures.csv', function( data ) {
 
var transformedData = data.map(function(o) {
return [o.key, o.value]
diff --git a/build/stylesheets/graph.css b/build/stylesheets/graph.css
index 5cd59ef..fc57d38 100644
--- a/build/stylesheets/graph.css
+++ b/build/stylesheets/graph.css
@@ -1,10 +1,10 @@
-.analytics { border: 1px solid #375baf; border-top: 6px solid #347bff; 
box-shadow: none; background: #ff; margin: 40px 0; }
-@media all and (min-width: 992px) { .analytics { border: none; border-top: 6px 
solid #347bff; box-shadow: 0 17px 35px -17px #375baf; } }
+.analytics { border: 1px solid #375baf; border-top: 6px solid #3366cc; 
box-shadow: none; background: #ff; margin: 40px 0; }
+@media all and (min-width: 992px) { .analytics { border: none; border-top: 6px 
solid #3366cc; box-shadow: 0 17px 35px -17px #375baf; } }
 .analytics h2 { margin: 20px; }
 .analytics ul.tabs { list-style: none; padding: 0; border-bottom: 1px solid 
#d1d1d1; }
 .analytics ul.tabs li { display: inline; }
 .analytics ul.tabs li a { display: inline-block; padding: 3px 10px; 
text-transform: uppercase; font-size: 12px; font-weight: 400; color: #666; 
border-bottom: 4px solid transparent; }
-.analytics ul.tabs li a.active, .analytics ul.tabs li a:hover { 
text-decoration: none; border-color: #347bff; }
+.analytics ul.tabs li a.active, .analytics ul.tabs li a:hover { 
text-decoration: none; border-color: #3366cc; }
 .analytics ul.tabs li:first-child { margin-left: 10px; }
 .analytics .bar_graph_horizontal.rect.gray_bars, .analytics 
.bar_graph_horizontal.rect.blue_bars { cursor: pointer; }
 .analytics h3 { font-family: serif; font-size: 20px; margin: 20px; 

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Stop using abandoned blue

[Siddparmar (Code Review)]

Siddparmar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337215 )

Change subject: Stop using abandoned blue
..


Stop using abandoned blue

This commit only changes the source, need to 'middleman build' again
to change the actual website.

Bug: T157828
Change-Id: Ie2111d6a4ee63edc7e989ec330dcda3785703f1f
---
M source/javascripts/privacy.js
M source/stylesheets/variables.css.scss
2 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Siddparmar: Verified; Looks good to me, approved



diff --git a/source/javascripts/privacy.js b/source/javascripts/privacy.js
index b9c3e0c..36cf338 100644
--- a/source/javascripts/privacy.js
+++ b/source/javascripts/privacy.js
@@ -841,7 +841,7 @@
svg.append('g')
.attr('class', 'labels')
 
-   var colors = ['#347bff', '#3464bc', '#344e7a', '#343838'];
+   var colors = ['#36c', '#3464bc', '#344e7a', '#343838'];
 
var pie = d3.layout.pie()
.value(function(d) {
@@ -864,7 +864,7 @@
'class': 'pieChart__slice'
})
 
-   // this will come handy in positioning our 
+   // this will come handy in positioning our
// lables and lines outside the chart
function midAngle(d) {
return d.startAngle + (d.endAngle - d.startAngle) / 2;
@@ -920,7 +920,7 @@
pos[0] = polylineFactor * (midAngle(d) < 3.14 ? 
1 : -1);
return [arc.centroid(d), outerArc.centroid(d), 
pos];
},
-   'class': 'pieChart__line' 
+   'class': 'pieChart__line'
})
 
}
@@ -985,7 +985,7 @@
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'All', d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'No', d[ 'Informal Request' ] - d['Informal Request 
Complied (Partial)'] - d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'Partial', d[ 'Informal Request Complied (Partial)' ] 
);
-   
+
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'All', d[ 'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'No', d[ 'Government' ] - d['Government Complied (Partial)'] - d[ 
'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'Partial', d[ 'Government Complied (Partial)' ] );
@@ -1038,7 +1038,7 @@
graphTooltip = $('.graph_tooltip')
 
function updateFlagBorder() {
-   
+
$('.flagBorder').remove()
 
var flags = 
document.querySelectorAll('#bar_graph_by_country .flag')
@@ -,7 +,7 @@
} );
} );
 
-   d3.csv('./data/number_of_disclosures.csv', function( data ) {   

+   d3.csv('./data/number_of_disclosures.csv', function( data ) {
 
var transformedData = data.map(function(o) {
return [o.key, o.value]
diff --git a/source/stylesheets/variables.css.scss 
b/source/stylesheets/variables.css.scss
index ffcd3b4..86d099e 100644
--- a/source/stylesheets/variables.css.scss
+++ b/source/stylesheets/variables.css.scss
@@ -4,7 +4,7 @@
 $black: #343838;
 $red: #ff6060;
 
-$blue: #347BFF;
+$blue: #36C;
 $darkgray: #33425B;
 
 // for future use

-- 
To view, visit https://gerrit.wikimedia.org/r/337215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2111d6a4ee63edc7e989ec330dcda3785703f1f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 
Gerrit-Reviewer: Siddparmar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport[master]: Stop using abandoned blue

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337215 )

Change subject: Stop using abandoned blue
..

Stop using abandoned blue

This commit only changes the source, need to 'middleman build' again
to change the actual website.

Bug: T157828
Change-Id: Ie2111d6a4ee63edc7e989ec330dcda3785703f1f
---
M source/javascripts/privacy.js
M source/stylesheets/variables.css.scss
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport 
refs/changes/15/337215/1

diff --git a/source/javascripts/privacy.js b/source/javascripts/privacy.js
index b9c3e0c..36cf338 100644
--- a/source/javascripts/privacy.js
+++ b/source/javascripts/privacy.js
@@ -841,7 +841,7 @@
svg.append('g')
.attr('class', 'labels')
 
-   var colors = ['#347bff', '#3464bc', '#344e7a', '#343838'];
+   var colors = ['#36c', '#3464bc', '#344e7a', '#343838'];
 
var pie = d3.layout.pie()
.value(function(d) {
@@ -864,7 +864,7 @@
'class': 'pieChart__slice'
})
 
-   // this will come handy in positioning our 
+   // this will come handy in positioning our
// lables and lines outside the chart
function midAngle(d) {
return d.startAngle + (d.endAngle - d.startAngle) / 2;
@@ -920,7 +920,7 @@
pos[0] = polylineFactor * (midAngle(d) < 3.14 ? 
1 : -1);
return [arc.centroid(d), outerArc.centroid(d), 
pos];
},
-   'class': 'pieChart__line' 
+   'class': 'pieChart__line'
})
 
}
@@ -985,7 +985,7 @@
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'All', d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'No', d[ 'Informal Request' ] - d['Informal Request 
Complied (Partial)'] - d[ 'Informal Request Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal 
Non-Government Requests', 'Partial', d[ 'Informal Request Complied (Partial)' ] 
);
-   
+
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'All', d[ 'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'No', d[ 'Government' ] - d['Government Complied (Partial)'] - d[ 
'Government Complied (All)' ] );
addFact( d[ 'Country' ], 'Informal Government 
Requests', 'Partial', d[ 'Government Complied (Partial)' ] );
@@ -1038,7 +1038,7 @@
graphTooltip = $('.graph_tooltip')
 
function updateFlagBorder() {
-   
+
$('.flagBorder').remove()
 
var flags = 
document.querySelectorAll('#bar_graph_by_country .flag')
@@ -,7 +,7 @@
} );
} );
 
-   d3.csv('./data/number_of_disclosures.csv', function( data ) {   

+   d3.csv('./data/number_of_disclosures.csv', function( data ) {
 
var transformedData = data.map(function(o) {
return [o.key, o.value]
diff --git a/source/stylesheets/variables.css.scss 
b/source/stylesheets/variables.css.scss
index ffcd3b4..86d099e 100644
--- a/source/stylesheets/variables.css.scss
+++ b/source/stylesheets/variables.css.scss
@@ -4,7 +4,7 @@
 $black: #343838;
 $red: #ff6060;
 
-$blue: #347BFF;
+$blue: #36C;
 $darkgray: #33425B;
 
 // for future use

-- 
To view, visit https://gerrit.wikimedia.org/r/337215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2111d6a4ee63edc7e989ec330dcda3785703f1f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics...web[master]: Drop redundant Bootstrap CSS

[Ricordisamoa (Code Review)]

Ricordisamoa has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337214 )

Change subject: Drop redundant Bootstrap CSS
..

Drop redundant Bootstrap CSS

Users of Bootswatch CSS should "replace Bootstrap's default stylesheet"
as stated in https://github.com/thomaspark/bootswatch#usage

Change-Id: I36d28993c42004379f0da5822521c7a820f30184
---
M quarry/web/templates/base.html
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web 
refs/changes/14/337214/1

diff --git a/quarry/web/templates/base.html b/quarry/web/templates/base.html
index 01c7df5..b60ad60 100644
--- a/quarry/web/templates/base.html
+++ b/quarry/web/templates/base.html
@@ -16,10 +16,7 @@
 var vars = {{jsvars|tojson}};
 
 {% endif %}
-
-
-
-
+
 
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36d28993c42004379f0da5822521c7a820f30184
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: OutputPage: Support UploadPath in testTransformResourcePath()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336941 )

Change subject: OutputPage: Support UploadPath in testTransformResourcePath()
..


OutputPage: Support UploadPath in testTransformResourcePath()

Updated tests to reflect this use case. Currently we assume all web-accessible
paths within ResourceBasePath (e.g "/w") to exist on disk at the same path
in $IP (e.g. "/var/www/mw").

While in theory any number of web server rewrites or aliases could exist,
there is one case in particular that we should support since the information
is available in the configuration: UploadDir and UploadPath. This path may
be rewritten in a way that varies by wiki in multi-wiki installs that share
the same source code. E.g. a server may rewrite "/w/images" to somewhere
else, which means it will not match the directory on disk that is shared
between wikis.

Bug: T155146
Change-Id: I320478c9c262cc012f08b585b48d290594ec2420
---
M includes/OutputPage.php
M tests/phpunit/includes/OutputPageTest.php
2 files changed, 79 insertions(+), 13 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 91fc75c..af82436 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3697,6 +3697,8 @@
 */
public static function transformResourcePath( Config $config, $path ) {
global $IP;
+
+   $localDir = $IP;
$remotePathPrefix = $config->get( 'ResourceBasePath' );
if ( $remotePathPrefix === '' ) {
// The configured base path is required to be empty 
string for
@@ -3710,8 +3712,18 @@
// - Path is protocol-relative. Fixes T155310. Not 
supported by RelPath lib.
return $path;
}
+   // For files in resources, extensions/ or skins/, 
ResourceBasePath is preferred here.
+   // For other misc files in $IP, we'll fallback to that as well. 
There is, however, a fourth
+   // supported dir/path pair in the configuration 
(wgUploadDirectory, wgUploadPath)
+   // which is not expected to be in wgResourceBasePath on CDNs. 
(T155146)
+   $uploadPath = $config->get( 'UploadPath' );
+   if ( strpos( $path, $uploadPath ) === 0 ) {
+   $localDir = $config->get( 'UploadDirectory' );
+   $remotePathPrefix = $remotePath = $uploadPath;
+   }
+
$path = RelPath\getRelativePath( $path, $remotePath );
-   return self::transformFilePath( $remotePathPrefix, $IP, $path );
+   return self::transformFilePath( $remotePathPrefix, $localDir, 
$path );
}
 
/**
diff --git a/tests/phpunit/includes/OutputPageTest.php 
b/tests/phpunit/includes/OutputPageTest.php
index d2494da..50f851c 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -181,22 +181,63 @@
$baseDir = dirname( __DIR__ ) . '/data/media';
return [
// File that matches basePath, and exists. Hash found 
and appended.
-   [ 'baseDir' => $baseDir, 'basePath' => '/w', 
'/w/test.jpg', '/w/test.jpg?edcf2' ],
+   [
+   'baseDir' => $baseDir, 'basePath' => '/w',
+   '/w/test.jpg',
+   '/w/test.jpg?edcf2'
+   ],
// File that matches basePath, but not found on disk. 
Empty query.
-   [ 'baseDir' => $baseDir, 'basePath' => '/w', 
'/w/unknown.png', '/w/unknown.png?' ],
+   [
+   'baseDir' => $baseDir, 'basePath' => '/w',
+   '/w/unknown.png',
+   '/w/unknown.png?'
+   ],
// File not matching basePath. Ignored.
-   [ 'baseDir' => $baseDir, 'basePath' => '/w', 
'/files/test.jpg' ],
+   [
+   'baseDir' => $baseDir, 'basePath' => '/w',
+   '/files/test.jpg'
+   ],
// Empty string. Ignored.
-   [ 'baseDir' => $baseDir, 'basePath' => '/w', '', '' ],
+   [
+   'baseDir' => $baseDir, 'basePath' => '/w',
+   '',
+   ''
+   ],
// Similar path, but with domain component. Ignored.
-   [ 'baseDir' => $baseDir, 'basePath' => '/w', 
'//example.org/w/test.jpg' ],
-   [ 'baseDir' => $baseDir, 'basePath' => 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use revision ids instead of timestamps for undeletion

[GeoffreyT2000 (Code Review)]

GeoffreyT2000 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337213 )

Change subject: Use revision ids instead of timestamps for undeletion
..

Use revision ids instead of timestamps for undeletion

Undeletion will use revision ids instead of timestamps. This means that it will 
become possible to undelete just one of two deleted revisions with the same 
timestamp.

Bug: T39465
Change-Id: Ia3d3213807156e7b89a2644299571a0881cc1bcb
---
M includes/specials/SpecialUndelete.php
1 file changed, 22 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/337213/1

diff --git a/includes/specials/SpecialUndelete.php 
b/includes/specials/SpecialUndelete.php
index 4c6a593..a7dad74 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -358,7 +358,7 @@
 * This also sets Status objects, $this->fileStatus and 
$this->revisionStatus
 * (depending what operations are attempted).
 *
-* @param array $timestamps Pass an empty array to restore all 
revisions,
+* @param array $revids Pass an empty array to restore all revisions,
 *   otherwise list the ones to undelete.
 * @param string $comment
 * @param array $fileVersions
@@ -369,14 +369,14 @@
 * @return array(number of file revisions restored, number of image 
revisions
 *   restored, log message) on success, false on failure.
 */
-   function undelete( $timestamps, $comment = '', $fileVersions = [],
+   function undelete( $revids, $comment = '', $fileVersions = [],
$unsuppress = false, User $user = null, $tags = null
) {
// If both the set of text revisions and file revisions are 
empty,
// restore everything. Otherwise, just restore the requested 
items.
-   $restoreAll = empty( $timestamps ) && empty( $fileVersions );
+   $restoreAll = empty( $revids ) && empty( $fileVersions );
 
-   $restoreText = $restoreAll || !empty( $timestamps );
+   $restoreText = $restoreAll || !empty( $revids );
$restoreFiles = $restoreAll || !empty( $fileVersions );
 
if ( $restoreFiles && $this->title->getNamespace() == NS_FILE ) 
{
@@ -392,7 +392,7 @@
}
 
if ( $restoreText ) {
-   $this->revisionStatus = $this->undeleteRevisions( 
$timestamps, $unsuppress, $comment );
+   $this->revisionStatus = $this->undeleteRevisions( 
$revids, $unsuppress, $comment );
if ( !$this->revisionStatus->isOK() ) {
return false;
}
@@ -446,14 +446,14 @@
 * This is the meaty bit -- It restores archived revisions of the given 
page
 * to the revision table.
 *
-* @param array $timestamps Pass an empty array to restore all 
revisions,
+* @param array $revids Pass an empty array to restore all revisions,
 *   otherwise list the ones to undelete.
 * @param bool $unsuppress Remove all ar_deleted/fa_deleted 
restrictions of seletected revs
 * @param string $comment
 * @throws ReadOnlyError
 * @return Status Status object containing the number of revisions 
restored on success
 */
-   private function undeleteRevisions( $timestamps, $unsuppress = false, 
$comment = '' ) {
+   private function undeleteRevisions( $revids, $unsuppress = false, 
$comment = '' ) {
if ( wfReadOnly() ) {
throw new ReadOnlyError();
}
@@ -461,7 +461,7 @@
$dbw = wfGetDB( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
 
-   $restoreAll = empty( $timestamps );
+   $restoreAll = empty( $revids );
 
# Does this page already exist? We'll have to update it...
$article = WikiPage::factory( $this->title );
@@ -507,7 +507,7 @@
'ar_title' => $this->title->getDBkey(),
];
if ( !$restoreAll ) {
-   $oldWhere['ar_timestamp'] = array_map( [ &$dbw, 
'timestamp' ], $timestamps );
+   $oldWhere['ar_rev_id'] = array_map( [ &$dbw, 'rev_id' 
], $revids );
}
 
$fields = [
@@ -562,7 +562,7 @@
$restoreFailedArIds = [];
 
// Map rev_id to the ar_id that is allowed to use it.  When 
checking later,
-   // if it doesn't match, the current ar_id can not be restored.
+   // if it doesn't match, the current ar_id cannot be restored.
 
// Value can be an ar_id or -1 (-1 means no ar_id can use it, 
since the
// rev_id is taken before we even start the restore).
@@ 

[MediaWiki-commits] [Gerrit] mediawiki...AutoProxyBlock[master]: Use RecentChange::addTags rather than ChangeTags::addTags

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336904 )

Change subject: Use RecentChange::addTags rather than ChangeTags::addTags
..


Use RecentChange::addTags rather than ChangeTags::addTags

This reduces database writes (by joining the RecentChange::save query) and
makes the tags visible to RecentChange::notify and RCFeed (I060811b2).

See e528a4872c (TorBlock) and 1a211639f7 (MobileApp) for similar commits.
Follows-up I8df2fd983c1263 in MediaWiki core.

Change-Id: I4b83d6dc2d6ebf412d038797cccdffef4c2855e2
---
M AutoProxyBlock.body.php
M AutoProxyBlock.php
2 files changed, 3 insertions(+), 8 deletions(-)

Approvals:
  Cenarium: Looks good to me, but someone else must approve
  TTO: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AutoProxyBlock.body.php b/AutoProxyBlock.body.php
index a7945f7..115df1d 100644
--- a/AutoProxyBlock.body.php
+++ b/AutoProxyBlock.body.php
@@ -93,16 +93,11 @@
return true;
}
  
-   function tagProxyChange( $recentChange ) {
+   static function onRecentChangeSave( RecentChange $rc ) {
global $wgTagProxyActions, $wgUser, $wgRequest;

if ( $wgTagProxyActions && self::isProxy( $wgRequest->getIP() ) 
&& !$wgUser->isAllowed( 'notagproxychanges' ) ) {
-   ChangeTags::addTags( 
-   'proxy',
-   $recentChange->mAttribs['rc_id'],
-   $recentChange->mAttribs['rc_this_oldid'],
-   $recentChange->mAttribs['rc_logid'] 
-   );
+   $rc->addTags( 'proxy' );
}
return true;
}
diff --git a/AutoProxyBlock.php b/AutoProxyBlock.php
index 42287d3..2e747a6 100644
--- a/AutoProxyBlock.php
+++ b/AutoProxyBlock.php
@@ -25,7 +25,7 @@
 
 // set hooks
 $wgHooks['getUserPermissionsErrorsExpensive'][] = 'AutoProxyBlock::checkProxy';
-$wgHooks['RecentChange_save'][] = 'AutoProxyBlock::tagProxyChange';
+$wgHooks['RecentChange_save'][] = 'AutoProxyBlock::onRecentChangeSave';
 $wgHooks['ListDefinedTags'][] = 'AutoProxyBlock::addProxyTag';
 $wgHooks['ChangeTagsListActive'][] = 'AutoProxyBlock::addProxyTag';
 $wgHooks['AbuseFilter-filterAction'][] = 'AutoProxyBlock::AFSetVar';

-- 
To view, visit https://gerrit.wikimedia.org/r/336904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b83d6dc2d6ebf412d038797cccdffef4c2855e2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AutoProxyBlock
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Cenarium 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: TTO 
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...SecurePoll[master]: Fix method name in LoadExtensionSchemaUpdates

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337212 )

Change subject: Fix method name in LoadExtensionSchemaUpdates
..


Fix method name in LoadExtensionSchemaUpdates

Bug: T157651
Change-Id: Ie2b47edabebc5dc00ee3754aaab4d9cebe63e503
---
M includes/SecurePollHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Huji: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/SecurePollHooks.php b/includes/SecurePollHooks.php
index 794cc63..3266223 100644
--- a/includes/SecurePollHooks.php
+++ b/includes/SecurePollHooks.php
@@ -20,7 +20,7 @@
switch ( $updater->getDB()->getType() ) {
case 'mysql':
$updater->addExtensionTable( 
'securepoll_entity', "$base/SecurePoll.sql" );
-   $updater->modifyField( 'securepoll_votes', 
'vote_ip',
+   $updater->modifyExtensionField( 
'securepoll_votes', 'vote_ip',

"$base/patches/patch-vote_ip-extend.sql", true );
$updater->addExtensionIndex( 
'securepoll_options', 'spop_election',

"$base/patches/patch-op_election-index.sql"
@@ -88,4 +88,4 @@
define( 'NS_SECUREPOLL', 830 );
define( 'NS_SECUREPOLL_TALK', 831 );
}
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/337212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2b47edabebc5dc00ee3754aaab4d9cebe63e503
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Huji 
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...SecurePoll[master]: Fix method name in LoadExtensionSchemaUpdates

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337212 )

Change subject: Fix method name in LoadExtensionSchemaUpdates
..

Fix method name in LoadExtensionSchemaUpdates

Bug: T157651
Change-Id: Ie2b47edabebc5dc00ee3754aaab4d9cebe63e503
---
M includes/SecurePollHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll 
refs/changes/12/337212/1

diff --git a/includes/SecurePollHooks.php b/includes/SecurePollHooks.php
index 794cc63..3266223 100644
--- a/includes/SecurePollHooks.php
+++ b/includes/SecurePollHooks.php
@@ -20,7 +20,7 @@
switch ( $updater->getDB()->getType() ) {
case 'mysql':
$updater->addExtensionTable( 
'securepoll_entity', "$base/SecurePoll.sql" );
-   $updater->modifyField( 'securepoll_votes', 
'vote_ip',
+   $updater->modifyExtensionField( 
'securepoll_votes', 'vote_ip',

"$base/patches/patch-vote_ip-extend.sql", true );
$updater->addExtensionIndex( 
'securepoll_options', 'spop_election',

"$base/patches/patch-op_election-index.sql"
@@ -88,4 +88,4 @@
define( 'NS_SECUREPOLL', 830 );
define( 'NS_SECUREPOLL_TALK', 831 );
}
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/337212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2b47edabebc5dc00ee3754aaab4d9cebe63e503
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix method name in LoadExtensionSchemaUpdates

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337211 )

Change subject: Fix method name in LoadExtensionSchemaUpdates
..

Fix method name in LoadExtensionSchemaUpdates

Bug: T157651
Change-Id: Ib901dd95ddd77f6a1fc700499f9f3815c0ae01d0
---
M Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/11/337211/1

diff --git a/Hooks.php b/Hooks.php
index 975985f..29de2c5 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -201,7 +201,7 @@
if ( $updater->getDB()->indexExists( 'echo_event', 'type_page', 
__METHOD__ ) ) {
$updater->addExtensionIndex( 'echo_event', 
'event_type', "$dir/db_patches/patch-alter-type_page-index.sql" );
}
-   $updater->dropTable( 'echo_subscription' );
+   $updater->dropExtensionTable( 'echo_subscription' );
$updater->dropExtensionField( 'echo_event', 'event_timestamp', 
"$dir/db_patches/patch-drop-echo_event-event_timestamp.sql" );
$updater->addExtensionField( 'echo_email_batch', 
'eeb_event_hash',
"$dir/db_patches/patch-email_batch-new-field.sql" );

-- 
To view, visit https://gerrit.wikimedia.org/r/337211
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib901dd95ddd77f6a1fc700499f9f3815c0ae01d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Fix popup position for RTL

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337210 )

Change subject: RCFilters UI: Fix popup position for RTL
..

RCFilters UI: Fix popup position for RTL

This is harder than it should be, and exposes a serious bug in
the way OOUI calculates the popup positioning now.

PopupWidget is now FloatableElement, and now the calculation of
the positioning is done twice - once in FloatableElement, deciding
on a 'left' value that takes into account the element the
FloatableElement is floating "under", and then again, this time
setting 'margin-left' "correction" to the positioning under the
indicator.

Neither one of those take into account RTL corrections - but trying
to fix one gets overridden by the other.

As a result, this fix is a temporary measure until we correct and
figure out how to properly combine and calculate the alignment
upstream.

The commit does three things:
1. It removes the value of 'margin-left' completely. This value is
unnecessary and creates a small bug, where the filter popup is slightly
misaligned if the scrollbars are on the left.
2. It adds a test when the popup is toggled visible, to adjust its
positioning in case the directionality is RTL.
3. It adds 'direction: ltr' to the entire interface, rather than just
the input, since the entire FilterWrapperWidget is interface-direction
and not content direction.

Bug: T157189
Change-Id: I94ccfea878d83a24e071696b9c4e58115c9295c9
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
2 files changed, 26 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/337210/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index 2928102..bdc94b3 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -1,5 +1,7 @@
 .mw-rcfilters-ui-filterWrapperWidget {
width: 100%;
+   // Make sure this uses the interface direction, not the content 
direction
+   direction: ltr;
 
&-popup {
// We have to override OOUI's definition, which is set
@@ -13,7 +15,9 @@
margin-top: -0.5em;
 
input {
-   // Make sure this uses the interface direction, not the 
content direction
+   // We need to reiterate the directionality
+   // for the input as well to literally override
+   // a MediaWiki CSS rule that turns it 'ltr'
direction: ltr;
}
}
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 56303d5..b89375d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -192,10 +192,31 @@
 * @inheritdoc
 */
mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.focus = 
function () {
+   var pos;
+
// Override this method; we don't want to focus on the popup, 
and we
// don't want to bind the size to the handle.
if ( !this.isDisabled() ) {
this.popup.toggle( true );
+
+   // Fix for RTL
+   // TODO: This should be fixed upstream; now that 
PopupWidget is also
+   // a FloatableElement, the positioning of both elements 
are interfering
+   // with one another, and neither one of them corrects 
itself for RTL
+   if ( OO.ui.Element.static.getDir( this.$element ) === 
'rtl' ) {
+   pos = this.popup.$element.offset();
+   this.popup.$element.css(
+   'left',
+   pos.left + 
this.filterInput.$element.width() - this.popup.$element.width()
+   );
+   }
+
+   // The 'margin-left' correct that arrives from 
PopupWidget
+   // is wrong here. It makes the popup shift to the left, 
aligning
+   // the scrollbar outside the bounds of the input.
+   // TODO: This should be fixed upstream in OOUI
+   this.popup.$element.css( 'margin-left', 'auto' );
+
this.filterInput.$input.get( 0 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove jzerebecki from Icinga contact groups

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337209 )

Change subject: Remove jzerebecki from Icinga contact groups
..

Remove jzerebecki from Icinga contact groups

After this is merged, the contact should be removed from puppet-private
too.

Change-Id: I0591eb1d67f903245f3130a9a87f3a778ed7085d
---
M modules/nagios_common/files/contactgroups.cfg
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/337209/1

diff --git a/modules/nagios_common/files/contactgroups.cfg 
b/modules/nagios_common/files/contactgroups.cfg
index 683fd3d..f3d2521 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -51,7 +51,7 @@
 
 define contactgroup {
 contactgroup_name   wikidata
-members wikidata-monitoring,jzerebecki,irc-wikidata,hoo
+members wikidata-monitoring,irc-wikidata,hoo
 }
 
 define contactgroup {
@@ -72,7 +72,7 @@
 # T111243
 define contactgroup {
 contactgroup_name   wdqs-admins
-members smalyshev,irc-wikidata,jzerebecki,hoo,gehel
+members smalyshev,irc-wikidata,hoo,gehel
 }
 
 define contactgroup {

-- 
To view, visit https://gerrit.wikimedia.org/r/337209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0591eb1d67f903245f3130a9a87f3a778ed7085d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Destroy CapsuleItemWidget when it is removed

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337208 )

Change subject: RCFilters UI: Destroy CapsuleItemWidget when it is removed
..

RCFilters UI: Destroy CapsuleItemWidget when it is removed

The widget is recreated when an item is reinserted, so we should
clean up the external elements it creates (like the popup) and
disconnect from events.

Bug: T157852
Change-Id: I8e6eaac7b1a3062d156d4c0b5b912d1a6bfae7de
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
2 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/337208/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index 525f718..ab8ce03 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -107,4 +107,17 @@
mw.rcfilters.ui.CapsuleItemWidget.prototype.onCapsuleRemovedByUser = 
function () {
this.controller.updateFilter( this.model.getName(), false );
};
+
+   /**
+* Remove and destroy external elements of this widget
+*/
+   mw.rcfilters.ui.CapsuleItemWidget.prototype.destroy = function () {
+   // Destroy the popup
+   this.popup.toggle( false );
+   this.popup.$element.detach();
+
+   // Disconnect events
+   this.model.disconnect( this );
+   this.closeButton.disconnect( this );
+   };
 }( mediaWiki, jQuery ) );
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
index 56303d5..9bb1a98 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js
@@ -230,4 +230,21 @@
this.menu.selectItem();
this.menu.highlightItem();
};
+
+   /**
+* @inheritdoc
+*/
+   mw.rcfilters.ui.FilterCapsuleMultiselectWidget.prototype.removeItems = 
function ( items ) {
+   // Parent call
+   
mw.rcfilters.ui.FilterCapsuleMultiselectWidget.parent.prototype.removeItems.call(
 this, items );
+
+   // Destroy the item widget when it is removed
+   // This is done because we re-add items by recreating them, 
rather than hiding them
+   // and items include popups, that will just continue to be 
created and appended
+   // unnecessarily.
+   items.forEach( function ( widget ) {
+   widget.destroy();
+   } );
+   };
+
 }( mediaWiki, jQuery ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/337208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e6eaac7b1a3062d156d4c0b5b912d1a6bfae7de
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] operations/puppet[production]: toollabs: drop precise-related monitoring check

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337207 )

Change subject: toollabs: drop precise-related monitoring check
..

toollabs: drop precise-related monitoring check

Change-Id: Ifd0d86129aa4bfd2b3d8c5e25f15a93b0146bd6b
---
M modules/icinga/manifests/monitor/toollabs.pp
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/337207/1

diff --git a/modules/icinga/manifests/monitor/toollabs.pp 
b/modules/icinga/manifests/monitor/toollabs.pp
index 8d3ad78..185c449 100644
--- a/modules/icinga/manifests/monitor/toollabs.pp
+++ b/modules/icinga/manifests/monitor/toollabs.pp
@@ -117,14 +117,6 @@
 retry_interval => 5,
 }
 
-monitoring::service { 'tools-checker-grid-start-precise':
-description=> 'Start a job and verify on Precise',
-check_command  => "${checker}!/grid/start/precise!OK",
-host   => $test_entry_host,
-check_interval => 5,
-retry_interval => 5,
-}
-
 monitoring::service { 'tools-checker-etcd-flannel':
 description   => 'All Flannel etcd nodes are healthy',
 check_command => "${checker}!/etcd/flannel!OK",

-- 
To view, visit https://gerrit.wikimedia.org/r/337207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd0d86129aa4bfd2b3d8c5e25f15a93b0146bd6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split RCFilter's RL modules

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337206 )

Change subject: Split RCFilter's RL modules
..

Split RCFilter's RL modules

Create 'dm' / 'ui' and 'controller' modules for ResourceLoader,
make sure that Special:RecentChanges loads 'ui' module (that
depends on the other two) and yet the qunit tests only load
the dm module.

Bug: T156532
Change-Id: If53a735458703f0bd2c094349edf86f38f05ccd7
---
M includes/specials/SpecialRecentchanges.php
M resources/Resources.php
M tests/qunit/QUnitTestResources.php
3 files changed, 21 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/337206/1

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index b2e5674..975e210 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -532,7 +532,7 @@
/*ignoreHidden=*/ true
)
) {
-   $out->addModules( 'mediawiki.rcfilters.filters' );
+   $out->addModules( 'mediawiki.rcfilters.filters.ui' );
}
}
 
diff --git a/resources/Resources.php b/resources/Resources.php
index 02487ea..2d6000e 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1751,13 +1751,30 @@
 
/* MediaWiki Special pages */
 
-   'mediawiki.rcfilters.filters' => [
+   'mediawiki.rcfilters.filters.dm' => [
'scripts' => [
'resources/src/mediawiki.rcfilters/mw.rcfilters.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js',
+   ],
+   'dependencies' => [
+   'oojs',
+   ],
+   ],
+   'mediawiki.rcfilters.filters.controller' => [
+   'scripts' => [
+   
'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js',
+   ],
+   'dependencies' => [
+   'oojs',
+   'mediawiki.rcfilters.filters.dm',
+   'mediawiki.Uri',
+   ],
+   ],
+   'mediawiki.rcfilters.filters.ui' => [
+   'scripts' => [

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js',
@@ -1767,7 +1784,6 @@

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js',
-   
'resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js',

'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
],
'styles' => [
@@ -1828,7 +1844,7 @@
],
'dependencies' => [
'oojs-ui',
-   'mediawiki.Uri',
+   'mediawiki.rcfilters.filters.controller',
'oojs-ui.styles.icons-moderation'
],
],
diff --git a/tests/qunit/QUnitTestResources.php 
b/tests/qunit/QUnitTestResources.php
index f31a646..1278ecb 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -137,7 +137,7 @@
'mediawiki.util',
'mediawiki.viewport',
'mediawiki.special.recentchanges',
-   'mediawiki.rcfilters.filters',
+   'mediawiki.rcfilters.filters.dm',
'mediawiki.language',
'mediawiki.cldr',
'mediawiki.cookie',

-- 
To view, visit https://gerrit.wikimedia.org/r/337206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If53a735458703f0bd2c094349edf86f38f05ccd7
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] operations/puppet[production]: labs_vagrant: drop precise support

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337205 )

Change subject: labs_vagrant: drop precise support
..

labs_vagrant: drop precise support

Change-Id: Ieb419d5e6ecf67b2812fd38634b3210e86005b73
---
M modules/labs_vagrant/manifests/init.pp
1 file changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/337205/1

diff --git a/modules/labs_vagrant/manifests/init.pp 
b/modules/labs_vagrant/manifests/init.pp
index 2c8158d..edf9a49 100644
--- a/modules/labs_vagrant/manifests/init.pp
+++ b/modules/labs_vagrant/manifests/init.pp
@@ -39,12 +39,7 @@
 group  => 'wikidev',
 }
 
-# precise-compat branch should be checked out if this is a precise 
installation
-if $::lsbdistcodename == 'precise' {
-$branch_name = 'precise-compat'
-} else {
-$branch_name = 'master'
-}
+$branch_name = 'master'
 
 git::clone { 'vagrant':
 directory => $install_directory,

-- 
To view, visit https://gerrit.wikimedia.org/r/337205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb419d5e6ecf67b2812fd38634b3210e86005b73
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb/prometheus: remove workaround for precise

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337204 )

Change subject: mariadb/prometheus: remove workaround for precise
..

mariadb/prometheus: remove workaround for precise

Change-Id: Id8f3d142a995316eb0abdb824c5f8a8e35138154
---
M modules/role/manifests/mariadb.pp
1 file changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/337204/1

diff --git a/modules/role/manifests/mariadb.pp 
b/modules/role/manifests/mariadb.pp
index 44e7921..cce663b 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -194,12 +194,8 @@
 }
 }
 
-# hacky workaround until we get rid of precise hosts
-# T123525
-if os_version('debian >= jessie || ubuntu >= trusty') {
-include role::prometheus::node_exporter
-include role::prometheus::mysqld_exporter
-}
+include role::prometheus::node_exporter
+include role::prometheus::mysqld_exporter
 }
 
 # miscellaneous services clusters

-- 
To view, visit https://gerrit.wikimedia.org/r/337204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8f3d142a995316eb0abdb824c5f8a8e35138154
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: salt: use SHA256 master key fingeprint on newer systems

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337189 )

Change subject: salt: use SHA256 master key fingeprint on newer systems
..


salt: use SHA256 master key fingeprint on newer systems

stretch's salt-minion expects master_finger to be a SHA256 fingerprint
rather than an MD5 one. While it's possible to change that with the
hash_type argument, MD5 is cryptographically obsolete and shouldn't be
relied on, so start using a SHA256 fingerprint instead.

Change-Id: Id6315e6ca37234e4bd3c4728b25d35830ef94193
---
M modules/role/manifests/salt/minions.pp
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/salt/minions.pp 
b/modules/role/manifests/salt/minions.pp
index 01d490c..f517428 100644
--- a/modules/role/manifests/salt/minions.pp
+++ b/modules/role/manifests/salt/minions.pp
@@ -15,7 +15,13 @@
 }
 } else {
 $master = 'neodymium.eqiad.wmnet'
-$master_finger = 'f6:1d:a7:1f:7e:12:10:40:75:d5:73:af:0c:be:7d:7c'
+if os_version('debian >= stretch') {
+# stretch's salt-minion uses SHA256 instead of MD5 by default.
+# while it's possible to set 'hash_type: md5', this is preferrable
+$master_finger = 
'f6:36:06:73:ca:54:55:c4:68:17:66:13:47:4b:cf:3e:32:71:7a:70:2d:69:b4:e8:3b:f0:d0:ae:d0:4b:4c:f5'
+} else {
+$master_finger = 'f6:1d:a7:1f:7e:12:10:40:75:d5:73:af:0c:be:7d:7c'
+}
 }
 $client_id = $::fqdn
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6315e6ca37234e4bd3c4728b25d35830ef94193
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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]: contint: drop npm settings for precise

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337203 )

Change subject: contint: drop npm settings for precise
..

contint: drop npm settings for precise

Change-Id: I82f420e9dfb8ce21ac380568e25e37d43c3f3e14
---
M modules/contint/manifests/packages/javascript.pp
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/337203/1

diff --git a/modules/contint/manifests/packages/javascript.pp 
b/modules/contint/manifests/packages/javascript.pp
index a5a290e..bbede51 100644
--- a/modules/contint/manifests/packages/javascript.pp
+++ b/modules/contint/manifests/packages/javascript.pp
@@ -18,13 +18,6 @@
 'npm'   => '2.15.2',
 }
 
-$npm_options = $::lsbdistcodename ? {
-# Default npm that ships with Ubuntu Precise's node predates npmjs.org 
SSL
-# 
http://blog.npmjs.org/post/78085451721/npms-self-signed-certificate-is-no-more
-'precise' => '--ca=null --force',
-default   => '',
-}
-
 if (os_version('ubuntu >= trusty') or os_version('debian >= jessie')) {
 # Provide 'node' alias for 'nodejs' because Debian/Ubuntu
 # already has a package called 'node'

-- 
To view, visit https://gerrit.wikimedia.org/r/337203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82f420e9dfb8ce21ac380568e25e37d43c3f3e14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lint: 'include standard' -> 'include ::standard'

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337202 )

Change subject: lint: 'include standard' -> 'include ::standard'
..

lint: 'include standard' -> 'include ::standard'

Change-Id: If0a848c683b7b149d86a2afbc67694d7d989b376
---
M modules/role/manifests/aqs.pp
M modules/role/manifests/builder.pp
M modules/role/manifests/cache/base.pp
M modules/role/manifests/debdeploy/master.pp
M modules/role/manifests/deployment/server.pp
M modules/role/manifests/docker/registry.pp
M modules/role/manifests/kubernetes/master.pp
M modules/role/manifests/kubernetes/worker.pp
M modules/role/manifests/labs/db/master.pp
M modules/role/manifests/labs/db/proxy.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/labs/db/slave.pp
M modules/role/manifests/labs/instance.pp
M modules/role/manifests/logstash/elasticsearch.pp
M modules/role/manifests/lvs/balancer.pp
M modules/role/manifests/maps/server.pp
M modules/role/manifests/mariadb.pp
M modules/role/manifests/mariadb/dbstore.pp
M modules/role/manifests/mariadb/dbstore2.pp
M modules/role/manifests/memcached.pp
M modules/role/manifests/mw_rc_irc.pp
M modules/role/manifests/ntp.pp
M modules/role/manifests/ocg.pp
M modules/role/manifests/osm/common.pp
M modules/role/manifests/postgres/common.pp
M modules/role/manifests/puppetmaster/puppetdb.pp
M modules/role/manifests/rcstream.pp
M modules/role/manifests/restbase/server.pp
M modules/role/manifests/sca.pp
M modules/role/manifests/scb.pp
M modules/role/manifests/snapshot/common.pp
M modules/role/manifests/spare/system.pp
M modules/role/manifests/statistics/cruncher.pp
M modules/role/manifests/swift/proxy.pp
M modules/role/manifests/swift/stats_reporter.pp
M modules/role/manifests/swift/storage.pp
M modules/role/manifests/tendril.pp
M modules/role/manifests/url_downloader.pp
M modules/role/manifests/wdqs.pp
M modules/standard/manifests/init.pp
M modules/wmflib/lib/puppet/parser/functions/role.rb
41 files changed, 54 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/337202/1

diff --git a/modules/role/manifests/aqs.pp b/modules/role/manifests/aqs.pp
index 7376a63..e2c5e46 100644
--- a/modules/role/manifests/aqs.pp
+++ b/modules/role/manifests/aqs.pp
@@ -12,7 +12,7 @@
 
 include ::passwords::aqs
 
-include standard
+include ::standard
 include base::firewall
 
 #
diff --git a/modules/role/manifests/builder.pp 
b/modules/role/manifests/builder.pp
index 9aa897a..6f3eb75 100644
--- a/modules/role/manifests/builder.pp
+++ b/modules/role/manifests/builder.pp
@@ -1,6 +1,6 @@
 # filtertags: labs-project-packaging
 class role::builder {
-include standard
+include ::standard
 include base::firewall
 include role::package::builder
 include profile::docker::storage::loopback
diff --git a/modules/role/manifests/cache/base.pp 
b/modules/role/manifests/cache/base.pp
index 462bac8..952590e 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -4,7 +4,7 @@
 $purge_host_not_upload_re = '^(?!upload\.wikimedia\.org)',
 $storage_parts = ['sda3', 'sdb3'],
 ) {
-include standard
+include ::standard
 include nrpe
 include lvs::configuration
 include network::constants
diff --git a/modules/role/manifests/debdeploy/master.pp 
b/modules/role/manifests/debdeploy/master.pp
index cbcdcc4..113038d 100644
--- a/modules/role/manifests/debdeploy/master.pp
+++ b/modules/role/manifests/debdeploy/master.pp
@@ -1,5 +1,5 @@
 class role::debdeploy::master {
-include standard
+include ::standard
 
 system::role { 'role::debdeploymaster':
 description => 'debdeploy master',
diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 0cd4c36..5b56833 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -4,7 +4,7 @@
 $deployment_group = 'wikidev',
 ) {
 
-include standard
+include ::standard
 $base_path = '/srv/deployment'
 include role::deployment::mediawiki
 
diff --git a/modules/role/manifests/docker/registry.pp 
b/modules/role/manifests/docker/registry.pp
index 91eee10..b81bbcd 100644
--- a/modules/role/manifests/docker/registry.pp
+++ b/modules/role/manifests/docker/registry.pp
@@ -1,5 +1,5 @@
 class role::docker::registry {
-include standard
+include ::standard
 include base::firewall
 include profile::docker::registry
 }
diff --git a/modules/role/manifests/kubernetes/master.pp 
b/modules/role/manifests/kubernetes/master.pp
index d9338e2..20daeb6 100644
--- a/modules/role/manifests/kubernetes/master.pp
+++ b/modules/role/manifests/kubernetes/master.pp
@@ -1,5 +1,5 @@
 class role::kubernetes::master {
-include standard
+include ::standard
 include base::firewall
 
 # Sets up docker on the machine
diff --git 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lint: 'include base::firewall' -> 'include ::base::firewall'

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337201 )

Change subject: lint: 'include base::firewall' -> 'include ::base::firewall'
..

lint: 'include base::firewall' -> 'include ::base::firewall'

Change-Id: I38d8459aa27450dc7934de7a9b1823e5328293be
---
M modules/base/manifests/firewall.pp
M modules/role/manifests/aqs.pp
M modules/role/manifests/archiva.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/backup/host.pp
M modules/role/manifests/backup/storage.pp
M modules/role/manifests/beta/mediawiki.pp
M modules/role/manifests/builder.pp
M modules/role/manifests/cassandra.pp
M modules/role/manifests/docker/registry.pp
M modules/role/manifests/etcd.pp
M modules/role/manifests/eventbus/eventbus.pp
M modules/role/manifests/ganeti.pp
M modules/role/manifests/kubernetes/master.pp
M modules/role/manifests/kubernetes/worker.pp
M modules/role/manifests/labs/db/proxy.pp
M modules/role/manifests/labs/db/replica.pp
M modules/role/manifests/labs/novaproxy.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
M modules/role/manifests/logstash/collector.pp
M modules/role/manifests/logstash/elasticsearch.pp
M modules/role/manifests/mail/mx.pp
M modules/role/manifests/maps/server.pp
M modules/role/manifests/mariadb.pp
M modules/role/manifests/memcached.pp
M modules/role/manifests/mw_rc_irc.pp
M modules/role/manifests/ocg.pp
M modules/role/manifests/openldap/corp.pp
M modules/role/manifests/openldap/labs.pp
M modules/role/manifests/openldap/labtest.pp
M modules/role/manifests/osm/master.pp
M modules/role/manifests/osm/slave.pp
M modules/role/manifests/package/builder.pp
M modules/role/manifests/parsoid.pp
M modules/role/manifests/poolcounter/server.pp
M modules/role/manifests/postgres/master.pp
M modules/role/manifests/prometheus/global.pp
M modules/role/manifests/prometheus/ops.pp
M modules/role/manifests/puppet/self.pp
M modules/role/manifests/puppetmaster/backend.pp
M modules/role/manifests/puppetmaster/frontend.pp
M modules/role/manifests/pybaltest.pp
M modules/role/manifests/restbase/server.pp
M modules/role/manifests/sca.pp
M modules/role/manifests/scb.pp
M modules/role/manifests/snapshot/common.pp
M modules/role/manifests/statistics/cruncher.pp
M modules/role/manifests/swift/proxy.pp
M modules/role/manifests/swift/storage.pp
M modules/role/manifests/syslog/centralserver.pp
M modules/role/manifests/tendril.pp
M modules/role/manifests/thumbor/mediawiki.pp
M modules/role/manifests/toollabs/k8s/worker.pp
M modules/role/manifests/url_downloader.pp
M modules/role/manifests/wdqs.pp
55 files changed, 57 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/337201/1

diff --git a/modules/base/manifests/firewall.pp 
b/modules/base/manifests/firewall.pp
index 130c984..3cbd021 100644
--- a/modules/base/manifests/firewall.pp
+++ b/modules/base/manifests/firewall.pp
@@ -1,6 +1,6 @@
 # Don't include this sub class on all hosts yet
 # NOTE: Policy is DROP by default
-class base::firewall($ensure = 'present') {
+class ::base::firewall($ensure = 'present') {
 include ::network::constants
 include ::ferm
 
diff --git a/modules/role/manifests/aqs.pp b/modules/role/manifests/aqs.pp
index 7376a63..13f0296 100644
--- a/modules/role/manifests/aqs.pp
+++ b/modules/role/manifests/aqs.pp
@@ -13,7 +13,7 @@
 include ::passwords::aqs
 
 include standard
-include base::firewall
+include ::base::firewall
 
 #
 # Set up Cassandra for AQS.
diff --git a/modules/role/manifests/archiva.pp 
b/modules/role/manifests/archiva.pp
index 04404cd..e97f1f8 100644
--- a/modules/role/manifests/archiva.pp
+++ b/modules/role/manifests/archiva.pp
@@ -7,7 +7,7 @@
 class role::archiva {
 system::role { 'role::archiva': description => 'Apache Archiva Host' }
 
-include base::firewall
+include ::base::firewall
 
 require_package('openjdk-7-jdk')
 
diff --git a/modules/role/manifests/authdns/server.pp 
b/modules/role/manifests/authdns/server.pp
index e99b5d4..dcecfa5 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -2,7 +2,7 @@
 class role::authdns::server {
 system::role { 'authdns': description => 'Authoritative DNS server' }
 
-include base::firewall
+include ::base::firewall
 include authdns::ganglia
 include prometheus::node_gdnsd
 include role::authdns::data
diff --git a/modules/role/manifests/backup/host.pp 
b/modules/role/manifests/backup/host.pp
index 0580bc4..aaec25f 100644
--- a/modules/role/manifests/backup/host.pp
+++ b/modules/role/manifests/backup/host.pp
@@ -23,7 +23,7 @@
 }
 File <| tag == 'backup-motd' |>
 
-# If the machine includes base::firewall then let director connect to us
+# If the machine includes ::base::firewall then let director connect to us
 ferm::service { 'bacula-file-demon':
 proto  => 'tcp',
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: delete install1001/2001 from Hiera data

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337199 )

Change subject: delete install1001/2001 from Hiera data
..


delete install1001/2001 from Hiera data

Bug: T157840
Change-Id: I842c68783bd7beb431dbc23e93776ef75150b2cb
---
D hieradata/hosts/install1001.yaml
D hieradata/hosts/install2001.yaml
2 files changed, 0 insertions(+), 12 deletions(-)

Approvals:
  Dzahn: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/install1001.yaml b/hieradata/hosts/install1001.yaml
deleted file mode 100644
index f009bff..000
--- a/hieradata/hosts/install1001.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Not assigned via the role, since overlap with various bastion hosts which 
also have that role
-debdeploy::grains:
-  debdeploy-tftpserver:
-value: standard
-
-do_acme: false
diff --git a/hieradata/hosts/install2001.yaml b/hieradata/hosts/install2001.yaml
deleted file mode 100644
index f009bff..000
--- a/hieradata/hosts/install2001.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Not assigned via the role, since overlap with various bastion hosts which 
also have that role
-debdeploy::grains:
-  debdeploy-tftpserver:
-value: standard
-
-do_acme: false

-- 
To view, visit https://gerrit.wikimedia.org/r/337199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I842c68783bd7beb431dbc23e93776ef75150b2cb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] maps/kartotherian[master]: Update package.json

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337200 )

Change subject: Update package.json
..

Update package.json

Change-Id: Ifa6a089b2d594e1312728c306e2b8718386e0d65
---
M package.json
1 file changed, 25 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian 
refs/changes/00/337200/1

diff --git a/package.json b/package.json
index d4b099b..1a626c4 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,7 @@
 "express": "^4.13.4",
 "js-yaml": "^3.6.0",
 "preq": "^0.4.11",
-"service-runner": "git+https://github.com/nyurik/service-runner.git;
-,
+"service-runner": "^2.1.15",
 "heapdump": "*",
 "node-pre-gyp": "~0.6.25",
 
@@ -96,12 +95,34 @@
 "swagger-router": "^0.4.2"
   },
   "deploy": {
-"node": "4.6.0",
+"node": "6.9.1",
 "target": "debian",
+"install_opts": ["--build-from-source=mapnik", 
"--fallback-to-build=false"] ,
 "dependencies": {
   "_all": ["libcairo2-dev", "libgif-dev", "libpango1.0-dev"],
   "ubuntu": ["libjpeg62-dev"],
-  "debian": ["libjpeg62-turbo-dev"]
+  "debian": [
+"libjpeg62-turbo-dev",
+"fonts-dejavu",
+"libboost-filesystem-dev",
+"libboost-program-options-dev",
+"libboost-regex-dev",
+"libboost-system-dev",
+"libboost-thread-dev",
+"libgdal-dev",
+"libicu-dev",
+"libpq-dev",
+"libcurl4-gnutls-dev",
+"libproj-dev",
+"libtiff-dev",
+"libwebp5",
+{
+  "repo_url": "https://apt.wikimedia.org/wikimedia;,
+  "release": "jessie-wikimedia",
+  "pool": "backports",
+  "packages": [ "libmapbox-variant-dev", "libmapnik-dev", 
"mapnik-utils" ]
+}
+  ]
 }
   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/337200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa6a089b2d594e1312728c306e2b8718386e0d65
Gerrit-PatchSet: 1
Gerrit-Project: maps/kartotherian
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: delete install1001/2001 from Hiera data

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337199 )

Change subject: delete install1001/2001 from Hiera data
..

delete install1001/2001 from Hiera data

Bug: T157840
Change-Id: I842c68783bd7beb431dbc23e93776ef75150b2cb
---
D hieradata/hosts/install1001.yaml
D hieradata/hosts/install2001.yaml
2 files changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/337199/1

diff --git a/hieradata/hosts/install1001.yaml b/hieradata/hosts/install1001.yaml
deleted file mode 100644
index f009bff..000
--- a/hieradata/hosts/install1001.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Not assigned via the role, since overlap with various bastion hosts which 
also have that role
-debdeploy::grains:
-  debdeploy-tftpserver:
-value: standard
-
-do_acme: false
diff --git a/hieradata/hosts/install2001.yaml b/hieradata/hosts/install2001.yaml
deleted file mode 100644
index f009bff..000
--- a/hieradata/hosts/install2001.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Not assigned via the role, since overlap with various bastion hosts which 
also have that role
-debdeploy::grains:
-  debdeploy-tftpserver:
-value: standard
-
-do_acme: false

-- 
To view, visit https://gerrit.wikimedia.org/r/337199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I842c68783bd7beb431dbc23e93776ef75150b2cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: let install1002 be the new source for APT data rsync

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337198 )

Change subject: let install1002 be the new source for APT data rsync
..

let install1002 be the new source for APT data rsync

Start syncing /srv APT data from install1002 to install2002
instead of from carbon to install1002.

Change-Id: I513e1cd1a2cd381013675304e25df733ae780829
---
M hieradata/common.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/337198/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f2d4df1..377c326 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -453,5 +453,5 @@
 
 deployment_server: tin.eqiad.wmnet
 
-install_server: carbon.wikimedia.org
-install_server_failover: install1002.wikimedia.org
+install_server: install1002.wikimedia.org
+install_server_failover: install2002.wikimedia.org

-- 
To view, visit https://gerrit.wikimedia.org/r/337198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I513e1cd1a2cd381013675304e25df733ae780829
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove carbon from puppet

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337197 )

Change subject: remove carbon from puppet
..

remove carbon from puppet

Change-Id: Ib58bd8ad52a2047e488aca64672f445daf62dc5b
---
M manifests/site.pp
1 file changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/337197/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 0e8fa66..b0c19e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -211,22 +211,6 @@
 include ::openstack::horizon::puppetpanel
 }
 
-# DHCP / TFTP
-node 'carbon.wikimedia.org' {
-role(installserver::tftp,
-installserver::dhcp,
-installserver::http,
-installserver::proxy,
-installserver::preseed,
-aptrepo::wikimedia)
-
-$cluster = 'misc'
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
 # cerium, praseodymium and xenon are Cassandra test hosts
 node /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ {
 role(restbase::server, cassandra)

-- 
To view, visit https://gerrit.wikimedia.org/r/337197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib58bd8ad52a2047e488aca64672f445daf62dc5b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: switch apt.wm.org from carbon to install1002

[Dzahn (Code Review)]

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/337196

to review the following change.


Change subject: switch apt.wm.org from carbon to install1002
..

switch apt.wm.org from carbon to install1002

This reverts commit 090348d622c294044818472ec79027e1d6802813.

Change-Id: Iab87c9c49132f7c7df48d66bae18ab6a4024759d
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/96/337196/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index a9c4bb8..8266d89 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -428,7 +428,7 @@
 
 annual  600 IN DYNA geoip!misc-addrs
 
-apt 300  IN CNAMEcarbon
+apt 300  IN CNAME   install1002
 
 archiva 1H  IN CNAMEmeitnerium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab87c9c49132f7c7df48d66bae18ab6a4024759d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
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]: Revert "switch apt.wm.org from carbon to install1002"

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337195 )

Change subject: Revert "switch apt.wm.org from carbon to install1002"
..


Revert "switch apt.wm.org from carbon to install1002"

This reverts commit 55a2ca5be55db9ad221a41f194406c026be93de3.

Change-Id: I0bca08e4696cd5d54bc6cca9e140702e09ad8af9
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 8266d89..a9c4bb8 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -428,7 +428,7 @@
 
 annual  600 IN DYNA geoip!misc-addrs
 
-apt 300  IN CNAME   install1002
+apt 300  IN CNAMEcarbon
 
 archiva 1H  IN CNAMEmeitnerium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bca08e4696cd5d54bc6cca9e140702e09ad8af9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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]: Revert "switch apt.wm.org from carbon to install1002"

[Dzahn (Code Review)]

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/337195

to review the following change.


Change subject: Revert "switch apt.wm.org from carbon to install1002"
..

Revert "switch apt.wm.org from carbon to install1002"

This reverts commit 55a2ca5be55db9ad221a41f194406c026be93de3.

Change-Id: I0bca08e4696cd5d54bc6cca9e140702e09ad8af9
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/95/337195/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 8266d89..a9c4bb8 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -428,7 +428,7 @@
 
 annual  600 IN DYNA geoip!misc-addrs
 
-apt 300  IN CNAME   install1002
+apt 300  IN CNAMEcarbon
 
 archiva 1H  IN CNAMEmeitnerium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bca08e4696cd5d54bc6cca9e140702e09ad8af9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
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...crm[master]: Pass more error details to calling function.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336962 )

Change subject: Pass more error details to calling function.
..


Pass more error details to calling function.

By using the civicrm_api3 with debug=1 & passing ->getExtraParams() to the 
wmfException
we can make more information about the error available higher up the chain. 
These are the places
where I had to do it to debug the test issue in Benevity.

In testing I also stored the exception data on the class & accessed it from the 
tests but
I'm not adding that at this stage because I think it could be memory intensive

Change-Id: I27d577eeb5c385996f4bd126b6ae8067a1af271a
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 10 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index d7051e8..8ff43f5 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1384,6 +1384,7 @@
 
   try {
 civicrm_api3( "Email", "Replace", array(
+  'debug' => 1,
   'location_type_id' => $loc_type_id = 
wmf_civicrm_get_default_location_type_id(),
   'contact_id' => $contact_id,
   'values' => array(array(
@@ -1394,7 +1395,7 @@
 )));
   }
   catch (CiviCRM_API3_Exception $e) {
-throw new WmfException( 'IMPORT_CONTACT', "Couldn't store email for the 
contact.", array('result' => $e->getMessage()) );
+throw new WmfException( 'IMPORT_CONTACT', "Couldn't store email for the 
contact.", $e->getExtraParams());
   }
 }
 
@@ -1433,12 +1434,14 @@
 'is_primary' => 1,
 'is_billing' => 1,
 'location_type_id' => $loc_type_id,
-'version' => 3,
+'debug' => 1,
 );
 
-$result = civicrm_api( "Email", "Create", $email_params );
-if ( array_key_exists( 'is_error', $result ) && $result['is_error'] != 0 ) 
{
-throw new WmfException( 'IMPORT_CONTACT', "Couldn't store email for 
the contact.", array('result' => $result) );
+try {
+  civicrm_api3("Email", "Create", $email_params);
+}
+catch (CiviCRM_API3_Exception $e) {
+throw new WmfException( 'IMPORT_CONTACT', "Couldn't store email for 
the contact.", $e->getExtraParams());
 }
 }
 
@@ -1492,6 +1495,7 @@
 'country_id' => $country_id,
 'country' => $msg['country' ],
 'is_billing' => 1,
+'debug' => 1,
   );
   if (!empty($msg['state_province'])) {
 $address['state_province'] = $msg['state_province'];
@@ -1511,7 +1515,7 @@
 civicrm_api3('Address', 'replace', $address_params);
   }
   catch (CiviCRM_API3_Exception $e) {
-throw new WmfException( 'IMPORT_CONTACT', "Couldn't store address for the 
contact." . $e->getMessage());
+throw new WmfException( 'IMPORT_CONTACT', "Couldn't store address for the 
contact.", $e->getExtraParams());
   }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/336962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I27d577eeb5c385996f4bd126b6ae8067a1af271a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
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] wikimedia...crm[master]: Matching gifts import.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/334235 )

Change subject: Matching gifts import.
..


Matching gifts import.

This import will create contacts for individuals if it cannot find a single 
exact match
but it requires the importer to ensure there is a single exact match for 
the organization.

There is an assumption that importers may prefer to ensure organizations are
non-ambiguous first. The nick name field takes precedence.

Individuals who do not have email or and do not have both first and last 
name are matched
to the anonymous contact.

It should be easy (I hope) to download & re-import the skipped ones once 
organizations
are repaired.

Bug: T115044

Change-Id: I7cc558b8b42a17949aedf468b9d8a22d383ac470
---
A sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/ChecksFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
A sites/all/modules/offline2civicrm/tests/BenevityTest.php
M sites/all/modules/offline2civicrm/tests/EngageChecksFileTest.php
A sites/all/modules/offline2civicrm/tests/data/benevity.csv
A sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email.csv
A sites/all/modules/offline2civicrm/tests/data/engage_multiple_errors.csv
M sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
M sites/all/modules/wmf_common/WmfDatabase.php
M sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
13 files changed, 745 insertions(+), 23 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
new file mode 100644
index 000..7616c44
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -0,0 +1,318 @@
+ $value) {
+  if ($value == 'Not shared by donor') {
+unset($msg['field']);
+  }
+}
+$msg['soft_credit_to_id'] = $msg['employer_id'] = 
$this->getOrganizationID($msg['matching_organization_name']);
+// If we let this go through the individual will be treated as an 
organization.
+parent::mungeMessage($msg);
+$msg['contact_id'] = $this->getIndividualID($msg);
+if ($msg['contact_id'] == $this->getAnonymousContactID()) {
+  $this->unsetAddressFields($msg);
+}
+
+  }
+
+  protected function getDefaultValues() {
+return array(
+  'source' => 'Matched gift',
+  'payment_method' => 'EFT',
+  'contact_type' => 'Individual',
+  'country' => 'US',
+  'currency' => 'USD',
+);
+  }
+
+  /**
+   * Map the import column headers to our normalized format.
+   *
+   * @return array
+   */
+  protected function getFieldMapping() {
+$mapping = parent::getFieldMapping();
+$mapping['Participating Corporation'] = 'matching_organization_name';
+// $mapping['Project'] = field just contains 'Wikimedia' intermittantly. 
Ignore.
+$mapping['Date of Donation'] = 'date';
+$mapping['Donor First Name'] = 'first_name';
+$mapping['Donor Last Name'] = 'last_name';
+$mapping['Email'] = 'email';
+$mapping['Address'] = 'street_address';
+$mapping['City'] = 'city';
+$mapping['State/Province'] = 'state_province';
+$mapping['Postal Code'] = 'postal_code';
+$mapping['Comment'] = 'notes';
+$mapping['Transaction ID'] = 'gateway_txn_id';
+// Not sure we need this - notes currently used for comments but few of 
them.
+// $mapping['Donation Frequency'] = 'notes';
+$mapping['Donation Amount'] = 'gross';
+$mapping['Matched Amount'] = 'matching_amount';
+return $mapping;
+  }
+
+  /**
+   * Do the actual import.
+   *
+   * @param array $msg
+   * @return array
+   */
+  public function doImport($msg) {
+$contribution = array();
+if (!empty($msg['gross'])) {
+  $contribution = wmf_civicrm_contribution_message_import($msg);
+}
+
+$matchedMsg = $msg;
+if (!empty($msg['matching_amount'])) {
+  $matchedMsg['contact_id'] = $msg['soft_credit_to_id'];
+  $matchedMsg['soft_credit_to_id'] = $msg['contact_id'];
+  $matchedMsg['gross'] = $msg['matching_amount'];
+  $matchedMsg['gateway_txn_id'] = $msg['gateway_txn_id'] . '_matched';
+  $this->unsetAddressFields($matchedMsg);
+  $matchingContribution = 
wmf_civicrm_contribution_message_import($matchedMsg);
+}
+
+if (empty($contribution)) {
+  return $matchingContribution;
+}
+$this->mungeContribution($contribution);
+return $contribution;
+  }
+
+  /**
+   * Get the id of the organization whose nick name (preferably) or name 
matches.
+   *
+   * If there are no possible matches this will fail. It will also fail if 
there
+   * are multiple possible matches of the same 

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Parallels base image

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335397 )

Change subject: Parallels base image
..


Parallels base image

bug: T154295
Change-Id: I960eb0293e21d73697f1eaa72ee8f9b3a3cf24f0
---
M Vagrantfile
1 file changed, 6 insertions(+), 12 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index 3c2748a..773bfc9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -89,19 +89,13 @@
   # Requires plugins:
   #   * Parallels provider - http://parallels.github.io/vagrant-parallels/
   # $ vagrant plugin install vagrant-parallels
-  #   * Puppet installer - https://github.com/petems/vagrant-puppet-install
-  # $ vagrant plugin install vagrant-puppet-install
   #
-  # Note that port forwarding works via localhost but not via external 
interfaces
-  # of the host machine by default...
-  # config.vm.provider :parallels do |_parallels, override|
-  #   override.vm.box = 'parallels/ubuntu-14.04'
-
-  #   # Pin to a 3.x version, current as of this config writing.
-  #   override.puppet_install.puppet_version = '3.7.4'
-
-  #   override.vm.network :private_network, ip: settings[:static_ip]
-  # end
+  # Note that port forwarding works via localhost but not via external
+  # interfaces of the host machine by default...
+  config.vm.provider :parallels do |_parallels, override|
+override.vm.box = 'boxcutter/debian8'
+override.vm.network :private_network, ip: settings[:static_ip]
+  end
 
   # libvirt (KVM/QEMU) provider.  Enable with `--provider=libvirt`.
   # config.vm.provider :libvirt do |_libvirt, override|

-- 
To view, visit https://gerrit.wikimedia.org/r/335397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I960eb0293e21d73697f1eaa72ee8f9b3a3cf24f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dduvall 
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] operations/dns[master]: switch apt.wm.org from carbon to install1002

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335734 )

Change subject: switch apt.wm.org from carbon to install1002
..


switch apt.wm.org from carbon to install1002

Bug: T132757
Change-Id: I6a7201feb35c719805eb6863e27a338da5b96dff
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index a9c4bb8..8266d89 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -428,7 +428,7 @@
 
 annual  600 IN DYNA geoip!misc-addrs
 
-apt 300  IN CNAMEcarbon
+apt 300  IN CNAME   install1002
 
 archiva 1H  IN CNAMEmeitnerium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/335734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a7201feb35c719805eb6863e27a338da5b96dff
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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[jessie-migration]: HyperV base image

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/335396 )

Change subject: HyperV base image
..


HyperV base image

Bug: T154293
Change-Id: Ic4ad2f653464f47d2096e6509374d906e6af8efc
---
M Vagrantfile
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index d6bfb2f..3c2748a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -73,12 +73,10 @@
   # Note you must configure networking manually in Hyper-V Manager!
   # NAT and port redirection are not automatically set up for you.
   #
-  # config.vm.provider :hyperv do |_hyperv, override|
-  #   # Our default box doesn't have Hyper-V support...
-  #   override.vm.box = 'cirex/ubuntu-14.04'
-
-  #   override.vm.network :private_network, ip: settings[:static_ip]
-  # end
+  config.vm.provider :hyperv do |_hyperv, override|
+override.vm.box = 'ira/leap'
+override.vm.network :private_network, ip: settings[:static_ip]
+   end
 
   # LXC provider. Enable wtih `--provider=lxc`
   # Requires vagrant-lxc plugin and Vagrant 1.7+

-- 
To view, visit https://gerrit.wikimedia.org/r/335396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4ad2f653464f47d2096e6509374d906e6af8efc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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...ConfirmEdit[wmf/1.29.0-wmf.11]: Add timing instrumentation

[Reedy (Code Review)]

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337194 )

Change subject: Add timing instrumentation
..

Add timing instrumentation

Move some code closer to relevant usage

Tweak some output of newlines

Bug: T157737
Change-Id: I3a4d9c74a3a93fe0474e78c9c0913dd85dec4bb6
(cherry picked from commit cff6e0f3596e3257a8d4dd0a4a5e69bfe5226c5e)
---
M maintenance/GenerateFancyCaptchas.php
1 file changed, 57 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/94/337194/1

diff --git a/maintenance/GenerateFancyCaptchas.php 
b/maintenance/GenerateFancyCaptchas.php
index 0a02bd5..26a8715 100644
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -51,11 +51,14 @@
);
$this->addOption( "delete", "Delete the old captches" );
$this->mDescription = "Generate new captchas and move them into 
storage";
+
$this->requireExtension( "FancyCaptcha" );
}
 
public function execute() {
global $wgCaptchaSecret, $wgCaptchaDirectoryLevels;
+
+   $totalTime = -microtime( true );
 
$instance = ConfirmEditHooks::getInstance();
if ( !( $instance instanceof FancyCaptcha ) ) {
@@ -84,7 +87,6 @@
 
$e = null; // exception
try {
-
$captchaScript = 'captcha.py';
 
if ( $this->hasOption( 'oldcaptcha' ) ) {
@@ -104,25 +106,29 @@
}
}
 
-   $this->output( "Generating $countGen new captchas...\n" 
);
+   $this->output( "Generating $countGen new captchas.." );
$retVal = 1;
+   $captchaTime = -microtime( true );
wfShellExec( $cmd, $retVal, [], [ 'time' => 0 ] );
if ( $retVal != 0 ) {
wfRecursiveRemoveDir( $tmpDir );
$this->error( "Could not run generation 
script.\n", 1 );
}
 
-   $flags = FilesystemIterator::SKIP_DOTS;
-   $iter = new RecursiveIteratorIterator(
-   new RecursiveDirectoryIterator( $tmpDir, $flags 
),
-   RecursiveIteratorIterator::CHILD_FIRST // 
include dirs
-   );
+   $captchaTime += microtime( true );
+   $this->output( " Done.\n" );
 
-   $this->output( "Done.\n" );
+   $this->output(
+   sprintf(
+   "\nGenerated %d captchas in %.1f 
seconds\n",
+   $countGen,
+   $captchaTime
+   )
+   );
 
$originalFiles = [];
if ( $deleteOldCaptchas ) {
-   $this->output( "Getting a list of old 
captchas...\n" );
+   $this->output( "Getting a list of old 
captchas..." );
foreach (
$backend->getFileList(
[ 'dir' => 
$backend->getRootStoragePath() . '/captcha-render' ]
@@ -130,10 +136,21 @@
) {
$originalFiles[] = $file;
}
-   $this->output( "Done.\n" );
+   $this->output( " Done.\n" );
}
 
-   $this->output( "Copying the new captchas to 
storage...\n" );
+   $this->output( "Copying the new captchas to storage..." 
);
+
+   $storeTime = -microtime( true );
+   $iter = new RecursiveIteratorIterator(
+   new RecursiveDirectoryIterator(
+   $tmpDir,
+   FilesystemIterator::SKIP_DOTS
+   ),
+   RecursiveIteratorIterator::CHILD_FIRST // 
include dirs
+   );
+
+   $captchasGenerated = iterator_count( $iter );
foreach ( $iter as $fileInfo ) {
if ( !$fileInfo->isFile() ) {
continue;
@@ -149,24 +166,50 @@
$this->error( "Could not save file 
'{$fileInfo->getPathname()}'.\n" );
}
}
-   $this->output( "Done.\n" );
+  

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Provide meaningful error when accessing $wgLang prematurely.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337188 )

Change subject: Provide meaningful error when accessing $wgLang prematurely.
..


Provide meaningful error when accessing $wgLang prematurely.

Change-Id: I147f0b13eccd248bffdbb6ac0f5b5d25fb0f3641
---
M client/includes/WikibaseClient.php
M repo/includes/WikibaseRepo.php
2 files changed, 20 insertions(+), 0 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 2681b08..3f7d7e8 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -634,6 +634,11 @@
// NOTE: we cannot inject $wgContLang in the constructor, 
because it may still be null
// when WikibaseClient is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgContLang ) {
+   throw new MWException( 'Premature access: $wgContLang 
is not yet initialized!' );
+   }
+
StubObject::unstub( $wgContLang );
return $wgContLang;
}
@@ -648,6 +653,11 @@
// NOTE: we cannot inject $wgLang in the constructor, because 
it may still be null
// when WikibaseClient is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgLang ) {
+   throw new MWException( 'Premature access: $wgLang is 
not yet initialized!' );
+   }
+
StubObject::unstub( $wgLang );
return $wgLang;
}
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index a55c03d..ee8ce12 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -522,6 +522,11 @@
// NOTE: we cannot inject $wgContLang in the constructor, 
because it may still be null
// when WikibaseRepo is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgContLang ) {
+   throw new MWException( 'Premature access: $wgContLang 
is not yet initialized!' );
+   }
+
StubObject::unstub( $wgContLang );
return $wgContLang;
}
@@ -536,6 +541,11 @@
// NOTE: we cannot inject $wgLang in the constructor, because 
it may still be null
// when WikibaseRepo is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgLang ) {
+   throw new MWException( 'Premature access: $wgLang is 
not yet initialized!' );
+   }
+
StubObject::unstub( $wgLang );
return $wgLang;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I147f0b13eccd248bffdbb6ac0f5b5d25fb0f3641
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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]: Gerrit: Stop stuffing so many cache things into memory

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337193 )

Change subject: Gerrit: Stop stuffing so many cache things into memory
..


Gerrit: Stop stuffing so many cache things into memory

The disk cache is fast enough, plus is survives restarts

Change-Id: Iee02c1d2049421c7c9da108ec4c450d484425ed9
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 0 insertions(+), 17 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 1a8e2d1..7d5479f 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -51,31 +51,14 @@
 maxWait = 5 min
 [cache]
 directory = cache
-[cache "accounts_byname"]
-memoryLimit = 2048
-[cache "conflicts"]
-memoryLimit = 2048
-[cache "groups"]
-memoryLimit = 2048
-[cache "groups_byuuid"]
-memoryLimit = 2048
-[cache "ldap_group_existence"]
-maxAge = 1 hour
-[cache "ldap_groups"]
-memoryLimit = 2048
 [cache "ldap_groups_byinclude"]
 maxAge = 1 hour
 [cache "ldap_usernames"]
 maxAge = 1 hour
-memoryLimit = 2048
 [cache "projects"]
-memoryLimit = 2048
 loadOnStartup = true
-[cache "ssh_keys"]
-memoryLimit = 2048
 [cache "static_content"]
 maxAge = 1 day
-memoryLimit = 2048
 [cache "web_sessions"]
 maxAge = 90 days
 memoryLimit = 2048

-- 
To view, visit https://gerrit.wikimedia.org/r/337193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee02c1d2049421c7c9da108ec4c450d484425ed9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 
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] operations/puppet[production]: Gerrit: Stop stuffing so many cache things into memory

[Chad (Code Review)]

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337193 )

Change subject: Gerrit: Stop stuffing so many cache things into memory
..

Gerrit: Stop stuffing so many cache things into memory

The disk cache is fast enough, plus is survives restarts

Change-Id: Iee02c1d2049421c7c9da108ec4c450d484425ed9
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 0 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/337193/1

diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index 1a8e2d1..7d5479f 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -51,31 +51,14 @@
 maxWait = 5 min
 [cache]
 directory = cache
-[cache "accounts_byname"]
-memoryLimit = 2048
-[cache "conflicts"]
-memoryLimit = 2048
-[cache "groups"]
-memoryLimit = 2048
-[cache "groups_byuuid"]
-memoryLimit = 2048
-[cache "ldap_group_existence"]
-maxAge = 1 hour
-[cache "ldap_groups"]
-memoryLimit = 2048
 [cache "ldap_groups_byinclude"]
 maxAge = 1 hour
 [cache "ldap_usernames"]
 maxAge = 1 hour
-memoryLimit = 2048
 [cache "projects"]
-memoryLimit = 2048
 loadOnStartup = true
-[cache "ssh_keys"]
-memoryLimit = 2048
 [cache "static_content"]
 maxAge = 1 day
-memoryLimit = 2048
 [cache "web_sessions"]
 maxAge = 90 days
 memoryLimit = 2048

-- 
To view, visit https://gerrit.wikimedia.org/r/337193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee02c1d2049421c7c9da108ec4c450d484425ed9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Adding "Categoria:" as namespace alias for ext.wikipedia

[MarcoAurelio (Code Review)]

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337192 )

Change subject: Adding "Categoria:" as namespace alias for ext.wikipedia
..

Adding "Categoria:" as namespace alias for ext.wikipedia

The category namespace is being renamed on I17493a44 as it was misspelt there. 
To avoid breaking links and allow to move the categories without blocking 
mediawiki development, I'm adding the misspelt word as namespace alias 
temporary until all links are fixed.

Change-Id: I8acbd3645f23cf009e4ffb2a354c62ce1e8524f3
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/92/337192/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b6a48c6..9b6cea0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3098,6 +3098,10 @@
'Author' => 106,
'Author_talk' => 107,
],
+   '+extwiki' => [ // Temporary for debug following rename of NS_CATEGORY 
in MW-core.
+   'Categoria' => NS_CATEGORY,
+   'Categoria_caraba' => NS_CATEGORY_TALK,
+   ],
'+fawiki' => [
'كاربر' => NS_USER,
'بحث كاربر' => NS_USER_TALK,

-- 
To view, visit https://gerrit.wikimedia.org/r/337192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8acbd3645f23cf009e4ffb2a354c62ce1e8524f3
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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...CirrusSearch[master]: [WIP] Expose a search profile for popular pages

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337191 )

Change subject: [WIP] Expose a search profile for popular pages
..

[WIP] Expose a search profile for popular pages

The apps teams are putting out a feature to show popular pages
nearby the user. These new profiles weight very heavily towards
page popularity in the content namespace, and the incoming links
on all other namespaces. Not expecting much usage outside the
content namespace though.

Bug: T157843
Change-Id: I7fb983fc51c1232e652798600855ba3a4e661eef
---
M profiles/RescoreProfiles.config.php
1 file changed, 103 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/91/337191/1

diff --git a/profiles/RescoreProfiles.config.php 
b/profiles/RescoreProfiles.config.php
index 3ffc62e..8a036ec 100644
--- a/profiles/RescoreProfiles.config.php
+++ b/profiles/RescoreProfiles.config.php
@@ -151,6 +151,59 @@
],
],
],
+
+   // inclinks + pageviews applied as weighted sum with
+   // a very high weight on pageviews, for returning the
+   // most popular matching pages
+   'popular_inclinks_pv' => [
+   'supported_namespaces' => 'content',
+   'fallback_profile' => 'popular_inclinks',
+   'rescore' => [
+   [
+   'window' => 8192,
+   'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+   'query_weight' => 1.0,
+   'rescore_query_weight' => 1.0,
+   'score_mode' => 'total',
+   'type' => 'function_score',
+   'function_chain' => 'wsum_inclinks_pv+'
+   ],
+   [
+   'window' => 8192,
+   'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+   'query_weight' => 1.0,
+   'rescore_query_weight' => 1.0,
+   'score_mode' => 'multiply',
+   'type' => 'function_score',
+   'function_chain' => 'optional_chain'
+   ],
+   ],
+   ],
+
+   'popular_inclinks' => [
+   'supported_namespaces' => 'all',
+   'rescore' => [
+   [
+   'window' => 8192,
+   'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+   'query_weight' => 1.0,
+   'rescore_query_weight' => 100.0,
+   'score_mode' => 'total',
+   'type' => 'function_score',
+   'function_chain' => 'wsum_inclinks'
+   ],
+   [
+   'window' => 8192,
+   'window_size_override' => 
'CirrusSearchFunctionRescoreWindowSize',
+   'query_weight' => 1.0,
+   'rescore_query_weight' => 1.0,
+   'score_mode' => 'multiply',
+   'type' => 'function_score',
+   'function_chain' => 'optional_chain'
+   ],
+   ],
+   ],
+
 ];
 
 /**
@@ -283,4 +336,54 @@
],
],
],
+
+   // like wsum_inclinks_pv, but heavily weighted towards the popularity 
score
+   'wsum_inclinks_pv+' => [
+   'score_mode' => 'sum',
+   'boost_mode' => 'sum',
+   'functions' => [
+   [
+   'type' => 'satu',
+   'weight' => [
+   'value' => 1000,
+   'config_override' => 
'CirrusSearchPageViewsW',
+   'uri_param_override' => 
'cirrusPageViewsW',
+   ],
+   'params' => [
+   'field' => 'popularity_score',
+   'k' => [
+   'value' => 8E-6,
+   'config_override' => 
'CirrusSearchPageViewsK',
+   'uri_param_override' => 
'cirrusPageViewsK',
+   ],
+   'a' => [
+   'value' => 0.8,
+   

[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Bump editor scorer dependency

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337190 )

Change subject: Bump editor scorer dependency
..

Bump editor scorer dependency

* Weights down anonymous edits

Change-Id: I0e071ddecdde5e3e9f3fc809451e49ecc6991e56
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits 
refs/changes/90/337190/1

diff --git a/package.json b/package.json
index fe01927..8b7e4d2 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
 "service-runner": "^2.1.10",
 "swagger-router": "^0.4.6",
 "node-rdkafka": "^0.6.2",
-"wikipedia-edits-scorer": "^1.4.0"
+"wikipedia-edits-scorer": "^1.5.0"
   },
   "devDependencies": {
 "extend": "^3.0.0",

-- 
To view, visit https://gerrit.wikimedia.org/r/337190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e071ddecdde5e3e9f3fc809451e49ecc6991e56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: salt: use SHA256 master key fingeprint on newer systems

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337189 )

Change subject: salt: use SHA256 master key fingeprint on newer systems
..

salt: use SHA256 master key fingeprint on newer systems

stretch's salt-minion expects master_finger to be a SHA256 fingerprint
rather than an MD5 one. While it's possible to change that with the
hash_type argument, MD5 is cryptographically obsolete and shouldn't be
relied on, so start using a SHA256 fingerprint instead.

Change-Id: Id6315e6ca37234e4bd3c4728b25d35830ef94193
---
M modules/role/manifests/salt/minions.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/337189/1

diff --git a/modules/role/manifests/salt/minions.pp 
b/modules/role/manifests/salt/minions.pp
index 01d490c..0381488 100644
--- a/modules/role/manifests/salt/minions.pp
+++ b/modules/role/manifests/salt/minions.pp
@@ -15,7 +15,13 @@
 }
 } else {
 $master = 'neodymium.eqiad.wmnet'
-$master_finger = 'f6:1d:a7:1f:7e:12:10:40:75:d5:73:af:0c:be:7d:7c'
+if os_version("debian >= stretch") {
+# stretch's salt-minion uses SHA256 instead of MD5 by default.
+# while it's possible to set 'hash_type: md5', this is preferrable
+$master_finger = 
'f6:36:06:73:ca:54:55:c4:68:17:66:13:47:4b:cf:3e:32:71:7a:70:2d:69:b4:e8:3b:f0:d0:ae:d0:4b:4c:f5'
+} else {
+$master_finger = 'f6:1d:a7:1f:7e:12:10:40:75:d5:73:af:0c:be:7d:7c'
+}
 }
 $client_id = $::fqdn
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6315e6ca37234e4bd3c4728b25d35830ef94193
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Provide meaningful error when accessing $wgLang prematurely.

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337188 )

Change subject: Provide meaningful error when accessing $wgLang prematurely.
..

Provide meaningful error when accessing $wgLang prematurely.

Change-Id: I147f0b13eccd248bffdbb6ac0f5b5d25fb0f3641
---
M client/includes/WikibaseClient.php
M repo/includes/WikibaseRepo.php
2 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/88/337188/1

diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 2681b08..3f7d7e8 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -634,6 +634,11 @@
// NOTE: we cannot inject $wgContLang in the constructor, 
because it may still be null
// when WikibaseClient is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgContLang ) {
+   throw new MWException( 'Premature access: $wgContLang 
is not yet initialized!' );
+   }
+
StubObject::unstub( $wgContLang );
return $wgContLang;
}
@@ -648,6 +653,11 @@
// NOTE: we cannot inject $wgLang in the constructor, because 
it may still be null
// when WikibaseClient is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgLang ) {
+   throw new MWException( 'Premature access: $wgLang is 
not yet initialized!' );
+   }
+
StubObject::unstub( $wgLang );
return $wgLang;
}
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index a55c03d..ee8ce12 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -522,6 +522,11 @@
// NOTE: we cannot inject $wgContLang in the constructor, 
because it may still be null
// when WikibaseRepo is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgContLang ) {
+   throw new MWException( 'Premature access: $wgContLang 
is not yet initialized!' );
+   }
+
StubObject::unstub( $wgContLang );
return $wgContLang;
}
@@ -536,6 +541,11 @@
// NOTE: we cannot inject $wgLang in the constructor, because 
it may still be null
// when WikibaseRepo is initialized. In particular, the 
language object may not yet
// be there when the SetupAfterCache hook is run during 
bootstrapping.
+
+   if ( !$wgLang ) {
+   throw new MWException( 'Premature access: $wgLang is 
not yet initialized!' );
+   }
+
StubObject::unstub( $wgLang );
return $wgLang;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I147f0b13eccd248bffdbb6ac0f5b5d25fb0f3641
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: TR final fixes; Round 1

[Siddparmar (Code Review)]

Siddparmar has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337187 )

Change subject: TR final fixes; Round 1
..


TR final fixes; Round 1

Change-Id: Ie49dbab2d21d95b4325baaac1befbdc940a9bf86
---
M build/content.html
M build/data/targeted_takedown.csv
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/privacy.html
M build/fr/stories.html
M build/images/story_grave.jpg
M build/index.html
M build/javascripts/rag.js
M build/privacy.html
M build/stories.html
M locales/en.yml
M source/data/targeted_takedown.csv
M source/images/story_grave.jpg
M source/javascripts/rag.js
M source/localizable/content.html.erb
M source/localizable/privacy.html.erb
M source/localizable/stories.html.erb
19 files changed, 158 insertions(+), 62 deletions(-)

Approvals:
  Siddparmar: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/337187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie49dbab2d21d95b4325baaac1befbdc940a9bf86
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Siddparmar 
Gerrit-Reviewer: Siddparmar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: TR final fixes; Round 1

[Siddparmar (Code Review)]

Siddparmar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337187 )

Change subject: TR final fixes; Round 1
..

TR final fixes; Round 1

Change-Id: Ie49dbab2d21d95b4325baaac1befbdc940a9bf86
---
M build/content.html
M build/data/targeted_takedown.csv
M build/faq.html
M build/fr/content.html
M build/fr/faq.html
M build/fr/privacy.html
M build/fr/stories.html
M build/images/story_grave.jpg
M build/index.html
M build/javascripts/rag.js
M build/privacy.html
M build/stories.html
M locales/en.yml
M source/data/targeted_takedown.csv
M source/images/story_grave.jpg
M source/javascripts/rag.js
M source/localizable/content.html.erb
M source/localizable/privacy.html.erb
M source/localizable/stories.html.erb
19 files changed, 158 insertions(+), 62 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private 
refs/changes/87/337187/1


-- 
To view, visit https://gerrit.wikimedia.org/r/337187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie49dbab2d21d95b4325baaac1befbdc940a9bf86
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Siddparmar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Change beta feature info and talk links

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337128 )

Change subject: Change beta feature info and talk links
..


Change beta feature info and talk links

Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
---
M includes/TwoColConflictHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 0648e8b..574a799 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -49,9 +49,9 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
-   => 
'https://meta.wikimedia.org/wiki/Talk:WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
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]: salt: add missing import to grain-ensure.py

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337185 )

Change subject: salt: add missing import to grain-ensure.py
..


salt: add missing import to grain-ensure.py

grain-ensure uses salt.minion.SMinion but doesn't actually import
salt.minion. This is currently broken with at least salt 2016.11.1, as
found in stretch.

Change-Id: I985645bf559f6d674298480529f14231123a68f7
---
M modules/salt/files/grain-ensure.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/salt/files/grain-ensure.py 
b/modules/salt/files/grain-ensure.py
index f5d387b..829f0ea 100644
--- a/modules/salt/files/grain-ensure.py
+++ b/modules/salt/files/grain-ensure.py
@@ -41,6 +41,7 @@
 
 import salt.client
 import salt.config
+import salt.minion
 
 
 class SaltLocalCaller(salt.client.Caller):

-- 
To view, visit https://gerrit.wikimedia.org/r/337185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I985645bf559f6d674298480529f14231123a68f7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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]: remove install1001 and install2001, keep 2001 mgmt

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337093 )

Change subject: remove install1001 and install2001, keep 2001 mgmt
..


remove install1001 and install2001, keep 2001 mgmt

decom' these hosts that have been replaced by
install1002 and install2002.

install2001 was a physical server, while install1001
was a VM, that is why one has mgmt and the other does not.

Bug: T84380
Bug: T157840
Change-Id: I8e64ab61f4dd8f1a38f77f8f40c0172090cbd028
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
5 files changed, 0 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index e986c46..07b8601 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -22,7 +22,6 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr2-codfw.wikimedia.org.
 
-4.0.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install2001.wikimedia.org.
 5.0.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   bast2001.wikimedia.org.
 2.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   acamar.wikimedia.org.
 3.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   baham.wikimedia.org.
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index b21f007..9eb40f7 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -71,7 +71,6 @@
 4.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   fermium.wikimedia.org.
 6.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   mx1001.wikimedia.org.
 2.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   dbmonitor1001.wikimedia.org.
-3.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install1001.wikimedia.org.
 5.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   gerrit.wikimedia.org.
 6.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install1002.wikimedia.org.
 0.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   aluminium.wikimedia.org.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index c75e969..a290dba 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -17,7 +17,6 @@
 1   1H  IN PTR  vrrp-gw-2001.wikimedia.org.
 2   1H  IN PTR  ae1-2001.cr1-codfw.wikimedia.org.
 3   1H  IN PTR  ae1-2001.cr2-codfw.wikimedia.org.
-4   1H  IN PTR  install2001.wikimedia.org.
 5   1H  IN PTR  bast2001.wikimedia.org.
 6   1H  IN PTR  vl2001-eth0.lvs2001.codfw.wmnet.
 7   1H  IN PTR  vl2001-eth0.lvs2002.codfw.wmnet.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index c27afde..0a8f423 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -68,7 +68,6 @@
 80  1H  IN PTR  aluminium.wikimedia.org. ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 81  1H  IN PTR  cobalt.wikimedia.org.
 82  1H  IN PTR  dbmonitor1001.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
-83  1H  IN PTR  install1001.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 84  1H  IN PTR  ununpentium.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 85  1H  IN PTR  gerrit.wikimedia.org.
 86  1H  IN PTR  install1002.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 24f14ae..a9c4bb8 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -132,12 +132,8 @@
 gerrit2001  1H  IN A208.80.153.106
 hydrogen1H  IN A208.80.154.50
 1H  IN  2620:0:861:1:208:80:154:50
-install1001 1H  IN A208.80.154.83
-install1001 1H  IN  2620:0:861:3:208:80:154:83
 install1002 1H  IN A208.80.154.86
 install1002 1H  IN  2620:0:861:3:208:80:154:86
-install2001 1H  IN A208.80.153.4
-install2001 1H  IN  2620:0:860:1:208:80:153:4
 install2002 1H  IN A208.80.153.53
 install2002 1H  IN  2620:0:860:2:208:80:153:53
 iron1H  IN A208.80.154.151

-- 
To view, visit https://gerrit.wikimedia.org/r/337093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e64ab61f4dd8f1a38f77f8f40c0172090cbd028
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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...TwoColConflict[wmf/1.29.0-wmf.11]: Change beta feature info and talk links

[Addshore (Code Review)]

Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337186 )

Change subject: Change beta feature info and talk links
..

Change beta feature info and talk links

Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
---
M includes/TwoColConflictHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/86/337186/1

diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 0648e8b..574a799 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -49,9 +49,9 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
-   => 
'https://meta.wikimedia.org/wiki/Talk:WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: wmf/1.29.0-wmf.11
Gerrit-Owner: Addshore 
Gerrit-Reviewer: WMDE-Fisch 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Toollabs: Remove zsh from package list

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337184 )

Change subject: Toollabs:  Remove zsh from package list
..


Toollabs:  Remove zsh from package list

zsh is now included in Standard, which is already present
on all toollabs nodes.

Change-Id: I9315cec33af0eca84fe1c336d97df62df167b90e
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 1a7ed79..9f077fe 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -318,7 +318,6 @@
 'xsltproc',# T68962.
 'xvfb',# T100268
 'zbar-tools',  # T58996
-'zsh', # T58995
 'debootstrap', # T138138
 'fakechroot',  # T138138
 ]:

-- 
To view, visit https://gerrit.wikimedia.org/r/337184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9315cec33af0eca84fe1c336d97df62df167b90e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Faidon Liambotis 
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]: salt: add missing import to grain-ensure.py

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337185 )

Change subject: salt: add missing import to grain-ensure.py
..

salt: add missing import to grain-ensure.py

grain-ensure uses salt.minion.SMinion but doesn't actually import
salt.minion. This is currently broken with at least salt 2016.11.1, as
found in stretch.

Change-Id: I985645bf559f6d674298480529f14231123a68f7
---
M modules/salt/files/grain-ensure.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/337185/1

diff --git a/modules/salt/files/grain-ensure.py 
b/modules/salt/files/grain-ensure.py
index f5d387b..829f0ea 100644
--- a/modules/salt/files/grain-ensure.py
+++ b/modules/salt/files/grain-ensure.py
@@ -41,6 +41,7 @@
 
 import salt.client
 import salt.config
+import salt.minion
 
 
 class SaltLocalCaller(salt.client.Caller):

-- 
To view, visit https://gerrit.wikimedia.org/r/337185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I985645bf559f6d674298480529f14231123a68f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Toollabs: Remove zsh from package list

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337184 )

Change subject: Toollabs:  Remove zsh from package list
..

Toollabs:  Remove zsh from package list

zsh is now included in Standard, which is already present
on all toollabs nodes.

Change-Id: I9315cec33af0eca84fe1c336d97df62df167b90e
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/337184/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 1a7ed79..9f077fe 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -318,7 +318,6 @@
 'xsltproc',# T68962.
 'xvfb',# T100268
 'zbar-tools',  # T58996
-'zsh', # T58995
 'debootstrap', # T138138
 'fakechroot',  # T138138
 ]:

-- 
To view, visit https://gerrit.wikimedia.org/r/337184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9315cec33af0eca84fe1c336d97df62df167b90e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FileImporter[master]: Show file details on special page

[Addshore (Code Review)]

Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337183 )

Change subject: Show file details on special page
..

Show file details on special page

This uses a pretend importable target
to just throw some data on the special page.

This also adds a POST vs GET case for the special
page, the GET will simply show the infomation about
the import and the POST would actually perform the import.

The Importable interface will provide everything needed
to import a file onto the wiki, currently only basic methods
have been added, more will be added as needed.

ExternalMediaWikiFile currently contains mock data.

Some sort of factory will be needed to turn URLs into
Importable objects.

Change-Id: I71b7e7a3b6c09519d51789065d29a770a94e0338
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A src/ExternalMediaWikiFile.php
A src/Importable.php
M src/SpecialImportFile.php
6 files changed, 121 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileImporter 
refs/changes/83/337183/1

diff --git a/extension.json b/extension.json
index 75dd6bd..70fa5b7 100644
--- a/extension.json
+++ b/extension.json
@@ -19,6 +19,8 @@
 "ImportFile": "FileImporter\\SpecialImportFile"
   },
   "AutoloadClasses": {
+"FileImporter\\ExternalMediaWikiFile": "src/ExternalMediaWikiFile.php",
+"FileImporter\\Importable": "src/Importable.php",
 "FileImporter\\FileImporterHooks": "src/FileImporterHooks.php",
 "FileImporter\\SpecialImportFile": "src/SpecialImportFile.php",
 "FileImporter\\UrlBasedSiteLookup": "src/UrlBasedSiteLookup.php"
diff --git a/i18n/en.json b/i18n/en.json
index dc6073c..eb4b211 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,5 +11,6 @@
   "fileimporter-cantimporturl": "Can't import the given URL",
   "fileimporter-exampleprefix": "Example",
   "fileimporter-submit": "Submit",
+  "fileimporter-import": "Import",
   "fileimporter-importfilefromprefix" : "Importing file from"
 }
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c56b9a4..89afd5e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,5 +11,6 @@
"fileimporter-cantimporturl": "Error message shown on the special page 
when the URL entered can not be imported from",
"fileimporter-exampleprefix": "Prefix for the example URL contained 
within the URL text box on the special page",
"fileimporter-submit": "Text for the submit button on the special page",
+   "fileimporter-import": "Text for the import button on the special page",
"fileimporter-importfilefromprefix" : "prefix for the URL being 
imported from on the special page"
 }
diff --git a/src/ExternalMediaWikiFile.php b/src/ExternalMediaWikiFile.php
new file mode 100644
index 000..22cb263
--- /dev/null
+++ b/src/ExternalMediaWikiFile.php
@@ -0,0 +1,20 @@
+https://upload.wikimedia.org/wikipedia/commons/5/52/Berlin_Montage_4.jpg';
+   }
+
+   public function getTargetUrl() {
+   return 
'https://en.wikipedia.org/wiki/File:Berlin_Montage_4.jpg';
+   }
+
+}
diff --git a/src/Importable.php b/src/Importable.php
new file mode 100644
index 000..ae8b8c2
--- /dev/null
+++ b/src/Importable.php
@@ -0,0 +1,24 @@
+enableOOUI();
 
$rawUrl = $out->getRequest()->getVal( 'clientUrl', '' );
+   $wasPosted = $out->getRequest()->wasPosted();
 
if ( !$rawUrl ) {
$this->showUrlEntryPage();
@@ -35,8 +37,17 @@
$this->showDisallowedUrlMessage();
$this->showUrlEntryPage();
} else {
-   $this->showImportPage( $parsedUrl );
+   if ( $wasPosted ) {
+   $this->doImport();
+   } else {
+   $this->showImportPage( $rawUrl );
+   }
}
+   }
+
+   private function doImport() {
+   // TODO implement importing
+   $this->getOutput()->addHTML( 'TODO do the import' );
}
 
/**
@@ -71,8 +82,37 @@
}
 
private function showUrlEntryPage() {
+   $this->showInputForm();
+   }
+
+   /**
+* @param string $rawUrl
+*/
+   private function showImportPage( $rawUrl ) {
+   // TODO actually make the correct file?
+   $file = new ExternalMediaWikiFile();
+   $out = $this->getOutput();
+
$this->getOutput()->addModuleStyles( 'ext.FileImporter.Special' 
);
-   $this->getOutput()->addHTML(
+   $this->showInputForm( $file->getTargetUrl() );
+
+   $out->addHTML(
+   Html::rawElement(
+   'p',
+   [],
+   ( new Message( 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bumps submodule/ores to HEAD

[Halfak (Code Review)]

Halfak has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337182 )

Change subject: Bumps submodule/ores to HEAD
..


Bumps submodule/ores to HEAD

Change-Id: I62d4780d920787216e5e6c1cb0844769c48cd07b
---
M submodules/ores
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Halfak: Verified; Looks good to me, approved



diff --git a/submodules/ores b/submodules/ores
index 7ad40f8..febe7c5 16
--- a/submodules/ores
+++ b/submodules/ores
@@ -1 +1 @@
-Subproject commit 7ad40f89047399cfa0387c06101c6e21ffc1ba99
+Subproject commit febe7c5eaaa0b3c148c1ed199474d2cab6a0180b

-- 
To view, visit https://gerrit.wikimedia.org/r/337182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62d4780d920787216e5e6c1cb0844769c48cd07b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Halfak 
Gerrit-Reviewer: Halfak 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bumps submodule/ores to HEAD

[Halfak (Code Review)]

Halfak has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337182 )

Change subject: Bumps submodule/ores to HEAD
..

Bumps submodule/ores to HEAD

Change-Id: I62d4780d920787216e5e6c1cb0844769c48cd07b
---
M submodules/ores
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy 
refs/changes/82/337182/1

diff --git a/submodules/ores b/submodules/ores
index 7ad40f8..febe7c5 16
--- a/submodules/ores
+++ b/submodules/ores
@@ -1 +1 @@
-Subproject commit 7ad40f89047399cfa0387c06101c6e21ffc1ba99
+Subproject commit febe7c5eaaa0b3c148c1ed199474d2cab6a0180b

-- 
To view, visit https://gerrit.wikimedia.org/r/337182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62d4780d920787216e5e6c1cb0844769c48cd07b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Halfak 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Create IResultWrapper interface for type-hints

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336584 )

Change subject: Create IResultWrapper interface for type-hints
..


Create IResultWrapper interface for type-hints

Change-Id: Ie46ede59c09eb7b0b9ff06c6988e39fe2a953e46
---
M autoload.php
A includes/libs/rdbms/database/resultwrapper/IResultWrapper.php
M includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
3 files changed, 87 insertions(+), 42 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/autoload.php b/autoload.php
index 1cb8a14..a6aebed 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1588,6 +1588,7 @@
'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/ILBFactory.php',
'Wikimedia\\Rdbms\\ILoadBalancer' => __DIR__ . 
'/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
'Wikimedia\\Rdbms\\ILoadMonitor' => __DIR__ . 
'/includes/libs/rdbms/loadmonitor/ILoadMonitor.php',
+   'Wikimedia\\Rdbms\\IResultWrapper' => __DIR__ . 
'/includes/libs/rdbms/database/resultwrapper/IResultWrapper.php',
'Wikimedia\\Rdbms\\LBFactory' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactory.php',
'Wikimedia\\Rdbms\\LBFactoryMulti' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactoryMulti.php',
'Wikimedia\\Rdbms\\LBFactorySimple' => __DIR__ . 
'/includes/libs/rdbms/lbfactory/LBFactorySimple.php',
diff --git a/includes/libs/rdbms/database/resultwrapper/IResultWrapper.php 
b/includes/libs/rdbms/database/resultwrapper/IResultWrapper.php
new file mode 100644
index 000..dc89a2d
--- /dev/null
+++ b/includes/libs/rdbms/database/resultwrapper/IResultWrapper.php
@@ -0,0 +1,82 @@
+fieldname, with fields acting like member variables. If no 
more rows are available,
+* false is returned.
+*
+* @return stdClass|bool
+* @throws DBUnexpectedError Thrown if the database returns an error
+*/
+   public function fetchObject();
+
+   /**
+* Fetch the next row from the given result object, in associative 
array form. Fields are
+* retrieved with $row['fieldname']. If no more rows are available, 
false is returned.
+*
+* @return array|bool
+* @throws DBUnexpectedError Thrown if the database returns an error
+*/
+   public function fetchRow();
+
+   /**
+* Change the position of the cursor in a result object.
+* See mysql_data_seek()
+*
+* @param int $row
+*/
+   public function seek( $row );
+
+   /**
+* Free a result object
+*
+* This either saves memory in PHP (buffered queries) or on the server 
(unbuffered queries).
+* In general, queries are not large enough in result sets for this to 
be worth calling.
+*/
+   public function free();
+
+   /**
+* @return stdClass|array|bool
+*/
+   public function current();
+
+   /**
+* @return int
+*/
+   public function key();
+
+   /**
+* @return stdClass
+*/
+   function next();
+}
diff --git a/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php 
b/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
index 53109c8..88e7cdd 100644
--- a/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
+++ b/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
@@ -1,4 +1,7 @@
 getDB()->numRows( $this );
}
 
-   /**
-* Fetch the next row from the given result object, in object form. 
Fields can be retrieved with
-* $row->fieldname, with fields acting like member variables. If no 
more rows are available,
-* false is returned.
-*
-* @return stdClass|bool
-* @throws DBUnexpectedError Thrown if the database returns an error
-*/
public function fetchObject() {
return $this->getDB()->fetchObject( $this );
}
 
-   /**
-* Fetch the next row from the given result object, in associative 
array form. Fields are
-* retrieved with $row['fieldname']. If no more rows are available, 
false is returned.
-*
-* @return array|bool
-* @throws DBUnexpectedError Thrown if the database returns an error
-*/
public function fetchRow() {
return $this->getDB()->fetchRow( $this );
}
 
-   /**
-* Change the position of the cursor in a result object.
-* See mysql_data_seek()
-*
-* @param int $row
-*/
public function seek( $row ) {
$this->getDB()->dataSeek( $this, $row );
}
 
-   /**
-* Free a result object
-*
-* This either saves memory in PHP (buffered queries) or on the server 
(unbuffered queries).
-* In general, queries are not large enough in 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] Changes to perf consumer of event logging events

[Nuria (Code Review)]

Nuria has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337158 )

Change subject: [WIP] Changes to perf consumer of event logging events
..

[WIP] Changes to perf consumer of event logging events

TODO:
If we want to keep data backewards compatible we are going
to have to modify a bit what ua-parser returns to make it look like more
like the performance convention

Bug: T156760
Change-Id: I85323b69976ee1b132099a9b9e26351a968c9ca7
---
M modules/webperf/files/navtiming.py
M modules/webperf/files/navtiming_ua_data.yaml
2 files changed, 32 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/337158/1

diff --git a/modules/webperf/files/navtiming.py 
b/modules/webperf/files/navtiming.py
index 3a88470..ef327a5 100755
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -14,6 +14,8 @@
 import zmq
 import yaml
 
+# for CR: how are dependencies fullfilled where this script runs?
+import json
 
 handlers = {}
 
@@ -90,12 +92,36 @@
 def parse_ua(ua):
 """Return a tuple of browser_family and browser_major, or None.
 
+Can parse a raw user agent or a json object alredy digested by ua-parser
+
 Inspired by https://github.com/ua-parser/uap-core
 
 - Add unit test with sample user agent string for each match.
 - Must return a string in form ".".
 - Use the same family name as ua-parser.
 - Ensure version number match doesn't contain dots (or transform them).
+
+"""
+# trick, if app version is there this is a digested user agent
+m = re.search('wmf_app_version', ua)
+
+if m is not None:
+return parse_ua_obj(ua)
+else:
+return parse_ua_legacy(ua)
+
+
+def parse_ua_obj(ua):
+"""
+Parses user agent digested by ua-parser
+Note that only browser major is reported
+"""
+ua_obj = json.loads(ua)
+return (ua_obj["browser_family"], ua_obj["browser_major"])
+
+def parse_ua_legacy(ua):
+"""
+Parses raw user agent
 """
 
 # Chrome for iOS
diff --git a/modules/webperf/files/navtiming_ua_data.yaml 
b/modules/webperf/files/navtiming_ua_data.yaml
index d8f2ca8..dc1dbf3 100644
--- a/modules/webperf/files/navtiming_ua_data.yaml
+++ b/modules/webperf/files/navtiming_ua_data.yaml
@@ -59,3 +59,9 @@
 # Undetected, but here to catch regressions
 - result:
   ua: 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:11.03.16) Gecko/20110302 
Conkeror/0.9.2 (Debian-0.9.2)'
+
+- result: Chrome.56
+  ua: "{\"os_minor\": null, \"os_major\": null, \"device_family\": \"Other\", 
\"os_family\": \"Windows 10\", \"wmf_app_version\": \"-\", \"browser_major\": 
\"56\", \"browser_family\": \"Chrome\"}"
+
+- result: Chrome.56
+  ua: "{\"os_minor\": \"11\", \"os_major\": \"10\", \"device_family\": 
\"Other\", \"os_family\": \"Mac OS X\", \"wmf_app_version\": \"-\", 
\"browser_major\": \"56\", \"browser_family\": \"Chrome\"}"

-- 
To view, visit https://gerrit.wikimedia.org/r/337158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85323b69976ee1b132099a9b9e26351a968c9ca7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nuria 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Replace 'zsh-beta' with 'zsh'

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337153 )

Change subject: Replace 'zsh-beta' with 'zsh'
..


Replace 'zsh-beta' with 'zsh'

zsh-beta was a transitional package (in trusty/jessie) depending on zsh
that is non-existent in stretch onwards. Replace it with zsh but don't
add a zsh-beta removal as to not affect existing precise installs.

Change-Id: I4209290edb88be684cd6012590bcf9f426480a5d
---
M modules/base/manifests/standard_packages.pp
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/base/manifests/standard_packages.pp 
b/modules/base/manifests/standard_packages.pp
index a382139..d2bafb8 100644
--- a/modules/base/manifests/standard_packages.pp
+++ b/modules/base/manifests/standard_packages.pp
@@ -39,7 +39,7 @@
 'vim',
 'wipe',
 'xfsprogs',
-'zsh-beta',
+'zsh',
 ])
 
 package { 'tzdata': ensure => latest }
diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 6b59643..a48d83e 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -37,7 +37,7 @@
 - snmp
 - wipe
 - tzdata
-- zsh-beta
+- zsh
 - jfsutils
 - xfsprogs
 - screen
diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index c0a918a..21f076e 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -16,7 +16,7 @@
 mirror = http://mirrors.wikimedia.org/ubuntu/
 components = main,restricted,multiverse,universe
 <% if scope.function_os_version(['ubuntu >= trusty']) %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
+addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
 <% else %>
 addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint, 
tree, nagios-plugins-basic
 <% end %>

-- 
To view, visit https://gerrit.wikimedia.org/r/337153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4209290edb88be684cd6012590bcf9f426480a5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: autoinstall: also pass net.ifnames=0 to the end system

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337154 )

Change subject: autoinstall: also pass net.ifnames=0 to the end system
..


autoinstall: also pass net.ifnames=0 to the end system

Otherwise the newly-installed system gets brought up without working
network configuration.

Change-Id: I04cf599e32a5cfe89827c4840e4ea8e926ec8bdc
---
M modules/install_server/files/autoinstall/stretch.cfg
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/install_server/files/autoinstall/stretch.cfg 
b/modules/install_server/files/autoinstall/stretch.cfg
index 930fb65..8582385 100644
--- a/modules/install_server/files/autoinstall/stretch.cfg
+++ b/modules/install_server/files/autoinstall/stretch.cfg
@@ -7,5 +7,8 @@
 d-imirror/http/directory   string  /debian/
 d-imirror/http/proxy   string
 
+# use non-predictable interface naming for now
+d-idebian-installer/add-kernel-optsstring  elevator=deadline 
net.ifnames=0
+
 # only useful when using nightly d-i builds & testing
 d-imirror/udeb/suite   string  testing

-- 
To view, visit https://gerrit.wikimedia.org/r/337154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I04cf599e32a5cfe89827c4840e4ea8e926ec8bdc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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]: autoinstall: also pass net.ifnames=0 to the end system

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337154 )

Change subject: autoinstall: also pass net.ifnames=0 to the end system
..

autoinstall: also pass net.ifnames=0 to the end system

Otherwise the newly-installed system gets brought up without working
network configuration.

Change-Id: I04cf599e32a5cfe89827c4840e4ea8e926ec8bdc
---
M modules/install_server/files/autoinstall/stretch.cfg
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/337154/1

diff --git a/modules/install_server/files/autoinstall/stretch.cfg 
b/modules/install_server/files/autoinstall/stretch.cfg
index 930fb65..8582385 100644
--- a/modules/install_server/files/autoinstall/stretch.cfg
+++ b/modules/install_server/files/autoinstall/stretch.cfg
@@ -7,5 +7,8 @@
 d-imirror/http/directory   string  /debian/
 d-imirror/http/proxy   string
 
+# use non-predictable interface naming for now
+d-idebian-installer/add-kernel-optsstring  elevator=deadline 
net.ifnames=0
+
 # only useful when using nightly d-i builds & testing
 d-imirror/udeb/suite   string  testing

-- 
To view, visit https://gerrit.wikimedia.org/r/337154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04cf599e32a5cfe89827c4840e4ea8e926ec8bdc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Replace 'zsh-beta' with 'zsh'

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337153 )

Change subject: Replace 'zsh-beta' with 'zsh'
..

Replace 'zsh-beta' with 'zsh'

zsh-beta was a transitional package (in trusty/jessie) depending on zsh
that is non-existent in stretch onwards. Replace it with zsh but don't
add a zsh-beta removal as to not affect existing precise installs.

Change-Id: I4209290edb88be684cd6012590bcf9f426480a5d
---
M modules/base/manifests/standard_packages.pp
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/337153/1

diff --git a/modules/base/manifests/standard_packages.pp 
b/modules/base/manifests/standard_packages.pp
index a382139..d2bafb8 100644
--- a/modules/base/manifests/standard_packages.pp
+++ b/modules/base/manifests/standard_packages.pp
@@ -39,7 +39,7 @@
 'vim',
 'wipe',
 'xfsprogs',
-'zsh-beta',
+'zsh',
 ])
 
 package { 'tzdata': ensure => latest }
diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml 
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 6b59643..a48d83e 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -37,7 +37,7 @@
 - snmp
 - wipe
 - tzdata
-- zsh-beta
+- zsh
 - jfsutils
 - xfsprogs
 - screen
diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index c0a918a..21f076e 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -16,7 +16,7 @@
 mirror = http://mirrors.wikimedia.org/ubuntu/
 components = main,restricted,multiverse,universe
 <% if scope.function_os_version(['ubuntu >= trusty']) %>
-addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
+addpkg = coreutils, snmp, wipe, tzdata, zsh, jfsutils, xfsprogs, screen, gdb, 
iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, 
nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, 
jq, moreutils, molly-guard, dstat, tshark, tmux, ncdu, ntp, 
command-not-found-data, os-prober, python3-apport, linux-tools-generic, 
apt-listchanges, apport, command-not-found, wpasupplicant, mlocate, 
ecryptfs-utils, nagios-nrpe-server
 <% else %>
 addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client, 
virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, 
apt-show-versions, pv, nagios-plugins-standard, nagios-plugins, puppet-lint, 
tree, nagios-plugins-basic
 <% end %>

-- 
To view, visit https://gerrit.wikimedia.org/r/337153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4209290edb88be684cd6012590bcf9f426480a5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits 

[MediaWiki-commits] [Gerrit] mediawiki...NavigationTiming[master]: build: Replace jscs/jshint with eslint

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337138 )

Change subject: build: Replace jscs/jshint with eslint
..

build: Replace jscs/jshint with eslint

Change-Id: Iff79501de8d80a860eebb4a6e31dc8fca3285505
---
A .eslintrc.json
D .jscsrc
D .jshintrc
M Gruntfile.js
M modules/ext.navigationTiming.js
M package.json
6 files changed, 26 insertions(+), 53 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming 
refs/changes/38/337138/1

diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..f4afcc2
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,9 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true
+   },
+   "rules": {
+   "valid-jsdoc": 0
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index fcf4a3e..000
--- a/.jscsrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-   "preset": "wikimedia",
-
-   "excludeFiles": [
-   "{node_modules}/**"
-   ]
-}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 94545ab..000
--- a/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-   "predef": [
-   "Geo",
-   "jQuery",
-   "mediaWiki",
-   "mediaWikiLoadStart",
-   "performance",
-   "chrome"
-   ],
-
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "es3": true,
-   "freeze": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-
-   // Environment
-   "browser": true
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 5784898..8d16173 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,31 +1,24 @@
-/*jshint node:true */
+/* eslint-env node */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
 
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
-   },
-   all: [ '*.js', 'modules/**/*.js' ]
-   },
-   jscs: {
-   all: [ '*.js', 'modules/**/*.js' ]
-   },
-   banana: {
-   all: 'i18n/'
-   },
jsonlint: {
all: [
'**/*.json',
'!node_modules/**'
]
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   eslint: {
+   all: [ '*.js', 'modules/**/*.js' ]
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'eslint' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index 3baf459..b31a758 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -167,6 +167,7 @@
 
if ( timing.msFirstPaint > navStart ) {
timingData.firstPaint = timing.msFirstPaint - navStart;
+   /* global chrome */
} else if ( window.chrome && $.isFunction( chrome.loadTimes ) ) 
{
chromeLoadTimes = chrome.loadTimes();
if ( chromeLoadTimes.firstPaintTime > 
chromeLoadTimes.startLoadTime ) {
@@ -199,10 +200,12 @@
}
 
if ( window.mediaWikiLoadStart ) {
+   /* global mediaWikiLoadStart */
event.mediaWikiLoadComplete = Math.round( 
mediaWikiLoadEnd - mediaWikiLoadStart );
}
 
if ( window.Geo ) {
+   /* global Geo */
if ( typeof Geo.country === 'string' ) {
event.originCountry = Geo.country;
}
diff --git a/package.json b/package.json
index eca8152..e178319 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
 "test": "grunt test"
   },
   "devDependencies": {
-"grunt": "0.4.5",
-"grunt-banana-checker": "0.4.0",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-jscs": "2.1.0",
-"grunt-jsonlint": "1.0.7"
+"eslint-config-wikimedia": "0.3.0",
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
+"grunt-eslint": "19.0.0",
+"grunt-jsonlint": "1.1.0"
   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/337138
To unsubscribe, visit 

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Change beta feature info and talk links

[WMDE-Fisch (Code Review)]

WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337128 )

Change subject: Change beta feature info and talk links
..

Change beta feature info and talk links

Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
---
M includes/TwoColConflictHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/28/337128/1

diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 0648e8b..574a799 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -49,9 +49,9 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
-   => 
'https://meta.wikimedia.org/wiki/Talk:WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Enable QUnit job for NavigationTiming extension repo

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337079 )

Change subject: Enable QUnit job for NavigationTiming extension repo
..


Enable QUnit job for NavigationTiming extension repo

Its dependencies are already configured (specifically, EventLogging).

Bug: T157835
Change-Id: I6f46fc5d59cad701c188b29c264b7db746f9604b
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 53d11b8..6dce957 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4273,6 +4273,7 @@
   - name: mediawiki/extensions/NavigationTiming
 template:
   - name: extension-unittests-generic
+  - name: extension-qunit-generic
   - name: npm
 check:
   - jsonlint

-- 
To view, visit https://gerrit.wikimedia.org/r/337079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f46fc5d59cad701c188b29c264b7db746f9604b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
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...NavigationTiming[master]: Add basic QUnit test

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337110 )

Change subject: Add basic QUnit test
..

Add basic QUnit test

* Jenkins job enabled in I6f46fc5d59c (integration/config.git).

Bug: T157835
Change-Id: I8e65cecefe14b18945749fea77bc13862b27d23a
---
M NavigationTiming.hooks.php
M extension.json
M modules/ext.navigationTiming.js
A tests/ext.navigationTiming.test.js
4 files changed, 91 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming 
refs/changes/10/337110/1

diff --git a/NavigationTiming.hooks.php b/NavigationTiming.hooks.php
index 0819b08..e504b5c 100644
--- a/NavigationTiming.hooks.php
+++ b/NavigationTiming.hooks.php
@@ -2,16 +2,23 @@
 
 class NavigationTimingHooks {
 
-   public static function onBeforePageDisplay ( &$out, &$skin ) {
+   public static function onBeforePageDisplay( &$out, &$skin ) {
$out->addModules( 'ext.navigationTiming' );
return true;
}
 
-   public static function onResourceLoaderGetConfigVars ( &$vars ) {
+   public static function onResourceLoaderGetConfigVars( &$vars ) {
global $wgNavigationTimingSamplingFactor;
$vars[ 'wgNavigationTimingSamplingFactor' ] = 
$wgNavigationTimingSamplingFactor;
return true;
}
 
-
+   public static function onResourceLoaderTestModules( array &$modules, 
ResourceLoader &$rl ) {
+   $modules['qunit']['ext.navigationTiming.test'] = [
+   'scripts' => [ 'tests/ext.navigationTiming.test.js' ],
+   'dependencies' => [ 'ext.navigationTiming' ],
+   'localBasePath' => __DIR__ ,
+   'remoteExtPath' => 'NavigationTiming',
+   ];
+   }
 }
diff --git a/extension.json b/extension.json
index 11db92e..a7c8c6a 100644
--- a/extension.json
+++ b/extension.json
@@ -4,7 +4,8 @@
"author": [
"Asher Feldman",
"Ori Livneh",
-   "Patrick Reilly"
+   "Patrick Reilly",
+   "Timo Tijhof"
],
"url": "https://www.mediawiki.org/wiki/Extension:NavigationTiming;,
"descriptionmsg": "navigationtiming-desc",
@@ -42,6 +43,9 @@
"BeforePageDisplay": [
"NavigationTimingHooks::onBeforePageDisplay"
],
+   "ResourceLoaderTestModules": [
+   "NavigationTimingHooks::onResourceLoaderTestModules"
+   ],
"ResourceLoaderGetConfigVars": [
"NavigationTimingHooks::onResourceLoaderGetConfigVars"
]
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index 3baf459..64fe4fa 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -267,4 +267,22 @@
mw.hook( 'postEdit' ).add( emitSaveTiming );
} );
 
+   if ( typeof QUnit !== 'undefined' ) {
+   /**
+* For testing only. Subject to change any time.
+*
+* @private
+*/
+   module.exports = {
+   emitNavTiming: emitNavigationTiming,
+   reinit: function () {
+   // performance is recursively read-only and can 
only be
+   // mocked from the top down via 
window.performance. The test
+   // needs to force this module to re-resolve 
this cached
+   // reference. See ext.navigationTiming.test.js
+   navigation = performance.navigation;
+   }
+   };
+   }
+
 }( mediaWiki, jQuery ) );
diff --git a/tests/ext.navigationTiming.test.js 
b/tests/ext.navigationTiming.test.js
new file mode 100644
index 000..bebe927
--- /dev/null
+++ b/tests/ext.navigationTiming.test.js
@@ -0,0 +1,58 @@
+/* global mw */
+QUnit.module( 'ext.navigationTiming' );
+
+// Basic test will ensure no exceptions are thrown and various
+// of the core properties are set as expected.
+QUnit.test( 'Basic', function ( assert ) {
+   var stub, event, expected, key, type, val;
+
+   this.sandbox.stub( window, 'performance', {
+   timing: performance.timing,
+   navigation: {
+   // Force TYPE_NAVIGATE instead of e.g. TYPE_REDIRECT.
+   // Since we only collect metrics from regular requests,
+   // but we don't want that logic to apply to the unit 
test,
+   // as otherwise it may omit the main Navigation Timing 
keys.
+   type: 0,
+   redirectCount: 0
+   }
+   } );
+   require( 'ext.navigationTiming' 

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Add timing instrumentation

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336914 )

Change subject: Add timing instrumentation
..


Add timing instrumentation

Move some code closer to relevant usage

Tweak some output of newlines

Bug: T157737
Change-Id: I3a4d9c74a3a93fe0474e78c9c0913dd85dec4bb6
---
M maintenance/GenerateFancyCaptchas.php
1 file changed, 57 insertions(+), 14 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/GenerateFancyCaptchas.php 
b/maintenance/GenerateFancyCaptchas.php
index beade3d..4811692 100644
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -51,11 +51,14 @@
);
$this->addOption( "delete", "Delete the old captches" );
$this->mDescription = "Generate new captchas and move them into 
storage";
+
$this->requireExtension( "FancyCaptcha" );
}
 
public function execute() {
global $wgCaptchaSecret, $wgCaptchaDirectoryLevels;
+
+   $totalTime = -microtime( true );
 
$instance = ConfirmEditHooks::getInstance();
if ( !( $instance instanceof FancyCaptcha ) ) {
@@ -84,7 +87,6 @@
 
$e = null; // exception
try {
-
$captchaScript = 'captcha.py';
 
if ( $this->hasOption( 'oldcaptcha' ) ) {
@@ -104,25 +106,29 @@
}
}
 
-   $this->output( "Generating $countGen new captchas...\n" 
);
+   $this->output( "Generating $countGen new captchas.." );
$retVal = 1;
+   $captchaTime = -microtime( true );
wfShellExec( $cmd, $retVal, [], [ 'time' => 0 ] );
if ( $retVal != 0 ) {
wfRecursiveRemoveDir( $tmpDir );
$this->error( "Could not run generation 
script.\n", 1 );
}
 
-   $flags = FilesystemIterator::SKIP_DOTS;
-   $iter = new RecursiveIteratorIterator(
-   new RecursiveDirectoryIterator( $tmpDir, $flags 
),
-   RecursiveIteratorIterator::CHILD_FIRST // 
include dirs
-   );
+   $captchaTime += microtime( true );
+   $this->output( " Done.\n" );
 
-   $this->output( "Done.\n" );
+   $this->output(
+   sprintf(
+   "\nGenerated %d captchas in %.1f 
seconds\n",
+   $countGen,
+   $captchaTime
+   )
+   );
 
$originalFiles = [];
if ( $deleteOldCaptchas ) {
-   $this->output( "Getting a list of old 
captchas...\n" );
+   $this->output( "Getting a list of old 
captchas..." );
foreach (
$backend->getFileList(
[ 'dir' => 
$backend->getRootStoragePath() . '/captcha-render' ]
@@ -130,10 +136,21 @@
) {
$originalFiles[] = $file;
}
-   $this->output( "Done.\n" );
+   $this->output( " Done.\n" );
}
 
-   $this->output( "Copying the new captchas to 
storage...\n" );
+   $this->output( "Copying the new captchas to storage..." 
);
+
+   $storeTime = -microtime( true );
+   $iter = new RecursiveIteratorIterator(
+   new RecursiveDirectoryIterator(
+   $tmpDir,
+   FilesystemIterator::SKIP_DOTS
+   ),
+   RecursiveIteratorIterator::CHILD_FIRST // 
include dirs
+   );
+
+   $captchasGenerated = iterator_count( $iter );
foreach ( $iter as $fileInfo ) {
if ( !$fileInfo->isFile() ) {
continue;
@@ -149,24 +166,50 @@
$this->error( "Could not save file 
'{$fileInfo->getPathname()}'.\n" );
}
}
-   $this->output( "Done.\n" );
+   $storeTime += microtime( true );
+

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove install1001 and install2001, keep 2001 mgmt

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337093 )

Change subject: remove install1001 and install2001, keep 2001 mgmt
..

remove install1001 and install2001, keep 2001 mgmt

decom' these hosts that have been replaced by
install1002 and install2002.

install2001 was a physical server, while install1001
was a VM, that is why one has mgmt and the other does not.

Bug: T84380
Bug: T132757
Change-Id: I8e64ab61f4dd8f1a38f77f8f40c0172090cbd028
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
5 files changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/93/337093/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index e986c46..07b8601 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -22,7 +22,6 @@
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr1-codfw.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae1-2001.cr2-codfw.wikimedia.org.
 
-4.0.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install2001.wikimedia.org.
 5.0.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   bast2001.wikimedia.org.
 2.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   acamar.wikimedia.org.
 3.1.0.0.3.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   baham.wikimedia.org.
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index b21f007..9eb40f7 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -71,7 +71,6 @@
 4.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   fermium.wikimedia.org.
 6.7.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   mx1001.wikimedia.org.
 2.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   dbmonitor1001.wikimedia.org.
-3.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install1001.wikimedia.org.
 5.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   gerrit.wikimedia.org.
 6.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   install1002.wikimedia.org.
 0.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   aluminium.wikimedia.org.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index c75e969..a290dba 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -17,7 +17,6 @@
 1   1H  IN PTR  vrrp-gw-2001.wikimedia.org.
 2   1H  IN PTR  ae1-2001.cr1-codfw.wikimedia.org.
 3   1H  IN PTR  ae1-2001.cr2-codfw.wikimedia.org.
-4   1H  IN PTR  install2001.wikimedia.org.
 5   1H  IN PTR  bast2001.wikimedia.org.
 6   1H  IN PTR  vl2001-eth0.lvs2001.codfw.wmnet.
 7   1H  IN PTR  vl2001-eth0.lvs2002.codfw.wmnet.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index c27afde..0a8f423 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -68,7 +68,6 @@
 80  1H  IN PTR  aluminium.wikimedia.org. ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 81  1H  IN PTR  cobalt.wikimedia.org.
 82  1H  IN PTR  dbmonitor1001.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
-83  1H  IN PTR  install1001.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 84  1H  IN PTR  ununpentium.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 85  1H  IN PTR  gerrit.wikimedia.org.
 86  1H  IN PTR  install1002.wikimedia.org. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 24f14ae..a9c4bb8 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -132,12 +132,8 @@
 gerrit2001  1H  IN A208.80.153.106
 hydrogen1H  IN A208.80.154.50
 1H  IN  2620:0:861:1:208:80:154:50
-install1001 1H  IN A208.80.154.83
-install1001 1H  IN  2620:0:861:3:208:80:154:83
 install1002 1H  IN A208.80.154.86
 install1002 1H  IN  2620:0:861:3:208:80:154:86
-install2001 1H  IN A208.80.153.4
-install2001 1H  IN  2620:0:860:1:208:80:153:4
 install2002 1H  IN A208.80.153.53
 install2002 1H  IN  2620:0:860:2:208:80:153:53
 iron1H  IN A208.80.154.151

-- 
To view, visit https://gerrit.wikimedia.org/r/337093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e64ab61f4dd8f1a38f77f8f40c0172090cbd028
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove install1001/install2001 from site.pp

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337084 )

Change subject: remove install1001/install2001 from site.pp
..


remove install1001/install2001 from site.pp

Bug: T84380
Bug: T132757
Change-Id: I6d839a03f05ee83f2ab21579fac0790ad077a40b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 31 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 5412ff1..0e8fa66 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1277,22 +1277,7 @@
 include ::base::firewall
 }
 
-# partially replaces carbon (T132757)
-node 'install1001.wikimedia.org' {
-role(installserver::tftp,
-installserver::dhcp,
-installserver::http,
-installserver::proxy,
-installserver::preseed,
-aptrepo::wikimedia)
-
-$cluster = 'misc'
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
+# replaced carbon and install1001 (T132757)
 node 'install1002.wikimedia.org' {
 role(installserver::tftp,
 installserver::dhcp,
@@ -1312,21 +1297,7 @@
 }
 }
 
-node 'install2001.wikimedia.org' {
-role(installserver::tftp,
-installserver::dhcp,
-installserver::http,
-installserver::proxy,
-installserver::preseed,
-aptrepo::wikimedia)
-
-$cluster = 'misc'
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
+# replaced carbon and install2001 (T84380, T156440)
 node 'install2002.wikimedia.org' {
 role(installserver::tftp,
 installserver::dhcp,

-- 
To view, visit https://gerrit.wikimedia.org/r/337084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d839a03f05ee83f2ab21579fac0790ad077a40b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337088 )

Change subject: Bump versionCode
..


Bump versionCode

Change-Id: Ia2579200aa509b4a6947d976b1a66e529623b37d
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Niedzielski: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/build.gradle b/app/build.gradle
index 27d4831..bfb00f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 187
+versionCode 188
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

-- 
To view, visit https://gerrit.wikimedia.org/r/337088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2579200aa509b4a6947d976b1a66e529623b37d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
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]: aptrepo: add new RSA 4096 apt key

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337089 )

Change subject: aptrepo: add new RSA 4096 apt key
..


aptrepo: add new RSA 4096 apt key

Add a new RSA 4096 key for use by apt with a fingerprint of:
B8A2 DF05 748F 9D52 4A3A  2ADE 9D39 2D3F FADF

Use it initially just for stretch-wikimedia, as a) the machinery to use
it in already installed systems is not there yet and b) stretch actually
requires a stronger key.

Change-Id: I1dc483fdc6c7b3bc374b6005937128c52698dd41
---
M modules/aptrepo/files/distributions-wikimedia
M modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index 6274753..63f9309 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -8,7 +8,7 @@
 UDebComponents: main
 Update: jenkins cloudera hwraid elasticsearch logstash hp-mcp-precise
 Description: Wikimedia specific packages for Ubuntu Precise
-SignWith: default
+SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override
 Log:
  log
@@ -23,7 +23,7 @@
 UDebComponents: main
 Update: hwraid cloudera elasticsearch logstash hp-mcp-trusty confluent
 Description: Wikimedia specific packages for Ubuntu Trusty Tahr
-SignWith: default
+SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override
 Log:
  log
@@ -39,7 +39,7 @@
 UDebComponents: main backports thirdparty experimental
 Update: hwraid cassandra grafana tor hp-mcp-jessie confluent cloudera kibana 
elasticsearch docker
 Description: Wikimedia packages for Debian Jessie
-SignWith: default
+SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override
 Log:
  log
@@ -55,7 +55,7 @@
 UDebComponents: main backports thirdparty experimental
 Update: hwraid
 Description: Wikimedia packages for Debian stretch
-SignWith: default
+SignWith: 9D392D3FFADF18FB
 DebOverride: deb-override
 Log:
  log
diff --git 
a/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
 
b/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
index 67e233a..3c760f1 100644
--- 
a/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
+++ 
b/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/337089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1dc483fdc6c7b3bc374b6005937128c52698dd41
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
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]: aptrepo: add new RSA 4096 apt key

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337089 )

Change subject: aptrepo: add new RSA 4096 apt key
..

aptrepo: add new RSA 4096 apt key

Add a new RSA 4096 key for use by apt with a fingerprint of:
B8A2 DF05 748F 9D52 4A3A  2ADE 9D39 2D3F FADF

Use it initially just for stretch-wikimedia, as a) the machinery to use
it in already installed systems is not there yet and b) stretch actually
requires a stronger key.

Change-Id: I1dc483fdc6c7b3bc374b6005937128c52698dd41
---
M modules/aptrepo/files/distributions-wikimedia
M modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/337089/1

diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index 6274753..63f9309 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -8,7 +8,7 @@
 UDebComponents: main
 Update: jenkins cloudera hwraid elasticsearch logstash hp-mcp-precise
 Description: Wikimedia specific packages for Ubuntu Precise
-SignWith: default
+SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override
 Log:
  log
@@ -23,7 +23,7 @@
 UDebComponents: main
 Update: hwraid cloudera elasticsearch logstash hp-mcp-trusty confluent
 Description: Wikimedia specific packages for Ubuntu Trusty Tahr
-SignWith: default
+SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override
 Log:
  log
@@ -39,7 +39,7 @@
 UDebComponents: main backports thirdparty experimental
 Update: hwraid cassandra grafana tor hp-mcp-jessie confluent cloudera kibana 
elasticsearch docker
 Description: Wikimedia packages for Debian Jessie
-SignWith: default
+SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override
 Log:
  log
@@ -55,7 +55,7 @@
 UDebComponents: main backports thirdparty experimental
 Update: hwraid
 Description: Wikimedia packages for Debian stretch
-SignWith: default
+SignWith: 9D392D3FFADF18FB
 DebOverride: deb-override
 Log:
  log
diff --git 
a/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
 
b/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
index 67e233a..3c760f1 100644
--- 
a/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
+++ 
b/modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/337089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dc483fdc6c7b3bc374b6005937128c52698dd41
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337088 )

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: Ia2579200aa509b4a6947d976b1a66e529623b37d
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/88/337088/1

diff --git a/app/build.gradle b/app/build.gradle
index 27d4831..bfb00f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 16
 targetSdkVersion 25
-versionCode 187
+versionCode 188
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

-- 
To view, visit https://gerrit.wikimedia.org/r/337088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2579200aa509b4a6947d976b1a66e529623b37d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: install/DHCP/TFTP: use install1002 and install2002 as next-s...

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336959 )

Change subject: install/DHCP/TFTP: use install1002 and install2002 as 
next-servers
..


install/DHCP/TFTP: use install1002 and install2002 as next-servers

- replace install1001 with install1002
- replace install2001 with install2002
- remove carbon

Bug: T84380
Bug: T132757
Change-Id: I9f66945f045fed3ee72adbb17f32f7044a6501df
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 4 insertions(+), 31 deletions(-)

Approvals:
  Dzahn: Verified; Looks good to me, approved



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 1d97f17..b13b94d 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -321,7 +321,7 @@
 hardware ethernet a4:ba:db:30:d8:14;
 fixed-address bast3001.wikimedia.org;
 
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
 filename "pxelinux.0";
 }
@@ -330,7 +330,7 @@
 hardware ethernet 90:b1:1c:4d:42:49;
 fixed-address bast4001.wikimedia.org;
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
 filename "lpxelinux.0";
 }
@@ -340,15 +340,6 @@
 fixed-address californium.wikimedia.org;
 option pxelinux.pathprefix "trusty-installer/";
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
-host carbon {
-hardware ethernet 78:2b:cb:09:0e:a0;
-fixed-address carbon.wikimedia.org;
-option pxelinux.pathprefix "precise-installer/";
-filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
-
-next-server 208.80.153.4; # install2001 (tftp server)
 }
 
 host cerium {
@@ -2464,29 +2455,11 @@
 fixed-address hydrogen.wikimedia.org;
 }
 
-host install1001 {
-hardware ethernet aa:00:00:5d:92:b9;
-fixed-address install1001.wikimedia.org;
-
-next-server 208.80.153.4; # install2001 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
 host install1002 {
 hardware ethernet aa:00:00:3c:d7:80;
 fixed-address install1002.wikimedia.org;
 
-next-server 208.80.154.83; # install1001 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
-host install2001 {
-hardware ethernet D4:AE:52:AA:06:C3;
-fixed-address install2001.wikimedia.org;
-
-next-server 208.80.154.83; # install1001 (tftp server)
+next-server 208.80.153.53; # install2002 (tftp server)
 option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
 filename "lpxelinux.0";
 }
@@ -2495,7 +2468,7 @@
 hardware ethernet aa:00:00:6b:d7:3f;
 fixed-address install2002.wikimedia.org;
 
-next-server 208.80.153.4; # install2001 (tftp server)
+next-server 208.80.154.86; # install1002 (tftp server)
 option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
 filename "lpxelinux.0";
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/336959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f66945f045fed3ee72adbb17f32f7044a6501df
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
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]: phpunit: Add test to verify computed lists are up to date

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337078 )

Change subject: phpunit: Add test to verify computed lists are up to date
..


phpunit: Add test to verify computed lists are up to date

Change-Id: I41b09873feb552296da811a442246ea77c6f109b
---
M tests/dblistTest.php
1 file changed, 23 insertions(+), 0 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 0f0b39d..92beca0 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -85,7 +85,30 @@
"'{$dbfile}.dblist' contains names not in 
'all.dblist'"
);
}
+   }
 
+   public function testComputedListsFreshness() {
+   $lists = DBList::getLists();
+   foreach ( $lists as $listname => $dbnames ) {
+   if ( strpos( $listname, 'computed' ) !== false ) {
+   if ( strpos( $listname, 'labs' ) !== false ) {
+   continue;
+   }
+   $suffix = '-computed';
+   $expandedListName = str_replace( $suffix, '', 
$listname );
+   $this->assertEquals(
+   $suffix,
+   substr( $listname, -strlen( $suffix ) ),
+   "Computed list name '$listname' must 
end with '$suffix'"
+   );
+   $expandedList = MWWikiversions::readDbListFile( 
$expandedListName );
+   $this->assertEquals(
+   $expandedList,
+   $dbnames,
+   "Contents of '$expandedListName' must 
match expansion of '$listname'"
+   );
+   }
+   }
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/337078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I41b09873feb552296da811a442246ea77c6f109b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
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]: Include geoip on refinery hosts

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337082 )

Change subject: Include geoip on refinery hosts
..


Include geoip on refinery hosts

This will put geoip on stat1004 and analytics1027

Change-Id: I319e6d9c3580aef4934060aacd79f99b2557704f
---
M modules/role/manifests/analytics_cluster/refinery.pp
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/analytics_cluster/refinery.pp 
b/modules/role/manifests/analytics_cluster/refinery.pp
index c41012b..1e557ba 100644
--- a/modules/role/manifests/analytics_cluster/refinery.pp
+++ b/modules/role/manifests/analytics_cluster/refinery.pp
@@ -12,6 +12,9 @@
 # Clone mediawiki/event-schemas so refinery can use them.
 include ::eventschemas
 
+# Include geoip for geolocating
+include ::geoip
+
 # Some refinery python scripts use docopt for CLI parsing.
 if !defined(Package['python-docopt']) {
 package { 'python-docopt':

-- 
To view, visit https://gerrit.wikimedia.org/r/337082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I319e6d9c3580aef4934060aacd79f99b2557704f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
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...Nuke[wmf/1.29.0-wmf.11]: Update callers to conform with OOUI

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337076 )

Change subject: Update callers to conform with OOUI
..


Update callers to conform with OOUI

Bug: T156112
Bug: T156949
Bug: T156314
Change-Id: I7cbd0f0ac799a2a29ac0bfb3559944771d7380d6
---
M Nuke_body.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Nuke_body.php b/Nuke_body.php
index bba849a..6f5dbc5 100644
--- a/Nuke_body.php
+++ b/Nuke_body.php
@@ -23,7 +23,7 @@
}
 
$req = $this->getRequest();
-   $target = trim( $req->getText( 'nuke-target', $par ) );
+   $target = trim( $req->getText( 'wpnuke-target', $par ) );
 
// Normalise name
if ( $target !== '' ) {
@@ -39,8 +39,8 @@
inContentLanguage()->text();
$reason = $req->getText( 'wpReason', $msg );
 
-   $limit = $req->getInt( 'limit', 500 );
-   $namespace = $req->getVal( 'namespace' );
+   $limit = $req->getInt( 'wplimit', 500 );
+   $namespace = $req->getVal( 'wpnamespace' );
$namespace = ctype_digit( $namespace ) ? (int)$namespace : null;
 
if ( $req->wasPosted()

-- 
To view, visit https://gerrit.wikimedia.org/r/337076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cbd0f0ac799a2a29ac0bfb3559944771d7380d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Nuke
Gerrit-Branch: wmf/1.29.0-wmf.11
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
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]: remove install1001/install2001 from site.pp

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337084 )

Change subject: remove install1001/install2001 from site.pp
..

remove install1001/install2001 from site.pp

Change-Id: I6d839a03f05ee83f2ab21579fac0790ad077a40b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/337084/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ec7f693..d10065a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1277,22 +1277,7 @@
 include ::base::firewall
 }
 
-# partially replaces carbon (T132757)
-node 'install1001.wikimedia.org' {
-role(installserver::tftp,
-installserver::dhcp,
-installserver::http,
-installserver::proxy,
-installserver::preseed,
-aptrepo::wikimedia)
-
-$cluster = 'misc'
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
+# replaced carbon and install1001 (T132757)
 node 'install1002.wikimedia.org' {
 role(installserver::tftp,
 installserver::dhcp,
@@ -1312,21 +1297,7 @@
 }
 }
 
-node 'install2001.wikimedia.org' {
-role(installserver::tftp,
-installserver::dhcp,
-installserver::http,
-installserver::proxy,
-installserver::preseed,
-aptrepo::wikimedia)
-
-$cluster = 'misc'
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
+# replaced carbon and install2001 (T84380, T156440)
 node 'install2002.wikimedia.org' {
 role(installserver::tftp,
 installserver::dhcp,

-- 
To view, visit https://gerrit.wikimedia.org/r/337084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d839a03f05ee83f2ab21579fac0790ad077a40b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Include geoip on refinery hosts

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337082 )

Change subject: Include geoip on refinery hosts
..

Include geoip on refinery hosts

This will put geoip on stat1004 and analytics1027

Change-Id: I319e6d9c3580aef4934060aacd79f99b2557704f
---
M modules/role/manifests/analytics_cluster/refinery.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/337082/1

diff --git a/modules/role/manifests/analytics_cluster/refinery.pp 
b/modules/role/manifests/analytics_cluster/refinery.pp
index c41012b..1e557ba 100644
--- a/modules/role/manifests/analytics_cluster/refinery.pp
+++ b/modules/role/manifests/analytics_cluster/refinery.pp
@@ -12,6 +12,9 @@
 # Clone mediawiki/event-schemas so refinery can use them.
 include ::eventschemas
 
+# Include geoip for geolocating
+include ::geoip
+
 # Some refinery python scripts use docopt for CLI parsing.
 if !defined(Package['python-docopt']) {
 package { 'python-docopt':

-- 
To view, visit https://gerrit.wikimedia.org/r/337082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I319e6d9c3580aef4934060aacd79f99b2557704f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Include geoip on refinery hosts

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337081 )

Change subject: Include geoip on refinery hosts
..

Include geoip on refinery hosts

This will put geoip on stat1004 and analytics1027

Change-Id: I03bb8cf2d205995fa821d5829bef8f2fc1e540d4
---
M modules/cdh
M modules/mariadb
M modules/role/manifests/analytics_cluster/refinery.pp
3 files changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/337081/1

diff --git a/modules/cdh b/modules/cdh
index 9605cef..09246da 16
--- a/modules/cdh
+++ b/modules/cdh
@@ -1 +1 @@
-Subproject commit 9605cefb425ae398148e15db2cccf42db7d2166f
+Subproject commit 09246da26c17a9e75b87b3c98e63d0b45c9ccf45
diff --git a/modules/mariadb b/modules/mariadb
index 3a09aee..920a192 16
--- a/modules/mariadb
+++ b/modules/mariadb
@@ -1 +1 @@
-Subproject commit 3a09aee8dd90d8f7f7b2aacd8b0175e8ed0bdd5e
+Subproject commit 920a1922602df56edb26afb7badb6655fe7ebce6
diff --git a/modules/role/manifests/analytics_cluster/refinery.pp 
b/modules/role/manifests/analytics_cluster/refinery.pp
index c41012b..1e557ba 100644
--- a/modules/role/manifests/analytics_cluster/refinery.pp
+++ b/modules/role/manifests/analytics_cluster/refinery.pp
@@ -12,6 +12,9 @@
 # Clone mediawiki/event-schemas so refinery can use them.
 include ::eventschemas
 
+# Include geoip for geolocating
+include ::geoip
+
 # Some refinery python scripts use docopt for CLI parsing.
 if !defined(Package['python-docopt']) {
 package { 'python-docopt':

-- 
To view, visit https://gerrit.wikimedia.org/r/337081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03bb8cf2d205995fa821d5829bef8f2fc1e540d4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Enable QUnit job for NavigationTiming extension repo

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337079 )

Change subject: Enable QUnit job for NavigationTiming extension repo
..

Enable QUnit job for NavigationTiming extension repo

Its dependencies are already configured (specifically, EventLogging).

Bug: T157835
Change-Id: I6f46fc5d59cad701c188b29c264b7db746f9604b
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/79/337079/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 53d11b8..6dce957 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4273,6 +4273,7 @@
   - name: mediawiki/extensions/NavigationTiming
 template:
   - name: extension-unittests-generic
+  - name: extension-qunit-generic
   - name: npm
 check:
   - jsonlint

-- 
To view, visit https://gerrit.wikimedia.org/r/337079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f46fc5d59cad701c188b29c264b7db746f9604b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] operations...conftool[master]: tests: Use sample data that doesn't match production names

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327686 )

Change subject: tests: Use sample data that doesn't match production names
..


tests: Use sample data that doesn't match production names

Avoid matches in these files when searching for wmf-production names in Git.

Change-Id: Idee279516003af115e8b7bb47387cfc4eb267f09
---
M conftool/tests/fixtures/nodes/eqiad.yaml
M conftool/tests/fixtures/services/data.yaml
M conftool/tests/integration/test_tool.py
M conftool/tests/unit/test_cli_tool.py
4 files changed, 78 insertions(+), 80 deletions(-)

Approvals:
  jenkins-bot: Verified
  Volans: Looks good to me, approved



diff --git a/conftool/tests/fixtures/nodes/eqiad.yaml 
b/conftool/tests/fixtures/nodes/eqiad.yaml
index 156a117..9ef371d 100644
--- a/conftool/tests/fixtures/nodes/eqiad.yaml
+++ b/conftool/tests/fixtures/nodes/eqiad.yaml
@@ -1,70 +1,70 @@
 cache_text:
-  cp1008:
+  cp0008:
 - varnish-fe
 - varnish-be
 - https
-  cp1052:
+  cp0052:
 - varnish-fe
 - varnish-be
 - https
-  cp1053:
+  cp0053:
 - varnish-fe
 - varnish-be
 - https
-  cp1054:
+  cp0054:
 - varnish-fe
 - varnish-be
 - https
-  cp1055:
+  cp0055:
 - varnish-fe
 - varnish-be
 - https
-  cp1065:
+  cp0065:
 - varnish-fe
 - varnish-be
 - https
-  cp1066:
+  cp0066:
 - varnish-fe
 - varnish-be
 - https
-  cp1067:
+  cp0067:
 - varnish-fe
 - varnish-be
 - https
-  cp1068:
+  cp0068:
 - varnish-fe
 - varnish-be
 - https
 appservers:
-  mw1018: [ apache ]
-  mw1019: [ apache ]
-  mw1020: [ apache ]
-  mw1021: [ apache ]
-  mw1022: [ apache ]
-  mw1023: [ apache ]
-  mw1024: [ apache ]
-  mw1025: [ apache ]
-  mw1026: [ apache ]
-  mw1027: [ apache ]
-  mw1028: [ apache ]
-  mw1029: [ apache ]
-  mw1030: [ apache ]
-  mw1031: [ apache ]
-  mw1032: [ apache ]
-  mw1033: [ apache ]
-  mw1034: [ apache ]
-  mw1035: [ apache ]
-  mw1036: [ apache ]
-  mw1037: [ apache ]
-  mw1038: [ apache ]
-  mw1039: [ apache ]
-  mw1040: [ apache ]
-  mw1041: [ apache ]
-  mw1042: [ apache ]
-  mw1043: [ apache ]
-  mw1044: [ apache ]
-  mw1045: [ apache ]
-  mw1046: [ apache ]
-  mw1047: [ apache ]
-  mw1048: [ apache ]
-  mw1049: [ apache ]
+  srv0018: [ apache ]
+  srv0019: [ apache ]
+  srv0020: [ apache ]
+  srv0021: [ apache ]
+  srv0022: [ apache ]
+  srv0023: [ apache ]
+  srv0024: [ apache ]
+  srv0025: [ apache ]
+  srv0026: [ apache ]
+  srv0027: [ apache ]
+  srv0028: [ apache ]
+  srv0029: [ apache ]
+  srv0030: [ apache ]
+  srv0031: [ apache ]
+  srv0032: [ apache ]
+  srv0033: [ apache ]
+  srv0034: [ apache ]
+  srv0035: [ apache ]
+  srv0036: [ apache ]
+  srv0037: [ apache ]
+  srv0038: [ apache ]
+  srv0039: [ apache ]
+  srv0040: [ apache ]
+  srv0041: [ apache ]
+  srv0042: [ apache ]
+  srv0043: [ apache ]
+  srv0044: [ apache ]
+  srv0045: [ apache ]
+  srv0046: [ apache ]
+  srv0047: [ apache ]
+  srv0048: [ apache ]
+  srv0049: [ apache ]
diff --git a/conftool/tests/fixtures/services/data.yaml 
b/conftool/tests/fixtures/services/data.yaml
index 2f5ec83..3edc874 100644
--- a/conftool/tests/fixtures/services/data.yaml
+++ b/conftool/tests/fixtures/services/data.yaml
@@ -5,30 +5,30 @@
   "pooled": "no"
   "weight": 0
 datacenters:
-  - codfw
-  - eqiad
-  - esams
-  - ulsfo
+  - foo
+  - bar
+  - baz
+  - quux
   varnish-be:
 port: 3128
 default_values:
   "pooled": "no"
   "weight": 0
 datacenters:
-  - codfw
-  - eqiad
-  - esams
-  - ulsfo
+  - foo
+  - bar
+  - baz
+  - quux
   https:
 port: 443
 default_values:
   "pooled": "no"
   "weight": 0
 datacenters:
-  - codfw
-  - eqiad
-  - esams
-  - ulsfo
+  - foo
+  - bar
+  - baz
+  - quux
 appservers:
   apache:
 port: 80
@@ -36,7 +36,5 @@
   "pooled": "yes"
   "weight": 0
 datacenters:
-  - codfw
-  - eqiad
-  
-
+  - foo
+  - bar
diff --git a/conftool/tests/integration/test_tool.py 
b/conftool/tests/integration/test_tool.py
index 08dd81b..d1d2c0e 100644
--- a/conftool/tests/integration/test_tool.py
+++ b/conftool/tests/integration/test_tool.py
@@ -54,23 +54,23 @@
 return args
 
 def test_get_node(self):
-args = self.generate_args('get cp1008')
+args = self.generate_args('get cp0008')
 output = self.output_for(args)[0]
 k = output.keys()
 k.sort()
-self.assertEquals(k, ['cp1008', 'tags'])
-self.assertEquals(output['cp1008']['pooled'], 'no')
+self.assertEquals(k, ['cp0008', 'tags'])
+self.assertEquals(output['cp0008']['pooled'], 'no')
 # Check the irc message was not sent for a get operation
 self.assertEquals(self.irc.emit.called, False)
 
 def test_find_node(self):
-args = 

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Update internals after removing claims

[Code Review]

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337059 )

Change subject: Update internals after removing claims
..

Update internals after removing claims

Change-Id: I819493b11fffb235a396005a747124aaad23b97f
---
M pywikibot/page.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/59/337059/2

diff --git a/pywikibot/page.py b/pywikibot/page.py
index b77ba4a..5d28c45 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4168,7 +4168,11 @@
 # list of length one.
 if isinstance(claims, pywikibot.Claim):
 claims = [claims]
-self.repo.removeClaims(claims, **kwargs)
+data = self.repo.removeClaims(claims, **kwargs)
+for claim in claims:
+claim.on_item = None
+claim.snak = None
+claim.on_item.latest_revision_id = data['pageinfo']['lastrevid']
 
 def mergeInto(self, item, **kwargs):
 """

-- 
To view, visit https://gerrit.wikimedia.org/r/337059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I819493b11fffb235a396005a747124aaad23b97f
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: refresh login token before saving description edit

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337054 )

Change subject: Fix: refresh login token before saving description edit
..


Fix: refresh login token before saving description edit

Follow the same flow as section editing

Bug: T157810
Change-Id: I035695e52ac315feba0ea6ca3d64a58f2acb1813
---
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
1 file changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java 
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
index 0793520..772d883 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -164,7 +164,18 @@
 editView.setSaveState(true);
 
 cancelCalls();
-requestEditToken();
+
+if (User.isLoggedIn()) {
+refreshLoginTokens(User.getUser(), new RetryCallback() {
+@Override
+public void retry() { // success callback
+requestEditToken();
+}
+});
+} else {
+requestEditToken();
+}
+
 if (funnel != null) {
 funnel.logSaveAttempt();
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/337054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I035695e52ac315feba0ea6ca3d64a58f2acb1813
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
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]: install_server: reinstall graphite1001 with jessie

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337077 )

Change subject: install_server: reinstall graphite1001 with jessie
..


install_server: reinstall graphite1001 with jessie

Bug: T157022
Change-Id: Id920560b339b8b7e109230632a14f4b08628c3ac
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 8a14153..1d97f17 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2420,8 +2420,6 @@
 host graphite1001 {
 hardware ethernet B0:83:FE:DF:2B:64;
 fixed-address graphite1001.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host graphite1002 {

-- 
To view, visit https://gerrit.wikimedia.org/r/337077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id920560b339b8b7e109230632a14f4b08628c3ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
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]: phpunit: Add test to verify computed lists are up to date

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337078 )

Change subject: phpunit: Add test to verify computed lists are up to date
..

phpunit: Add test to verify computed lists are up to date

Change-Id: I41b09873feb552296da811a442246ea77c6f109b
---
M tests/dblistTest.php
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/78/337078/1

diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 0f0b39d..92beca0 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -85,7 +85,30 @@
"'{$dbfile}.dblist' contains names not in 
'all.dblist'"
);
}
+   }
 
+   public function testComputedListsFreshness() {
+   $lists = DBList::getLists();
+   foreach ( $lists as $listname => $dbnames ) {
+   if ( strpos( $listname, 'computed' ) !== false ) {
+   if ( strpos( $listname, 'labs' ) !== false ) {
+   continue;
+   }
+   $suffix = '-computed';
+   $expandedListName = str_replace( $suffix, '', 
$listname );
+   $this->assertEquals(
+   $suffix,
+   substr( $listname, -strlen( $suffix ) ),
+   "Computed list name '$listname' must 
end with '$suffix'"
+   );
+   $expandedList = MWWikiversions::readDbListFile( 
$expandedListName );
+   $this->assertEquals(
+   $expandedList,
+   $dbnames,
+   "Contents of '$expandedListName' must 
match expansion of '$listname'"
+   );
+   }
+   }
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/337078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41b09873feb552296da811a442246ea77c6f109b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] operations/puppet[production]: install_server: reinstall graphite1001 with jessie

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337077 )

Change subject: install_server: reinstall graphite1001 with jessie
..

install_server: reinstall graphite1001 with jessie

Bug: T157022
Change-Id: Id920560b339b8b7e109230632a14f4b08628c3ac
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/337077/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 8a14153..1d97f17 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2420,8 +2420,6 @@
 host graphite1001 {
 hardware ethernet B0:83:FE:DF:2B:64;
 fixed-address graphite1001.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
 host graphite1002 {

-- 
To view, visit https://gerrit.wikimedia.org/r/337077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id920560b339b8b7e109230632a14f4b08628c3ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move mssql class to /libs

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336932 )

Change subject: Move mssql class to /libs
..


Move mssql class to /libs

* Inject global variables in MWLBFactory.php
* Remove incompatible ignoreErrors() override which is only called
  from the base classes.
* Remove use of wf* methods.

Change-Id: Idf8202474182cc82fb6ef453e2722e7af17e32aa
---
M autoload.php
M includes/db/MWLBFactory.php
R includes/libs/rdbms/database/DatabaseMssql.php
3 files changed, 49 insertions(+), 67 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/autoload.php b/autoload.php
index 1cb8a14..c64e49d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -327,7 +327,7 @@
'DatabaseInstaller' => __DIR__ . 
'/includes/installer/DatabaseInstaller.php',
'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
'DatabaseLogEntry' => __DIR__ . '/includes/logging/LogEntry.php',
-   'DatabaseMssql' => __DIR__ . '/includes/db/DatabaseMssql.php',
+   'DatabaseMssql' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMssql.php',
'DatabaseMysql' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysql.php',
'DatabaseMysqlBase' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqlBase.php',
'DatabaseMysqli' => __DIR__ . 
'/includes/libs/rdbms/database/DatabaseMysqli.php',
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 09d8fab..0186222 100644
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -72,7 +72,13 @@
// Work around the 
reserved word usage in MediaWiki schema
'keywordTableMap' => [ 
'user' => 'mwuser', 'text' => 'pagecontent' ]
];
+   } elseif ( $server['type'] === 'mssql' 
) {
+   $server += [
+   'port' => 
$mainConfig->get( 'DBport' ),
+   'useWindowsAuth' => 
$mainConfig->get( 'DBWindowsAuthentication' )
+   ];
}
+
if ( in_array( $server['type'], 
$typesWithSchema, true ) ) {
$server += [ 'schema' => 
$mainConfig->get( 'DBmwschema' ) ];
}
@@ -112,6 +118,9 @@
$server['port'] = $mainConfig->get( 
'DBport' );
// Work around the reserved word usage 
in MediaWiki schema
$server['keywordTableMap'] = [ 'user' 
=> 'mwuser', 'text' => 'pagecontent' ];
+   } elseif ( $server['type'] === 'mssql' ) {
+   $server['port'] = $mainConfig->get( 
'DBport' );
+   $server['useWindowsAuth'] = 
$mainConfig->get( 'DBWindowsAuthentication' );
}
$lbConf['servers'] = [ $server ];
}
diff --git a/includes/db/DatabaseMssql.php 
b/includes/libs/rdbms/database/DatabaseMssql.php
similarity index 93%
rename from includes/db/DatabaseMssql.php
rename to includes/libs/rdbms/database/DatabaseMssql.php
index d567d8b..b91c7b7 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/libs/rdbms/database/DatabaseMssql.php
@@ -29,6 +29,9 @@
  * @ingroup Database
  */
 class DatabaseMssql extends Database {
+   protected $mPort;
+   protected $mUseWindowsAuth = false;
+
protected $mInsertId = null;
protected $mLastResult = null;
protected $mAffectedRows = null;
@@ -40,8 +43,6 @@
protected $mIgnoreDupKeyErrors = false;
protected $mIgnoreErrors = [];
 
-   protected $mPort;
-
public function implicitGroupby() {
return false;
}
@@ -52,6 +53,13 @@
 
public function unionSupportsOrderAndLimit() {
return false;
+   }
+
+   public function __construct( array $params ) {
+   $this->mPort = $params['port'];
+   $this->mUseWindowsAuth = $params['UseWindowsAuth'];
+
+   parent::__construct( $params );
}
 
/**
@@ -73,8 +81,6 @@
);
}
 
-   global $wgDBport, $wgDBWindowsAuthentication;
-
# e.g. the class is being loaded
if ( !strlen( $user ) ) {
return null;
@@ -82,7 +88,6 @@
 
$this->close();
$this->mServer = $server;
-   $this->mPort = $wgDBport;
  

[MediaWiki-commits] [Gerrit] mediawiki...Nuke[wmf/1.29.0-wmf.11]: Update callers to conform with OOUI

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337076 )

Change subject: Update callers to conform with OOUI
..

Update callers to conform with OOUI

Bug: T156112
Bug: T156949
Bug: T156314
Change-Id: I7cbd0f0ac799a2a29ac0bfb3559944771d7380d6
---
M Nuke_body.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Nuke 
refs/changes/76/337076/1

diff --git a/Nuke_body.php b/Nuke_body.php
index bba849a..6f5dbc5 100644
--- a/Nuke_body.php
+++ b/Nuke_body.php
@@ -23,7 +23,7 @@
}
 
$req = $this->getRequest();
-   $target = trim( $req->getText( 'nuke-target', $par ) );
+   $target = trim( $req->getText( 'wpnuke-target', $par ) );
 
// Normalise name
if ( $target !== '' ) {
@@ -39,8 +39,8 @@
inContentLanguage()->text();
$reason = $req->getText( 'wpReason', $msg );
 
-   $limit = $req->getInt( 'limit', 500 );
-   $namespace = $req->getVal( 'namespace' );
+   $limit = $req->getInt( 'wplimit', 500 );
+   $namespace = $req->getVal( 'wpnamespace' );
$namespace = ctype_digit( $namespace ) ? (int)$namespace : null;
 
if ( $req->wasPosted()

-- 
To view, visit https://gerrit.wikimedia.org/r/337076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cbd0f0ac799a2a29ac0bfb3559944771d7380d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Nuke
Gerrit-Branch: wmf/1.29.0-wmf.11
Gerrit-Owner: Ladsgroup 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: autoinstall: add virtual.cfg to d-i-test

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337074 )

Change subject: autoinstall: add virtual.cfg to d-i-test
..


autoinstall: add virtual.cfg to d-i-test

Clearly a VM, with /dev/vda for its root device.

Change-Id: Ib7829b2985a2de2e4d8b1c77921ef2d9afe3d127
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index a2f7527..83278fe 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -65,7 +65,7 @@
 cp1008|cp104[34]|cp300[3-9]|cp301[0-8]) echo 
partman/varnish-oldssd.cfg ;; \
 cp[1234][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
-d-i-test) echo partman/flat.cfg ;; \
+d-i-test) echo partman/flat.cfg virtual.cfg ;; \
 druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
 eeden|maerlant|multatuli|nescio) echo partman/raid1-1partition.cfg ;; \
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \

-- 
To view, visit https://gerrit.wikimedia.org/r/337074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7829b2985a2de2e4d8b1c77921ef2d9afe3d127
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: autoinstall: pass net.ifnames=0 to stretch d-i

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337075 )

Change subject: autoinstall: pass net.ifnames=0 to stretch d-i
..


autoinstall: pass net.ifnames=0 to stretch d-i

Turn off predictable network interface names, that are the default for
new installs as of Debian stretch.

They are not as predictable as they claim to be (e.g. our d-i scripts
check for the "eth0", while the equivalent new name would not be
predictable).

They are not necessarily a bad idea, but they diverge significantly from
our current setup and assumptions all over our tree (d-i and puppet, not
to mention muscle memory). We can think about enabling them at a another
point in time, separate from the stretch upgrades.

Change-Id: I973eb1cde95286595fe1fd1b515ec479ce2551d5
---
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS1-115200
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS1-57600
5 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
index a388c39..3ab4af4 100644
--- 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
+++ 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
@@ -9,4 +9,4 @@
 
 LABEL server
kernel debian-installer/amd64/linux
-   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 console=ttyS0,115200n8
+   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 net.ifnames=0 console=ttyS0,115200n8
diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
index 2d99dbd..f3928ae 100644
--- 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
+++ 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
@@ -9,4 +9,4 @@
 
 LABEL server
kernel debian-installer/amd64/linux
-   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 console=ttyS0,57600n8
+   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 net.ifnames=0 console=ttyS0,57600n8
diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
index 94dc0bb..2e348d4 100644
--- 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
+++ 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
@@ -9,4 +9,4 @@
 
 LABEL server
kernel debian-installer/amd64/linux
-   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 console=ttyS0,9600n8
+   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 net.ifnames=0 console=ttyS0,9600n8
diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS1-115200
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: autoinstall: add virtual.cfg to d-i-test

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337074 )

Change subject: autoinstall: add virtual.cfg to d-i-test
..

autoinstall: add virtual.cfg to d-i-test

Clearly a VM, with /dev/vda for its root device.

Change-Id: Ib7829b2985a2de2e4d8b1c77921ef2d9afe3d127
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/337074/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index a2f7527..83278fe 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -65,7 +65,7 @@
 cp1008|cp104[34]|cp300[3-9]|cp301[0-8]) echo 
partman/varnish-oldssd.cfg ;; \
 cp[1234][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db.cfg ;; \
-d-i-test) echo partman/flat.cfg ;; \
+d-i-test) echo partman/flat.cfg virtual.cfg ;; \
 druid100[123]) echo partman/druid-4ssd-raid10.cfg ;; \
 eeden|maerlant|multatuli|nescio) echo partman/raid1-1partition.cfg ;; \
 elastic101[7-9]|elastic102[0-9]|elastic103[0-1]) echo 
partman/elasticsearch-raid0.cfg ;; \

-- 
To view, visit https://gerrit.wikimedia.org/r/337074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7829b2985a2de2e4d8b1c77921ef2d9afe3d127
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: autoinstall: pass net.ifnames=0 to stretch d-i

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337075 )

Change subject: autoinstall: pass net.ifnames=0 to stretch d-i
..

autoinstall: pass net.ifnames=0 to stretch d-i

Turn off predictable network interface names, that are the default for
new installs as of Debian stretch.

They are not as predictable as they claim to be (e.g. our d-i scripts
check for the "eth0", while the equivalent new name would not be
predictable).

They are not necessarily a bad idea, but they diverge significantly from
our current setup and assumptions all over our tree (d-i and puppet, not
to mention muscle memory). We can think about enabling them at a another
point in time, separate from the stretch upgrades.

Change-Id: I973eb1cde95286595fe1fd1b515ec479ce2551d5
---
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS1-115200
M 
modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS1-57600
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/337075/1

diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
index a388c39..3ab4af4 100644
--- 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
+++ 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-115200
@@ -9,4 +9,4 @@
 
 LABEL server
kernel debian-installer/amd64/linux
-   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 console=ttyS0,115200n8
+   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 net.ifnames=0 console=ttyS0,115200n8
diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
index 2d99dbd..f3928ae 100644
--- 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
+++ 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-57600
@@ -9,4 +9,4 @@
 
 LABEL server
kernel debian-installer/amd64/linux
-   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 console=ttyS0,57600n8
+   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 net.ifnames=0 console=ttyS0,57600n8
diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
index 94dc0bb..2e348d4 100644
--- 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
+++ 
b/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS0-9600
@@ -9,4 +9,4 @@
 
 LABEL server
kernel debian-installer/amd64/linux
-   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 console=ttyS0,9600n8
+   append initrd=debian-installer/amd64/initrd.gz vga=normal 
auto-install/enable=true 
preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 
netcfg/choose_interface=auto netcfg/get_hostname=unassigned 
netcfg/get_domain=unassigned netcfg/dhcp_timeout=60 --- 
ixgbe.allow_unsupported_sfp=1 net.ifnames=0 console=ttyS0,9600n8
diff --git 
a/modules/install_server/files/tftpboot/stretch-installer/pxelinux.cfg/ttyS1-115200
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Type check the APC value in LoadBalancer::doWait()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337073 )

Change subject: Type check the APC value in LoadBalancer::doWait()
..


Type check the APC value in LoadBalancer::doWait()

Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Brion VIBBER: Verified
  jenkins-bot: Verified



diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 532a8ed..900a79c 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -491,7 +491,10 @@
$key = $this->srvCache->makeGlobalKey( __CLASS__, 
'last-known-pos', $server );
/** @var DBMasterPos $knownReachedPos */
$knownReachedPos = $this->srvCache->get( $key );
-   if ( $knownReachedPos && $knownReachedPos->hasReached( 
$this->mWaitForPos ) ) {
+   if (
+   $knownReachedPos instanceof DBMasterPos &&
+   $knownReachedPos->hasReached( $this->mWaitForPos )
+   ) {
$this->replLogger->debug( __METHOD__ .
": replica DB $server known to be caught up 
(pos >= $knownReachedPos)." );
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/337073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Thcipriani 
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]: ClippableElement: Order matters (inexplicably)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337070 )

Change subject: ClippableElement: Order matters (inexplicably)
..


ClippableElement: Order matters (inexplicably)

In Chrome, if `overflow-y` is not set before `height`, unnecessary
scrollbars are displayed.

This is incredibly silly, but feels like a less heavy-handed solution
than calling `reconsiderScrollbars()` (our generic workaround for
scrollbars being messed up). And unlike in the case where we stop
clipping, here "just" doing it in this order and forcing a reflow is
sufficient.

Bug: T157672
Change-Id: Id1e0ceb89557db597274d5464289118137bf267b
---
M src/mixins/ClippableElement.js
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  VolkerE: Looks good to me, approved



diff --git a/src/mixins/ClippableElement.js b/src/mixins/ClippableElement.js
index 37b7c04..2a716fe 100644
--- a/src/mixins/ClippableElement.js
+++ b/src/mixins/ClippableElement.js
@@ -241,8 +241,11 @@
clipHeight = allotedHeight < naturalHeight;
 
if ( clipWidth ) {
+   // The order matters here. If overflow is not set first, Chrome 
displays bogus scrollbars. (T157672)
+   // Forcing a reflow is a smaller workaround than calling 
reconsiderScrollbars() for this case.
+   this.$clippable.css( 'overflowX', 'scroll' );
+   void this.$clippable[ 0 ].offsetHeight; // Force reflow
this.$clippable.css( {
-   overflowX: 'scroll',
width: Math.max( 0, allotedWidth ),
maxWidth: ''
} );
@@ -254,8 +257,11 @@
} );
}
if ( clipHeight ) {
+   // The order matters here. If overflow is not set first, Chrome 
displays bogus scrollbars. (T157672)
+   // Forcing a reflow is a smaller workaround than calling 
reconsiderScrollbars() for this case.
+   this.$clippable.css( 'overflowY', 'scroll' );
+   void this.$clippable[ 0 ].offsetHeight; // Force reflow
this.$clippable.css( {
-   overflowY: 'scroll',
height: Math.max( 0, allotedHeight ),
maxHeight: ''
} );

-- 
To view, visit https://gerrit.wikimedia.org/r/337070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1e0ceb89557db597274d5464289118137bf267b
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: VolkerE 
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]: Type check the APC value in LoadBalancer::doWait()

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337073 )

Change subject: Type check the APC value in LoadBalancer::doWait()
..

Type check the APC value in LoadBalancer::doWait()

Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/337073/1

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 532a8ed..900a79c 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -491,7 +491,10 @@
$key = $this->srvCache->makeGlobalKey( __CLASS__, 
'last-known-pos', $server );
/** @var DBMasterPos $knownReachedPos */
$knownReachedPos = $this->srvCache->get( $key );
-   if ( $knownReachedPos && $knownReachedPos->hasReached( 
$this->mWaitForPos ) ) {
+   if (
+   $knownReachedPos instanceof DBMasterPos &&
+   $knownReachedPos->hasReached( $this->mWaitForPos )
+   ) {
$this->replLogger->debug( __METHOD__ .
": replica DB $server known to be caught up 
(pos >= $knownReachedPos)." );
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/337073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demo: Use longer text in popup in $overlay demo

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337069 )

Change subject: demo: Use longer text in popup in $overlay demo
..


demo: Use longer text in popup in $overlay demo

It's a lot easier to test the clipping behavior when the text is
actually longer than a single line.

Change-Id: I0da510eceb53e96c9dd18cfa59750f38a56ea6a9
---
M demos/pages/dialogs.js
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  VolkerE: Looks good to me, approved



diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index f48d456..0bf3c59 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -660,7 +660,7 @@
label: 'Popup button',
popup: {
padded: true,
-   $content: $( '' ).text( 
'Popup contents.' )
+   $content: this.makeContents()
}
} ), $spacer.clone() ]
} ),
@@ -671,7 +671,7 @@
label: 'Popup button',
popup: {
padded: true,
-   $content: $( '' ).text( 
'Popup contents.' )
+   $content: this.makeContents()
}
} ), $spacer.clone() ]
} ),
@@ -719,6 +719,11 @@
} );
} );
};
+   DialogWithDropdowns.prototype.makeContents = function () {
+   var loremIpsum = 'Lorem ipsum dolor sit amet, consectetur 
adipisicing elit, ' +
+   'sed do eiusmod tempor incididunt ut labore et dolore 
magna aliqua.\u200E';
+   return $( '' ).text( loremIpsum );
+   };
 
DialogWithDropdowns.prototype.getActionProcess = function ( action ) {
if ( action ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/337069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0da510eceb53e96c9dd18cfa59750f38a56ea6a9
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: Register a bunch of alias files

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337072 )

Change subject: Register a bunch of alias files
..


Register a bunch of alias files

Change-Id: Ic8f58365916ef27c0cbdec443a95a0f47c190864
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 28dbe24..032eded 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -662,6 +662,7 @@
 ignored = commenttab-editintro, commenttab-preload
 
 Commentbox
+aliasfile = Commentbox/Commentbox.alias.php
 ignored = commentbox-prefill
 
 Comments
@@ -969,6 +970,7 @@
 Error Handler
 
 Ether Editor
+aliasfile = EtherEditor/EtherEditor.alias.php
 
 Etherpad Lite
 
@@ -1223,6 +1225,7 @@
 Google Analytics Metrics
 
 Google Analytics Top Pages
+aliasfile = GoogleAnalyticsTopPages/GoogleAnalyticsTopPages.alias.php
 
 # Google API Client # T119905
 
@@ -1775,6 +1778,7 @@
 optional = ores-beta-feature-message
 
 Page Assessments
+aliasfile = PageAssessments/PageAssessments.i18n.alias.php
 
 Page Creation Notif
 descmsg = page-creation-notif-desc
@@ -1973,6 +1977,7 @@
 Pipe Escape
 
 Pluggable Auth
+aliasfile = PluggableAuth/PluggableAuth.alias.php
 
 Poem
 

-- 
To view, visit https://gerrit.wikimedia.org/r/337072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8f58365916ef27c0cbdec443a95a0f47c190864
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits