[MediaWiki-commits] [Gerrit] Fix config paths so that hhvm is not broken by default - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163101
Change subject: Fix config paths so that hhvm is not broken by default
..
Fix config paths so that hhvm is not broken by default
Change-Id: I0fb0e4f47f84d60e275bc043e773056f2288530d
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M debian/changelog
A debian/patches/fix-config-path.patch
M debian/patches/series
3 files changed, 35 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm
refs/changes/01/163101/1
diff --git a/debian/changelog b/debian/changelog
index 97d996a..83e7e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-hhvm (3.3.0-20140925+wmf1) UNRELEASED; urgency=medium
+hhvm (3.3.0-20140925+wmf2) trusty-wikimedia; urgency=medium
+
+ * Fix config files path.
+
+ -- Giuseppe Lavagetto glavage...@wikimedia.org Fri, 26 Sep 2014 08:00:57
+0200
+
+hhvm (3.3.0-20140925+wmf1) trusty-wikimedia; urgency=medium
* New upstream version
* Added a few patches to fix bugs in production
diff --git a/debian/patches/fix-config-path.patch
b/debian/patches/fix-config-path.patch
new file mode 100644
index 000..6130767
--- /dev/null
+++ b/debian/patches/fix-config-path.patch
@@ -0,0 +1,27 @@
+Description: do not prefix the configuration path with the INSTALL_PREFIX.
+ For some strange reason, INSTALL_PREFIX (in our case, /usr) was prepended to
+ the config file path, thus breaking any standard and using the ugly
/usr/etc/hhvm
+ dir.
+
+Author: Giuseppe Lavagetto glavage...@wikimedia.org
+Last-Updated: 2014-09-26
+
+diff --git a/hphp/runtime/base/emulate-zend.cpp
b/hphp/runtime/base/emulate-zend.cpp
+index 52636af..f2af4f1 100644
+--- a/hphp/runtime/base/emulate-zend.cpp
b/hphp/runtime/base/emulate-zend.cpp
+@@ -229,12 +229,12 @@ int emulate_zend(int argc, char** argv) {
+
+ // If the -c option is specified without a -n, php behavior is to
+ // load the default ini/hdf
+-auto default_config_file = INSTALL_PREFIX /etc/hhvm/php.ini;
++auto default_config_file = /etc/hhvm/php.ini;
+ if (access(default_config_file, R_OK) != -1) {
+ newargv.push_back(-c);
+ newargv.push_back(default_config_file);
+ }
+-default_config_file = INSTALL_PREFIX /etc/hhvm/config.hdf;
++default_config_file = /etc/hhvm/config.hdf;
+ if (access(default_config_file, R_OK) != -1) {
+ newargv.push_back(-c);
+ newargv.push_back(default_config_file);
diff --git a/debian/patches/series b/debian/patches/series
index 60d788c..1592731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
remove_libpam.patch
typos.patch
+fix-config-path.patch
# Wikimedia-specific (waiting for upstream merge)
Make-RUSAGE_THREAD-available-to-getrusage.patch
--
To view, visit https://gerrit.wikimedia.org/r/163101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fb0e4f47f84d60e275bc043e773056f2288530d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix TeX escaping of []. - change (mediawiki...latex_renderer)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix TeX escaping of [].
..
Fix TeX escaping of [].
`\\ [...] blah` was crashing LaTeX in [[The Minister and the Massacres]]
because the [ was being parsed as the optional argument to the `\\` command.
While we're at it, properly quote and fix a missing g flag on the
smart single quote rule.
Change-Id: Ifb1ee7f16285ccca6963a66068f2a7df72922520
---
M lib/index.js
1 file changed, 16 insertions(+), 8 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/index.js b/lib/index.js
index 2625543..99044b2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -153,14 +153,19 @@
}).join('');
}
// protect TeX special characters
- str = str.replace(/[#$_%{}~^\\]/g, function(c) {
- // twiddle, carat, and backslash are special
+ // (See `class CharMaps` in
http://sourceforge.net/p/docutils/code/HEAD/tree/trunk/docutils/docutils/writers/latex2e/__init__.py
)
+ str = str.replace(/[#$_%{}~^\\\[\]]/g, function(c) {
+ // twiddle, carat, backslash, and square bracket are special
switch (c) {
- case '~': return '\\textasciitilde{}';
- case '^': return '\\textasciicircum{}';
- case '\\': return '\\textbackslash{}';
- default: return '\\' + c;
- }
+ case '~': return '\\textasciitilde{}';
+ case '^': return '\\textasciicircum{}';
+ case '\\': return '\\textbackslash{}';
+ // square brackets are ordinary chars and cannot be escaped with
+ // '\' so we put them in curly braces to protect them.
+ case '[': return '{[}';
+ case ']': return '{]}';
+ default: return '\\' + c;
+ }
});
// compress multiple newlines (and use unix-style newlines exclusively)
str = str.replace(/\r\n?/g, '\n').replace(/\n\n+/g, '\n');
@@ -171,13 +176,16 @@
// smart quotes
// XXX smart quotes should probably be disabled in some locales
// because having curly quotes in zh or fr is not exactly
appropriate
+ // Also: in many languages is an accent character, eg e for ë
str = str.replace(/(^|\s|\()[](\w)/g, function(match, before, after) {
return before + '\u201C' + after;
}).replace(/(\w|[.,])[](\s|[.,\u2014\)]|$)/g, function(match, before,
after) {
return before + \u201D + after;
- }).replace(/(s')|(\w's)/, function(match) {
+ }).replace(/(s')|(\w's)/g, function(match) {
return match.replace(/'/, '\u2019');
});
+ // In some languages is an accent character, eg e for ë
+ str = str.replace(//g, '\textquotedbl{}');
// differentiate minus sign from hyphen
//str = str.replace(/(^|\W)(-[0-9.]+)/g, '$1$$$2$$');
str = str.replace(/(^|\W)-([0-9.]+)/g, '$1$$-$$$2');
--
To view, visit https://gerrit.wikimedia.org/r/163091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb1ee7f16285ccca6963a66068f2a7df72922520
Gerrit-PatchSet: 2
Gerrit-Project:
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix There's no line here to end. crasher (br after dd). - change (mediawiki...latex_renderer)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix There's no line here to end. crasher (br after dd).
..
Fix There's no line here to end. crasher (br after dd).
Change-Id: I6a2b45aa54f495f97ad7ab7ea410c23363a82c52
---
M lib/index.js
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/index.js b/lib/index.js
index 99044b2..20a4f7d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -970,6 +970,7 @@
}
this.format.writeDecorated(']');
this.format.dirBreak();
+ this.format.resetSOL();
this.listInfo.sawDT = true;
};
--
To view, visit https://gerrit.wikimedia.org/r/163092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a2b45aa54f495f97ad7ab7ea410c23363a82c52
Gerrit-PatchSet: 2
Gerrit-Project:
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure that we switch to the latin font where necessary. - change (mediawiki...latex_renderer)
jenkins-bot has submitted this change and it was merged.
Change subject: Ensure that we switch to the latin font where necessary.
..
Ensure that we switch to the latin font where necessary.
Initialize the 'latin switch' boolean based on the default collection
language, and use the formatter to emit the title, subtitle, summary,
and chapter titles.
Change-Id: I4b7d5963ba1615c66ab73cd39ccb01651b3cb801
---
M lib/index.js
1 file changed, 33 insertions(+), 18 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/index.js b/lib/index.js
index 20a4f7d..8852cba 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -611,6 +611,7 @@
this.currentDirectionality = options.dir || 'ltr';
this.usedLanguages = new Set();
this.listInfo = {};
+ this.format.setCoverage(Polyglossia.lookup(this.currentLanguage));
};
// Helper function -- wrap the contents of the children of the node
@@ -1625,32 +1626,41 @@
var usedLanguages = new Set();
usedLanguages.add(collectionLanguage);
head += '\n\\input{'+path.join(builddir, 'languages.tex')+'}';
+ // image file path
+ var graphicspath = path.join(builddir, 'bundle', 'images');
+ head += '\n\\graphicspath{{' + graphicspath + '/}}';
+ // special formatter for the head.
+ var collectionPoly = Polyglossia.lookup(collectionLanguage);
+ var headFormat = new Formatter(output, {
+ dir: collectionPoly.dir
+ });
+ headFormat.setCoverage(collectionPoly);
+ headFormat.writeDecorated(head + '\n');
// emit title, subtitle, etc.
var title = metabook.title;
if (!title metabook.items.length === 1) {
title = metabook.items[0].title;
}
- head += '\n\\hypersetup{pdftitle={' + texEscape(title, 'nourls') + '}}';
- head += '\n\\title{{\\Huge ' + texEscape(title) + '}';
+ headFormat.writeDecorated('\\hypersetup{pdftitle={'+texEscape(title,
'nourls')+'}}\n');
+ headFormat.writeDecorated('\\title{{\\Huge ');
+ headFormat.write(title);
+ headFormat.writeDecorated('}');
if (metabook.subtitle) {
- head += ' ' + texEscape(metabook.subtitle);
+ headFormat.lineBreak();
+ headFormat.write(metabook.subtitle);
}
- head += '}';
- // image file path
- var graphicspath = path.join(builddir, 'bundle', 'images');
- head += '\n\\graphicspath{{' + graphicspath + '/}}';
+ headFormat.writeDecorated('}\n');
// start the doc!
- head += '\n\\begin{document}\\maketitle';
+ headFormat.writeDecorated('\\begin{document}\\maketitle\n');
if (toc) {
- head += '\n\\pagenumbering{roman}\\tableofcontents\\newpage';
- head += '\n\\pagenumbering{arabic}';
+
headFormat.writeDecorated('\\pagenumbering{roman}\\tableofcontents\n');
+ headFormat.writeDecorated('\\newpage\\pagenumbering{arabic}\n');
}
if (metabook.summary) {
- head += '\n\\begin{abstract}\n' + texEscape(metabook.summary);
- head += '\n\\end{abstract}';
+ headFormat.begin('abstract');
+ headFormat.write(metabook.summary);
+ headFormat.end('abstract');
}
- head += '\n';
- output.write(head);
// Now recurse through the item tree generating .tex files for each
// article.
@@ -1673,7 +1683,7 @@
isAttribution ? 'attribution.tex' :
(item.wiki + '-' + revid + '.tex')
);
- output.write('\\input{' + outfile + '}\n');
+ headFormat.writeDecorated('\\input{' + outfile + '}\n');
var pContents = isAttribution ?
P.call(fs.readFile, fs, item.filename, { encoding:
'utf8' }) :
pdb.get(key, 'nojson');
@@ -1729,9 +1739,12 @@
status.report('Processing chapter', item.title);
if ('columns' in item columns !== item.columns) {
columns = item.columns;
- output.write(columns === 1 ? '\\onecolumn\n' :
'\\twocolumn\n');
+ headFormat.writeDecorated
+ (columns === 1 ? '\\onecolumn\n' :
'\\twocolumn\n');
}
- output.write('\\chapter{' + texEscape(item.title) + '}\n');
+ headFormat.writeDecorated('\\chapter{');
+ headFormat.write(item.title);
+ headFormat.writeDecorated('}\n');
return P.forEachSeq(item.items || [], write.article);
};
@@ -1748,7 +1761,7 @@
return;
}
// write attribution 'chapter'
- output.write('\\attributions\n');
+
[MediaWiki-commits] [Gerrit] Indic language support. - change (mediawiki...latex_renderer)
jenkins-bot has submitted this change and it was merged.
Change subject: Indic language support.
..
Indic language support.
Add missing polyglossia `gloss-*.ldf` files so that appropriate fonts
are selected for Assamese, Gujarati, Marathi, Oriya, and Punjabi.
(Note that the Marathi gloss corrects a typo in the upstream gloss.)
Change-Id: Iba4b904a738c59cc585a3cd29543d420d8b8c192
---
M lib/polyglossia.js
A tex/gloss-assamese.ldf
A tex/gloss-gujarati.ldf
A tex/gloss-marathi.ldf
A tex/gloss-oriya.ldf
A tex/gloss-punjabi.ldf
6 files changed, 154 insertions(+), 0 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/polyglossia.js b/lib/polyglossia.js
index 6e60e1c..ec48706 100644
--- a/lib/polyglossia.js
+++ b/lib/polyglossia.js
@@ -5,6 +5,7 @@
amharic: { script: 'Ethiopic' },
arabic: { dir: 'rtl', script: 'Arabic', env: 'Arabic' },
armenian: { script: 'Armenian' },
+ assamese: { script: 'Assamese' },
bengali: { script: 'Bengali' },
bulgarian: { script: 'Cyrillic' },
hans: { script: 'CJK' },
@@ -42,6 +43,7 @@
am: { lang: 'amharic' },
ar: { lang: 'arabic' },
'und-Arab': { lang: 'arabic' },
+ as: { lang: 'assamese' },
hy: { lang: 'armenian' },
ast: { lang: 'asturian' },
id: { lang: 'bahasai' },
diff --git a/tex/gloss-assamese.ldf b/tex/gloss-assamese.ldf
new file mode 100644
index 000..3d52a45
--- /dev/null
+++ b/tex/gloss-assamese.ldf
@@ -0,0 +1,17 @@
+\ProvidesFile{gloss-assamese.ldf}[polyglossia: module for assamese]
+\ifluatex
+ \xpg@warning{Assamese is not supported with LuaTeX.\MessageBreak
+I will proceed with the compilation, but\MessageBreak
+the output is not guaranteed to be correct\MessageBreak
+and may look very wrong.}
+\fi
+
+\PolyglossiaSetup{assamese}{
+ script=Bengali, % except for three letters
+ scripttag=beng,
+ langtag=ASM,
+ hyphennames={nohyphenation},
+ fontsetup=true
+}
+
+\endinput
diff --git a/tex/gloss-gujarati.ldf b/tex/gloss-gujarati.ldf
new file mode 100644
index 000..ae26e00
--- /dev/null
+++ b/tex/gloss-gujarati.ldf
@@ -0,0 +1,17 @@
+\ProvidesFile{gloss-gujarati.ldf}[polyglossia: module for gujarati]
+\ifluatex
+ \xpg@warning{Gujarati is not supported with LuaTeX.\MessageBreak
+I will proceed with the compilation, but\MessageBreak
+the output is not guaranteed to be correct\MessageBreak
+and may look very wrong.}
+\fi
+
+\PolyglossiaSetup{gujarati}{
+ script=Gujarati,
+ scripttag=gujr,
+ langtag=GUJ,
+ hyphennames={nohyphenation},
+ fontsetup=true
+}
+
+\endinput
diff --git a/tex/gloss-marathi.ldf b/tex/gloss-marathi.ldf
new file mode 100644
index 000..b015ac5
--- /dev/null
+++ b/tex/gloss-marathi.ldf
@@ -0,0 +1,84 @@
+% Translations provided by Abhijit Navale abhi_nav...@live.in
+% TODO implement Hindu calendar (not used in day-to-day practice)
+
+\ProvidesFile{gloss-marathi.ldf}[polyglossia: module for marathi]
+\ifluatex
+ \xpg@warning{Marathi is not supported with LuaTeX.\MessageBreak
+I will proceed with the compilation, but\MessageBreak
+the output is not guaranteed to be correct\MessageBreak
+and may look very wrong.}
+\fi
+\RequirePackage{devanagaridigits}
+
+\PolyglossiaSetup{marathi}{
+ script=Devanagari,
+ scripttag=deva,
+ langtag=MAR,
+ hyphennames={marathi},
+ hyphenmins={2,2},%CHECK
+ fontsetup=true,
+ %TODO nouppercase=true,
+ %TODO localnumber=marathinumber
+}
+
+\def\tmp@western{Western}
+\newif\ifmarathi@devanagari@numerals
+\marathi@devanagari@numeralstrue
+
+\define@key{marathi}{numerals}[Devanagari]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@western
+\marathi@devanagari@numeralsfalse
+ \fi}
+
+\def\marathinumber#1{%
+ \ifmarathi@devanagari@numerals
+\devanagaridigits{\number#1}%
+ \else
+\number#1%
+ \fi}
+
+\def\captionsmarathi{%
+ \def\refname{संदर्भ}%
+ \def\abstractname{सारांश}%
+ \def\bibname{संदर्भ ग्रंथांची यादी}%
+ \def\prefacename{प्रस्तावना}%
+ \def\chaptername{प्रकरण}%
+ \def\appendixname{परिशिष्ट}%
+ \def\contentsname{अनुक्रमणिका}%
+ \def\listfigurename{आक्रुत्यांची यादी}%
+ \def\listtablename{कॊष्टकांची यादी}%
+ \def\indexname{सुची}%
+ \def\figurename{आक्रुती}%
+ \def\tablename{कोष्टक}%
+ %\def\thepart{}% TODO
+ \def\partname{भाग}%
+ \def\pagename{पान}%
+ \def\seename{पहा}%
+ \def\alsoname{हे सुध्दा पहा}%
+ \def\enclname{समाविष्ट}%
+ \def\ccname{सि.सि.}%
+ \def\headtoname{प्रति}%
+ \def\proofname{कसोटी}%
+ \def\glossaryname{स्पष्टीकरणकोश}%
+}
+\def\datemarathi{%
+ \def\marathimonth{%
+ \ifcase\month\or
+ जानेवारी\or
+ फेब्रुवारी\or
+ मार्च\or
+ एप्रिल\or
+ मे\or
+ जुन\or
+ जुलॆ\or
+ ओगस्ट\or
+ सप्टेंबर\or
+ ओक्टोबर\or
+ नोव्हेंबर\or
+ डिसेंबर\fi
+ }%
+ \def\today{\marathinumber\day\space\marathimonth\space\marathinumber\year}%
+}
+
+\endinput
[MediaWiki-commits] [Gerrit] Fix config paths so that hhvm is not broken by default - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Fix config paths so that hhvm is not broken by default
..
Fix config paths so that hhvm is not broken by default
Change-Id: I0fb0e4f47f84d60e275bc043e773056f2288530d
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M debian/changelog
A debian/patches/fix-config-path.patch
M debian/patches/series
3 files changed, 36 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 97d996a..83e7e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-hhvm (3.3.0-20140925+wmf1) UNRELEASED; urgency=medium
+hhvm (3.3.0-20140925+wmf2) trusty-wikimedia; urgency=medium
+
+ * Fix config files path.
+
+ -- Giuseppe Lavagetto glavage...@wikimedia.org Fri, 26 Sep 2014 08:00:57
+0200
+
+hhvm (3.3.0-20140925+wmf1) trusty-wikimedia; urgency=medium
* New upstream version
* Added a few patches to fix bugs in production
diff --git a/debian/patches/fix-config-path.patch
b/debian/patches/fix-config-path.patch
new file mode 100644
index 000..f5bed91
--- /dev/null
+++ b/debian/patches/fix-config-path.patch
@@ -0,0 +1,28 @@
+Description: do not prefix the configuration path with the INSTALL_PREFIX.
+ In the 3.3.0 branch, INSTALL_PREFIX (in our case, /usr) was prepended to
+ the config file path, thus breaking any standard and using the ugly
+ /usr/etc/hhvm dir. This also breaks our package as we install configs in
+ /etc/hhvm/.
+
+Author: Giuseppe Lavagetto glavage...@wikimedia.org
+Last-Updated: 2014-09-26
+
+diff --git a/hphp/runtime/base/emulate-zend.cpp
b/hphp/runtime/base/emulate-zend.cpp
+index 52636af..f2af4f1 100644
+--- a/hphp/runtime/base/emulate-zend.cpp
b/hphp/runtime/base/emulate-zend.cpp
+@@ -229,12 +229,12 @@ int emulate_zend(int argc, char** argv) {
+
+ // If the -c option is specified without a -n, php behavior is to
+ // load the default ini/hdf
+-auto default_config_file = INSTALL_PREFIX /etc/hhvm/php.ini;
++auto default_config_file = /etc/hhvm/php.ini;
+ if (access(default_config_file, R_OK) != -1) {
+ newargv.push_back(-c);
+ newargv.push_back(default_config_file);
+ }
+-default_config_file = INSTALL_PREFIX /etc/hhvm/config.hdf;
++default_config_file = /etc/hhvm/config.hdf;
+ if (access(default_config_file, R_OK) != -1) {
+ newargv.push_back(-c);
+ newargv.push_back(default_config_file);
diff --git a/debian/patches/series b/debian/patches/series
index 60d788c..1592731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
remove_libpam.patch
typos.patch
+fix-config-path.patch
# Wikimedia-specific (waiting for upstream merge)
Make-RUSAGE_THREAD-available-to-getrusage.patch
--
To view, visit https://gerrit.wikimedia.org/r/163101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fb0e4f47f84d60e275bc043e773056f2288530d
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)
Cscott has uploaded a new change for review. https://gerrit.wikimedia.org/r/163102 Change subject: Updating to latest masters .. Updating to latest masters Deployed new service (2946c8901cbd5fcb8abf7bb8cb63b579066bbe17): * Speed up/cache directory size computation in health check (bug 71260). Deployed new latexer (144bdd2962702abaa468a18c343509a0945c11e4): * Support Simplified and Traditional Chinese scripts. * Don't crash if images are inside `dt` tags. * Fix TeX escaping of `[]`. * Fix There's no line here to end. crasher (`br` after `dd`). * Ensure that we switch to the latin font where necessary. * Indic language support (fixes for Assamese, Gujarati, Marathi, Oriya, and Punjabi). Change-Id: Iecba9d0dd2a6f9c11a004bc97ab0e403192c3072 --- M mw-ocg-latexer M mw-ocg-service 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection refs/changes/02/163102/1 diff --git a/mw-ocg-latexer b/mw-ocg-latexer index 86c1e14..144bdd2 16 --- a/mw-ocg-latexer +++ b/mw-ocg-latexer -Subproject commit 86c1e14305b5109acd68a6bbd3b129692563c195 +Subproject commit 144bdd2962702abaa468a18c343509a0945c11e4 diff --git a/mw-ocg-service b/mw-ocg-service index 34dce85..2946c89 16 --- a/mw-ocg-service +++ b/mw-ocg-service -Subproject commit 34dce8513b9ce0f6c84b22f854f3d732c36c779e +Subproject commit 2946c8901cbd5fcb8abf7bb8cb63b579066bbe17 -- To view, visit https://gerrit.wikimedia.org/r/163102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecba9d0dd2a6f9c11a004bc97ab0e403192c3072 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ocg-collection Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)
Cscott has submitted this change and it was merged. Change subject: Updating to latest masters .. Updating to latest masters Deployed new service (2946c8901cbd5fcb8abf7bb8cb63b579066bbe17): * Speed up/cache directory size computation in health check (bug 71260). Deployed new latexer (144bdd2962702abaa468a18c343509a0945c11e4): * Support Simplified and Traditional Chinese scripts. * Don't crash if images are inside `dt` tags. * Fix TeX escaping of `[]`. * Fix There's no line here to end. crasher (`br` after `dd`). * Ensure that we switch to the latin font where necessary. * Indic language support (fixes for Assamese, Gujarati, Marathi, Oriya, and Punjabi). Change-Id: Iecba9d0dd2a6f9c11a004bc97ab0e403192c3072 --- M mw-ocg-latexer M mw-ocg-service 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: Cscott: Verified; Looks good to me, approved diff --git a/mw-ocg-latexer b/mw-ocg-latexer index 86c1e14..144bdd2 16 --- a/mw-ocg-latexer +++ b/mw-ocg-latexer -Subproject commit 86c1e14305b5109acd68a6bbd3b129692563c195 +Subproject commit 144bdd2962702abaa468a18c343509a0945c11e4 diff --git a/mw-ocg-service b/mw-ocg-service index 34dce85..2946c89 16 --- a/mw-ocg-service +++ b/mw-ocg-service -Subproject commit 34dce8513b9ce0f6c84b22f854f3d732c36c779e +Subproject commit 2946c8901cbd5fcb8abf7bb8cb63b579066bbe17 -- To view, visit https://gerrit.wikimedia.org/r/163102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecba9d0dd2a6f9c11a004bc97ab0e403192c3072 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ocg-collection Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)
Cscott has uploaded a new change for review. https://gerrit.wikimedia.org/r/163103 Change subject: Merge branch 'master' into wmf-deploy .. Merge branch 'master' into wmf-deploy Change-Id: I3df89db596aeca8dae4829dd36c7a135e71c1aae --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection refs/changes/03/163103/1 -- To view, visit https://gerrit.wikimedia.org/r/163103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3df89db596aeca8dae4829dd36c7a135e71c1aae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ocg-collection Gerrit-Branch: wmf-deploy Gerrit-Owner: Cscott canan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)
Cscott has submitted this change and it was merged. Change subject: Merge branch 'master' into wmf-deploy .. Merge branch 'master' into wmf-deploy Change-Id: I3df89db596aeca8dae4829dd36c7a135e71c1aae --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Cscott: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/163103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3df89db596aeca8dae4829dd36c7a135e71c1aae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ocg-collection Gerrit-Branch: wmf-deploy Gerrit-Owner: Cscott canan...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged.
Change subject: HHVM BetaFeature: Add screenshot; improve text
..
HHVM BetaFeature: Add screenshot; improve text
Bug: 71048
Change-Id: I3330498284279d13300936935856dc3233f7aec2
---
M WikimediaEventsHooks.php
A betafeatures-HHVM-ltr.svg
A betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 39 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Greg Grossmeier: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index afff33e..df3d4a1 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,9 +342,15 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
+ $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
+ 'screenshot' = array(
+ 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
+ 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
+ ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
new file mode 100644
index 000..8bfc84e
--- /dev/null
+++ b/betafeatures-HHVM-ltr.svg
@@ -0,0 +1,19 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
+path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
+path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
+g fill=#e5e5e5
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
+path d=M221 5h6v6h-6z/
+path d=M211 5h6v6h-6z/
+path d=M201 5h6v6h-6z/
+path d=M38 47v-5h-25v5h25z/
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+/g
+g fill=none
+path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
+path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
+/g
+/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
new file mode 100644
index 000..f17320b
--- /dev/null
+++ b/betafeatures-HHVM-rtl.svg
@@ -0,0 +1,12 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
+path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391 10-11.473-10-13.891
10-10.245-8.4v-110.6h-154v114.66l-8.078-5.66-4.922
4.18v-113.18h-38v116.95l-10-7.45v-152.5zM61 43h154v110.6l-2.145-1.6-12.555
10-13.809-10-14.229 10-12.972-10-12.973 10-13.811-10-12.136 10-13.391-10-14.229
[MediaWiki-commits] [Gerrit] HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163104
Change subject: HHVM BetaFeature: Add screenshot; improve text
..
HHVM BetaFeature: Add screenshot; improve text
Bug: 71048
Change-Id: I3330498284279d13300936935856dc3233f7aec2
(cherry picked from commit c986272ae0f7386e4fb82a8eea487178a8d9dd3b)
---
M WikimediaEventsHooks.php
A betafeatures-HHVM-ltr.svg
A betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 39 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/04/163104/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index afff33e..df3d4a1 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,9 +342,15 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
+ $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
+ 'screenshot' = array(
+ 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
+ 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
+ ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
new file mode 100644
index 000..8bfc84e
--- /dev/null
+++ b/betafeatures-HHVM-ltr.svg
@@ -0,0 +1,19 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
+path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
+path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
+g fill=#e5e5e5
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
+path d=M221 5h6v6h-6z/
+path d=M211 5h6v6h-6z/
+path d=M201 5h6v6h-6z/
+path d=M38 47v-5h-25v5h25z/
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+/g
+g fill=none
+path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
+path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
+/g
+/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
new file mode 100644
index 000..f17320b
--- /dev/null
+++ b/betafeatures-HHVM-rtl.svg
@@ -0,0 +1,12 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
+path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391 10-11.473-10-13.891
10-10.245-8.4v-110.6h-154v114.66l-8.078-5.66-4.922
4.18v-113.18h-38v116.95l-10-7.45v-152.5zM61 43h154v110.6l-2.145-1.6-12.555
10-13.809-10-14.229
[MediaWiki-commits] [Gerrit] HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged.
Change subject: HHVM BetaFeature: Add screenshot; improve text
..
HHVM BetaFeature: Add screenshot; improve text
Bug: 71048
Change-Id: I3330498284279d13300936935856dc3233f7aec2
(cherry picked from commit c986272ae0f7386e4fb82a8eea487178a8d9dd3b)
---
M WikimediaEventsHooks.php
A betafeatures-HHVM-ltr.svg
A betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 39 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index afff33e..df3d4a1 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,9 +342,15 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
+ $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
+ 'screenshot' = array(
+ 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
+ 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
+ ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
new file mode 100644
index 000..8bfc84e
--- /dev/null
+++ b/betafeatures-HHVM-ltr.svg
@@ -0,0 +1,19 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
+path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
+path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
+g fill=#e5e5e5
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
+path d=M221 5h6v6h-6z/
+path d=M211 5h6v6h-6z/
+path d=M201 5h6v6h-6z/
+path d=M38 47v-5h-25v5h25z/
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+/g
+g fill=none
+path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
+path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
+/g
+/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
new file mode 100644
index 000..f17320b
--- /dev/null
+++ b/betafeatures-HHVM-rtl.svg
@@ -0,0 +1,12 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
+path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391 10-11.473-10-13.891
10-10.245-8.4v-110.6h-154v114.66l-8.078-5.66-4.922
4.18v-113.18h-38v116.95l-10-7.45v-152.5zM61 43h154v110.6l-2.145-1.6-12.555
10-13.809-10-14.229 10-12.972-10-12.973 10-13.811-10-12.136 10-13.391-10-14.229
[MediaWiki-commits] [Gerrit] HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163105
Change subject: HHVM BetaFeature: Add screenshot; improve text
..
HHVM BetaFeature: Add screenshot; improve text
Bug: 71048
Change-Id: I3330498284279d13300936935856dc3233f7aec2
---
M WikimediaEventsHooks.php
A betafeatures-HHVM-ltr.svg
A betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 40 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/05/163105/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index afff33e..df3d4a1 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,9 +342,15 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
+ $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
+ 'screenshot' = array(
+ 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
+ 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
+ ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
new file mode 100644
index 000..8bfc84e
--- /dev/null
+++ b/betafeatures-HHVM-ltr.svg
@@ -0,0 +1,19 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
+path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
+path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
+g fill=#e5e5e5
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
+path d=M221 5h6v6h-6z/
+path d=M211 5h6v6h-6z/
+path d=M201 5h6v6h-6z/
+path d=M38 47v-5h-25v5h25z/
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+/g
+g fill=none
+path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
+path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
+/g
+/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
new file mode 100644
index 000..f17320b
--- /dev/null
+++ b/betafeatures-HHVM-rtl.svg
@@ -0,0 +1,12 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
+path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391 10-11.473-10-13.891
10-10.245-8.4v-110.6h-154v114.66l-8.078-5.66-4.922
4.18v-113.18h-38v116.95l-10-7.45v-152.5zM61 43h154v110.6l-2.145-1.6-12.555
10-13.809-10-14.229 10-12.972-10-12.973 10-13.811-10-12.136 10-13.391-10-14.229
[MediaWiki-commits] [Gerrit] HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged.
Change subject: HHVM BetaFeature: Add screenshot; improve text
..
HHVM BetaFeature: Add screenshot; improve text
Bug: 71048
Change-Id: I3330498284279d13300936935856dc3233f7aec2
---
M WikimediaEventsHooks.php
A betafeatures-HHVM-ltr.svg
A betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 40 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index afff33e..df3d4a1 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,9 +342,15 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
+ $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
+ 'screenshot' = array(
+ 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
+ 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
+ ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
new file mode 100644
index 000..8bfc84e
--- /dev/null
+++ b/betafeatures-HHVM-ltr.svg
@@ -0,0 +1,19 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
+path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
+path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
+g fill=#e5e5e5
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
+path d=M221 5h6v6h-6z/
+path d=M211 5h6v6h-6z/
+path d=M201 5h6v6h-6z/
+path d=M38 47v-5h-25v5h25z/
+path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
+/g
+g fill=none
+path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
+path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
+/g
+/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
new file mode 100644
index 000..f17320b
--- /dev/null
+++ b/betafeatures-HHVM-rtl.svg
@@ -0,0 +1,12 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
+path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
+path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391 10-11.473-10-13.891
10-10.245-8.4v-110.6h-154v114.66l-8.078-5.66-4.922
4.18v-113.18h-38v116.95l-10-7.45v-152.5zM61 43h154v110.6l-2.145-1.6-12.555
10-13.809-10-14.229 10-12.972-10-12.973 10-13.811-10-12.136 10-13.391-10-14.229
10-12.972-10-12.974 10-5.804-4.34v-114.66zm-51
[MediaWiki-commits] [Gerrit] Update WikimediaEvents for 0e087daea5 - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/163106 Change subject: Update WikimediaEvents for 0e087daea5 .. Update WikimediaEvents for 0e087daea5 Change-Id: I03bceae2ed81d5e1970fb023c4ea50401f232fbb --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/06/163106/1 diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 08a95b2..0e087da 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 08a95b280a17b84124fb80a7b0fd23562120ef48 +Subproject commit 0e087daea5b19aa80c8c89904cd40347a7a93a92 -- To view, visit https://gerrit.wikimedia.org/r/163106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03bceae2ed81d5e1970fb023c4ea50401f232fbb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf22 Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaEvents for 0e087daea5 - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/163107 Change subject: Update WikimediaEvents for 0e087daea5 .. Update WikimediaEvents for 0e087daea5 Change-Id: Ie7e7035fb2568c9fd77a0ebd5976c114fcb6c1fb --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/07/163107/1 diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 827f7cc..705db82 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 827f7cc17281437e9550a60d9a52f31f7b502dac +Subproject commit 705db82cacd75177fdb035b131b0c0ade144da5d -- To view, visit https://gerrit.wikimedia.org/r/163107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7e7035fb2568c9fd77a0ebd5976c114fcb6c1fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make onPostLoginRedirect behave the same as onCentralAuthPos... - change (mediawiki...GettingStarted)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163108
Change subject: Make onPostLoginRedirect behave the same as
onCentralAuthPostLoginRedirect
..
Make onPostLoginRedirect behave the same as onCentralAuthPostLoginRedirect
Automatically redirect the user to the previous page
Change-Id: Ibd4d51a58ac27efaffb02c1a7ef3a3c39e420640
---
M Hooks.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/08/163108/1
diff --git a/Hooks.php b/Hooks.php
index 79c099b..46f7557 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -428,10 +428,8 @@
if ( !self::shouldShowGettingStarted( $returnToQuery, $type ) )
{
return true;
}
- // TODO: rmoen 2014-05-30 determine if we want to mock the
current bahavior
- // if CentralAuth is not enabled. Note: Auto redirecting is out
of the normal
- // login flow for users logging in on wikis not running C.A.
- // This can be done by setting $type = 'successredirect';
+ // Behave like centralAuth and auto redirect to previous page
+ $type = 'successredirect';
$returnToQuery['gettingStartedReturn'] = 'true';
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/163108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd4d51a58ac27efaffb02c1a7ef3a3c39e420640
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Robmoen rm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaEvents for 0e087daea5 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update WikimediaEvents for 0e087daea5 .. Update WikimediaEvents for 0e087daea5 Change-Id: I03bceae2ed81d5e1970fb023c4ea50401f232fbb --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 08a95b2..0e087da 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 08a95b280a17b84124fb80a7b0fd23562120ef48 +Subproject commit 0e087daea5b19aa80c8c89904cd40347a7a93a92 -- To view, visit https://gerrit.wikimedia.org/r/163106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03bceae2ed81d5e1970fb023c4ea50401f232fbb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf22 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaEvents for 0e087daea5 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update WikimediaEvents for 0e087daea5 .. Update WikimediaEvents for 0e087daea5 Change-Id: Ie7e7035fb2568c9fd77a0ebd5976c114fcb6c1fb --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 827f7cc..705db82 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 827f7cc17281437e9550a60d9a52f31f7b502dac +Subproject commit 705db82cacd75177fdb035b131b0c0ade144da5d -- To view, visit https://gerrit.wikimedia.org/r/163107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7e7035fb2568c9fd77a0ebd5976c114fcb6c1fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove executable bit from non-executable files - change (mediawiki/core)
IAlex has uploaded a new change for review. https://gerrit.wikimedia.org/r/163109 Change subject: Remove executable bit from non-executable files .. Remove executable bit from non-executable files Follow-up: - Ibd1c0617c4 (d30edce) - I1a906f533f (42583e9) Change-Id: I8081ed2f3fbb08f1d2c0c839a697029234e4d12d --- M resources/src/mediawiki.action/mediawiki.action.edit.styles.css M resources/src/mediawiki.action/mediawiki.action.history.diff.css M resources/src/mediawiki.skinning/interface.css 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/163109/1 diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css old mode 100755 new mode 100644 diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.css b/resources/src/mediawiki.action/mediawiki.action.history.diff.css old mode 100755 new mode 100644 diff --git a/resources/src/mediawiki.skinning/interface.css b/resources/src/mediawiki.skinning/interface.css old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/163109 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8081ed2f3fbb08f1d2c0c839a697029234e4d12d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex coderev...@emsenhuber.ch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove copypasted code from attribution logger - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163110
Change subject: Remove copypasted code from attribution logger
..
Remove copypasted code from attribution logger
Probably copied this from the duration logger and forgot to delete.
Change-Id: Ia59f9d8e5b384486c3d8509120223f6694a78529
---
M resources/mmv/logging/mmv.logging.AttributionLogger.js
1 file changed, 1 insertion(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/10/163110/1
diff --git a/resources/mmv/logging/mmv.logging.AttributionLogger.js
b/resources/mmv/logging/mmv.logging.AttributionLogger.js
index 45888f1..4c0ac0d 100644
--- a/resources/mmv/logging/mmv.logging.AttributionLogger.js
+++ b/resources/mmv/logging/mmv.logging.AttributionLogger.js
@@ -24,9 +24,7 @@
* @extends mw.mmv.logging.Logger
* @constructor
*/
- function AttributionLogger() {
- this.starts = {};
- }
+ function AttributionLogger() {}
oo.inheritClass( AttributionLogger, mw.mmv.logging.Logger );
--
To view, visit https://gerrit.wikimedia.org/r/163110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia59f9d8e5b384486c3d8509120223f6694a78529
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki...WikimediaEvents)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163111
Change subject: Fix extension asset path error in I333049828
..
Fix extension asset path error in I333049828
Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
---
M WikimediaEventsHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/11/163111/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..a077f34 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,8 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+ global $wgExtensionAssetsPath;
+ $iconpath = $wgExtensionAssetsPath . '/WikimediaEvents';
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
--
To view, visit https://gerrit.wikimedia.org/r/163111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.24wmf22
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki...WikimediaEvents)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163112
Change subject: Fix extension asset path error in I333049828
..
Fix extension asset path error in I333049828
Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
---
M WikimediaEventsHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/12/163112/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..a077f34 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,8 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+ global $wgExtensionAssetsPath;
+ $iconpath = $wgExtensionAssetsPath . '/WikimediaEvents';
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
--
To view, visit https://gerrit.wikimedia.org/r/163112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix extension asset path error in I333049828
..
Fix extension asset path error in I333049828
Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
---
M WikimediaEventsHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..a077f34 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,8 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+ global $wgExtensionAssetsPath;
+ $iconpath = $wgExtensionAssetsPath . '/WikimediaEvents';
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
--
To view, visit https://gerrit.wikimedia.org/r/163112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/163113 Change subject: Fix extension asset path error in I333049828 .. Fix extension asset path error in I333049828 Change-Id: I74b13da4e354e02954160141bf8ee70e73c74772 --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/13/163113/1 diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 705db82..99d9420 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 705db82cacd75177fdb035b131b0c0ade144da5d +Subproject commit 99d94205a59e2bc7ec4a58cce8a0094a5948e12c -- To view, visit https://gerrit.wikimedia.org/r/163113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74b13da4e354e02954160141bf8ee70e73c74772 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki/core)
Ori.livneh has submitted this change and it was merged. Change subject: Fix extension asset path error in I333049828 .. Fix extension asset path error in I333049828 Change-Id: I74b13da4e354e02954160141bf8ee70e73c74772 --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 705db82..99d9420 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 705db82cacd75177fdb035b131b0c0ade144da5d +Subproject commit 99d94205a59e2bc7ec4a58cce8a0094a5948e12c -- To view, visit https://gerrit.wikimedia.org/r/163113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74b13da4e354e02954160141bf8ee70e73c74772 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki...WikimediaEvents)
Ori.livneh has submitted this change and it was merged.
Change subject: Fix extension asset path error in I333049828
..
Fix extension asset path error in I333049828
Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
---
M WikimediaEventsHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..a077f34 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,8 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+ global $wgExtensionAssetsPath;
+ $iconpath = $wgExtensionAssetsPath . '/WikimediaEvents';
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
--
To view, visit https://gerrit.wikimedia.org/r/163111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.24wmf22
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/163114 Change subject: Fix extension asset path error in I333049828 .. Fix extension asset path error in I333049828 Change-Id: I1d3fe55bbb84905528d3b4eb5d361d6199a9b8f8 --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/14/163114/1 diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 0e087da..791e14c 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 0e087daea5b19aa80c8c89904cd40347a7a93a92 +Subproject commit 791e14cfc1dc2e98eccb315b64e61ffd7dbfd4ad -- To view, visit https://gerrit.wikimedia.org/r/163114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d3fe55bbb84905528d3b4eb5d361d6199a9b8f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf22 Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki/core)
Ori.livneh has submitted this change and it was merged. Change subject: Fix extension asset path error in I333049828 .. Fix extension asset path error in I333049828 Change-Id: I1d3fe55bbb84905528d3b4eb5d361d6199a9b8f8 --- M extensions/WikimediaEvents 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/extensions/WikimediaEvents b/extensions/WikimediaEvents index 0e087da..791e14c 16 --- a/extensions/WikimediaEvents +++ b/extensions/WikimediaEvents -Subproject commit 0e087daea5b19aa80c8c89904cd40347a7a93a92 +Subproject commit 791e14cfc1dc2e98eccb315b64e61ffd7dbfd4ad -- To view, visit https://gerrit.wikimedia.org/r/163114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d3fe55bbb84905528d3b4eb5d361d6199a9b8f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf22 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix @group WikibaseRepo tests in lib - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Fix @group WikibaseRepo tests in lib .. Fix @group WikibaseRepo tests in lib Change-Id: Iff730b0fc6c0ff55162196699d1f87d670652dc7 --- M lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php M lib/tests/phpunit/store/EntityRedirectTest.php M lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php b/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php index 88b2079..45730ef 100644 --- a/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php +++ b/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php @@ -15,7 +15,7 @@ /** * @covers Wikibase\Lib\Store\EntityRedirectResolver * - * @group WikibaseRepo + * @group WikibaseLib * @group Wikibase * * @licence GNU GPL v2+ diff --git a/lib/tests/phpunit/store/EntityRedirectTest.php b/lib/tests/phpunit/store/EntityRedirectTest.php index c41b8e9..d1ed176 100644 --- a/lib/tests/phpunit/store/EntityRedirectTest.php +++ b/lib/tests/phpunit/store/EntityRedirectTest.php @@ -9,7 +9,7 @@ /** * @covers Wikibase\Lib\Store\EntityRedirect * - * @group WikibaseRepo + * @group WikibaseLib * @group Wikibase * * @licence GNU GPL v2+ diff --git a/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php b/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php index d1c0738..62bee66 100644 --- a/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php +++ b/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php @@ -12,7 +12,7 @@ /** * @covers Wikibase\Lib\Store\RedirectResolvingEntityLookup * - * @group WikibaseRepo + * @group WikibaseLib * @group Wikibase * * @licence GNU GPL v2+ diff --git a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php b/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php index 9ba4fc4..1961cb9 100644 --- a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php +++ b/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php @@ -12,7 +12,7 @@ * @covers Wikibase\SqlEntityInfoBuilder * * @group Wikibase - * @group WikibaseRepo + * @group WikibaseLib * @group WikibaseStore * @group WikibasePropertyInfo * @group Database -- To view, visit https://gerrit.wikimedia.org/r/163087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff730b0fc6c0ff55162196699d1f87d670652dc7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make options of a custom campaign field parseable - change (mediawiki...UploadWizard)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163115
Change subject: Make options of a custom campaign field parseable
..
Make options of a custom campaign field parseable
Bug: 71160
Change-Id: Iff16de257abad9893c63e5ce0c11c2aacb89018c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/906
---
M includes/UploadWizardCampaign.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/15/163115/1
diff --git a/includes/UploadWizardCampaign.php
b/includes/UploadWizardCampaign.php
index 9b6ceb7..6c0f509 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -251,7 +251,11 @@
foreach ( $array as $key = $value ) {
if ( $forKeys !== null ) {
if( in_array( $key, $forKeys ) ) {
- $parsed[$key] = $this-parseValue(
$value, $lang );
+ if ( is_array( $value ) ) {
+ $parsed[$key] =
$this-parseArrayValues( $value, $lang );
+ } else {
+ $parsed[$key] =
$this-parseValue( $value, $lang );
+ }
} else {
$parsed[$key] = $value;
}
@@ -307,7 +311,7 @@
$parsedConfig['fields'][] =
$this-parseArrayValues(
$field,
$lang,
- array( 'label' )
+ array( 'label',
'options' )
);
}
break;
--
To view, visit https://gerrit.wikimedia.org/r/163115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff16de257abad9893c63e5ce0c11c2aacb89018c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.24wmf22
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add message documenation - change (mediawiki...Capiunto)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163116
Change subject: Add message documenation
..
Add message documenation
* Fix extension credits array
* Add license to extension credits per file header
* Consistency tweak in description message
Change-Id: I07e0e44768547529dfe71905545b4c49b011e1c6
---
M Capiunto.php
M i18n/en.json
A i18n/qqq.json
3 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Capiunto
refs/changes/16/163116/1
diff --git a/Capiunto.php b/Capiunto.php
index 8180e00..b4b4128 100644
--- a/Capiunto.php
+++ b/Capiunto.php
@@ -11,12 +11,13 @@
die( Not an entry point.\n );
}
-$wgExtensionCredits['parserhook']['Capiunto'] = array(
+$wgExtensionCredits['parserhook'] = array(
'path' = __FILE__,
'name' = 'Capiunto',
'author' = 'Marius Hoch',
'url' = 'https://www.mediawiki.org/wiki/Extension:Capiunto',
'descriptionmsg' = 'capiunto-desc',
+ 'license-name' = 'GPLv2',
);
$wgMessagesDirs['Capiunto'] = __DIR__ . '/i18n';
diff --git a/i18n/en.json b/i18n/en.json
index ee59754..f17cde8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,5 @@
Marius Hoch
]
},
-capiunto-desc: Provides basic Infobox functionality for Scribunto.
+capiunto-desc: Provides basic infobox functionality for Scribunto
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..f65fd2c
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Raimond Spekking
+]
+},
+capiunto-desc:
{{desc|name=Capiunto|url=https://www.mediawiki.org/wiki/Extension:Capiunto}};,
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/163116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07e0e44768547529dfe71905545b4c49b011e1c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Capiunto
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make options of a custom campaign field parseable - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Make options of a custom campaign field parseable
..
Make options of a custom campaign field parseable
Bug: 71160
Change-Id: Iff16de257abad9893c63e5ce0c11c2aacb89018c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/906
---
M includes/UploadWizardCampaign.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/UploadWizardCampaign.php
b/includes/UploadWizardCampaign.php
index 9b6ceb7..6c0f509 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -251,7 +251,11 @@
foreach ( $array as $key = $value ) {
if ( $forKeys !== null ) {
if( in_array( $key, $forKeys ) ) {
- $parsed[$key] = $this-parseValue(
$value, $lang );
+ if ( is_array( $value ) ) {
+ $parsed[$key] =
$this-parseArrayValues( $value, $lang );
+ } else {
+ $parsed[$key] =
$this-parseValue( $value, $lang );
+ }
} else {
$parsed[$key] = $value;
}
@@ -307,7 +311,7 @@
$parsedConfig['fields'][] =
$this-parseArrayValues(
$field,
$lang,
- array( 'label' )
+ array( 'label',
'options' )
);
}
break;
--
To view, visit https://gerrit.wikimedia.org/r/163115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff16de257abad9893c63e5ce0c11c2aacb89018c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.24wmf22
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for fixed header position - change (mediawiki...ContentTranslation)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163117
Change subject: Fix for fixed header position
..
Fix for fixed header position
Setting explicit positioning to the sticky header helps to make it
more robust. Previously, additional UI elements (e.g., introduced by the
personal toolbar)
could push the header down generating a gap that made the UI look broken.
Change-Id: Ideabc8b7f2cca2d9ae5bb40347dd43c3b5328269
---
M modules/header/styles/ext.cx.header.less
1 file changed, 2 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/17/163117/1
diff --git a/modules/header/styles/ext.cx.header.less
b/modules/header/styles/ext.cx.header.less
index 3d92937..e91a851 100644
--- a/modules/header/styles/ext.cx.header.less
+++ b/modules/header/styles/ext.cx.header.less
@@ -77,6 +77,8 @@
.cx-header.sticky {
.mw-ui-two-thirds;
position:fixed;
+ top:0;
+ left:0;
background: #fff;
background: rgba(255,255,255,0.95);
padding-top: 5px;
--
To view, visit https://gerrit.wikimedia.org/r/163117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ideabc8b7f2cca2d9ae5bb40347dd43c3b5328269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for fixed header position - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix for fixed header position
..
Fix for fixed header position
Setting explicit positioning to the sticky header helps to make it
more robust. Previously, additional UI elements (e.g., introduced by the
personal toolbar)
could push the header down generating a gap that made the UI look broken.
Change-Id: Ideabc8b7f2cca2d9ae5bb40347dd43c3b5328269
---
M modules/header/styles/ext.cx.header.less
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/header/styles/ext.cx.header.less
b/modules/header/styles/ext.cx.header.less
index 3d92937..9df673a 100644
--- a/modules/header/styles/ext.cx.header.less
+++ b/modules/header/styles/ext.cx.header.less
@@ -77,6 +77,8 @@
.cx-header.sticky {
.mw-ui-two-thirds;
position:fixed;
+ top: 0;
+ left: 0;
background: #fff;
background: rgba(255,255,255,0.95);
padding-top: 5px;
--
To view, visit https://gerrit.wikimedia.org/r/163117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ideabc8b7f2cca2d9ae5bb40347dd43c3b5328269
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WikimediaEvents] Remove optional tag. Message has translata... - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/163118 Change subject: [WikimediaEvents] Remove optional tag. Message has translatable conent now .. [WikimediaEvents] Remove optional tag. Message has translatable conent now https://gerrit.wikimedia.org/r/#/c/162008/ Change-Id: I33ff8e774e923a40c4ca236c5bc1a9d7508359dd --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/18/163118/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index ef5f941..f0b8e77 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2256,7 +2256,6 @@ Wikimedia Events ignored = tag-HHVM -optional = hhvm-label Wikimedia Incubator descmsg = wminc-desc -- To view, visit https://gerrit.wikimedia.org/r/163118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33ff8e774e923a40c4ca236c5bc1a9d7508359dd Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WikimediaEvents] Remove optional tag. Message has translata... - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [WikimediaEvents] Remove optional tag. Message has translatable conent now .. [WikimediaEvents] Remove optional tag. Message has translatable conent now https://gerrit.wikimedia.org/r/#/c/162008/ Change-Id: I33ff8e774e923a40c4ca236c5bc1a9d7508359dd --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index ef5f941..f0b8e77 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2256,7 +2256,6 @@ Wikimedia Events ignored = tag-HHVM -optional = hhvm-label Wikimedia Incubator descmsg = wminc-desc -- To view, visit https://gerrit.wikimedia.org/r/163118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33ff8e774e923a40c4ca236c5bc1a9d7508359dd Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate mediawiki-core-npm to Zuul cloner - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163119 Change subject: Migrate mediawiki-core-npm to Zuul cloner .. Migrate mediawiki-core-npm to Zuul cloner The Jenkins git plugin is legacy, migrate to zuul cloner. As a side effect that fix up a bug when cleaning submodules fetched from a wmf branch and a master branch build is run. Bug: 71314 Change-Id: I81a8a6487ef150119e2a8aa470c4cba9fd68ca4a --- M mediawiki.yaml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/19/163119/1 diff --git a/mediawiki.yaml b/mediawiki.yaml index 1e10afb..45464a6 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -23,13 +23,14 @@ - job-template: name: 'mediawiki-core-npm' node: contintLabsSlave UbuntuTrusty -defaults: use-remoteonly-zuul concurrent: true logrotate: daysToKeep: 15 triggers: - zuul builders: + - zuul-cloner: + projects: mediawiki/core - npm-in: dir: '$WORKSPACE/tests/frontend' -- To view, visit https://gerrit.wikimedia.org/r/163119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81a8a6487ef150119e2a8aa470c4cba9fd68ca4a Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] First commit on a newbranch! - change (mediawiki/core)
Andriana has uploaded a new change for review. https://gerrit.wikimedia.org/r/163120 Change subject: First commit on a newbranch! .. First commit on a newbranch! Second commit!!! Change-Id: I2f30a38861c941099f791b87168e9ccf4a721744 --- M api.php M api.php5 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/163120/1 diff --git a/api.php b/api.php index 2a6a095..85c1185 100644 --- a/api.php +++ b/api.php @@ -130,3 +130,4 @@ // get here to worry about whether this should be = or =, but the file has to parse properly. $lb = wfGetLBFactory(); $lb-shutdown(); +//FILE WAS MODIFIED!!! diff --git a/api.php5 b/api.php5 index 524dfd5..11920c8 100644 --- a/api.php5 +++ b/api.php5 @@ -22,3 +22,4 @@ */ require './api.php'; +//FILE WAS MODIFIED IN SECOND COMMIT! -- To view, visit https://gerrit.wikimedia.org/r/163120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f30a38861c941099f791b87168e9ccf4a721744 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Andriana aa...@cisco.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate mediawiki-core-npm to Zuul cloner - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate mediawiki-core-npm to Zuul cloner .. Migrate mediawiki-core-npm to Zuul cloner The Jenkins git plugin is legacy, migrate to zuul cloner. As a side effect that fix up a bug when cleaning submodules fetched from a wmf branch and a master branch build is run. Adjust the npm-in path since core is now fetched under /src/ Bug: 71314 Change-Id: I81a8a6487ef150119e2a8aa470c4cba9fd68ca4a --- M mediawiki.yaml 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki.yaml b/mediawiki.yaml index 1e10afb..df24a17 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -23,15 +23,16 @@ - job-template: name: 'mediawiki-core-npm' node: contintLabsSlave UbuntuTrusty -defaults: use-remoteonly-zuul concurrent: true logrotate: daysToKeep: 15 triggers: - zuul builders: + - zuul-cloner: + projects: mediawiki/core - npm-in: -dir: '$WORKSPACE/tests/frontend' +dir: '$WORKSPACE/src/tests/frontend' # Generic job to run QUnit - job-template: -- To view, visit https://gerrit.wikimedia.org/r/163119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81a8a6487ef150119e2a8aa470c4cba9fd68ca4a Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adds a libext option to class for tag install of Sprint library - change (operations/puppet)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163121
Change subject: Adds a libext option to class for tag install of Sprint library
..
Adds a libext option to class for tag install of Sprint library
Change-Id: I5dc570519e6109bad07466f52c67734f003861b0
---
M manifests/role/phabricator.pp
M modules/phabricator/manifests/init.pp
2 files changed, 29 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/163121/1
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index c3e091d..6c64e04 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -124,6 +124,7 @@
git_tag = $current_tag,
lock_file= '/var/run/phab_repo_lock',
auth_type= 'local',
+libext_tag = 'HEAD',
extension_tag= 'HEAD',
extensions = ['SecurityPolicyEnforcerAction.php'],
settings = {
@@ -134,6 +135,7 @@
'phabricator.show-beta-applications' = true,
'mysql.pass' = $mysqlpass,
'auth.require-email-verification'= false,
+'load-libraries' = { 'burndown' =
'/srv/phab/libext/Sprint' },
},
}
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 1dcd458..e01aa36 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -43,6 +43,9 @@
# [*auth_type*]
# Specify a template to match the provided login mechanisms
#
+# [*libext_tag*]
+# Track library extension revision
+#
# [*extension_tag*]
# Track extension revision
#
@@ -67,6 +70,7 @@
$timezone = 'America/Los_Angeles',
$lock_file= '',
$git_tag = 'HEAD',
+$libext_tag = '',
$extension_tag= '',
$extensions = [],
$settings = {},
@@ -154,6 +158,29 @@
notify= Exec[ensure_lock_${lock_file}],
}
+if ($libext_tag) {
+
+file { '/srv/phab/libext':
+ensure = 'directory',
+}
+
+$libext_lock_path = ${phabdir}/library_lock_${libext_tag}
+
+git::install { 'phabricator/extensions/Sprint':
+directory = ${phabdir}/libext/Sprint,
+git_tag = $libext_tag,
+lock_file = $libext_lock_path,
+notify= Exec[$libext_lock_path],
+before= Git::Install['phabricator/phabricator'],
+}
+
+exec {$libext_lock_path:
+command = touch ${libext_lock_path},
+unless = test -z ${libext_lock_path} || test -e
${libext_lock_path},
+path= '/usr/bin:/bin',
+}
+}
+
if ($extension_tag) {
$ext_lock_path = ${phabdir}/extension_lock_${extension_tag}
--
To view, visit https://gerrit.wikimedia.org/r/163121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dc570519e6109bad07466f52c67734f003861b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163124
Change subject: Revert HHVM BetaFeature: Add screenshot; improve text
..
Revert HHVM BetaFeature: Add screenshot; improve text
onGetBetaFeaturePreferences() attempts to use an undefined variable.
That causes fatal error on beta cluster whenever using Special:Preferences.
This reverts commit 0e087daea5b19aa80c8c89904cd40347a7a93a92.
Bug: 71345
Change-Id: I1f579c7f7b7e784d47122f5d4b0b4bfafb977247
---
M WikimediaEventsHooks.php
D betafeatures-HHVM-ltr.svg
D betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 2 insertions(+), 40 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/24/163124/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..afff33e 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,15 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
-
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
- 'screenshot' = array(
- 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
- 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
- ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
deleted file mode 100644
index 8bfc84e..000
--- a/betafeatures-HHVM-ltr.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-?xml version=1.0 encoding=UTF-8 standalone=no?
-svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
-path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
-path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
-path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
-g fill=#e5e5e5
-path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
-path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
-path d=M221 5h6v6h-6z/
-path d=M211 5h6v6h-6z/
-path d=M201 5h6v6h-6z/
-path d=M38 47v-5h-25v5h25z/
-path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
-/g
-g fill=none
-path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
-path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
-/g
-/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
deleted file mode 100644
index f17320b..000
--- a/betafeatures-HHVM-rtl.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-?xml version=1.0 encoding=UTF-8 standalone=no?
-svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
-path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
-path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391
[MediaWiki-commits] [Gerrit] Revert HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163123
Change subject: Revert HHVM BetaFeature: Add screenshot; improve text
..
Revert HHVM BetaFeature: Add screenshot; improve text
onGetBetaFeaturePreferences() attempts to use an undefined variable.
That causes fatal error on beta cluster whenever using Special:Preferences.
This reverts commit c986272ae0f7386e4fb82a8eea487178a8d9dd3b.
Bug: 71345
Change-Id: Ic238317317c6e96b80a2a2aee5c96575c4e64d86
---
M WikimediaEventsHooks.php
D betafeatures-HHVM-ltr.svg
D betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 2 insertions(+), 39 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/23/163123/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..afff33e 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,15 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
-
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
- 'screenshot' = array(
- 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
- 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
- ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
deleted file mode 100644
index 8bfc84e..000
--- a/betafeatures-HHVM-ltr.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-?xml version=1.0 encoding=UTF-8 standalone=no?
-svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
-path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
-path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
-path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
-g fill=#e5e5e5
-path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
-path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
-path d=M221 5h6v6h-6z/
-path d=M211 5h6v6h-6z/
-path d=M201 5h6v6h-6z/
-path d=M38 47v-5h-25v5h25z/
-path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
-/g
-g fill=none
-path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
-path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
-/g
-/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
deleted file mode 100644
index f17320b..000
--- a/betafeatures-HHVM-rtl.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-?xml version=1.0 encoding=UTF-8 standalone=no?
-svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
-path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
-path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391
[MediaWiki-commits] [Gerrit] hhvm: do not install a specific version anymore - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163122
Change subject: hhvm: do not install a specific version anymore
..
hhvm: do not install a specific version anymore
Change-Id: I6ab798693e0f04cf1d43355aa7311a0771bbe0b9
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/hhvm/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/163122/1
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1e4d2ce..96c154a 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -191,7 +191,7 @@
## Packages
package { [ 'hhvm', 'hhvm-dbg' ]:
-ensure = '3.3.0-20140925+wmf1',
+ensure = present,
before = Service['hhvm'],
}
--
To view, visit https://gerrit.wikimedia.org/r/163122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ab798693e0f04cf1d43355aa7311a0771bbe0b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert HHVM BetaFeature: Add screenshot; improve text - change (mediawiki...WikimediaEvents)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163125
Change subject: Revert HHVM BetaFeature: Add screenshot; improve text
..
Revert HHVM BetaFeature: Add screenshot; improve text
onGetBetaFeaturePreferences() attempts to use an undefined variable.
That causes fatal error on beta cluster whenever using Special:Preferences.
This reverts commit 705db82cacd75177fdb035b131b0c0ade144da5d.
Bug: 71345
Change-Id: I7f8f55890528673ebb8311f36b07c2c877c1e43d
---
M WikimediaEventsHooks.php
D betafeatures-HHVM-ltr.svg
D betafeatures-HHVM-rtl.svg
M i18n/en.json
4 files changed, 2 insertions(+), 39 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/25/163125/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..afff33e 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,15 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
-
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
- 'screenshot' = array(
- 'ltr' = $iconpath/betafeatures-HHVM-ltr.svg,
- 'rtl' = $iconpath/betafeatures-HHVM-rtl.svg,
- ),
'info-link' =
'//www.mediawiki.org/wiki/Special:MyLanguage/HHVM/About',
'discussion-link' =
'//www.mediawiki.org/wiki/Talk:HHVM/About',
);
diff --git a/betafeatures-HHVM-ltr.svg b/betafeatures-HHVM-ltr.svg
deleted file mode 100644
index 8bfc84e..000
--- a/betafeatures-HHVM-ltr.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-?xml version=1.0 encoding=UTF-8 standalone=no?
-svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
-path d=M24.833 151.362l-11.467
9.995-12.866-9.608v-151.249h263v151.749l-9
6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.849l-9.751
8.031-13.916-10.018z fill=#fff/
-path d=M263 1v150.998l-8
5.96v-115.958h-40v112.019l-3.274-2.779-.589-.499-.633.44-6.504
4.557v-113.738h-156v111.099l-9.257 7.661-13.295-9.569-.644-.465-.598.521-10.864
9.47-12.342-9.218v-150.499h262zm1-1h-264v152l13.391 10 11.473-10 13.891 10
10.245-8.4v-110.6h154v114.66l8.078-5.66 4.922
4.18v-113.18h38v116.95l10-7.45v-152.5z fill=#e5e5e5/
-path d=M203 43h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10
12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10
5.804-4.34v-114.66zm51 116.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10
2.747-2.05z fill=#e5e5e5/
-g fill=#e5e5e5
-path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
-path d=M38 137v-77h-25v77h25zm195-132h26v6h-26v-6z/
-path d=M221 5h6v6h-6z/
-path d=M211 5h6v6h-6z/
-path d=M201 5h6v6h-6z/
-path d=M38 47v-5h-25v5h25z/
-path d=M11 24c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z/
-/g
-g fill=none
-path d=M164 47.65l16.968 16.968 16.968-16.968h-33.936zm-6.363
13.433l7.956 7.956 7.956-7.956h-15.911zm0 22.624l7.956 7.956
7.956-7.956h-15.911zm-19.796 2.828l5.726 5.726 5.726-5.726h-11.452zm-1.414
22.624l5.726 5.726 5.726-5.726h-11.452zm62.923-60.095l-16.968 16.968 16.968
16.968v-33.936zm-24.566 13.254l-7.956 7.956 7.956 7.956v-15.911zm0
22.624l-7.956 7.956 7.956 7.956v-15.911zm-24.147 2.937l-5.726 5.726 5.726
5.726v-11.452zm-1.414 22.624l-5.726 5.726 5.726 5.726v-11.452z fill=#0f74fb/
-path d=M148.841 68.465l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833zm-.269
38.673l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917
3.917v-7.833zm12.457-33.441l3.917 3.917 3.917-3.917h-7.833zm8.753.919l-3.917
3.917 3.917 3.917v-7.833zm-68.848 30.896l3.917 3.917
3.917-3.917h-7.833zm8.753.919l-3.917 3.917 3.917 3.917v-7.833z fill=#fff/
-/g
-/svg
diff --git a/betafeatures-HHVM-rtl.svg b/betafeatures-HHVM-rtl.svg
deleted file mode 100644
index f17320b..000
--- a/betafeatures-HHVM-rtl.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-?xml version=1.0 encoding=UTF-8 standalone=no?
-svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0
264 162
-path d=M239.167 151.362l11.467 9.995
12.866-9.608v-151.249h-263v151.749l9 6.705v-116.454h39v112.6l4.393-3.731 7.607
5.33v-114.199h155v110.849l9.751 8.031 13.916-10.018z fill=#fff/
-path d=M1 1v150.998l8
5.96v-115.958h40v112.019l3.274-2.779.589-.499.633.44 6.504
4.557v-113.738h156v111.099l9.257 7.661 13.295-9.569.644-.465.598.521 10.864
9.47 12.342-9.218v-150.499h-262zm-1-1h264v152l-13.391
[MediaWiki-commits] [Gerrit] hhvm: do not install a specific version anymore - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: do not install a specific version anymore
..
hhvm: do not install a specific version anymore
Change-Id: I6ab798693e0f04cf1d43355aa7311a0771bbe0b9
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/hhvm/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1e4d2ce..96c154a 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -191,7 +191,7 @@
## Packages
package { [ 'hhvm', 'hhvm-dbg' ]:
-ensure = '3.3.0-20140925+wmf1',
+ensure = present,
before = Service['hhvm'],
}
--
To view, visit https://gerrit.wikimedia.org/r/163122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ab798693e0f04cf1d43355aa7311a0771bbe0b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki...WikimediaEvents)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163126
Change subject: Fix extension asset path error in I333049828
..
Fix extension asset path error in I333049828
Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
(cherry picked from commit 791e14cfc1dc2e98eccb315b64e61ffd7dbfd4ad)
---
M WikimediaEventsHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/26/163126/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..a077f34 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,8 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+ global $wgExtensionAssetsPath;
+ $iconpath = $wgExtensionAssetsPath . '/WikimediaEvents';
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
--
To view, visit https://gerrit.wikimedia.org/r/163126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix extension asset path error in I333049828 - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix extension asset path error in I333049828
..
Fix extension asset path error in I333049828
Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
(cherry picked from commit 791e14cfc1dc2e98eccb315b64e61ffd7dbfd4ad)
---
M WikimediaEventsHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index df3d4a1..a077f34 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -342,8 +342,9 @@
* @param array $prefs
*/
public static function onGetBetaFeaturePreferences( User $user, array
$prefs ) {
- $iconpath = $coreConfig-get( 'ExtensionAssetsPath' ) .
/WikimediaEvents;
+ global $wgExtensionAssetsPath;
+ $iconpath = $wgExtensionAssetsPath . '/WikimediaEvents';
$prefs['HHVM'] = array(
'label-message' = 'hhvm-label',
'desc-message'= 'hhvm-desc',
--
To view, visit https://gerrit.wikimedia.org/r/163126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1cac344eb0b2640192413706b9f8895770b253e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: install lldpd early - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: install-server: install lldpd early .. install-server: install lldpd early rationale being that this way a newly-installed machine will be listed in 'show lldp neigh' command on the switches, confirming where the machine is and the link status Change-Id: I4ab7606b99f4c16c0c9d518a6c36b5952b21ff28 --- M modules/install-server/files/autoinstall/scripts/late_command 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Mark Bergsma: Looks good to me, but someone else must approve diff --git a/modules/install-server/files/autoinstall/scripts/late_command b/modules/install-server/files/autoinstall/scripts/late_command index 7b733fd..ee114c1 100644 --- a/modules/install-server/files/autoinstall/scripts/late_command +++ b/modules/install-server/files/autoinstall/scripts/late_command @@ -8,9 +8,10 @@ wget -O /target/root/.ssh/authorized_keys http://apt.wikimedia.org/autoinstall/ssh/authorized_keys chmod go-rwx /target/root/.ssh/authorized_keys -# install openssh-server to make the machine accessible -# and puppet because we'll need it soon anyway -apt-install openssh-server puppet +# openssh-server: to make the machine accessible +# puppet: because we'll need it soon anyway +# lldpd: announce the machine on the network +apt-install openssh-server puppet lldpd # Change /etc/motd to read the auto-install date chroot /target /bin/sh -c 'echo $(cat /etc/issue.net) auto-installed on $(date). /etc/motd.tail' -- To view, visit https://gerrit.wikimedia.org/r/162847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ab7606b99f4c16c0c9d518a6c36b5952b21ff28 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] If the source title is not given do not load unnecessary js - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163127
Change subject: If the source title is not given do not load unnecessary js
..
If the source title is not given do not load unnecessary js
In such cases we just need the translation selector.
Since header module is required anyway, lot it, but prevent showing
the Publish button. Show it when progress module is loaded
Change-Id: Ib11a89b14fea59b4bafb7d30bf7b6bf382fddced
---
M Resources.php
M modules/base/ext.cx.base.js
M modules/header/ext.cx.header.js
M modules/translation/ext.cx.translation.progress.js
4 files changed, 18 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/27/163127/1
diff --git a/Resources.php b/Resources.php
index 7ffe486..6227fe8 100644
--- a/Resources.php
+++ b/Resources.php
@@ -68,7 +68,6 @@
'header/styles/ext.cx.header.less',
),
'dependencies' = array(
- 'ext.cx.publish',
'mediawiki.Uri',
'mediawiki.jqueryMsg',
'mediawiki.util',
diff --git a/modules/base/ext.cx.base.js b/modules/base/ext.cx.base.js
index c2f780c..d76d6d3 100644
--- a/modules/base/ext.cx.base.js
+++ b/modules/base/ext.cx.base.js
@@ -44,14 +44,17 @@
this.$header.cxHeader( this.siteMapper );
this.$source.cxSource( this.siteMapper );
- mw.loader.using( [
- 'ext.cx.tools',
- 'ext.cx.translation',
- 'ext.cx.translation.progress'
- ] ).then( function () {
- cx.$translation.cxTranslation();
- cx.$tools.cxTools();
- } );
+ if ( mw.cx.sourceTitle ) {
+ mw.loader.using( [
+ 'ext.cx.tools',
+ 'ext.cx.translation',
+ 'ext.cx.translation.progress',
+ 'ext.cx.publish'
+ ] ).then( function () {
+ cx.$translation.cxTranslation();
+ cx.$tools.cxTools();
+ } );
+ }
};
ContentTranslation.prototype.render = function () {
diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js
index 2320948..bb884d8 100644
--- a/modules/header/ext.cx.header.js
+++ b/modules/header/ext.cx.header.js
@@ -38,7 +38,7 @@
* @param {object} weights
*/
ContentTranslationHeader.prototype.setPublishButtonState = function (
weights ) {
- this.$publishButton.prop( 'disabled', weights.any === 0 );
+ this.$publishButton.show().prop( 'disabled', weights.any === 0
);
};
/**
@@ -157,7 +157,8 @@
this.$publishButton = $( 'button' )
.addClass( 'cx-header__publish publish mw-ui-button
mw-ui-constructive' )
.prop( 'disabled', true )
- .text( mw.msg( 'cx-publish-button' ) );
+ .text( mw.msg( 'cx-publish-button' ) )
+ .hide();
$translationCenterLink = $( 'a' )
.text( mw.msg( 'cx-header-translation-center' ) )
diff --git a/modules/translation/ext.cx.translation.progress.js
b/modules/translation/ext.cx.translation.progress.js
index ad7c222..8a90416 100644
--- a/modules/translation/ext.cx.translation.progress.js
+++ b/modules/translation/ext.cx.translation.progress.js
@@ -130,6 +130,10 @@
$( function () {
mw.hook( 'mw.cx.translation.change' ).add( onSectionUpdate );
+ // Show the progress bar with 0 progress.
+ mw.hook( 'mw.cx.progress' ).fire( {
+ any: 0
+ } );
window.onbeforeunload = function () {
var weights = getTranslationWeights(
getSectionsWithContent() );
--
To view, visit https://gerrit.wikimedia.org/r/163127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib11a89b14fea59b4bafb7d30bf7b6bf382fddced
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] top 5 languages - change (analytics/zero-sms)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163128
Change subject: top 5 languages
..
top 5 languages
Change-Id: I9325f16c703d5908b6490cd5b5963e8e0cf030ec
---
M scripts/weblogs.py
1 file changed, 40 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/zero-sms
refs/changes/28/163128/1
diff --git a/scripts/weblogs.py b/scripts/weblogs.py
index 3806ecd..8a0e0cd 100644
--- a/scripts/weblogs.py
+++ b/scripts/weblogs.py
@@ -5,9 +5,8 @@
import collections
import sys
from pandas import read_table, pivot_table
-from pandas.core.frame import DataFrame
+from pandas.core.frame import DataFrame, Series
import numpy as np
-import api
from logprocessor import *
@@ -284,33 +283,54 @@
allData = DataFrame(stats, columns=columnHeaders11)
# filter type==DATA
-df = allData[allData['type'] == 'DATA']
-# filter out last date
-lastDate = df.date.max()
-df = df[df.date lastDate]
-# create an artificial yes/opera value
-opera = df[(df.via == 'OPERA') (df.iszero == 'yes')]
-opera['iszero'] = 'opera'
-df = df.append(opera)
+allData = allData[allData['type'] == 'DATA']
+# filter out last date
+lastDate = allData.date.max()
+df = allData[allData.date lastDate]
xcs = list(df.xcs.unique())
+wiki = self.getWiki()
for id in xcs:
+xcsDf = df[df.xcs == id]
+
+# create an artificial yes/opera value
+opera = xcsDf[(xcsDf.via == 'OPERA') (xcsDf.iszero == 'yes')]
+opera['str'] = 'zero-opera'
+
+yes = xcsDf[xcsDf.iszero == 'yes']
+yes['str'] = 'zero-all'
+
+no = xcsDf[xcsDf.iszero == 'no']
+no['str'] = 'non-zero'
+
+combined = opera.append(yes).append(no)
+
s = StringIO.StringIO()
-pivot_table(df[df.xcs == id], 'count', ['date', 'iszero'],
aggfunc=np.sum).to_csv(s, header=True)
-result = s.getvalue()
+pivot_table(combined, 'count', ['date', 'str'],
aggfunc=np.sum).to_csv(s, header=False)
+result = 'date,iszero,count\n' + s.getvalue()
-# sortColumns = ['date', 'via', 'ipset', 'https', 'lang',
'subdomain', 'site', 'iszero']
-# outColumns = ['date', 'via', 'ipset', 'https', 'lang',
'subdomain', 'site', 'iszero', 'count']
-# xcsData = df[df.xcs == id].sort(columns=sortColumns)
-# result =
xcsData.sort(columns=sortColumns).to_csv(columns=outColumns, index=False)
-
-wiki = self.getWiki()
wiki(
'edit',
title='RawData:' + id,
+summary='refreshing data',
+text=result,
+token=wiki.token()
+)
+
+
+byLang = pivot_table(xcsDf, 'count', ['lang'],
aggfunc=np.sum).order('count', ascending=False)
+top = byLang.head(5)
+other = byLang.sum() - top.sum()
+s = StringIO.StringIO()
+Series.to_csv(top, s)
+result = 'lang,count\n' + s.getvalue() + ('other,%d\n' % other)
+
+wiki(
+'edit',
+title='RawData:' + id + '-langTotal',
summary='refreshing data',
text=result,
token=wiki.token()
@@ -352,5 +372,5 @@
self.generateGraphData()
if __name__ == '__main__':
-# WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).manualRun()
-WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).safeRun()
+WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).manualRun()
+# WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).safeRun()
--
To view, visit https://gerrit.wikimedia.org/r/163128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9325f16c703d5908b6490cd5b5963e8e0cf030ec
Gerrit-PatchSet: 1
Gerrit-Project: analytics/zero-sms
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] top 5 languages - change (analytics/zero-sms)
Yurik has submitted this change and it was merged.
Change subject: top 5 languages
..
top 5 languages
Change-Id: I9325f16c703d5908b6490cd5b5963e8e0cf030ec
---
M scripts/weblogs.py
1 file changed, 40 insertions(+), 20 deletions(-)
Approvals:
Yurik: Verified; Looks good to me, approved
diff --git a/scripts/weblogs.py b/scripts/weblogs.py
index 3806ecd..8a0e0cd 100644
--- a/scripts/weblogs.py
+++ b/scripts/weblogs.py
@@ -5,9 +5,8 @@
import collections
import sys
from pandas import read_table, pivot_table
-from pandas.core.frame import DataFrame
+from pandas.core.frame import DataFrame, Series
import numpy as np
-import api
from logprocessor import *
@@ -284,33 +283,54 @@
allData = DataFrame(stats, columns=columnHeaders11)
# filter type==DATA
-df = allData[allData['type'] == 'DATA']
-# filter out last date
-lastDate = df.date.max()
-df = df[df.date lastDate]
-# create an artificial yes/opera value
-opera = df[(df.via == 'OPERA') (df.iszero == 'yes')]
-opera['iszero'] = 'opera'
-df = df.append(opera)
+allData = allData[allData['type'] == 'DATA']
+# filter out last date
+lastDate = allData.date.max()
+df = allData[allData.date lastDate]
xcs = list(df.xcs.unique())
+wiki = self.getWiki()
for id in xcs:
+xcsDf = df[df.xcs == id]
+
+# create an artificial yes/opera value
+opera = xcsDf[(xcsDf.via == 'OPERA') (xcsDf.iszero == 'yes')]
+opera['str'] = 'zero-opera'
+
+yes = xcsDf[xcsDf.iszero == 'yes']
+yes['str'] = 'zero-all'
+
+no = xcsDf[xcsDf.iszero == 'no']
+no['str'] = 'non-zero'
+
+combined = opera.append(yes).append(no)
+
s = StringIO.StringIO()
-pivot_table(df[df.xcs == id], 'count', ['date', 'iszero'],
aggfunc=np.sum).to_csv(s, header=True)
-result = s.getvalue()
+pivot_table(combined, 'count', ['date', 'str'],
aggfunc=np.sum).to_csv(s, header=False)
+result = 'date,iszero,count\n' + s.getvalue()
-# sortColumns = ['date', 'via', 'ipset', 'https', 'lang',
'subdomain', 'site', 'iszero']
-# outColumns = ['date', 'via', 'ipset', 'https', 'lang',
'subdomain', 'site', 'iszero', 'count']
-# xcsData = df[df.xcs == id].sort(columns=sortColumns)
-# result =
xcsData.sort(columns=sortColumns).to_csv(columns=outColumns, index=False)
-
-wiki = self.getWiki()
wiki(
'edit',
title='RawData:' + id,
+summary='refreshing data',
+text=result,
+token=wiki.token()
+)
+
+
+byLang = pivot_table(xcsDf, 'count', ['lang'],
aggfunc=np.sum).order('count', ascending=False)
+top = byLang.head(5)
+other = byLang.sum() - top.sum()
+s = StringIO.StringIO()
+Series.to_csv(top, s)
+result = 'lang,count\n' + s.getvalue() + ('other,%d\n' % other)
+
+wiki(
+'edit',
+title='RawData:' + id + '-langTotal',
summary='refreshing data',
text=result,
token=wiki.token()
@@ -352,5 +372,5 @@
self.generateGraphData()
if __name__ == '__main__':
-# WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).manualRun()
-WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).safeRun()
+WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).manualRun()
+# WebLogProcessor(logDatePattern=(sys.argv[1] if len(sys.argv) 1 else
False)).safeRun()
--
To view, visit https://gerrit.wikimedia.org/r/163128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9325f16c703d5908b6490cd5b5963e8e0cf030ec
Gerrit-PatchSet: 1
Gerrit-Project: analytics/zero-sms
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikidata-performance browsertests job to WMF Jenkins - change (integration/jenkins-job-builder-config)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/163129 Change subject: Move wikidata-performance browsertests job to WMF Jenkins .. Move wikidata-performance browsertests job to WMF Jenkins Change-Id: I3a2c94d022ec5dc4f81723b6b183ff69325d80d7 --- M browsertests.yaml 1 file changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/29/163129/1 diff --git a/browsertests.yaml b/browsertests.yaml index 7dfe8df..42f2abf 100644 --- a/browsertests.yaml +++ b/browsertests.yaml @@ -543,6 +543,65 @@ --tags @wikidata.beta.wmflabs.org \ --tags ~@skip + # Wikidata +- job: +name: browsertests-WikidataPerformance-wikidata.beta.wmflabs.org-linux-firefox-sauce +node: contintLabsSlave + +scm: +- git: +url: 'https://github.com/wmde/WikidataBrowserTests.git' +branches: + - 'master' +skip-tag: true + +wrappers: + - ansicolor + - timestamps + +triggers: + - timed: 'H 16 * * *' + +builders: + - shell: | + # Shared cache of gems to avoid hitting rubygems all the time + # See https://github.com/bundler/bundler/issues/2856 + export GEM_HOME=$WORKSPACE/../gems + + # install ruby dependencies + mkdir -p vendor + gem1.9.3 install --env-shebang -i vendor bundler --no-ri --no-rdoc + # Prepare some paths lookup + export GEM_PATH=`pwd`/vendor + + cd tests/browser + $WORKSPACE/vendor/bin/bundle install --verbose + + cp config/config_ci.yml config/config.yml + + export WB_REPO_USERNAME=WikidataTester + + export BROWSER=firefox + export VERSION=25 + export PLATFORM=Linux + export BROWSER_TIMEOUT=360 + $WORKSPACE/vendor/bin/bundle exec cucumber \ +--backtrace \ +--color \ +--verbose \ +--format pretty \ +--format Cucumber::Formatter::Sauce \ +--out $WORKSPACE/log/junit \ +--tags @performance_testing \ +--tags ~@skip + +publishers: + - performance: + failed-threshold: -1 + unstable-threshold: -1 + report: + - junit: tests/browser/reports/junit/*.xml + # WikiLove - project: name: WikiLove -- To view, visit https://gerrit.wikimedia.org/r/163129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a2c94d022ec5dc4f81723b6b183ff69325d80d7 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove test manifest in deployment - change (wikimedia...crm)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/163130 Change subject: remove test manifest in deployment .. remove test manifest in deployment Change-Id: Iaad6d7885978aa7ae5205a49df8825caffdba104 --- D phpunit.xml 1 file changed, 0 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/30/163130/1 diff --git a/phpunit.xml b/phpunit.xml deleted file mode 100644 index f632dc3..000 --- a/phpunit.xml +++ /dev/null @@ -1,38 +0,0 @@ -phpunit -xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; -xsi:noNamespaceSchemaLocation=http://schema.phpunit.de/3.7/phpunit.xsd; -bootstrap=sites/default/bootstrap-phpunit.php - -testsuites - testsuite name=large_donation tests -directorysites/all/modules/large_donation/tests/directory - /testsuite - !-- FIXME: need to mock currency conversion - testsuite name=offline2civicrm tests -directorysites/all/modules/offline2civicrm/tests/directory - /testsuite - -- - testsuite name=exchange_rates tests -directorysites/all/modules/exchange_rates/tests/phpunit/directory - /testsuite - testsuite name=queue2civicrm tests -directorysites/all/modules/queue2civicrm/tests/phpunit/directory - /testsuite - testsuite name=recurring_globalcollect tests -directorysites/all/modules/recurring_globalcollect/tests/directory - /testsuite - testsuite name=wmf_campaigns tests -directorysites/all/modules/wmf_campaigns/tests/directory - /testsuite - testsuite name=wmf_civicrm tests -directorysites/all/modules/wmf_civicrm/tests/phpunit/directory - /testsuite - testsuite name=wmf_common tests -directorysites/all/modules/wmf_common/tests/phpunit/directory - /testsuite - testsuite name=wmf_communication tests - directorysites/all/modules/wmf_communication/tests/phpunit/directory - excludesites/all/modules/wmf_communication/tests/phpunit/CiviMailTestBase.php/exclude - /testsuite -/testsuites -/phpunit -- To view, visit https://gerrit.wikimedia.org/r/163130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaad6d7885978aa7ae5205a49df8825caffdba104 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lvs: add hhvm-api.svc.eqiad.wmnet - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: lvs: add hhvm-api.svc.eqiad.wmnet
..
lvs: add hhvm-api.svc.eqiad.wmnet
Change-Id: I777e640dd22413c7f18b367448a938ab518b6d1f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/lvs/manifests/configuration.pp
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 277114d..2a791b7 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -180,6 +180,9 @@
'api' = {
'eqiad' = 10.2.2.22,
},
+'hhvm_api' = {
+'eqiad' = 10.2.2.3,
+},
'search_pool1' = {
'eqiad' = 10.2.2.11,
},
@@ -254,6 +257,9 @@
},
'api' = {
'pmtpa' = 10.4.0.253,
+},
+'hhvm_api' = {
+'pmtpa' = 10.4.0.254,
},
'bits' = {
'pmtpa' = 10.4.0.252,
@@ -655,6 +661,21 @@
'RunCommand' = $runcommand_monitor_options
},
},
+hhvm_api = {
+'description' = MediaWiki API cluster (HHVM),
hhvm-api.svc.eqiad.wmnet,
+'class' = low-traffic,
+'sites' = [ eqiad ],
+'ip' = $service_ips['hhvm_api'][$::site],
+'bgp' = yes,
+'depool-threshold' = .6,
+'monitors' = {
+'ProxyFetch' = {
+'url' = [ 'http://en.wikipedia.org/w/api.php' ],
+},
+'IdleConnection' = $idleconnection_monitor_options,
+'RunCommand' = $runcommand_monitor_options
+},
+},
search_pool1 = {
'description' = Lucene search pool 1,
'class' = low-traffic,
--
To view, visit https://gerrit.wikimedia.org/r/162894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I777e640dd22413c7f18b367448a938ab518b6d1f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add service ip for apis under hhvm - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/163131 Change subject: Add service ip for apis under hhvm .. Add service ip for apis under hhvm Change-Id: Iacc83804687cb48de25b3ba9e0ef71dff907a4f9 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M manifests/role/lvs.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/163131/1 diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp index a321137..e77961a 100644 --- a/manifests/role/lvs.pp +++ b/manifests/role/lvs.pp @@ -39,6 +39,7 @@ $sip['apaches'][$::site], $sip['hhvm_appservers'][$::site], $sip['api'][$::site], +$sip['hhvm_api'][$::site], $sip['rendering'][$::site], $sip['search_pool1'][$::site], $sip['search_pool2'][$::site], -- To view, visit https://gerrit.wikimedia.org/r/163131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacc83804687cb48de25b3ba9e0ef71dff907a4f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add service ip for apis under hhvm - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Add service ip for apis under hhvm .. Add service ip for apis under hhvm Change-Id: Iacc83804687cb48de25b3ba9e0ef71dff907a4f9 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M manifests/role/lvs.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp index a321137..e77961a 100644 --- a/manifests/role/lvs.pp +++ b/manifests/role/lvs.pp @@ -39,6 +39,7 @@ $sip['apaches'][$::site], $sip['hhvm_appservers'][$::site], $sip['api'][$::site], +$sip['hhvm_api'][$::site], $sip['rendering'][$::site], $sip['search_pool1'][$::site], $sip['search_pool2'][$::site], -- To view, visit https://gerrit.wikimedia.org/r/163131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacc83804687cb48de25b3ba9e0ef71dff907a4f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Override Twig security to not whitelist property access - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163132
Change subject: Override Twig security to not whitelist property access
..
Override Twig security to not whitelist property access
DEPLOYMENT: We must require vendor/autoload.php earlier,
from settings.php, now that we're introducing dependencies
in top-level scope.
Change-Id: I5fe17a4cfd2013478c0cb17de4795844af358bb0
---
M sites/all/modules/wmf_communication/Templating.php
1 file changed, 22 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/32/163132/1
diff --git a/sites/all/modules/wmf_communication/Templating.php
b/sites/all/modules/wmf_communication/Templating.php
index 1550120..b1f176b 100644
--- a/sites/all/modules/wmf_communication/Templating.php
+++ b/sites/all/modules/wmf_communication/Templating.php
@@ -70,24 +70,7 @@
$twig-addExtension( new TwigLocalization() );
-$tags = array(
-'if'
-);
-$filters = array(
-'escape',
-'l10n_currency',
-'raw',
-);
-$methods = array(
-//'Article' = array('getTitle', 'getBody'),
-);
-$properties = array(
-//'Article' = array('title', 'body'),
-);
-$functions = array(
-//'range'
-);
-$policy = new Twig_Sandbox_SecurityPolicy( $tags, $filters, $methods,
$properties, $functions );
+$policy = new RestrictiveSecurityPolicy();
$sandbox = new Twig_Extension_Sandbox( $policy, true );
$twig-addExtension( $sandbox );
@@ -189,3 +172,24 @@
return $twig-render( $template, $params );
}
}
+
+class RestrictiveSecurityPolicy extends Twig_Sandbox_SecurityPolicy {
+function __construct() {
+$tags = array(
+'if'
+);
+$filters = array(
+'escape',
+'l10n_currency',
+'raw',
+);
+$methods = array();
+$properties = array(); // Overridden to allow all
+$functions = array();
+parent::__construct( $tags, $filters, $methods, $properties,
$functions );
+}
+
+function checkPropertyAllowed( $obj, $property ) {
+// pass
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/163132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fe17a4cfd2013478c0cb17de4795844af358bb0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP noticed some things in large_donation - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163133
Change subject: WIP noticed some things in large_donation
..
WIP noticed some things in large_donation
Change-Id: I4af2116f5baf2854c71de264827cea5a3e82ca49
---
M sites/all/modules/large_donation/large_donation.module
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/33/163133/1
diff --git a/sites/all/modules/large_donation/large_donation.module
b/sites/all/modules/large_donation/large_donation.module
index 8c44061..81b0661 100644
--- a/sites/all/modules/large_donation/large_donation.module
+++ b/sites/all/modules/large_donation/large_donation.module
@@ -42,6 +42,10 @@
/**
* Callback for menu path admin/config/large_donation.
+ *
+ * The fields for multiple notification levels are identified by
+ * the suffix _N, where N is a counter and not related to the
+ * notification's database ID.
*/
function large_donation_settings( $formId, $formState ) {
$form = array();
@@ -51,7 +55,7 @@
$formState['clicked_button']['#attributes']['id'] === 'add_threshold';
// Are we deleting something?
- $is_deleting = isset( $formState['clicked_button'] )
+ $is_deleting = isset( $formState['clicked_button']['#attributes']['class'] )
$formState['clicked_button']['#attributes']['class'] === array(
'delete' );
if ( $is_deleting ) {
--
To view, visit https://gerrit.wikimedia.org/r/163133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4af2116f5baf2854c71de264827cea5a3e82ca49
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill errant tab - change (mediawiki...Vector)
jenkins-bot has submitted this change and it was merged. Change subject: Kill errant tab .. Kill errant tab Change-Id: I5806d3fa815e641bbd743eba857f3cf1ce48a36a --- M VectorTemplate.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/VectorTemplate.php b/VectorTemplate.php index 30ba32e..62452d1 100644 --- a/VectorTemplate.php +++ b/VectorTemplate.php @@ -254,7 +254,7 @@ /body /html - ?php +?php } /** -- To view, visit https://gerrit.wikimedia.org/r/163086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5806d3fa815e641bbd743eba857f3cf1ce48a36a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Vector Gerrit-Branch: master Gerrit-Owner: MZMcBride w...@mzmcbride.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Edokter er...@darcoury.nl Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] load vendor classes for all tests - change (wikimedia...crm)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/163134 Change subject: load vendor classes for all tests .. load vendor classes for all tests Change-Id: I669a83351968521c224c8b8315976758d303cc9e --- M sites/default/bootstrap-phpunit.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/34/163134/1 diff --git a/sites/default/bootstrap-phpunit.php b/sites/default/bootstrap-phpunit.php index 4da3779..0df07c8 100644 --- a/sites/default/bootstrap-phpunit.php +++ b/sites/default/bootstrap-phpunit.php @@ -12,3 +12,6 @@ // Drupal just usurped PHPUnit's error handler. Kick it off the throne. restore_error_handler(); + +// Load contrib libs so tests can inherit from them. +require_once( '../vendor/autoload.php' ); -- To view, visit https://gerrit.wikimedia.org/r/163134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I669a83351968521c224c8b8315976758d303cc9e Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a trailing newline - change (mediawiki...MonoBook)
jenkins-bot has submitted this change and it was merged. Change subject: Add a trailing newline .. Add a trailing newline Change-Id: I86ae9c40e613a27c310f639e2324f1891edba209 --- M MonoBookTemplate.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php index c432625..0673e76 100644 --- a/MonoBookTemplate.php +++ b/MonoBookTemplate.php @@ -183,6 +183,7 @@ $this-printTrail(); echo Html::closeElement( 'body' ); echo Html::closeElement( 'html' ); + echo \n; wfRestoreWarnings(); } // end of execute() method -- To view, visit https://gerrit.wikimedia.org/r/163089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86ae9c40e613a27c310f639e2324f1891edba209 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MonoBook Gerrit-Branch: master Gerrit-Owner: MZMcBride w...@mzmcbride.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove executable bit from non-executable files - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove executable bit from non-executable files .. Remove executable bit from non-executable files Follow-up: - Ibd1c0617c4 (d30edce) - I1a906f533f (42583e9) Change-Id: I8081ed2f3fbb08f1d2c0c839a697029234e4d12d --- M resources/src/mediawiki.action/mediawiki.action.edit.styles.css M resources/src/mediawiki.action/mediawiki.action.history.diff.css M resources/src/mediawiki.skinning/interface.css 3 files changed, 0 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css old mode 100755 new mode 100644 diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.css b/resources/src/mediawiki.action/mediawiki.action.history.diff.css old mode 100755 new mode 100644 diff --git a/resources/src/mediawiki.skinning/interface.css b/resources/src/mediawiki.skinning/interface.css old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/163109 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8081ed2f3fbb08f1d2c0c839a697029234e4d12d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex coderev...@emsenhuber.ch Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Isarra zhoris...@gmail.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move RepoItemLinkGenerator into client namespace - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/163135 Change subject: Move RepoItemLinkGenerator into client namespace .. Move RepoItemLinkGenerator into client namespace Change-Id: I2afeda32852f1f7f2f2bb0c294b4617679044d63 --- M client/WikibaseClient.hooks.php M client/includes/RepoItemLinkGenerator.php M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php 3 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/35/163135/1 diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index e243809..e618e45 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -37,6 +37,7 @@ use Wikibase\Client\RecentChanges\ChangeLineFormatter; use Wikibase\Client\RecentChanges\ExternalChangeFactory; use Wikibase\Client\RecentChanges\RecentChangesFilterOptions; +use Wikibase\Client\RepoItemLinkGenerator; use Wikibase\Client\WikibaseClient; /** diff --git a/client/includes/RepoItemLinkGenerator.php b/client/includes/RepoItemLinkGenerator.php index 6337dae..b5d3296 100644 --- a/client/includes/RepoItemLinkGenerator.php +++ b/client/includes/RepoItemLinkGenerator.php @@ -1,10 +1,12 @@ ?php -namespace Wikibase; +namespace Wikibase\Client; use Title; use Wikibase\Client\RepoLinker; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; +use Wikibase\NamespaceChecker; /** * @since 0.4 diff --git a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php index f73e7c7..d239850 100644 --- a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php +++ b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php @@ -4,13 +4,13 @@ use Language; use Title; +use Wikibase\Client\RepoItemLinkGenerator; use Wikibase\Client\RepoLinker; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\NamespaceChecker; -use Wikibase\RepoItemLinkGenerator; /** - * @covers Wikibase\RepoItemLinkGenerator + * @covers Wikibase\Client\RepoItemLinkGenerator * * @group WikibaseClient * @group RepoItemLinkGenerator -- To view, visit https://gerrit.wikimedia.org/r/163135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2afeda32852f1f7f2f2bb0c294b4617679044d63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test what happens with Konqueror 3.5 against the blacklist - change (mediawiki/core)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/163136 Change subject: Test what happens with Konqueror 3.5 against the blacklist .. Test what happens with Konqueror 3.5 against the blacklist Konqueror 3.5 is not mentioned in recent compatibility decisions https://lists.wikimedia.org/pipermail/wikitech-l/2014-August/077958.html and should not be affected by the recent changes, but one 3.5.4 user reports problems on en.wikipedia.org since few days ago. Konqueror 3.5 was released in 2006 and is more a contemporary of Firefox 2 than of Firefox 3.5, though last in 3.5 series was released on August 2008. http://www.kde.org/announcements/announce-3.5.10.php Maybe it should be declared as grade C if it's really not currently functioning. Change-Id: Ia42a9e5028f1aae4837b204eab1e50c4121061c5 --- M tests/qunit/suites/resources/startup.test.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/163136/1 diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js index ed03418..6011961 100644 --- a/tests/qunit/suites/resources/startup.test.js +++ b/tests/qunit/suites/resources/startup.test.js @@ -96,6 +96,7 @@ 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20060928 (Debian|Debian-1.8.0.7-1) Epiphany/2.14', 'Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.8.1.6) Gecko/20070817 IceWeasel/2.0.0.6-g2', // KHTML + 'Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.4 (like Gecko)', 'Mozilla/5.0 (compatible; Konqueror/4.3; Linux) KHTML/4.3.5 (like Gecko)', // Text browsers 'Links (2.1pre33; Darwin 8.11.0 Power Macintosh; x)', -- To view, visit https://gerrit.wikimedia.org/r/163136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia42a9e5028f1aae4837b204eab1e50c4121061c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make onPostLoginRedirect behave the same as onCentralAuthPos... - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Make onPostLoginRedirect behave the same as
onCentralAuthPostLoginRedirect
..
Make onPostLoginRedirect behave the same as onCentralAuthPostLoginRedirect
Automatically redirect the user to the previous page
Change-Id: Ibd4d51a58ac27efaffb02c1a7ef3a3c39e420640
---
M Hooks.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 79c099b..46f7557 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -428,10 +428,8 @@
if ( !self::shouldShowGettingStarted( $returnToQuery, $type ) )
{
return true;
}
- // TODO: rmoen 2014-05-30 determine if we want to mock the
current bahavior
- // if CentralAuth is not enabled. Note: Auto redirecting is out
of the normal
- // login flow for users logging in on wikis not running C.A.
- // This can be done by setting $type = 'successredirect';
+ // Behave like centralAuth and auto redirect to previous page
+ $type = 'successredirect';
$returnToQuery['gettingStartedReturn'] = 'true';
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/163108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd4d51a58ac27efaffb02c1a7ef3a3c39e420640
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eqiad-prod: bump ms-be1013/1014/1015 weight to 3000 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/163137 Change subject: eqiad-prod: bump ms-be1013/1014/1015 weight to 3000 .. eqiad-prod: bump ms-be1013/1014/1015 weight to 3000 Change-Id: Id67c9b63f9d0e92ac5200d4812b2f1ce2b2d1519 --- M eqiad-prod/object.builder M eqiad-prod/object.dump M eqiad-prod/object.ring.gz 3 files changed, 207 insertions(+), 235 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/37/163137/1 -- To view, visit https://gerrit.wikimedia.org/r/163137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id67c9b63f9d0e92ac5200d4812b2f1ce2b2d1519 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-ring Gerrit-Branch: master Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Commit with index.php - third commit! - change (mediawiki/core)
Andriana has uploaded a new change for review. https://gerrit.wikimedia.org/r/163138 Change subject: Commit with index.php - third commit! .. Commit with index.php - third commit! Change-Id: Ifa139a596c92a0aa478554830a685c503aa861d4 --- M index.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/38/163138/1 diff --git a/index.php b/index.php index b35967b..0398931 100644 --- a/index.php +++ b/index.php @@ -44,3 +44,4 @@ $mediaWiki = new MediaWiki(); $mediaWiki-run(); +//SOME CHANGES! -- To view, visit https://gerrit.wikimedia.org/r/163138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa139a596c92a0aa478554830a685c503aa861d4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Andriana aa...@cisco.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Respect $wgNamespacesWithSubpages by default - change (mediawiki...Collection)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163139
Change subject: Respect $wgNamespacesWithSubpages by default
..
Respect $wgNamespacesWithSubpages by default
Using the full page name has no benefit and causes a long series of
problems to wikis which use subpages. See bug 28066 for some examples
and the kind of features which are considered necessary as workaround;
we can simplify the requirements by using a sensible default to start
wirh. Main namespace doesn't use subpages by default in core, but main
is not the only content namespace and could itself use subpages: that
is the job of $wgNamespacesWithSubpages to determine.
This has no adverse effect on wikis where nearly all collections are
made from namespaces with subpages disabled (like Wikipedia).
The undocumented $wgCollectionHierarchyDelimiter feature is also left
as later override so its users are not affected.
Also expand some code comments and point to the $collection specs.
Bug: 28066
Change-Id: I5e2c50fdaaada84651841df0ab0c52a7ed398b20
---
M Collection.body.php
M Collection.php
2 files changed, 16 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/39/163139/1
diff --git a/Collection.body.php b/Collection.body.php
index d5fa01e..4b6d5ec 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -642,6 +642,7 @@
'type' = 'article',
'content_type' = 'text/x-wiki',
'title' = $prefixedText,
+ 'displaytitle' = $title-getSubpageText(),
'revision' = strval( $oldid ),
'latest' = strval( $latest ),
'timestamp' = wfTimestamp( TS_UNIX,
$revision-getTimestamp() ),
@@ -871,6 +872,7 @@
'type' = 'article',
'content_type' = 'text/x-wiki',
'title' = $articleTitle-getPrefixedText(),
+ 'displaytitle' = $title-getSubpageText(),
'latest' = $latest,
'revision' = $oldid,
'timestamp' = wfTimestamp( TS_UNIX,
$revision-getTimestamp() ),
@@ -999,11 +1001,14 @@
}
/**
-* @param $collection
-* @param $referrer Title
-* @param $writer
+* Take an array of arrays, each containing information about one item
to be
+* assembled and exported, and appropriately feed the backend chosen
($writer).
+* @param $collection array following the collection/Metabook
dictionary formats
+* https://mwlib.readthedocs.org/en/latest/internals.html#article
+* @param $referrer Title object, used only to provide a returnto
parameter.
+* @param $writer A writer registered in the appropriate configuration.
*/
- function renderCollection( $collection, $referrer, $writer ) {
+ function renderCollection( $collection, Title $referrer, $writer ) {
if ( !$writer ) {
$writer = 'rl';
}
@@ -1190,9 +1195,11 @@
}
/**
-* @param $title Title
+* Render a single page: fetch page name and revision information, then
+* assemble and feed to renderCollection() a single-item $collection.
+* @param $title Title needs to be full page name aka prefixed title.
* @param $oldid int
-* @param $writer
+* @param $writer A writer registered in the appropriate configuration.
*/
function renderArticle( $title, $oldid, $writer ) {
if ( is_null( $title ) ) {
@@ -1202,7 +1209,8 @@
$article = array(
'type' = 'article',
'content_type' = 'text/x-wiki',
- 'title' = $title-getPrefixedText()
+ 'title' = $title-getPrefixedText(),
+ 'displaytitle' = $title-getSubpageText(),
);
if ( $oldid ) {
$article['revision'] = strval( $oldid );
diff --git a/Collection.php b/Collection.php
index 7297160..53c8c92 100644
--- a/Collection.php
+++ b/Collection.php
@@ -139,8 +139,7 @@
),
);
-/** For formats which rendering depends on an external server
-*/
+/* For formats whose rendering depends on an external server */
$wgCollectionFormatToServeURL = array();
$wgCollectionContentTypeToFilename = array(
--
To view, visit https://gerrit.wikimedia.org/r/163139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e2c50fdaaada84651841df0ab0c52a7ed398b20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Nemo bis
[MediaWiki-commits] [Gerrit] Use getFileContents() instead of incorrect file system call ... - change (mediawiki/core)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163140
Change subject: Use getFileContents() instead of incorrect file system call to
fetch file contents.
..
Use getFileContents() instead of incorrect file system call to fetch file
contents.
Bug: 47281
Change-Id: I2b9be4165ae85c52ff9a9b68b9d71ec011a6c5b4
(cherry picked from commit 3b5770835d91d01d2d906cd8c9e6a00058fc0001)
---
M includes/Export.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/163140/1
diff --git a/includes/Export.php b/includes/Export.php
index 7773d03..d120201 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -662,10 +662,13 @@
$archiveName = '';
}
if ( $dumpContents ) {
+ $be = $file-getRepo()-getBackend();
# Dump file as base64
# Uses only XML-safe characters, so does not need
escaping
+ # @TODO: too bad this loads the contents into memory
(script might swap)
$contents = ' contents encoding=base64' .
- chunk_split( base64_encode( file_get_contents(
$file-getPath() ) ) ) .
+ chunk_split( base64_encode(
+ $be-getFileContents( array( 'src' =
$file-getPath() ) ) ) ) .
/contents\n;
} else {
$contents = '';
--
To view, visit https://gerrit.wikimedia.org/r/163140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b9be4165ae85c52ff9a9b68b9d71ec011a6c5b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_19
Gerrit-Owner: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swiftstats: fix argparse %(default)s - change (operations/software)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160427
Change subject: swiftstats: fix argparse %(default)s
..
swiftstats: fix argparse %(default)s
Change-Id: Ie9152dfc273087b36836eacb11e1ccf03c797c72
---
M thumbstats/swift-thumb-stats
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/27/160427/1
diff --git a/thumbstats/swift-thumb-stats b/thumbstats/swift-thumb-stats
index 9b501ac..6b297e6 100755
--- a/thumbstats/swift-thumb-stats
+++ b/thumbstats/swift-thumb-stats
@@ -163,7 +163,7 @@
help='Key for obtaining an auth token')
parser.add_argument('-t', '--threads', dest='threads',
default=3, type=int,
-help='How many threads to use (%default)')
+help='How many threads to use (%(default)s)')
args = parser.parse_args()
if None in (args.auth, args.user, args.key):
--
To view, visit https://gerrit.wikimedia.org/r/160427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9152dfc273087b36836eacb11e1ccf03c797c72
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] thumbstats: fix description - change (operations/software)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160426
Change subject: thumbstats: fix description
..
thumbstats: fix description
Change-Id: Ib344b0a6c0a70d9c437100049ca7492859c5d342
---
M thumbstats/swift-thumb-stats
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/26/160426/2
diff --git a/thumbstats/swift-thumb-stats b/thumbstats/swift-thumb-stats
index 03e9e5e..9b501ac 100755
--- a/thumbstats/swift-thumb-stats
+++ b/thumbstats/swift-thumb-stats
@@ -151,7 +151,7 @@
def main():
-parser = argparse.ArgumentParser(description=Print swift account
statistics)
+parser = argparse.ArgumentParser(description=Print swift thumb
statistics)
parser.add_argument('-A', '--auth', dest='auth',
default=os.environ.get('ST_AUTH', None),
help='URL for obtaining an auth token')
--
To view, visit https://gerrit.wikimedia.org/r/160426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib344b0a6c0a70d9c437100049ca7492859c5d342
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] thumbstats: fix description - change (operations/software)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: thumbstats: fix description
..
thumbstats: fix description
Change-Id: Ib344b0a6c0a70d9c437100049ca7492859c5d342
---
M thumbstats/swift-thumb-stats
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/thumbstats/swift-thumb-stats b/thumbstats/swift-thumb-stats
index 03e9e5e..9b501ac 100755
--- a/thumbstats/swift-thumb-stats
+++ b/thumbstats/swift-thumb-stats
@@ -151,7 +151,7 @@
def main():
-parser = argparse.ArgumentParser(description=Print swift account
statistics)
+parser = argparse.ArgumentParser(description=Print swift thumb
statistics)
parser.add_argument('-A', '--auth', dest='auth',
default=os.environ.get('ST_AUTH', None),
help='URL for obtaining an auth token')
--
To view, visit https://gerrit.wikimedia.org/r/160426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib344b0a6c0a70d9c437100049ca7492859c5d342
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swiftstats: fix argparse %(default)s - change (operations/software)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swiftstats: fix argparse %(default)s
..
swiftstats: fix argparse %(default)s
Change-Id: Ie9152dfc273087b36836eacb11e1ccf03c797c72
---
M thumbstats/swift-thumb-stats
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/thumbstats/swift-thumb-stats b/thumbstats/swift-thumb-stats
index 9b501ac..6b297e6 100755
--- a/thumbstats/swift-thumb-stats
+++ b/thumbstats/swift-thumb-stats
@@ -163,7 +163,7 @@
help='Key for obtaining an auth token')
parser.add_argument('-t', '--threads', dest='threads',
default=3, type=int,
-help='How many threads to use (%default)')
+help='How many threads to use (%(default)s)')
args = parser.parse_args()
if None in (args.auth, args.user, args.key):
--
To view, visit https://gerrit.wikimedia.org/r/160427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9152dfc273087b36836eacb11e1ccf03c797c72
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add message documenation - change (mediawiki...Capiunto)
jenkins-bot has submitted this change and it was merged.
Change subject: Add message documenation
..
Add message documenation
* Fix extension credits array
* Add license to extension credits per file header
* Consistency tweak in description message
Change-Id: I07e0e44768547529dfe71905545b4c49b011e1c6
---
M Capiunto.php
M i18n/en.json
A i18n/qqq.json
3 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Capiunto.php b/Capiunto.php
index 8180e00..b4b4128 100644
--- a/Capiunto.php
+++ b/Capiunto.php
@@ -11,12 +11,13 @@
die( Not an entry point.\n );
}
-$wgExtensionCredits['parserhook']['Capiunto'] = array(
+$wgExtensionCredits['parserhook'] = array(
'path' = __FILE__,
'name' = 'Capiunto',
'author' = 'Marius Hoch',
'url' = 'https://www.mediawiki.org/wiki/Extension:Capiunto',
'descriptionmsg' = 'capiunto-desc',
+ 'license-name' = 'GPLv2',
);
$wgMessagesDirs['Capiunto'] = __DIR__ . '/i18n';
diff --git a/i18n/en.json b/i18n/en.json
index ee59754..f17cde8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,5 @@
Marius Hoch
]
},
-capiunto-desc: Provides basic Infobox functionality for Scribunto.
+capiunto-desc: Provides basic infobox functionality for Scribunto
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..06c33a7
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+@metadata: {
+authors: [
+Raimond Spekking
+]
+},
+capiunto-desc:
{{desc|name=Capiunto|url=https://www.mediawiki.org/wiki/Extension:Capiunto}};
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/163116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07e0e44768547529dfe71905545b4c49b011e1c6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Capiunto
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setup ldap client in bast1001 - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163141
Change subject: Setup ldap client in bast1001
..
Setup ldap client in bast1001
With this, silver (according to puppet, at least) has no
more functions, and can be decomissioned
Change-Id: I68c9cd9c4e636d4ca98f12f619edfaffe7462657
---
M manifests/site.pp
M modules/admin/README
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/163141/1
diff --git a/manifests/site.pp b/manifests/site.pp
index bdc398f..12748de 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -354,7 +354,8 @@
class { 'admin':
groups = ['deployment',
'restricted',
- 'bastiononly'],
+ 'bastiononly',
+ 'ldap-admins'],
}
@@ -362,6 +363,7 @@
include nfs::netapp::home::othersite
include misc::dsh
include ssh::hostkeys-collect
+include ldap::role::client::labs
}
node 'bast2001.wikimedia.org' {
@@ -2674,9 +2676,7 @@
}
node 'silver.wikimedia.org' {
-class { 'admin': groups = ['ldap-admins'] }
include standard
-include ldap::role::client::labs
}
node 'sodium.wikimedia.org' {
diff --git a/modules/admin/README b/modules/admin/README
index 2d8bfd7..98b2420 100644
--- a/modules/admin/README
+++ b/modules/admin/README
@@ -56,7 +56,7 @@
# NOTE: To choose the UID for a new user please lookup
# the existing UID in (labs) LDAP and use that.
-# currently you do this on silver, example:
+# currently you do this on bast1001, example:
#
# ldaplist -l passwd someuser
# ...
--
To view, visit https://gerrit.wikimedia.org/r/163141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68c9cd9c4e636d4ca98f12f619edfaffe7462657
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Watchlist: changed all for the max number of days available - change (mediawiki/core)
Luis Felipe Schenone has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163142
Change subject: Watchlist: changed all for the max number of days available
..
Watchlist: changed all for the max number of days available
Bug 26022
Continues the change Iffcbc837, which was abandoned for old.
Change-Id: I349c801d74dade093a64f17afa8f1d18e0249c3e
---
M includes/DefaultSettings.php
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
4 files changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/163142/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 28349e9..ea2242f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5731,9 +5731,9 @@
/**
* Recentchanges items are periodically purged; entries older than this many
* seconds will go.
- * Default: 13 weeks = about three months
+ * Default: 90 days = about three months
*/
-$wgRCMaxAge = 13 * 7 * 24 * 3600;
+$wgRCMaxAge = 90 * 24 * 3600;
/**
* Filter $wgRCLinkDays by $wgRCMaxAge to avoid showing links for numbers
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index 8f2f86b..7becfaa 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -562,12 +562,10 @@
protected function daysLink( $d, $options = array() ) {
$options['days'] = $d;
- $message = $d ? $this-getLanguage()-formatNum( $d )
- : $this-msg( 'watchlistall2' )-escaped();
return Linker::linkKnown(
$this-getPageTitle(),
- $message,
+ $this-getLanguage()-formatNum( $d ),
array(),
$options
);
@@ -581,8 +579,11 @@
* @return string
*/
protected function cutoffLinks( $days, $options = array() ) {
+ global $wgRCMaxAge;
+ $watchlistMaxDays = ceil( $wgRCMaxAge / ( 3600 * 24 ) );
+
$hours = array( 1, 2, 6, 12 );
- $days = array( 1, 3, 7 );
+ $days = array( 1, 3, 7, $watchlistMaxDays );
$i = 0;
foreach ( $hours as $h ) {
$hours[$i++] = $this-hoursLink( $h, $options );
@@ -594,8 +595,7 @@
return $this-msg( 'wlshowlast' )-rawParams(
$this-getLanguage()-pipeList( $hours ),
- $this-getLanguage()-pipeList( $days ),
- $this-daysLink( 0, $options ) )-parse();
+ $this-getLanguage()-pipeList( $days ) )-parse();
}
/**
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 12d1429..8cbbd2c 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1828,7 +1828,7 @@
wlheader-enotif: Email notification is enabled.,
wlheader-showupdated: Pages that have been changed since you last
visited them are shown in strongbold/strong.,
wlnote: Below {{PLURAL:$1|is the last change|are the last
strong$1/strong changes}} in the last {{PLURAL:$2|hour|strong$2/strong
hours}}, as of $3, $4.,
- wlshowlast: Show last $1 hours $2 days $3,
+ wlshowlast: Show last $1 hours $2 days,
watchlist-options: Watchlist options,
watching: Watching...,
unwatching: Unwatching...,
@@ -3050,7 +3050,6 @@
exif-urgency-low: Low ($1),
exif-urgency-high: High ($1),
exif-urgency-other: User-defined priority ($1),
- watchlistall2: all,
namespacesall: all,
monthsall: all,
confirmemail: Confirm email address,
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d480e2d..db3b894 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1990,7 +1990,7 @@
wlheader-enotif: Message at the top of [[Special:Watchlist]], after
{{msg-mw|watchlist-details}}. Has to be a full sentence.\n\nSee also:\n*
{{msg-mw|Watchlist-options|fieldset}}\n* {{msg-mw|enotif reset|Submit button
text}},
wlheader-showupdated: Message at the top of [[Special:Watchlist]],
after {{msg-mw|watchlist-details}}. Has to be a full sentence.,
wlnote: Used on [[Special:Watchlist]] when a maximum number of hours
or days is specified.\n\nParameters:\n* $1 - the number of changes shown\n* $2
- the number of hours for which the changes are shown\n* $3 - a date alone\n*
$4 - a time alone,
- wlshowlast: Appears on [[Special:Watchlist]]. Parameters:\n* $1 - a
choice of different numbers of hours (\1 | 2 | 6 | 12\)\n* $2 - a choice of
different numbers of days (\1 | 3 | 7\)\n* $3 -
{{msg-mw|watchlistall2}}\nClicking on your choice changes the list of changes
you see (without
[MediaWiki-commits] [Gerrit] Move RepoItemLinkGenerator into client namespace - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move RepoItemLinkGenerator into client namespace .. Move RepoItemLinkGenerator into client namespace Change-Id: I2afeda32852f1f7f2f2bb0c294b4617679044d63 --- M client/WikibaseClient.hooks.php M client/includes/RepoItemLinkGenerator.php M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php 3 files changed, 6 insertions(+), 3 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index e243809..e618e45 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -37,6 +37,7 @@ use Wikibase\Client\RecentChanges\ChangeLineFormatter; use Wikibase\Client\RecentChanges\ExternalChangeFactory; use Wikibase\Client\RecentChanges\RecentChangesFilterOptions; +use Wikibase\Client\RepoItemLinkGenerator; use Wikibase\Client\WikibaseClient; /** diff --git a/client/includes/RepoItemLinkGenerator.php b/client/includes/RepoItemLinkGenerator.php index 6337dae..b5d3296 100644 --- a/client/includes/RepoItemLinkGenerator.php +++ b/client/includes/RepoItemLinkGenerator.php @@ -1,10 +1,12 @@ ?php -namespace Wikibase; +namespace Wikibase\Client; use Title; use Wikibase\Client\RepoLinker; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; +use Wikibase\NamespaceChecker; /** * @since 0.4 diff --git a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php index f73e7c7..d239850 100644 --- a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php +++ b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php @@ -4,13 +4,13 @@ use Language; use Title; +use Wikibase\Client\RepoItemLinkGenerator; use Wikibase\Client\RepoLinker; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\NamespaceChecker; -use Wikibase\RepoItemLinkGenerator; /** - * @covers Wikibase\RepoItemLinkGenerator + * @covers Wikibase\Client\RepoItemLinkGenerator * * @group WikibaseClient * @group RepoItemLinkGenerator -- To view, visit https://gerrit.wikimedia.org/r/163135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2afeda32852f1f7f2f2bb0c294b4617679044d63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the Capiunto extension - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Add the Capiunto extension .. Add the Capiunto extension Change-Id: Ie9a2f2d01486ef3dc8ec2afa8ef4d0cf4b065d4a --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index ef5f941..12cd1ef 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -469,6 +469,8 @@ Campaigns +Capiunto + Carp optional = carp-function-msg, carp-template-msg, carp-template -- To view, visit https://gerrit.wikimedia.org/r/163077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9a2f2d01486ef3dc8ec2afa8ef4d0cf4b065d4a Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Diff-related classes into namespace - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move Diff-related classes into namespace .. Move Diff-related classes into namespace Change-Id: If16ddd6f7b4840cb38e6f448e17cf23c3c6ea536 (cherry picked from commit 501e44238ab02cfaad8ccd9b4085d16f90629e72) --- M repo/includes/ClaimSummaryBuilder.php R repo/includes/Diff/ClaimDiffer.php R repo/includes/Diff/ClaimDifference.php R repo/includes/Diff/ClaimDifferenceVisualizer.php R repo/includes/Diff/DiffOpValueFormatter.php R repo/includes/Diff/DiffView.php R repo/includes/Diff/EntityContentDiffView.php R repo/includes/Diff/EntityDiffVisualizer.php M repo/includes/actions/EditEntityAction.php M repo/includes/api/SetClaim.php M repo/includes/content/EntityHandler.php M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php R repo/tests/phpunit/includes/Diff/ClaimDifferTest.php R repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php R repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php R repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php R repo/tests/phpunit/includes/Diff/DiffViewTest.php R repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php R repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php 19 files changed, 49 insertions(+), 36 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/ClaimSummaryBuilder.php b/repo/includes/ClaimSummaryBuilder.php index 5e98795..04c56b1 100644 --- a/repo/includes/ClaimSummaryBuilder.php +++ b/repo/includes/ClaimSummaryBuilder.php @@ -3,6 +3,7 @@ namespace Wikibase; use InvalidArgumentException; +use Wikibase\Repo\Diff\ClaimDiffer; /** * EditSummary-Builder for claim operations diff --git a/repo/includes/ClaimDiffer.php b/repo/includes/Diff/ClaimDiffer.php similarity index 94% rename from repo/includes/ClaimDiffer.php rename to repo/includes/Diff/ClaimDiffer.php index bd01646..ad30474 100644 --- a/repo/includes/ClaimDiffer.php +++ b/repo/includes/Diff/ClaimDiffer.php @@ -1,10 +1,14 @@ ?php -namespace Wikibase; +namespace Wikibase\Repo\Diff; use Diff\Differ\Differ; use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpChange; +use Wikibase\DataModel\Claim\Claim; +use Wikibase\DataModel\ReferenceList; +use Wikibase\DataModel\Snak\SnakList; +use Wikibase\DataModel\Statement\Statement; /** * Class for generating a ClaimDifference given two claims. diff --git a/repo/includes/ClaimDifference.php b/repo/includes/Diff/ClaimDifference.php similarity index 98% rename from repo/includes/ClaimDifference.php rename to repo/includes/Diff/ClaimDifference.php index a05fc0f..8d0fd65 100644 --- a/repo/includes/ClaimDifference.php +++ b/repo/includes/Diff/ClaimDifference.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase; +namespace Wikibase\Repo\Diff; use Comparable; use Diff\DiffOp\Diff\Diff; diff --git a/repo/includes/ClaimDifferenceVisualizer.php b/repo/includes/Diff/ClaimDifferenceVisualizer.php similarity index 98% rename from repo/includes/ClaimDifferenceVisualizer.php rename to repo/includes/Diff/ClaimDifferenceVisualizer.php index 021507c..808dc24 100644 --- a/repo/includes/ClaimDifferenceVisualizer.php +++ b/repo/includes/Diff/ClaimDifferenceVisualizer.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase; +namespace Wikibase\Repo\Diff; use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpAdd; @@ -13,6 +13,10 @@ use RuntimeException; use ValueFormatters\FormattingException; use ValueFormatters\ValueFormatter; +use Wikibase\DataModel\Claim\Claim; +use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Snak\Snak; +use Wikibase\DataModel\Snak\SnakList; use Wikibase\Lib\Serializers\ClaimSerializer; use Wikibase\Lib\SnakFormatter; diff --git a/repo/includes/DiffOpValueFormatter.php b/repo/includes/Diff/DiffOpValueFormatter.php similarity index 99% rename from repo/includes/DiffOpValueFormatter.php rename to repo/includes/Diff/DiffOpValueFormatter.php index 24c956c..1bfb0c2 100644 --- a/repo/includes/DiffOpValueFormatter.php +++ b/repo/includes/Diff/DiffOpValueFormatter.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase; +namespace Wikibase\Repo\Diff; use Diff; use Html; diff --git a/repo/includes/DiffView.php b/repo/includes/Diff/DiffView.php similarity index 99% rename from repo/includes/DiffView.php rename to repo/includes/Diff/DiffView.php index 2d63337..8b15c61 100644 --- a/repo/includes/DiffView.php +++ b/repo/includes/Diff/DiffView.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase; +namespace Wikibase\Repo\Diff; use ContextSource; use Diff\DiffOp\Diff\Diff; diff --git a/repo/includes/EntityContentDiffView.php b/repo/includes/Diff/EntityContentDiffView.php similarity index 99% rename from repo/includes/EntityContentDiffView.php rename to repo/includes/Diff/EntityContentDiffView.php index a6c204d..8cd7d2e 100644 --- a/repo/includes/EntityContentDiffView.php +++
[MediaWiki-commits] [Gerrit] convert mathoid from high-traffic to low-traffic - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163144
Change subject: convert mathoid from high-traffic to low-traffic
..
convert mathoid from high-traffic to low-traffic
Bad assumption on my part to put it in high-traffic anyway
Add service IP for mathoid in LVS balancer IPs
Change-Id: I9ac218a56e4794d968058d401fe329a449ea5307
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/163144/1
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index e77961a..6455b04 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -49,6 +49,7 @@
$sip['search_prefix'][$::site],
$sip['swift'][$::site],
$sip['parsoid'][$::site],
+$sip['mathoid'][$::site],
$sip['search'][$::site],
],
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 2a791b7..4d9f046 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -884,7 +884,7 @@
},
'mathoid' = {
'description' = 'Mathematical rendering service,
mathoid.svc.eqiad.wmnet',
-'class' = 'high-traffic2',
+'class' = 'low-traffic',
'sites' = [ 'eqiad' ],
'ip' = $service_ips['mathoid'][$::site],
'port' = 10042,
--
To view, visit https://gerrit.wikimedia.org/r/163144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ac218a56e4794d968058d401fe329a449ea5307
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: allow additional pools on one mediawiki host - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163145
Change subject: mediawiki: allow additional pools on one mediawiki host
..
mediawiki: allow additional pools on one mediawiki host
Change-Id: I80db47e22b3ced3577cfe8e27a23384816c4354f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/mainrole/appserver_hhvm.yaml
M manifests/role/mediawiki.pp
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/163145/1
diff --git a/hieradata/mainrole/appserver_hhvm.yaml
b/hieradata/mainrole/appserver_hhvm.yaml
index 393c03b..62c4e1f 100644
--- a/hieradata/mainrole/appserver_hhvm.yaml
+++ b/hieradata/mainrole/appserver_hhvm.yaml
@@ -1,2 +1,3 @@
cluster: appserver_hhvm
role::mediawiki::webserver::pool: hhvm_appservers
+role::mediawiki::webserver::additional_pool: hhvm_api
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index e341857..78e95de 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -52,7 +52,7 @@
}
}
-class role::mediawiki::webserver( $pool, $workers_limit = undef ) {
+class role::mediawiki::webserver( $pool, $workers_limit = undef,
$additional_pool = undef) {
include ::role::mediawiki::common
include ::apache::monitoring
include ::lvs::configuration
@@ -62,8 +62,19 @@
workers_limit = $workers_limit,
}
+# Horrible, temporarily hack for hhvm - which is sharing servers for api
and normal
+# appservers; this will go away soon
+if $additional_pool != undef {
+$ips = [
+$lvs::configuration::lvs_service_ips[$::realm][$pool][$::site],
+
$lvs::configuration::lvs_service_ips[$::realm][$additional_pool][$::site]
+]
+} else {
+$ips = $lvs::configuration::lvs_service_ips[$::realm][$pool][$::site]
+}
+
class { 'lvs::realserver':
-realserver_ips =
$lvs::configuration::lvs_service_ips[$::realm][$pool][$::site],
+realserver_ips = $ips,
}
monitor_service { 'appserver http':
--
To view, visit https://gerrit.wikimedia.org/r/163145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80db47e22b3ced3577cfe8e27a23384816c4354f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] convert mathoid from high-traffic to low-traffic - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: convert mathoid from high-traffic to low-traffic
..
convert mathoid from high-traffic to low-traffic
Bad assumption on my part to put it in high-traffic anyway
Add service IP for mathoid in LVS balancer IPs
Change-Id: I9ac218a56e4794d968058d401fe329a449ea5307
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index e77961a..6455b04 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -49,6 +49,7 @@
$sip['search_prefix'][$::site],
$sip['swift'][$::site],
$sip['parsoid'][$::site],
+$sip['mathoid'][$::site],
$sip['search'][$::site],
],
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 2a791b7..4d9f046 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -884,7 +884,7 @@
},
'mathoid' = {
'description' = 'Mathematical rendering service,
mathoid.svc.eqiad.wmnet',
-'class' = 'high-traffic2',
+'class' = 'low-traffic',
'sites' = [ 'eqiad' ],
'ip' = $service_ips['mathoid'][$::site],
'port' = 10042,
--
To view, visit https://gerrit.wikimedia.org/r/163144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ac218a56e4794d968058d401fe329a449ea5307
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: Move initscript into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163146
Change subject: icinga: Move initscript into module
..
icinga: Move initscript into module
Ideally we should just use the one that comes with icinga,
but not in this refactor
Change-Id: I81efef248eb62004d654421ef1807689436ab213
---
M manifests/misc/icinga.pp
R modules/icinga/files/icinga-init
A modules/icinga/manifests/initscript.pp
M modules/icinga/manifests/packages.pp
4 files changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/163146/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 70e456d..bd4f680 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -112,14 +112,6 @@
] :
notify = Service['icinga'],
}
-
-
-file { '/etc/init.d/icinga':
-source = 'puppet:///files/icinga/icinga-init',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
}
class icinga::monitor::files::misc {
diff --git a/files/icinga/icinga-init b/modules/icinga/files/icinga-init
similarity index 100%
rename from files/icinga/icinga-init
rename to modules/icinga/files/icinga-init
diff --git a/modules/icinga/manifests/initscript.pp
b/modules/icinga/manifests/initscript.pp
new file mode 100644
index 000..f004bbd
--- /dev/null
+++ b/modules/icinga/manifests/initscript.pp
@@ -0,0 +1,12 @@
+# Class: icinga::initscript
+#
+# Sets up a custom init script for icinga
+# FIXME: Unsure why this is required
+class icinga::initscript {
+file { '/etc/init.d/icinga':
+source = 'puppet:///modules/icinga/icinga-init',
+owner = 'root',
+group = 'root',
+mode = '0755',
+}
+}
diff --git a/modules/icinga/manifests/packages.pp
b/modules/icinga/manifests/packages.pp
index e57329e..da35211 100644
--- a/modules/icinga/manifests/packages.pp
+++ b/modules/icinga/manifests/packages.pp
@@ -9,4 +9,6 @@
] :
ensure = latest,
}
+
+include icinga::initscript
}
--
To view, visit https://gerrit.wikimedia.org/r/163146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81efef248eb62004d654421ef1807689436ab213
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Cleanup the Sanitarium - change (operations/software)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163147
Change subject: WIP: Cleanup the Sanitarium
..
WIP: Cleanup the Sanitarium
We already set triggers on tables for the nulling out fields
replicated to labs; extend that to a cleaner whitelist approach
that does not care when new tables and wikis are created.
Make it easier to resync the labs slaves by using activity
logging along side normal replication, designed along the lines
of Tungsten Replicator (without the java bit).
Probably also relevant to the impending replication of some Event
Logging tables to labs, pending discussion.
Change-Id: I4d060cce995380709caf5facada15c57bc3fc5a1
---
A dbtools/repl_prepare_schema.sh
A dbtools/repl_prepare_table.sh
A dbtools/repl_prepare_wiki.sh
A dbtools/repl_sync_schema.sh
A dbtools/repl_sync_table.sh
5 files changed, 751 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/47/163147/1
diff --git a/dbtools/repl_prepare_schema.sh b/dbtools/repl_prepare_schema.sh
new file mode 100755
index 000..f517e78
--- /dev/null
+++ b/dbtools/repl_prepare_schema.sh
@@ -0,0 +1,241 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+echo $0 --host=... --db=...
+exit 1
+}
+
+user=root
+host=
+port=3306
+db=
+
+for var in $@; do
+
+if [[ $var =~ ^--host=(.+) ]]; then
+host=${BASH_REMATCH[1]}
+fi
+
+if [[ $var =~ ^--port=(.+) ]]; then
+port=${BASH_REMATCH[1]}
+fi
+
+if [[ $var =~ ^--user=(.+) ]]; then
+user=${BASH_REMATCH[1]}
+fi
+
+if [[ $var =~ ^--db=(.+) ]]; then
+db=${BASH_REMATCH[1]}
+fi
+
+done
+
+[ $db ] || usage
+[ $host ] || usage
+
+my=mysql -h $host -P $port -u $user --skip-column-names
+
+today=$($my -e select to_days(now()))
+tomorrow=$((today+1))
+
+$my $db EOD
+set session sql_log_bin = 0;
+
+drop table if exists repl_tables;
+create table if not exists repl_tables (
+table_name varchar(100) not null primary key,
+table_stamp datetime not null,
+table_md5 binary(16) not null,
+index (table_name),
+index (table_md5)
+) engine=innodb default charset=binary;
+
+drop trigger if exists repl_tables_ins;
+create trigger repl_tables_ins before insert on repl_tables
+for each row set new.table_stamp = now(), new.table_md5 =
unhex(md5(new.table_name));
+
+drop table if exists repl_ignore;
+create table if not exists repl_ignore (
+table_name varchar(100) not null,
+primary key (table_name)
+) engine=innodb default charset=binary;
+
+replace into repl_ignore values ('accountaudit_login');
+replace into repl_ignore values ('arbcom1_vote');
+replace into repl_ignore values ('archive_old');
+replace into repl_ignore values ('blob_orphans');
+replace into repl_ignore values ('blob_tracking');
+replace into repl_ignore values ('bv2009_edits');
+replace into repl_ignore values ('categorylinks_old');
+replace into repl_ignore values ('click_tracking');
+replace into repl_ignore values ('cu_changes');
+replace into repl_ignore values ('cu_log');
+replace into repl_ignore values ('cur');
+replace into repl_ignore values ('edit_page_tracking');
+replace into repl_ignore values ('email_capture');
+replace into repl_ignore values ('exarchive');
+replace into repl_ignore values ('exrevision');
+replace into repl_ignore values ('filejournal');
+replace into repl_ignore values ('globalnames');
+replace into repl_ignore values ('hidden');
+replace into repl_ignore values ('image_old');
+replace into repl_ignore values ('job');
+replace into repl_ignore values ('linkscc');
+replace into repl_ignore values ('localnames');
+replace into repl_ignore values ('log_search');
+replace into repl_ignore values ('logging_old');
+replace into repl_ignore values ('long_run_profiling');
+replace into repl_ignore values ('migrateuser_medium');
+replace into repl_ignore values ('moodbar_feedback');
+replace into repl_ignore values ('moodbar_feedback_response');
+replace into repl_ignore values ('objectcache');
+replace into repl_ignore values ('old_growth');
+replace into repl_ignore values ('oldimage_old');
+replace into repl_ignore values ('optin_survey');
+replace into repl_ignore values ('pr_index');
+replace into repl_ignore values ('prefstats');
+replace into repl_ignore values ('prefswitch_survey');
+replace into repl_ignore values ('profiling');
+replace into repl_ignore values ('querycache');
+replace into repl_ignore values ('querycache_info');
+replace into repl_ignore values ('querycache_old');
+replace into repl_ignore values ('querycachetwo');
+replace into repl_ignore values ('securepoll_cookie_match');
+replace into repl_ignore values ('securepoll_elections');
+replace into repl_ignore values ('securepoll_entity');
+replace into repl_ignore values ('securepoll_lists');
+replace into repl_ignore values ('securepoll_msgs');
+replace into repl_ignore values ('securepoll_options');
[MediaWiki-commits] [Gerrit] mediawiki: allow additional pools on one mediawiki host - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: allow additional pools on one mediawiki host
..
mediawiki: allow additional pools on one mediawiki host
Change-Id: I80db47e22b3ced3577cfe8e27a23384816c4354f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/mainrole/appserver_hhvm.yaml
M manifests/role/mediawiki.pp
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/hieradata/mainrole/appserver_hhvm.yaml
b/hieradata/mainrole/appserver_hhvm.yaml
index 393c03b..62c4e1f 100644
--- a/hieradata/mainrole/appserver_hhvm.yaml
+++ b/hieradata/mainrole/appserver_hhvm.yaml
@@ -1,2 +1,3 @@
cluster: appserver_hhvm
role::mediawiki::webserver::pool: hhvm_appservers
+role::mediawiki::webserver::additional_pool: hhvm_api
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index e341857..78e95de 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -52,7 +52,7 @@
}
}
-class role::mediawiki::webserver( $pool, $workers_limit = undef ) {
+class role::mediawiki::webserver( $pool, $workers_limit = undef,
$additional_pool = undef) {
include ::role::mediawiki::common
include ::apache::monitoring
include ::lvs::configuration
@@ -62,8 +62,19 @@
workers_limit = $workers_limit,
}
+# Horrible, temporarily hack for hhvm - which is sharing servers for api
and normal
+# appservers; this will go away soon
+if $additional_pool != undef {
+$ips = [
+$lvs::configuration::lvs_service_ips[$::realm][$pool][$::site],
+
$lvs::configuration::lvs_service_ips[$::realm][$additional_pool][$::site]
+]
+} else {
+$ips = $lvs::configuration::lvs_service_ips[$::realm][$pool][$::site]
+}
+
class { 'lvs::realserver':
-realserver_ips =
$lvs::configuration::lvs_service_ips[$::realm][$pool][$::site],
+realserver_ips = $ips,
}
monitor_service { 'appserver http':
--
To view, visit https://gerrit.wikimedia.org/r/163145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80db47e22b3ced3577cfe8e27a23384816c4354f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove dead code for amwiki - change (operations/mediawiki-config)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/163148 Change subject: Remove dead code for amwiki .. Remove dead code for amwiki PHP is not a RTL language… Change-Id: I08d2f16dcf4987a3ce073f4cd04410fe8e7b7121 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/48/163148/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 6734fe0..0263e2c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2379,9 +2379,6 @@ '+abwiki' = array( 'Wikipedia' = NS_PROJECT, ), - '+amwiki' = array( - 100 = 'በር', - ), '+angwiki' = array( // bug 56634, 58711 'Wikipedia' = NS_PROJECT, 'Wikipedia_talk' = NS_PROJECT_TALK, -- To view, visit https://gerrit.wikimedia.org/r/163148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08d2f16dcf4987a3ce073f4cd04410fe8e7b7121 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: Move service definition into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163150
Change subject: icinga: Move service definition into module
..
icinga: Move service definition into module
Change-Id: Ifb8dbe5e6d20c2b10d77fd6d3d5839692424d400
---
M manifests/misc/icinga.pp
A modules/icinga/manifests/service.pp
2 files changed, 36 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/163150/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index dad22af..a4d8377 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -5,7 +5,6 @@
include facilities::pdu_monitoring
include icinga::ganglia::ganglios
-include icinga::apache
include icinga::monitor::checkpaging
include icinga::monitor::files::misc
include icinga::monitor::files::nagios-plugins
@@ -13,7 +12,6 @@
include icinga::nsca::firewall
include icinga::nsca::daemon
include icinga::packages
-include icinga::monitor::service
include icinga::monitor::wikidata
include icinga::user
include icinga::global_hostgroups
@@ -24,16 +22,22 @@
include nrpe
include certificates::globalsign_ca
-Class['icinga::packages'] - Class['icinga::monitor::service']
-
class { 'icinga::config':
-require = [Class['icinga::packages'],
Class['icinga::monitor::service']],
+require = [Class['icinga::packages'], Class['icinga::service']],
notify = Service['icinga']
}
class { 'icinga::naggen':
require = Class['icinga::config'],
notify = Service['icinga'],
+}
+
+class { 'icinga::apache':
+require = Class['icinga::packages'],
+}
+
+class { 'icinga::service':
+require = Class['icinga::apache'],
}
}
@@ -224,36 +228,6 @@
ensure = absent,
}
-}
-
-
-
-class icinga::monitor::service {
-
-require icinga::apache
-
-file { '/var/icinga-tmpfs':
-ensure = directory,
-owner = 'icinga',
-group = 'icinga',
-mode = '0755',
-}
-
-mount { '/var/icinga-tmpfs':
-ensure = mounted,
-atboot = true,
-fstype = 'tmpfs',
-device = 'none',
-options = 'size=128m,uid=icinga,gid=icinga,mode=755',
-require = File['/var/icinga-tmpfs']
-}
-
-service { 'icinga':
-ensure= running,
-hasstatus = false,
-restart = '/etc/init.d/icinga reload',
-require = Mount['/var/icinga-tmpfs'],
-}
}
class icinga::ganglia::ganglios {
diff --git a/modules/icinga/manifests/service.pp
b/modules/icinga/manifests/service.pp
new file mode 100644
index 000..da60f79
--- /dev/null
+++ b/modules/icinga/manifests/service.pp
@@ -0,0 +1,27 @@
+# = Class: icinga::service
+#
+# Sets up a running icinga service and tmpfs
+class icinga::service {
+file { '/var/icinga-tmpfs':
+ensure = directory,
+owner = 'icinga',
+group = 'icinga',
+mode = '0755',
+}
+
+mount { '/var/icinga-tmpfs':
+ensure = mounted,
+atboot = true,
+fstype = 'tmpfs',
+device = 'none',
+options = 'size=128m,uid=icinga,gid=icinga,mode=755',
+require = File['/var/icinga-tmpfs']
+}
+
+service { 'icinga':
+ensure= running,
+hasstatus = false,
+restart = '/etc/init.d/icinga reload',
+require = Mount['/var/icinga-tmpfs'],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/163150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb8dbe5e6d20c2b10d77fd6d3d5839692424d400
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: Move config into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163149
Change subject: icinga: Move config into module
..
icinga: Move config into module
- No need for $static_files, since service refresh is triggered
by notify in the class declaration
- No need for individual service notifications inside naggen,
are handled in the class declaration
Change-Id: I26eeb51cd23a3f2b3187dd62814f23068a9fc787
---
M manifests/misc/icinga.pp
R modules/icinga/files/cgi.cfg
R modules/icinga/files/contactgroups.cfg
R modules/icinga/files/icinga.cfg
A modules/icinga/manifests/config.pp
M modules/icinga/manifests/naggen.pp
6 files changed, 65 insertions(+), 84 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/163149/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index bd4f680..dad22af 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -7,11 +7,9 @@
include icinga::ganglia::ganglios
include icinga::apache
include icinga::monitor::checkpaging
-include icinga::monitor::configuration::files
include icinga::monitor::files::misc
include icinga::monitor::files::nagios-plugins
include icinga::logrotate
-include icinga::naggen
include icinga::nsca::firewall
include icinga::nsca::daemon
include icinga::packages
@@ -24,11 +22,19 @@
include mysql
include nagios::gsbmonitoring
include nrpe
-include passwords::nagios::mysql
include certificates::globalsign_ca
-Class['icinga::packages'] -
Class['icinga::monitor::configuration::files'] -
Class['icinga::monitor::service'] - Class['icinga::naggen']
+Class['icinga::packages'] - Class['icinga::monitor::service']
+class { 'icinga::config':
+require = [Class['icinga::packages'],
Class['icinga::monitor::service']],
+notify = Service['icinga']
+}
+
+class { 'icinga::naggen':
+require = Class['icinga::config'],
+notify = Service['icinga'],
+}
}
# Nagios/icinga configuration files
@@ -41,77 +47,6 @@
$icinga_config_dir = '/etc/icinga'
$nagios_config_dir = '/etc/nagios'
-
-$static_files = [
-
${icinga::monitor::configuration::variables::icinga_config_dir}/puppet_hostextinfo.cfg,
-
${icinga::monitor::configuration::variables::icinga_config_dir}/puppet_services.cfg,
-
${icinga::monitor::configuration::variables::icinga_config_dir}/icinga.cfg,
-
${icinga::monitor::configuration::variables::icinga_config_dir}/cgi.cfg,
-
${icinga::monitor::configuration::variables::icinga_config_dir}/checkcommands.cfg,
-
${icinga::monitor::configuration::variables::icinga_config_dir}/contactgroups.cfg,
-]
-}
-
-class icinga::monitor::configuration::files {
-
-# For all files dealing with icinga configuration
-
-require icinga::packages
-require passwords::nagios::mysql
-
-$nagios_mysql_check_pass = $passwords::nagios::mysql::mysql_check_pass
-
-Class['icinga::monitor::configuration::variables'] -
Class['icinga::monitor::configuration::files']
-
-# Icinga configuration files
-
-file { '/etc/icinga/cgi.cfg':
-source = 'puppet:///files/icinga/cgi.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
-
-file { '/etc/icinga/icinga.cfg':
-source = 'puppet:///files/icinga/icinga.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
-
-file { '/etc/icinga/nsca_frack.cfg':
-source = 'puppet:///private/nagios/nsca_frack.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
-
-file { '/etc/icinga/checkcommands.cfg':
-content = template('icinga/checkcommands.cfg.erb'),
-owner = 'root',
-group = 'root',
-mode= '0644',
-}
-
-file { '/etc/icinga/contactgroups.cfg':
-source = 'puppet:///files/icinga/contactgroups.cfg',
-owner = 'root',
-group = 'root',
-mode = '0644',
-}
-
-class { 'nagios_common::contacts':
-source = 'puppet:///private/nagios/contacts.cfg',
-notify = Service['icinga'],
-}
-
-class { [
- 'nagios_common::user_macros',
- 'nagios_common::timeperiods',
- 'nagios_common::notification_commands',
-] :
-notify = Service['icinga'],
-}
}
class icinga::monitor::files::misc {
@@ -317,9 +252,6 @@
ensure= running,
hasstatus = false,
restart = '/etc/init.d/icinga reload',
-subscribe = [
-File[$icinga::monitor::configuration::variables::static_files],
-],
require = Mount['/var/icinga-tmpfs'],
}
}
diff --git a/files/icinga/cgi.cfg b/modules/icinga/files/cgi.cfg
similarity index 100%
rename from files/icinga/cgi.cfg
rename to modules/icinga/files/cgi.cfg
[MediaWiki-commits] [Gerrit] DiscussionParser: Split off getPossibleUserLinkPrefixes() fr... - change (mediawiki...Echo)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163151
Change subject: DiscussionParser: Split off getPossibleUserLinkPrefixes() from
getUserFromLine()
..
DiscussionParser: Split off getPossibleUserLinkPrefixes() from getUserFromLine()
That method is too long.
Change-Id: Ifdbd46e7295c8225ae5d911ec8fd24d89941d8d6
---
M includes/DiscussionParser.php
1 file changed, 20 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/51/163151/1
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 381b395..a281688 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -657,20 +657,13 @@
}
/**
-* From a line in a wiki page, determine which user, if any,
-* has signed it.
-*
-* @param $line string The line.
-* @param $timestampPos int The offset of the start of the timestamp.
-* @return bool|array false for none, Array for success.
-* - First element is the position of the signature.
-* - Second element is the normalised user name.
+* Create the list of all possible user link prefixes used by
getUserFromLine().
+* @return string[]
*/
- static function getUserFromLine( $line, $timestampPos ) {
+ static function getPossibleUserLinkPrefixes() {
global $wgContLang;
// Later entries have a higher precedence
- // @todo FIXME: handle optional whitespace in links
$languages = array( $wgContLang );
if ( $wgContLang-getCode() !== 'en' ) {
$languages[] = Language::factory( 'en' );
@@ -700,10 +693,27 @@
}
}
+ return $possiblePrefixes;
+ }
+
+ /**
+* From a line in a wiki page, determine which user, if any,
+* has signed it.
+*
+* @param $line string The line.
+* @param $timestampPos int The offset of the start of the timestamp.
+* @return bool|array false for none, Array for success.
+* - First element is the position of the signature.
+* - Second element is the normalised user name.
+*/
+ static function getUserFromLine( $line, $timestampPos ) {
+ $possiblePrefixes = self::getPossibleUserLinkPrefixes();
+
$winningUser = false;
$winningPos = false;
// Look for the leftmost link to the rightmost user
+ // @todo FIXME: handle optional whitespace in links
foreach ( $possiblePrefixes as $prefix ) {
$output = self::getLinkFromLine( $line, $prefix );
--
To view, visit https://gerrit.wikimedia.org/r/163151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdbd46e7295c8225ae5d911ec8fd24d89941d8d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DiscussionParser: Support custom namespace aliases in signat... - change (mediawiki...Echo)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163152
Change subject: DiscussionParser: Support custom namespace aliases in signatures
..
DiscussionParser: Support custom namespace aliases in signatures
Turns out there are five sources of 'User' and 'User talk' namespace names:
* Canonical English-language names
* Canonical per-language translations
* Canonical per-language aliases, including gender-specific ones
* Local overrides via $wgExtraNamespaces
* Local aliases via $wgNamespaceAliases
Existing code handled all of these correctly except $wgNamespaceAliases
(although it did the canonical English ones in a weird way).
Added some tests for the aliases and translations.
Bug: 71353
Change-Id: I44ef4d56096f599f02a998ba64bf435e0ad94ef0
---
M includes/DiscussionParser.php
M tests/phpunit/includes/DiscussionParserTest.php
2 files changed, 42 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/52/163152/1
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index a281688..d99f45c 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -663,30 +663,34 @@
static function getPossibleUserLinkPrefixes() {
global $wgContLang;
- // Later entries have a higher precedence
- $languages = array( $wgContLang );
- if ( $wgContLang-getCode() !== 'en' ) {
- $languages[] = Language::factory( 'en' );
- }
-
+ // Logic to list all namespaces, from namespaceDupes.php in core
$possiblePrefixes = array();
-
- foreach ( $languages as $language ) {
- $nsNames = $language-getNamespaces();
- $possiblePrefixes[] = '[[' . $nsNames[NS_USER] . ':';
- $possiblePrefixes[] = '[[' . $nsNames[NS_USER_TALK] .
':';
-
- $nsAliases = $language-getNamespaceAliases();
- foreach ( $nsAliases as $text = $id ) {
- if ( $id == NS_USER || $id == NS_USER_TALK ) {
- $possiblePrefixes[] = '[[' . $text .
':';
- }
+ foreach ( MWNamespace::getCanonicalNamespaces() as $ns = $name
) {
+ // This includes $wgExtraNamespaces
+ if ( $ns == NS_USER || $ns == NS_USER_TALK ) {
+ $possiblePrefixes[] = '[[' . $name . ':';
+ }
+ }
+ foreach ( $wgContLang-getNamespaces() as $ns = $name ) {
+ if ( $ns == NS_USER || $ns == NS_USER_TALK ) {
+ $possiblePrefixes[] = '[[' . $name . ':';
+ }
+ }
+ foreach ( $wgNamespaceAliases as $name = $ns ) {
+ if ( $ns == NS_USER || $ns == NS_USER_TALK ) {
+ $possiblePrefixes[] = '[[' . $name . ':';
+ }
+ }
+ foreach ( $wgContLang-getNamespaceAliases() as $name = $ns ) {
+ if ( $ns == NS_USER || $ns == NS_USER_TALK ) {
+ $possiblePrefixes[] = '[[' . $name . ':';
}
}
- // @todo FIXME: Check aliases too
+ // @todo FIXME: Check special page aliases too
$possiblePrefixes[] = '[[' . SpecialPage::getTitleFor(
'Contributions' )-getPrefixedText() . '/';
+ // Accept both spaces and underscores everywhere
foreach ( $possiblePrefixes as $prefix ) {
if ( strpos( $prefix, '_' ) !== false ) {
$possiblePrefixes[] = str_replace( '_', ' ',
$prefix );
diff --git a/tests/phpunit/includes/DiscussionParserTest.php
b/tests/phpunit/includes/DiscussionParserTest.php
index 038dee6..5683e9d 100644
--- a/tests/phpunit/includes/DiscussionParserTest.php
+++ b/tests/phpunit/includes/DiscussionParserTest.php
@@ -3,13 +3,26 @@
/**
* @group Echo
*/
-class EchoDiscussionParserTest extends MediaWikiTestCase {
+class EchoDiscussionParserTest extends MediaWikiLangTestCase {
// TODO test cases for:
// - generateEventsForRevision
// - stripHeader
// - stripIndents
// - stripSignature
// - getNotifiedUsersForComment
+
+ protected function setUp() {
+ parent::setUp();
+
+ $this-setMwGlobals( array(
+ 'wgNamespaceAliases' = array(
+ 'Person' = NS_USER,
+ 'Person_talk' = NS_USER_TALK,
+ ),
+ 'wgLanguageCode' = 'pl',
+
[MediaWiki-commits] [Gerrit] icinga: Move plugins into module - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163153
Change subject: icinga: Move plugins into module
..
icinga: Move plugins into module
Change-Id: I461035d4ea66e87e8cf92b35275077b46cba6a0b
---
M manifests/misc/icinga.pp
R modules/icinga/files/check_MySQL.php
R modules/icinga/files/check_longqueries
R modules/icinga/files/check_mysql-replication.pl
R modules/icinga/files/check_nrpe
R modules/icinga/files/check_ram.sh
R modules/icinga/files/submit_check_result
A modules/icinga/manifests/plugins.pp
8 files changed, 106 insertions(+), 106 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/163153/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index a4d8377..5d3b694 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -7,7 +7,6 @@
include icinga::ganglia::ganglios
include icinga::monitor::checkpaging
include icinga::monitor::files::misc
-include icinga::monitor::files::nagios-plugins
include icinga::logrotate
include icinga::nsca::firewall
include icinga::nsca::daemon
@@ -22,6 +21,14 @@
include nrpe
include certificates::globalsign_ca
+class { 'icinga::apache':
+require = Class['icinga::packages'],
+}
+
+class { 'icinga::service':
+require = Class['icinga::apache'],
+}
+
class { 'icinga::config':
require = [Class['icinga::packages'], Class['icinga::service']],
notify = Service['icinga']
@@ -32,12 +39,9 @@
notify = Service['icinga'],
}
-class { 'icinga::apache':
-require = Class['icinga::packages'],
-}
-
-class { 'icinga::service':
-require = Class['icinga::apache'],
+class { 'icinga::plugins':
+require = Class['icinga::config'],
+notify = Service['icinga'],
}
}
@@ -129,105 +133,6 @@
ensure = file,
owner = 'icinga',
}
-}
-
-class icinga::monitor::files::nagios-plugins {
-
-require icinga::packages
-
-file { '/usr/lib/nagios':
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins':
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins/eventhandlers':
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins/eventhandlers/submit_check_result':
-source = 'puppet:///files/icinga/submit_check_result',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/var/lib/nagios/rm':
- ensure = directory,
- owner = 'icinga',
- group = 'nagios',
- mode = '0775',
-}
-file { '/etc/nagios-plugins':
- ensure = directory,
- owner = 'root',
- group = 'root',
- mode = '0755',
-}
-file { '/etc/nagios-plugins/config':
-ensure = directory,
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-
-File | tag == nagiosplugin |
-
-# WMF custom service checks
-file { '/usr/lib/nagios/plugins/check_mysql-replication.pl':
-source = 'puppet:///files/icinga/check_mysql-replication.pl',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins/check_longqueries':
-source = 'puppet:///files/icinga/check_longqueries',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins/check_MySQL.php':
-source = 'puppet:///files/icinga/check_MySQL.php',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins/check_nrpe':
-source = 'puppet:///files/icinga/check_nrpe',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-file { '/usr/lib/nagios/plugins/check_ram.sh':
-source = 'puppet:///files/icinga/check_ram.sh',
-owner = 'root',
-group = 'root',
-mode = '0755',
-}
-
-class { 'nagios_common::commands':
-notify = Service['icinga'],
-}
-
-class { 'nagios_common::check::ganglia':
-notify = Service['icinga'],
-}
-
-# Include check_elasticsearch from elasticsearch module
-include elasticsearch::nagios::plugin
-
-# some default configuration files conflict and should be removed
-file { '/etc/nagios-plugins/config/mailq.cfg':
-ensure = absent,
-}
-
}
class icinga::ganglia::ganglios {
diff --git a/files/icinga/check_MySQL.php b/modules/icinga/files/check_MySQL.php
similarity index 100%
rename from files/icinga/check_MySQL.php
rename to
[MediaWiki-commits] [Gerrit] Send all ariel's mail to Google Apps - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163154
Change subject: Send all ariel's mail to Google Apps
..
Send all ariel's mail to Google Apps
Ariel seems to have the same issue I have with different primary
account names on the two systems.
Change-Id: Ib4e7b9ef50518237ef74e4832f9662a54f675602
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/163154/1
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index c12df2c..fa34cbb 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -473,7 +473,7 @@
# TEMP migration
ldap_migration_account:
driver = manualroute
- local_parts = mark : mbergsma
+ local_parts = mark : mbergsma : ariel : aglenn
domains = wikimedia.org
condition = ${lookup ldap \
{user=cn=eximagent,ou=other,dc=corp,dc=wikimedia,dc=org pass=LDAPPASSWORD \
--
To view, visit https://gerrit.wikimedia.org/r/163154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4e7b9ef50518237ef74e4832f9662a54f675602
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move RepoItemLinkGenerator into client namespace - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/163155 Change subject: Move RepoItemLinkGenerator into client namespace .. Move RepoItemLinkGenerator into client namespace Change-Id: I2afeda32852f1f7f2f2bb0c294b4617679044d63 (cherry picked from commit 7161c7602dfbc6d337f0c4df4d201cb4271ebf90) --- M client/WikibaseClient.hooks.php M client/includes/RepoItemLinkGenerator.php M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php 3 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/55/163155/1 diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index e243809..e618e45 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -37,6 +37,7 @@ use Wikibase\Client\RecentChanges\ChangeLineFormatter; use Wikibase\Client\RecentChanges\ExternalChangeFactory; use Wikibase\Client\RecentChanges\RecentChangesFilterOptions; +use Wikibase\Client\RepoItemLinkGenerator; use Wikibase\Client\WikibaseClient; /** diff --git a/client/includes/RepoItemLinkGenerator.php b/client/includes/RepoItemLinkGenerator.php index 6337dae..b5d3296 100644 --- a/client/includes/RepoItemLinkGenerator.php +++ b/client/includes/RepoItemLinkGenerator.php @@ -1,10 +1,12 @@ ?php -namespace Wikibase; +namespace Wikibase\Client; use Title; use Wikibase\Client\RepoLinker; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; +use Wikibase\NamespaceChecker; /** * @since 0.4 diff --git a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php index f73e7c7..d239850 100644 --- a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php +++ b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php @@ -4,13 +4,13 @@ use Language; use Title; +use Wikibase\Client\RepoItemLinkGenerator; use Wikibase\Client\RepoLinker; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\NamespaceChecker; -use Wikibase\RepoItemLinkGenerator; /** - * @covers Wikibase\RepoItemLinkGenerator + * @covers Wikibase\Client\RepoItemLinkGenerator * * @group WikibaseClient * @group RepoItemLinkGenerator -- To view, visit https://gerrit.wikimedia.org/r/163155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2afeda32852f1f7f2f2bb0c294b4617679044d63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf1 Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move EntityPerPage-related classes into namespaces - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/163156 Change subject: Move EntityPerPage-related classes into namespaces .. Move EntityPerPage-related classes into namespaces Change-Id: Idd5096880f6c3ceab2cdb7b7edc734bf00689f4b (cherry picked from commit eb4dffd77b51c287f68c35d5574a3193a0d2b9e1) --- M repo/includes/Dumpers/JsonDumpGenerator.php R repo/includes/IO/EntityIdReader.php R repo/includes/IO/LineReader.php M repo/includes/content/EntityHandler.php M repo/includes/content/ItemHandler.php M repo/includes/content/PropertyHandler.php M repo/includes/store/EntityIdPager.php M repo/includes/store/EntityPerPage.php M repo/includes/store/Store.php M repo/includes/store/sql/EntityPerPageBuilder.php M repo/includes/store/sql/EntityPerPageIdPager.php M repo/includes/store/sql/EntityPerPageTable.php M repo/includes/store/sql/ItemsPerSiteBuilder.php M repo/includes/store/sql/SqlStore.php M repo/includes/store/sql/WikiPageEntityStore.php M repo/maintenance/dumpJson.php M repo/maintenance/rebuildEntityPerPage.php M repo/maintenance/rebuildItemsPerSite.php M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php R repo/tests/phpunit/includes/IO/EntityIdReaderTest.bad.txt R repo/tests/phpunit/includes/IO/EntityIdReaderTest.php R repo/tests/phpunit/includes/IO/EntityIdReaderTest.txt R repo/tests/phpunit/includes/IO/LineReaderTest.php R repo/tests/phpunit/includes/IO/LineReaderTest.txt M repo/tests/phpunit/includes/UpdateRepoOnMoveJobTest.php M repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php M repo/tests/phpunit/includes/store/sql/EntityPerPageIdPagerTest.php M repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php M repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php 30 files changed, 71 insertions(+), 47 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/56/163156/1 diff --git a/repo/includes/Dumpers/JsonDumpGenerator.php b/repo/includes/Dumpers/JsonDumpGenerator.php index 30f0d3f..d443213 100644 --- a/repo/includes/Dumpers/JsonDumpGenerator.php +++ b/repo/includes/Dumpers/JsonDumpGenerator.php @@ -6,7 +6,6 @@ use MWContentSerializationException; use MWException; use Wikibase\DataModel\Entity\EntityId; -use Wikibase\EntityIdPager; use Wikibase\Lib\Reporting\ExceptionHandler; use Wikibase\Lib\Reporting\MessageReporter; use Wikibase\Lib\Reporting\NullMessageReporter; @@ -14,6 +13,7 @@ use Wikibase\Lib\Serializers\Serializer; use Wikibase\Lib\Store\EntityLookup; use Wikibase\Lib\Store\StorageException; +use Wikibase\Repo\Store\EntityIdPager; /** * JsonDumpGenerator generates an JSON dump of a given set of entities. diff --git a/lib/includes/IO/EntityIdReader.php b/repo/includes/IO/EntityIdReader.php similarity index 97% rename from lib/includes/IO/EntityIdReader.php rename to repo/includes/IO/EntityIdReader.php index 29fe597..e2b3a7d 100644 --- a/lib/includes/IO/EntityIdReader.php +++ b/repo/includes/IO/EntityIdReader.php @@ -1,14 +1,14 @@ ?php -namespace Wikibase\IO; +namespace Wikibase\Repo\IO; use Disposable; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; use Wikibase\DataModel\Entity\EntityIdParsingException; -use Wikibase\EntityIdPager; use Wikibase\Lib\Reporting\ExceptionHandler; use Wikibase\Lib\Reporting\RethrowingExceptionHandler; +use Wikibase\Repo\Store\EntityIdPager; /** * EntityIdReader reads entity IDs from a file, one per line. @@ -150,4 +150,4 @@ return $ids; } -} \ No newline at end of file +} diff --git a/lib/includes/IO/LineReader.php b/repo/includes/IO/LineReader.php similarity index 98% rename from lib/includes/IO/LineReader.php rename to repo/includes/IO/LineReader.php index ed2e054..6ec1519 100644 --- a/lib/includes/IO/LineReader.php +++ b/repo/includes/IO/LineReader.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase\IO; +namespace Wikibase\Repo\IO; use Disposable; use Iterator; diff --git a/repo/includes/content/EntityHandler.php b/repo/includes/content/EntityHandler.php index ef24453..9b3d7f2 100644 --- a/repo/includes/content/EntityHandler.php +++ b/repo/includes/content/EntityHandler.php @@ -22,10 +22,10 @@ use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; use Wikibase\EntityContent; -use Wikibase\EntityPerPage; use Wikibase\Lib\Store\EntityContentDataCodec; use Wikibase\Lib\Store\EntityRedirect; use Wikibase\NamespaceUtils; +use Wikibase\Repo\Store\EntityPerPage; use Wikibase\TermIndex; use Wikibase\Updates\DataUpdateAdapter; use Wikibase\Validators\EntityValidator; diff --git a/repo/includes/content/ItemHandler.php b/repo/includes/content/ItemHandler.php index 3f8c5d3..acdef3a 100644 --- a/repo/includes/content/ItemHandler.php +++ b/repo/includes/content/ItemHandler.php @@ -8,9 +8,9 @@
[MediaWiki-commits] [Gerrit] authdns: set up extra listeners for codfw transitions - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163157
Change subject: authdns: set up extra listeners for codfw transitions
..
authdns: set up extra listeners for codfw transitions
rubidium (eqiad) now also listens on the addrs for
mexia (pmtpa) and baham (codfw).
baham (codfw) listens on the addr for mexia (pmtpa) as well.
Change-Id: I29d6ebadbc60aae7f52a6a58e268fab04c4ab98a
---
M manifests/role/authdns.pp
M modules/authdns/manifests/init.pp
M modules/authdns/templates/config-head.erb
3 files changed, 46 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/163157/1
diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp
index e25de77..1872d4a 100644
--- a/manifests/role/authdns.pp
+++ b/manifests/role/authdns.pp
@@ -1,13 +1,23 @@
# authdns role classes, heavily relying on the authdns role module
+# XXX Note: things are in a state of flux here to deal with
+# nameserver moves for pmtpa/codfw and related fallout.
+# $nameservers should be using the canonical names ns[012],
+# and the fqdn arguments to class authdns should be using
+# those names as well. They're currently using the real
+# hostnames of the machines so that authdns-update isn't
+# confused by some machines having loopback IPs for other
+# machines' nsX addrs.
+# We should put it all back once the transition is complete
+
class role::authdns::base {
system::role { 'authdns': description = 'Authoritative DNS server' }
$nameservers = [
-'ns0.wikimedia.org',
-'ns1-mexia.wikimedia.org',
-'ns1-baham.wikimedia.org',
-'ns2.wikimedia.org',
+'rubidium.wikimedia.org',
+'mexia.wikimedia.org',
+'baham.wikimedia.org',
+'eeden.esams.wikimedia.org',
]
$gitrepo = 'https://gerrit.wikimedia.org/r/p/operations/dns.git'
@@ -30,12 +40,27 @@
prefixlen = '128',
}
+# temporary for pmtpa/codfw transitional purposes
+$mexia_ipv4 = '208.80.152.214'
+$baham_ipv4 = '208.80.153.231'
+interface::ip { 'mexia_ipv4':
+interface = 'lo',
+address = $mexia_ipv4,
+prefixlen = '32',
+}
+interface::ip { 'baham_ipv4':
+interface = 'lo',
+address = $baham_ipv4,
+prefixlen = '32',
+}
+
class { 'authdns':
-fqdn = 'ns0.wikimedia.org',
+fqdn = 'rubidium.wikimedia.org',
ipaddress = $ipv4,
ipaddress6= $ipv6,
nameservers = $nameservers,
gitrepo = $gitrepo,
+extra_listeners = [ $mexia_ipv4, $baham_ipv4 ],
}
}
@@ -59,7 +84,7 @@
}
class { 'authdns':
-fqdn = 'ns1-mexia.wikimedia.org',
+fqdn = 'mexia.wikimedia.org',
ipaddress = $ipv4,
ipaddress6= $ipv6,
nameservers = $nameservers,
@@ -83,12 +108,21 @@
prefixlen = '128',
}
+# temporary for pmtpa/codfw transitional purposes
+$mexia_ipv4 = '208.80.152.214'
+interface::ip { 'mexia_ipv4':
+interface = 'lo',
+address = $mexia_ipv4,
+prefixlen = '32',
+}
+
class { 'authdns':
-fqdn = 'ns1-baham.wikimedia.org',
+fqdn = 'baham.wikimedia.org',
ipaddress = $ipv4,
ipaddress6= $ipv6,
nameservers = $nameservers,
gitrepo = $gitrepo,
+extra_listeners = [ $mexia_ipv4 ],
}
}
@@ -109,7 +143,7 @@
}
class { 'authdns':
-fqdn = 'ns2.wikimedia.org',
+fqdn = 'eeden.esams.wikimedia.org',
ipaddress = $ipv4,
ipaddress6= $ipv6,
nameservers = $nameservers,
diff --git a/modules/authdns/manifests/init.pp
b/modules/authdns/manifests/init.pp
index 2bd6f01..b3d6d94 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -6,6 +6,7 @@
$nameservers = [ $::fqdn ],
$ipaddress = undef,
$ipaddress6 = undef,
+$extra_listeners = [],
$gitrepo = undef,
$monitoring = true,
) {
diff --git a/modules/authdns/templates/config-head.erb
b/modules/authdns/templates/config-head.erb
index 9eca18c..3f6636a 100644
--- a/modules/authdns/templates/config-head.erb
+++ b/modules/authdns/templates/config-head.erb
@@ -7,6 +7,9 @@
% if (! @ipaddress6.nil?) -%
%= @ipaddress6 %,
% end -%
+% @extra_listeners.each do |listener| -%
+ %= listener %
+% end -%
],
% end -%
http_listen = [
--
To view, visit https://gerrit.wikimedia.org/r/163157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29d6ebadbc60aae7f52a6a58e268fab04c4ab98a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
[MediaWiki-commits] [Gerrit] Avoid implicit Message::toString in InfoAction - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/163158 Change subject: Avoid implicit Message::toString in InfoAction .. Avoid implicit Message::toString in InfoAction Call explicit escape to show which message format is used. Change-Id: I725f7ab394c275ad68a0b816b841c9b6b8bc325c --- M includes/actions/InfoAction.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/58/163158/1 diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index f932a405..52c2978 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -290,7 +290,7 @@ $pageInfo['header-basic'][] = array( $langDisp, Language::fetchLanguageName( $pageLang, $lang-getCode() ) - . ' ' . $this-msg( 'parentheses', $pageLang ) ); + . ' ' . $this-msg( 'parentheses', $pageLang )-escaped() ); // Content model of the page $pageInfo['header-basic'][] = array( -- To view, visit https://gerrit.wikimedia.org/r/163158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I725f7ab394c275ad68a0b816b841c9b6b8bc325c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Example to have a manually defined axis - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/163159 Change subject: Example to have a manually defined axis .. Example to have a manually defined axis Define a job that has a 'lang_list' parameter which is then used as an axis to spawn a build per value (space separated). Can let one manually build with just one parameter set. Change-Id: If082f4b3383fcbd9275f1e1f1161494c4f2e513f --- A dynamic.yaml 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/59/163159/1 diff --git a/dynamic.yaml b/dynamic.yaml new file mode 100644 index 000..cd23c57 --- /dev/null +++ b/dynamic.yaml @@ -0,0 +1,22 @@ +- job: +name: 'test-hashar-opt-axis' +project-type: matrix +parameters: + - string: + name: lang_list + default: en ja de + description: Languages (spaces separated) + +axes: + - axis: +type: label-expression +name: label +values: + - contintLabsSlave UbuntuPrecise + - axis: +type: dynamic +name: LANG +values: + - lang_list +builders: + - shell: 'echo LANG: $LANG' -- To view, visit https://gerrit.wikimedia.org/r/163159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If082f4b3383fcbd9275f1e1f1161494c4f2e513f Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Language: Correct getSpecialPageAliases() documentation - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163160
Change subject: Language: Correct getSpecialPageAliases() documentation
..
Language: Correct getSpecialPageAliases() documentation
Learned the hard way.
Change-Id: I72044c71f064f78a0d2d50034bdffae1e5985cde
---
M languages/Language.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/163160/1
diff --git a/languages/Language.php b/languages/Language.php
index b985077..fb04255 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3209,7 +3209,7 @@
/**
* Get special page names, as an associative array
-* case folded alias = real name
+* canonical name = array of valid names, including aliases
* @return array
*/
function getSpecialPageAliases() {
--
To view, visit https://gerrit.wikimedia.org/r/163160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72044c71f064f78a0d2d50034bdffae1e5985cde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
