[MediaWiki-commits] [Gerrit] Implemented jQuery.wikibase.sitelinkgroupview - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153564
Change subject: Implemented jQuery.wikibase.sitelinkgroupview
..
Implemented jQuery.wikibase.sitelinkgroupview
jQuery.wikibase.sitelinkgroupview acts as a container for a sitelinklistview
widget specific
to a particular site link group.
Change-Id: Iad39d3c808f55cf093b7b2c79d8ae04f93ee5d12
---
M lib/WikibaseLib.hooks.php
M lib/resources/Resources.php
A lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/templates.php
A lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M repo/includes/View/SiteLinksView.php
M repo/resources/Resources.php
M repo/resources/wikibase.ui.entityViewInit.js
8 files changed, 326 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/64/153564/1
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index 21d4f71..c61aeb8 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -193,6 +193,19 @@
),
);
+
$testModules['qunit']['jquery.wikibase.sitelinkgroupview.tests'] = $moduleBase
+ array(
+ 'scripts' => array(
+
'tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js',
+ ),
+ 'dependencies' => array(
+ 'jquery',
+ 'jquery.wikibase.sitelinkgroupview',
+ 'wikibase.datamodel',
+ 'wikibase.store.EntityStore',
+ 'wikibase.tests.qunit.testrunner',
+ ),
+ );
+
$testModules['qunit']['jquery.wikibase.sitelinkview.tests'] =
$moduleBase + array(
'scripts' => array(
'tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkview.tests.js',
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 09df591..c1ddcb8 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -472,6 +472,18 @@
)
),
+ 'jquery.wikibase.sitelinkgroupview' => $moduleTemplate + array(
+ 'scripts' => array(
+
'jquery.wikibase/jquery.wikibase.sitelinkgroupview.js'
+ ),
+ 'dependencies' => array(
+ 'jquery',
+ 'jquery.ui.TemplatedWidget',
+ 'jquery.wikibase.sitelinklistview',
+ 'wikibase.sites',
+ ),
+ ),
+
'jquery.wikibase.sitelinklistview' => $moduleTemplate + array(
'scripts' => array(
'jquery.wikibase/jquery.wikibase.sitelinklistview.js'
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
new file mode 100644
index 000..4a3d311
--- /dev/null
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -0,0 +1,171 @@
+/**
+ * @licence GNU GPL v2+
+ * @author H. Snater < mediaw...@snater.com >
+ */
+( function( $, mw, wb ) {
+ 'use strict';
+
+ var PARENT = $.ui.TemplatedWidget;
+
+/**
+ * Manages a sitelinklistview widget specific to a particular site link group.
+ * @since 0.5
+ * @extends jQuery.ui.TemplatedWidget
+ *
+ * @option {Object|null} value
+ * Object representing the widget's value.
+ * Structure: { group: <{string}>, siteLinks:
<{wikibase.datamodel.SiteLink[]}> }
+ * Default: null
+ *
+ * @options {string} entityId
+ *
+ * @option {wikibase.RepoApi} api
+ *
+ * @option {wikibase.store.EntityStore} entityStore
+ */
+$.widget( 'wikibase.sitelinkgroupview', PARENT, {
+ /**
+* @see jQuery.ui.TemplatedWidget.options
+*/
+ options: {
+ template: 'wikibase-sitelinkgroupview',
+ templateParams: [
+ '', // id
+ '', // heading
+ '', // counter
+ '', // sitelinklistview
+ '' // group
+ ],
+ templateShortCuts: {
+ '$h': 'h2',
+ '$counter': '.wikibase-sitelinkgroupview-counter',
+ '$sitelinklistview':
'.wikibase-sitelinkgroupview-sitelinklistview'
+ },
+ value: null,
+ entityId: null,
+ api: null,
+ entityStore: null
+ },
+
+ /**
+* @see jQuery.ui.TemplatedWidget._create
+*
+
[MediaWiki-commits] [Gerrit] Ignore warnings due to family codenames with dots - change (pywikibot/core)
Gallaecio has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153563
Change subject: Ignore warnings due to family codenames with dots
..
Ignore warnings due to family codenames with dots
PyWikiBot works perfectly when family names have dots in them, however it still
shows a warning. This patch avoids that warning.
Change-Id: I18ab14a490186782c68bdddf6e7fb41bdaef4775
---
M pywikibot/site.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/63/153563/1
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 16415fb..b8f2504 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -108,7 +108,11 @@
return _families[fam]
try:
-myfamily = imp.load_source(fam, config.family_files[fam])
+# Ignore warnings due to dots in family names.
+import warnings
+with warnings.catch_warnings():
+warnings.simplefilter("ignore")
+myfamily = imp.load_source(fam, config.family_files[fam])
except (ImportError, KeyError):
if fatal:
pywikibot.error(u"""\
--
To view, visit https://gerrit.wikimedia.org/r/153563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18ab14a490186782c68bdddf6e7fb41bdaef4775
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Gallaecio
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for generating lists of pages matching the searc... - change (pywikibot/core)
Gallaecio has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153562
Change subject: Add support for generating lists of pages matching the search
string
..
Add support for generating lists of pages matching the search string
This support was part of the old PyWikiBot, this patch simply restores that
feature.
Change-Id: I3fc2dcfb4847ca0b529bbed5687adec423c04c87
---
M scripts/replace.py
1 file changed, 93 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/62/153562/1
diff --git a/scripts/replace.py b/scripts/replace.py
index 3ddc0ec..77810ad 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -33,6 +33,17 @@
before the one specified (may also be given as
-xmlstart:Article).
+-save Saves the titles of the articles to a file instead of
+ modifying the articles. This way you may collect titles to
+ work on in automatic mode, and process them later with
+ -file. Opens the file for append, if exists.
+ If you insert the contents of the file into a wikipage, it
+ will appear as a numbered list, and may be used with -links.
+ Argument may also be given as "-save:filename".
+
+-savenew Just like -save, except that overwrites the existing file.
+ Argument may also be given as "-savenew:filename".
+
-addcat:cat_name Adds "cat_name" category to every altered page.
-excepttitle:XYZ Skip pages with titles that contain XYZ. If the -regex
@@ -107,6 +118,14 @@
python replace.py -page:John_Doe -fix:isbn
+Let's suppose, you want to change "color" to "colour" manually, but gathering
+the articles is too slow, so you want to save the list while you are sleeping.
+You have Windows, so "python" is not necessary. Use this:
+
+replace.py -xml -save:color.txt color colour -always
+
+You may use color.txt later with -file or -links, if you upload it to the wiki.
+
This command will change 'referer' to 'referrer', but not in pages which
talk about HTTP, where the typo has become part of the standard:
@@ -123,6 +142,7 @@
__version__ = '$Id$'
#
+import codecs
import re
import time
import pywikibot
@@ -225,7 +245,8 @@
"""
def __init__(self, generator, replacements, exceptions={},
acceptall=False, allowoverlap=False, recursive=False,
- addedCat=None, sleep=None, summary='', site=None):
+ addedCat=None, sleep=None, summary='', site=None,
+ articles=None):
"""
Arguments:
* generator- A generator that yields Page objects.
@@ -240,6 +261,9 @@
replaced.
* addedCat - If set to a value, add this category to every page
touched.
+* articles - An open file to save the page titles. If None,
+ we work on our wikisite immediately (default).
+ Corresponds to titlefile variable of main().
Structure of the exceptions dictionary:
This dictionary can have these keys:
@@ -275,6 +299,7 @@
cat_ns + ':' + addedCat)
self.sleep = sleep
self.summary = summary
+self.articles = articles
def isTitleExcepted(self, title):
"""
@@ -335,7 +360,7 @@
try:
# Load the page's text from the wiki
original_text = page.get(get_redirect=True)
-if not page.canBeEdited():
+if not (self.articles or page.canBeEdited()):
pywikibot.output(u"You can't edit page %s"
% page.title(asLink=True))
continue
@@ -403,25 +428,37 @@
if choice == 'a':
self.acceptall = True
if choice == 'y':
-page.put_async(new_text, self.summary)
+if not self.articles:
+page.put_async(new_text, self.summary)
+else:
+self.articles.write(u'#%s\n'
+% (page.title(asLink=True,
+ textlink=True)))
+self.articles.flush()
# choice must be 'N'
break
if self.acceptall and new_text != original_text:
-try:
-page.put(new_text, self.summary)
-except pywikibot.EditConflict:
-pywikibot.output(u'Skipping %s because of edit conflict'
- % (page.title(),))
-except pywikibot.SpamfilterError as e:
-
[MediaWiki-commits] [Gerrit] Add centralauth to information_schema_p on labsdb. - change (operations/software)
Springle has submitted this change and it was merged. Change subject: Add centralauth to information_schema_p on labsdb. .. Add centralauth to information_schema_p on labsdb. Change-Id: I292fa931755857ce1f0a53a7c9f3d63e534f8dd9 --- M dbtools/events_sanitarium.sql 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/dbtools/events_sanitarium.sql b/dbtools/events_sanitarium.sql index 85f1862..5e5fb0d 100644 --- a/dbtools/events_sanitarium.sql +++ b/dbtools/events_sanitarium.sql @@ -101,7 +101,7 @@ declare schema_list cursor for select schema_name from information_schema.schemata - where schema_name like '%wik%' + where (schema_name like '%wik%' or schema_name like '%auth%') and schema_name not like '%\_p' and schema_name <> 'l10nwiki' order by schema_name; -- To view, visit https://gerrit.wikimedia.org/r/153561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I292fa931755857ce1f0a53a7c9f3d63e534f8dd9 Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add centralauth to information_schema_p on labsdb. - change (operations/software)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/153561 Change subject: Add centralauth to information_schema_p on labsdb. .. Add centralauth to information_schema_p on labsdb. Change-Id: I292fa931755857ce1f0a53a7c9f3d63e534f8dd9 --- M dbtools/events_sanitarium.sql 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/61/153561/1 diff --git a/dbtools/events_sanitarium.sql b/dbtools/events_sanitarium.sql index 85f1862..5e5fb0d 100644 --- a/dbtools/events_sanitarium.sql +++ b/dbtools/events_sanitarium.sql @@ -101,7 +101,7 @@ declare schema_list cursor for select schema_name from information_schema.schemata - where schema_name like '%wik%' + where (schema_name like '%wik%' or schema_name like '%auth%') and schema_name not like '%\_p' and schema_name <> 'l10nwiki' order by schema_name; -- To view, visit https://gerrit.wikimedia.org/r/153561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I292fa931755857ce1f0a53a7c9f3d63e534f8dd9 Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistent error handling for methods (percona, ddl, ddlonli... - change (operations/software)
Springle has submitted this change and it was merged.
Change subject: Consistent error handling for methods (percona, ddl, ddlonline).
..
Consistent error handling for methods (percona, ddl, ddlonline).
Change-Id: Ibeb1e8d1a5e8ce9d644168185396595645f11cd4
---
M dbtools/osc_host.sh
1 file changed, 16 insertions(+), 7 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dbtools/osc_host.sh b/dbtools/osc_host.sh
index a2e7946..c6b934f 100755
--- a/dbtools/osc_host.sh
+++ b/dbtools/osc_host.sh
@@ -39,6 +39,7 @@
altersql=""
method="percona"
cleanup=0
+warn=1
for var in "$@"; do
@@ -69,6 +70,14 @@
# percona toolkit or straight DDL
if [[ "$var" =~ ^--method=(.+) ]]; then
method="${BASH_REMATCH[1]}"
+ fi
+
+ if [[ "$var" =~ ^--warn ]]; then
+ warn=1
+ fi
+
+ if [[ "$var" =~ ^--no-warn ]]; then
+ warn=0
fi
if [[ ! "$var" =~ ^-- ]]; then
@@ -168,7 +177,7 @@
for db in "${dblist[@]}"; do
- reconfirm=1
+ reconfirm=0
echo
echo "host: $host, database: $db"
@@ -223,27 +232,27 @@
fi
echo "$ddlrep analyze table $table"
$mysql $db -e "$ddlrep analyze table $table"
- reconfirm=0
else
echo "WARNING $db : $table encountered problems"
+ reconfirm=$warn
fi
elif [ "$method" == "ddl" ]; then
echo "$ddlargs alter table $table $altersql"
- if $mysql $db -e "$ddlargs alter table $table
$altersql"; then
- reconfirm=0
+ if ! $mysql $db -e "$ddlargs alter table $table
$altersql"; then
+ reconfirm=$warn
fi
elif [ "$method" == "ddlonline" ]; then
echo "$ddlargs alter online table $table $altersql"
- if $mysql $db -e "$ddlargs alter online table $table
$altersql"; then
- reconfirm=0
+ if ! $mysql $db -e "$ddlargs alter online table $table
$altersql"; then
+ reconfirm=$warn
fi
fi
else
echo "SKIPPING $db : $table - dry-run encountered problems"
- reconfirm=0
+ reconfirm=$warn
fi
if [ $reconfirm -gt 0 ]; then
--
To view, visit https://gerrit.wikimedia.org/r/153560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeb1e8d1a5e8ce9d644168185396595645f11cd4
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistent error handling for methods (percona, ddl, ddlonli... - change (operations/software)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153560
Change subject: Consistent error handling for methods (percona, ddl, ddlonline).
..
Consistent error handling for methods (percona, ddl, ddlonline).
Change-Id: Ibeb1e8d1a5e8ce9d644168185396595645f11cd4
---
M dbtools/osc_host.sh
1 file changed, 16 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/60/153560/1
diff --git a/dbtools/osc_host.sh b/dbtools/osc_host.sh
index a2e7946..c6b934f 100755
--- a/dbtools/osc_host.sh
+++ b/dbtools/osc_host.sh
@@ -39,6 +39,7 @@
altersql=""
method="percona"
cleanup=0
+warn=1
for var in "$@"; do
@@ -69,6 +70,14 @@
# percona toolkit or straight DDL
if [[ "$var" =~ ^--method=(.+) ]]; then
method="${BASH_REMATCH[1]}"
+ fi
+
+ if [[ "$var" =~ ^--warn ]]; then
+ warn=1
+ fi
+
+ if [[ "$var" =~ ^--no-warn ]]; then
+ warn=0
fi
if [[ ! "$var" =~ ^-- ]]; then
@@ -168,7 +177,7 @@
for db in "${dblist[@]}"; do
- reconfirm=1
+ reconfirm=0
echo
echo "host: $host, database: $db"
@@ -223,27 +232,27 @@
fi
echo "$ddlrep analyze table $table"
$mysql $db -e "$ddlrep analyze table $table"
- reconfirm=0
else
echo "WARNING $db : $table encountered problems"
+ reconfirm=$warn
fi
elif [ "$method" == "ddl" ]; then
echo "$ddlargs alter table $table $altersql"
- if $mysql $db -e "$ddlargs alter table $table
$altersql"; then
- reconfirm=0
+ if ! $mysql $db -e "$ddlargs alter table $table
$altersql"; then
+ reconfirm=$warn
fi
elif [ "$method" == "ddlonline" ]; then
echo "$ddlargs alter online table $table $altersql"
- if $mysql $db -e "$ddlargs alter online table $table
$altersql"; then
- reconfirm=0
+ if ! $mysql $db -e "$ddlargs alter online table $table
$altersql"; then
+ reconfirm=$warn
fi
fi
else
echo "SKIPPING $db : $table - dry-run encountered problems"
- reconfirm=0
+ reconfirm=$warn
fi
if [ $reconfirm -gt 0 ]; then
--
To view, visit https://gerrit.wikimedia.org/r/153560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibeb1e8d1a5e8ce9d644168185396595645f11cd4
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool db1009 and db1035. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Repool db1009 and db1035. .. Repool db1009 and db1035. Change-Id: Ie0ec72b0e21faadb86880b485238f0ca7dcf99ca --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f7dc927..69d75fd 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -100,15 +100,15 @@ 'db1024' => 0, # 1.4TB 64GB 'db1018' => 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1002' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager + 'db1009' => 100, # 1.4TB 64GB, traffic sampling 'db1036' => 100, # 1.4TB 64GB - # fs 'db1009' => 300, # 1.4TB 64GB, traffic sampling 'db1060' => 400, # 2.8TB 96GB 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' => array( 'db1038' => 0, # 1.4TB 64GB - #'db1035' => 0, # 1.4TB 64GB, snapshot, vslow, dump + 'db1035' => 0, # 1.4TB 64GB, snapshot, vslow, dump 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1019' => 400, # 1.4TB 64GB 'db1027' => 400, # 1.4TB 64GB @@ -183,10 +183,10 @@ ), /* s3 */ 'DEFAULT' => array( 'vslow' => array( - 'db1003' => 1, + 'db1035' => 1, ), 'dump' => array( - 'db1003' => 1, + 'db1035' => 1, ), 'watchlist' => array( 'db1003' => 1, -- To view, visit https://gerrit.wikimedia.org/r/153559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0ec72b0e21faadb86880b485238f0ca7dcf99ca Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool db1009 and db1035. - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/153559 Change subject: Repool db1009 and db1035. .. Repool db1009 and db1035. Change-Id: Ie0ec72b0e21faadb86880b485238f0ca7dcf99ca --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/59/153559/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f7dc927..69d75fd 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -100,15 +100,15 @@ 'db1024' => 0, # 1.4TB 64GB 'db1018' => 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1002' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager + 'db1009' => 100, # 1.4TB 64GB, traffic sampling 'db1036' => 100, # 1.4TB 64GB - # fs 'db1009' => 300, # 1.4TB 64GB, traffic sampling 'db1060' => 400, # 2.8TB 96GB 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' => array( 'db1038' => 0, # 1.4TB 64GB - #'db1035' => 0, # 1.4TB 64GB, snapshot, vslow, dump + 'db1035' => 0, # 1.4TB 64GB, snapshot, vslow, dump 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1019' => 400, # 1.4TB 64GB 'db1027' => 400, # 1.4TB 64GB @@ -183,10 +183,10 @@ ), /* s3 */ 'DEFAULT' => array( 'vslow' => array( - 'db1003' => 1, + 'db1035' => 1, ), 'dump' => array( - 'db1003' => 1, + 'db1035' => 1, ), 'watchlist' => array( 'db1003' => 1, -- To view, visit https://gerrit.wikimedia.org/r/153559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0ec72b0e21faadb86880b485238f0ca7dcf99ca Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depool db1009, filesystem issue. Repool db1018, take over vs... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Depool db1009, filesystem issue. Repool db1018, take over vslow & dump for s2. Move db1036 back onto normal traffic for s2, with warm-up. .. Depool db1009, filesystem issue. Repool db1018, take over vslow & dump for s2. Move db1036 back onto normal traffic for s2, with warm-up. Change-Id: If881087ecb3e943710432a562ad186e069b38ef8 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 6473208..f7dc927 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -98,10 +98,10 @@ ), 's2' => array( 'db1024' => 0, # 1.4TB 64GB - # lag 'db1018' => 0, # 1.4TB 64GB, snapshot, + 'db1018' => 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1002' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager - 'db1036' => 0, # 1.4TB 64GB, vslow, dump - 'db1009' => 300, # 1.4TB 64GB, traffic sampling + 'db1036' => 100, # 1.4TB 64GB + # fs 'db1009' => 300, # 1.4TB 64GB, traffic sampling 'db1060' => 400, # 2.8TB 96GB 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB @@ -163,10 +163,10 @@ // s1 => groupLoadsByDB 's2' => array( 'vslow' => array( - 'db1036' => 1, + 'db1018' => 1, ), 'dump' => array( - 'db1036' => 1, + 'db1018' => 1, ), 'watchlist' => array( 'db1002' => 1, -- To view, visit https://gerrit.wikimedia.org/r/153558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If881087ecb3e943710432a562ad186e069b38ef8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depool db1009, filesystem issue. Repool db1018, take over vs... - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/153558 Change subject: Depool db1009, filesystem issue. Repool db1018, take over vslow & dump for s2. Move db1036 back onto normal traffic for s2, with warm-up. .. Depool db1009, filesystem issue. Repool db1018, take over vslow & dump for s2. Move db1036 back onto normal traffic for s2, with warm-up. Change-Id: If881087ecb3e943710432a562ad186e069b38ef8 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/58/153558/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 6473208..f7dc927 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -98,10 +98,10 @@ ), 's2' => array( 'db1024' => 0, # 1.4TB 64GB - # lag 'db1018' => 0, # 1.4TB 64GB, snapshot, + 'db1018' => 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1002' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager - 'db1036' => 0, # 1.4TB 64GB, vslow, dump - 'db1009' => 300, # 1.4TB 64GB, traffic sampling + 'db1036' => 100, # 1.4TB 64GB + # fs 'db1009' => 300, # 1.4TB 64GB, traffic sampling 'db1060' => 400, # 2.8TB 96GB 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB @@ -163,10 +163,10 @@ // s1 => groupLoadsByDB 's2' => array( 'vslow' => array( - 'db1036' => 1, + 'db1018' => 1, ), 'dump' => array( - 'db1036' => 1, + 'db1018' => 1, ), 'watchlist' => array( 'db1002' => 1, -- To view, visit https://gerrit.wikimedia.org/r/153558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If881087ecb3e943710432a562ad186e069b38ef8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move ulsfo public traffic to eqiad temporarily for net maint... - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153557
Change subject: Move ulsfo public traffic to eqiad temporarily for net
maintenance
..
Move ulsfo public traffic to eqiad temporarily for net maintenance
Change-Id: Ia45c4762fe2a9171e9730d2578efce3c1f876fd6
---
M config-geo
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/57/153557/1
diff --git a/config-geo b/config-geo
index a672e34..690fae6 100644
--- a/config-geo
+++ b/config-geo
@@ -219,7 +219,7 @@
dcmap => {
eqiad => bits-lb.eqiad.wikimedia.org.
esams => bits-lb.esams.wikimedia.org.
-ulsfo => bits-lb.ulsfo.wikimedia.org.
+ulsfo => bits-lb.eqiad.wikimedia.org.
}
}
upload => {
@@ -227,7 +227,7 @@
dcmap => {
eqiad => upload-lb.eqiad.wikimedia.org.
esams => upload-lb.esams.wikimedia.org.
-ulsfo => upload-lb.ulsfo.wikimedia.org.
+ulsfo => upload-lb.eqiad.wikimedia.org.
}
}
geoiplookup => {
@@ -235,7 +235,7 @@
dcmap => {
eqiad => geoiplookup-lb.eqiad.wikimedia.org.
esams => geoiplookup-lb.esams.wikimedia.org.
-ulsfo => geoiplookup-lb.ulsfo.wikimedia.org.
+ulsfo => geoiplookup-lb.eqiad.wikimedia.org.
}
}
donate => {
@@ -243,7 +243,7 @@
dcmap => {
eqiad => donate-lb.eqiad.wikimedia.org.
esams => donate-lb.esams.wikimedia.org.
-ulsfo => donate-lb.ulsfo.wikimedia.org.
+ulsfo => donate-lb.eqiad.wikimedia.org.
}
}
text-lb => {
@@ -251,7 +251,7 @@
dcmap => {
eqiad => text-lb.eqiad.wikimedia.org.
esams => text-lb.esams.wikimedia.org.
-ulsfo => text-lb.ulsfo.wikimedia.org.
+ulsfo => text-lb.eqiad.wikimedia.org.
}
}
mobile-lb => {
@@ -259,7 +259,7 @@
dcmap => {
eqiad => mobile-lb.eqiad.wikimedia.org.
esams => mobile-lb.esams.wikimedia.org.
-ulsfo => mobile-lb.ulsfo.wikimedia.org.
+ulsfo => mobile-lb.eqiad.wikimedia.org.
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/153557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia45c4762fe2a9171e9730d2578efce3c1f876fd6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Add the mark as read button to messages view - change (mediawiki...Echo)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153556
Change subject: WIP: Add the mark as read button to messages view
..
WIP: Add the mark as read button to messages view
Change-Id: I4450a66cffd11c67b9a4ba9aac0fe958dc760e15
---
M modules/overlay/ext.echo.overlay.js
M modules/overlay/ext.echo.overlay.less
M tests/qunit/overlay/test_ext.echo.overlay.js
3 files changed, 88 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/56/153556/1
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 55c01d9..24bcf94 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -12,11 +12,13 @@
this._buildOverlay( apiResultNotifications );
}
- function EchoOverlayTab( name, notifications ) {
+ function EchoOverlayTab( options, notifications ) {
this.api = mw.echo.overlay.api;
- this.name = name;
+ this.markOnView = options.markOnView;
+ this.markAsReadCallback = options.markAsReadCallback;
+ this.name = options.name;
this.unread = [];
- this._buildList( notifications );
+ this._buildList( notifications[this.name] );
}
EchoOverlayTab.prototype = {
@@ -40,9 +42,10 @@
'token': mw.user.tokens.get(
'editToken' )
} ) ).then( function ( result ) {
return
result.query.echomarkread[self.name];
- } ).done( function() {
+ } ).done( function( result ) {
// reset internal state of unread
messages
self.unread = [];
+ self.markAsReadCallback( result );
} );
} else {
return new $.Deferred();
@@ -57,10 +60,19 @@
*/
_buildList: function( notifications ) {
var self = this,
- $ul = $( '' ).addClass(
'mw-echo-notifications' )
+ $container = $( '' )
.data( 'tab', this )
- .css( 'max-height', $( window
).height() - 134 );
+ .css( 'max-height', $( window
).height() - 134 ),
+ $ul = $( '' ).appendTo( $container );
+ if ( !this.markOnView ) {
+ $( '' )
+ .text( 'Mark all as read' )
+ .on( 'click', function() {
+ self.markAsRead();
+ } )
+ .appendTo( $container );
+ }
$.each( notifications.index, function ( index, id ) {
var $wrapper,
data = notifications.list[id],
@@ -124,7 +136,7 @@
mw.echo.setUpDismissability( $li );
}
} );
- this.$el = $ul;
+ this.$el = $container;
}
};
@@ -224,10 +236,9 @@
$lists.each( function() {
if ( $( this ).data( 'tab' ).name === tab.name
) {
$( this ).show();
- tab.markAsRead().done( function( data )
{
- self.updateBadgeCount(
data.count, data.rawcount );
- self._updateTitleElement();
- } );
+ if ( tab.markOnView ) {
+ tab.markAsRead();
+ }
}
} );
},
@@ -275,7 +286,7 @@
},
_getTitleElement: function() {
- $( '' ).addClass( 'mw-echo-overlay-title' )
+ var $title = $( '' ).addClass(
'mw-echo-overlay-title' )
.append( this._getTabsElement() );
this._showTabList( this.tabs[0] );
return $title;
@@ -284,21 +295,27 @@
_buildOverlay: function ( notifications ) {
var tabs,
self
[MediaWiki-commits] [Gerrit] Kill mark as read button - change (mediawiki...Echo)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153555
Change subject: Kill mark as read button
..
Kill mark as read button
This is being redefined as part of the introduction of notification
tabs.
Change-Id: I2211bf6727f661ca7fcd6023aaddb3f2b5ac53ba
---
M modules/overlay/ext.echo.overlay.js
M modules/overlay/ext.echo.overlay.less
2 files changed, 1 insertion(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/55/153555/1
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 6d00397..8c34d95 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -45,31 +45,6 @@
configuration: mw.config.get( 'wgEchoOverlayConfiguration' ),
- _getMarkAsReadButton: function() {
- var self = this;
- return $( '' )
- .addClass( 'mw-ui-button' )
- .attr( 'id', 'mw-echo-mark-read-button' )
- .text( mw.msg( 'echo-mark-all-as-read' ) )
- .click( function ( e ) {
- e.preventDefault();
- // FIXME: Use postWithToken
- self.api.post(
mw.echo.desktop.appendUseLang( {
- 'action' : 'echomarkread',
- 'all' : true,
- 'token': mw.user.tokens.get(
'editToken' )
- } ) ).done( function ( result ) {
- var count;
- if (
result.query.echomarkread.count !== undefined ) {
- count =
result.query.echomarkread.count;
- self.updateCount(
count, result.query.echomarkread.rawcount );
- // Reset header to
'Notifications'
- $(
'#mw-echo-overlay-title-text' ).html( mw.msg( 'echo-overlay-title' ) );
- }
- } );
- } );
- },
-
_getFooterElement: function() {
var $prefLink = $( '#pt-preferences a' ),
$overlayFooter = $( '' )
@@ -118,7 +93,7 @@
},
_getTitleElement: function() {
- var titleText, includeMarkAsReadButton, overflow,
+ var titleText,
counter = this.notificationCount,
notificationsCount = counter.all,
unreadRawTotalCount = counter.unreadRaw,
@@ -133,24 +108,11 @@
mw.language.convertNumber(
unreadCount ),
mw.language.convertNumber(
unreadTotalCount )
);
- overflow = true;
} else {
titleText = mw.msg(
'echo-overlay-title' );
- overflow = false;
}
} else {
titleText = mw.msg( 'echo-none' );
- }
- // If there are more unread notifications than can fit
in the overlay,
- // but fewer than the maximum count, show the 'mark all
as read' button.
- // The only reason we limit it to the maximum is to
prevent expensive
- // database updates. If the count is more than the
maximum, it could
- // be thousands.
- includeMarkAsReadButton = overflow &&
- unreadRawTotalCount < this.configuration[
'max-notification-count' ];
- if ( includeMarkAsReadButton ) {
- // Add the 'mark all as read' button to the
title area
- $title.append( this._getMarkAsReadButton() );
}
// Add the header to the title area
diff --git a/modules/overlay/ext.echo.overlay.less
b/modules/overlay/ext.echo.overlay.less
index 2d30df4..dfc8ef6 100644
--- a/modules/overlay/ext.echo.overlay.less
+++ b/modules/overlay/ext.echo.overlay.less
@@ -186,15 +186,6 @@
padding: 15px 15px 10px 60px;
}
-#mw-echo-mark-read-button {
-
[MediaWiki-commits] [Gerrit] Remove redundant "Given I am on Flow page" steps - change (mediawiki...Flow)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/153554 Change subject: Remove redundant "Given I am on Flow page" steps .. Remove redundant "Given I am on Flow page" steps Now these three Scenarios share a "Given I am logged in And I have created a Flow topic" Background, the last two don't need a "Given I am on Flow page" that re-requests the current page. It takes time and led to a browser test failure where the login state was lost (Firefox-sauce/146), so unless we actually want to check the menu is there on reload, we can remove the step. Tests still pass on ee-flow in Firefox with this change. Change-Id: Icefa190526d02419c1cbffb70655890bdefc8773 --- M tests/browser/features/flow_logged_in.feature 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/54/153554/1 diff --git a/tests/browser/features/flow_logged_in.feature b/tests/browser/features/flow_logged_in.feature index 37c58ce..83f5d30 100644 --- a/tests/browser/features/flow_logged_in.feature +++ b/tests/browser/features/flow_logged_in.feature @@ -21,14 +21,12 @@ And the block author link is visible Scenario: Post Actions -Given I am on Flow page When I click the Post Actions link Then I should see a Hide button And I should see a Delete button And I should see a Suppress button Scenario: Topic Actions -Given I am on Flow page When I click the Topic Actions link Then I should see a Hide topic button And I should see a Delete topic button -- To view, visit https://gerrit.wikimedia.org/r/153554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icefa190526d02419c1cbffb70655890bdefc8773 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Spage ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix /resources symbolic link - change (mediawiki/vagrant)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153553
Change subject: Fix /resources symbolic link
..
Fix /resources symbolic link
Bug: 69421
Change-Id: I03a0e9ae8cab24f1ea2ec9267d067f5fc4b03a40
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/53/153553/1
diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index 989adbc..ce99e4f 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -120,7 +120,7 @@
file { "${script_dir}/resources":
ensure => link,
-target => $::mediawiki::dir,
+target => "${::mediawiki::dir}/resources",
}
file { "${script_dir}/skins":
--
To view, visit https://gerrit.wikimedia.org/r/153553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03a0e9ae8cab24f1ea2ec9267d067f5fc4b03a40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix visibility in SkinFallback and StubObject - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix visibility in SkinFallback and StubObject
..
Fix visibility in SkinFallback and StubObject
Change-Id: Ie4c1aabd966fcdf87a9129ceb59c058740292f2e
---
M includes/StubObject.php
M includes/skins/SkinFallback.php
2 files changed, 14 insertions(+), 12 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 73952da..8878660 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -58,7 +58,7 @@
* @param string $class Name of the class of the real object.
* @param array $params Parameters to pass to constructor of the real
object.
*/
- function __construct( $global = null, $class = null, $params = array()
) {
+ public function __construct( $global = null, $class = null, $params =
array() ) {
$this->global = $global;
$this->class = $class;
$this->params = $params;
@@ -71,7 +71,7 @@
* @param object $obj Object to check.
* @return bool True if $obj is not an instance of StubObject class.
*/
- static function isRealObject( $obj ) {
+ public static function isRealObject( $obj ) {
return is_object( $obj ) && !$obj instanceof StubObject;
}
@@ -83,7 +83,7 @@
* @param object $obj Object to check.
* @return void
*/
- static function unstub( &$obj ) {
+ public static function unstub( &$obj ) {
if ( $obj instanceof StubObject ) {
$obj = $obj->_unstub( 'unstub', 3 );
}
@@ -100,7 +100,7 @@
* @param array $args Arguments
* @return mixed
*/
- function _call( $name, $args ) {
+ public function _call( $name, $args ) {
$this->_unstub( $name, 5 );
return call_user_func_array( array( $GLOBALS[$this->global],
$name ), $args );
}
@@ -109,7 +109,7 @@
* Create a new object to replace this stub object.
* @return object
*/
- function _newObject() {
+ public function _newObject() {
return MWFunction::newObj( $this->class, $this->params );
}
@@ -121,7 +121,7 @@
* @param array $args Arguments
* @return mixed
*/
- function __call( $name, $args ) {
+ public function __call( $name, $args ) {
return $this->_call( $name, $args );
}
@@ -137,7 +137,7 @@
* @return object The unstubbed version of itself
* @throws MWException
*/
- function _unstub( $name = '_unstub', $level = 2 ) {
+ public function _unstub( $name = '_unstub', $level = 2 ) {
static $recursionLevel = 0;
if ( !$GLOBALS[$this->global] instanceof StubObject ) {
@@ -170,18 +170,18 @@
*/
class StubUserLang extends StubObject {
- function __construct() {
+ public function __construct() {
parent::__construct( 'wgLang' );
}
- function __call( $name, $args ) {
+ public function __call( $name, $args ) {
return $this->_call( $name, $args );
}
/**
* @return Language
*/
- function _newObject() {
+ public function _newObject() {
return RequestContext::getMain()->getLanguage();
}
}
diff --git a/includes/skins/SkinFallback.php b/includes/skins/SkinFallback.php
index 6055473..30ea97d 100644
--- a/includes/skins/SkinFallback.php
+++ b/includes/skins/SkinFallback.php
@@ -12,14 +12,16 @@
* SkinTemplate class for the fallback skin
*/
class SkinFallback extends SkinTemplate {
- var $skinname = 'fallback', $template = 'SkinFallbackTemplate';
+
+ public $skinname = 'fallback';
+ public $template = 'SkinFallbackTemplate';
/**
* Add CSS via ResourceLoader
*
* @param $out OutputPage
*/
- function setupSkinUserCss( OutputPage $out ) {
+ public function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
$out->addModuleStyles( 'mediawiki.skinning.interface' );
}
--
To view, visit https://gerrit.wikimedia.org/r/153498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4c1aabd966fcdf87a9129ceb59c058740292f2e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-comm
[MediaWiki-commits] [Gerrit] Add @codingStandardsIgnore tags to parser classes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add @codingStandardsIgnore tags to parser classes
..
Add @codingStandardsIgnore tags to parser classes
Change-Id: I16d19de3d2b2461a68030afd3a79aa59c9e948d4
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
2 files changed, 46 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/Preprocessor_DOM.php
b/includes/parser/Preprocessor_DOM.php
index f4e4dd1..6136555 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -23,8 +23,10 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class Preprocessor_DOM implements Preprocessor {
+ // @codingStandardsIgnoreEnd
/**
* @var Parser
@@ -952,8 +954,10 @@
/**
* An expansion frame, used as a context to expand the result of
preprocessToObj()
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPFrame_DOM implements PPFrame {
+ // @codingStandardsIgnoreEnd
/**
* @var Preprocessor
@@ -1547,8 +1551,11 @@
/**
* Expansion frame with template arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPTemplateFrame_DOM extends PPFrame_DOM {
+ // @codingStandardsIgnoreEnd
+
public $numberedArgs, $namedArgs;
/**
@@ -1711,8 +1718,11 @@
/**
* Expansion frame with custom arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPCustomFrame_DOM extends PPFrame_DOM {
+ // @codingStandardsIgnoreEnd
+
public $args;
public function __construct( $preprocessor, $args ) {
@@ -1757,8 +1767,10 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPNode_DOM implements PPNode {
+ // @codingStandardsIgnoreEnd
/**
* @var DOMElement
diff --git a/includes/parser/Preprocessor_Hash.php
b/includes/parser/Preprocessor_Hash.php
index d7f5953..f751832 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -26,8 +26,10 @@
* * attribute nodes are children
* * "" nodes that aren't at the top are replaced with
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class Preprocessor_Hash implements Preprocessor {
+ // @codingStandardsIgnoreEnd
/**
* @var Parser
@@ -759,8 +761,11 @@
/**
* Stack class to help Preprocessor::preprocessToObj()
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDStack_Hash extends PPDStack {
+ // @codingStandardsIgnoreEnd
+
public function __construct() {
$this->elementClass = 'PPDStackElement_Hash';
parent::__construct();
@@ -770,8 +775,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDStackElement_Hash extends PPDStackElement {
+ // @codingStandardsIgnoreENd
+
public function __construct( $data = array() ) {
$this->partClass = 'PPDPart_Hash';
parent::__construct( $data );
@@ -808,8 +816,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDPart_Hash extends PPDPart {
+ // @codingStandardsIgnoreEnd
+
public function __construct( $out = '' ) {
$accum = new PPDAccum_Hash;
if ( $out !== '' ) {
@@ -821,8 +832,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDAccum_Hash {
+ // @codingStandardsIgnoreEnd
+
public $firstNode, $lastNode;
public function __construct() {
@@ -889,8 +903,10 @@
/**
* An expansion frame, used as a context to expand the result of
preprocessToObj()
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPFrame_Hash implements PPFrame {
+ // @codingStandardsIgnoreEnd
/**
* @var Parser
@@ -1453,8 +1469,11 @@
/**
* Expansion frame with template arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPTemplateFrame_Hash extends PPFrame_Hash {
+ // @codingStandardsIgnoreEnd
+
public $numberedArgs, $namedArgs, $parent;
public $numberedExpansionCache, $namedExpansionCache;
@@ -1633,8 +1652,11 @@
/**
* Expansion frame with custom arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPCustomFrame_Hash extends PPFrame_Hash {
+ // @codingStandardsIgnoreEnd
+
public $args;
public function __construct( $preprocessor, $args ) {
@@ -1683,8 +1705,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPNode_Hash_Tree implements PPNode {
+ // @codingStandardsIgnoreEnd
+
public $name, $firstChild, $lastChild, $nextSibling;
public function __construct( $name ) {
@@ -1905,8 +1930,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class P
[MediaWiki-commits] [Gerrit] Revert "Transaction around recurring Globalcollect charge" - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153552
Change subject: Revert "Transaction around recurring Globalcollect charge"
..
Revert "Transaction around recurring Globalcollect charge"
This partially reverts commit 8f27f54579705d52494fb72660e9a2d06a990fbc.
We don't want to roll back the entire transaction, because the subscription
record is updated with failure info, for example.
Change-Id: If316d4f7d639e7035f1472455428c245b631224e
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/52/153552/1
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 4789d56..39c450e 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -260,12 +260,13 @@
foreach ($contribution_batch as $contribution_recur)
{
try {
- WmfDatabase::transactionalCall(
- 'recurring_globalcollect_charge',
- array( $contribution_recur->id, $options )
- );
+ $status = recurring_globalcollect_charge($contribution_recur->id,
$options);
- $succeeded[] = $contribution_recur;
+ if ($status) {
+ $succeeded[] = $contribution_recur;
+ } else {
+ $failed[] = $contribution_recur;
+ }
}
catch ( WmfException $e )
{
--
To view, visit https://gerrit.wikimedia.org/r/153552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If316d4f7d639e7035f1472455428c245b631224e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] typo - change (wikimedia...crm)
Awight has submitted this change and it was merged.
Change subject: typo
..
typo
Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Awight: Looks good to me, approved
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 61921e9..4789d56 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -262,7 +262,7 @@
try {
WmfDatabase::transactionalCall(
'recurring_globalcollect_charge',
- array( $contribution_recur['id'], $options )
+ array( $contribution_recur->id, $options )
);
$succeeded[] = $contribution_recur;
--
To view, visit https://gerrit.wikimedia.org/r/153551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] typo - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153551
Change subject: typo
..
typo
Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/51/153551/1
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 61921e9..4789d56 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -262,7 +262,7 @@
try {
WmfDatabase::transactionalCall(
'recurring_globalcollect_charge',
- array( $contribution_recur['id'], $options )
+ array( $contribution_recur->id, $options )
);
$succeeded[] = $contribution_recur;
--
To view, visit https://gerrit.wikimedia.org/r/153551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Track thank you emails to CiviMail - change (wikimedia...crm)
Awight has submitted this change and it was merged.
Change subject: Track thank you emails to CiviMail
..
Track thank you emails to CiviMail
In make-thank-you, add CiviMail 'Mailing' records for each template.
Add mailing queue record for each message, use CiviMail VERP header for bounces.
Don't stop the show if we can't insert CiviMail records.
Change-Id: Id4f19ea94c1db82e838d7dd5439fb28a38c88a1a
---
M sites/all/modules/thank_you/generators/RenderTranslatedPage.php
M sites/all/modules/thank_you/thank_you.module
2 files changed, 111 insertions(+), 6 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
index f9d2875..03f9b1d 100644
--- a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
+++ b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
@@ -1,4 +1,5 @@
0) {
$languages = array_intersect($wantedLangs, $languages);
}
+
+ civicrm_initialize();
+ $civimail_store = new CiviMailStore();
+
foreach( $languages as $lang ) {
try {
$published_revision =
$this->get_published_revision( $lang );
@@ -52,8 +57,14 @@
// Assert no garbage
FindUnconsumedTokens::renderAndFindTokens(
$page_content, $lang );
+ $template_name = basename( $file );
+
+ $page_content =
$this->add_template_info_comment( $page_content, $template_name,
$published_revision );
+
if (file_put_contents( $file, $page_content )) {
watchdog( 'make-thank-you', "$lang --
Wrote translation into $file", null, WATCHDOG_INFO );
+ $subject = thank_you_get_subject( $lang
);
+ $civimail_store->addMailing(
'thank_you', $template_name, $page_content, $subject, $published_revision );
} else {
watchdog( 'make-thank-you', "$lang --
Could not open $file for writing!", null, WATCHDOG_ERROR );
@@ -63,11 +74,26 @@
}
} catch ( TranslationException $ex ) {
watchdog( 'make-thank-you', "$lang --
{$ex->getMessage()}", null, WATCHDOG_ERROR );
+ } catch ( CiviMailingInsertException $ex ) {
+ watchdog( 'make-thank-you', "Could not insert
CiviMail Mailing for $lang -- {$ex->getMessage()}", null, WATCHDOG_ERROR );
}
}
}
/**
+* Add an HTML comment with the file name and revision number to the
bottom of the page
+*
+* @param string $page_content HTML content without comment
+* @param string $template_name name of template
+* @param int $revision revision number of template
+*
+* @returns string Content with revision comment appended
+*/
+ protected function add_template_info_comment( $page_content,
$template_name, $revision ) {
+ $comment = "";
+ return $page_content . $comment;
+ }
+ /**
* This function builds a valid MediaWiki API URL by joining the
$base_url
* with a query string that is generated from the passed key, value
pairs.
*
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 1020371..f1ae9da 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -166,6 +166,7 @@
* TODO: document what code and configuration this test covers, and which it
does not
*/
function thank_you_send_test_form_submit( $form_id, $form_values ) {
+ civicrm_initialize();
$params = $form_values['values'];
# Massage the params a bit
@@ -441,12 +442,21 @@
return false;
}
- $subj_msg = "donate_interface-email-subject";
- $email['subject'] = Translation::get_translated_message( $subj_msg,
$params['locale'] );
+ $email['subject'] = thank_you_get_subject( $params['locale'] );
$mailer = Mailer::getDefault();
- $email['reply_to'] = 'bounce-' . str_replace( '@', '=',
$email['to_address'] ) . '@donate.wikimedia.org';
+ $civi_queue_record = thank_you_add_civi_queue(
+ $email['to_address'],
+ $email['subject'],
+ $email['html']
+ );
+
+ if ( $civi_queue_record ) {
+ $email['reply_to'] = $civi_queue_record->getVerp();
+ } else {
+ $email['re
[MediaWiki-commits] [Gerrit] Add activity records for individual thank you emails - change (wikimedia...crm)
Awight has submitted this change and it was merged.
Change subject: Add activity records for individual thank you emails
..
Add activity records for individual thank you emails
Change-Id: I0a0bb00328b9de73b2c2e1508e5c7960c3aa70a2
---
M sites/all/modules/thank_you/thank_you.module
M sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
M sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
3 files changed, 74 insertions(+), 16 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index f1ae9da..60c37b7 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -554,6 +554,7 @@
$civi_mailing = $civimail_store->addMailing(
'thank_you', $template_info['name'], 'missing body', $subject,
$template_info['revision'] );
}
$civi_queue_record = $civimail_store->addQueueRecord(
$civi_mailing, $email );
+ $civimail_store->addActivity( $civi_queue_record, $subject,
$html );
}
catch ( TemplateInfoMissingException $e ) {
watchdog( 'thank_you', 'Could not find template info comment in
thank you email template with subject ' . $subject, WATCHDOG_INFO );
diff --git
a/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
b/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
index 13a4de9..19d3ac4 100644
--- a/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
+++ b/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
@@ -9,7 +9,7 @@
/**
* Adds a 'delivered' event for this message
*/
- function markDelivered( $time = null );
+ function markDelivered( $date = null );
/**
* Get the Variable Email Return Path header to use
@@ -24,6 +24,20 @@
* @returns int
*/
function getQueueID();
+
+ /**
+* Get the CiviCRM Contact ID of this queue record
+*
+* @returns int
+*/
+ function getContactID();
+
+ /**
+* Get the CiviCRM Email ID of this queue record
+*
+* @returns int
+*/
+ function getEmailID();
}
class CiviMailQueueRecord implements ICiviMailQueueRecord {
@@ -33,11 +47,11 @@
/**
* @param CRM_Mailing_Event_DAO_Queue $queue
-* @param string $emailAddress
+* @param CRM_Core_Email $email
*/
- public function __construct( $queue, $emailAddress ) {
+ public function __construct( $queue, $email ) {
$this->queue = $queue;
- $this->emailAddress = $emailAddress;
+ $this->email = $email;
}
public function getVerp() {
@@ -45,12 +59,12 @@
$this->queue->job_id,
$this->queue->id,
$this->queue->hash,
- $this->emailAddress );
+ $this->email->email );
return $verpAndUrls[0]['bounce'];
}
- public function markBounced( $bounceType ) {
+ public function markBounced( $bounceType, $date = null ) {
//TODO
}
@@ -58,14 +72,22 @@
return $this->queue->id;
}
- public function markDelivered( $time = null ) {
- if ( !$time ) {
- $time = gmdate( 'YmdHis' );
+ public function getContactID() {
+ return $this->email->contact_id;
+ }
+
+ public function getEmailID() {
+ return $this->email->id;
+ }
+
+ public function markDelivered( $date = null ) {
+ if ( !$date ) {
+ $date = gmdate( 'YmdHis' );
}
$sql = "INSERT INTO civicrm_mailing_event_delivered (
event_queue_id, time_stamp ) VALUES ( %1, %2 )";
$params = array(
1 => array( $this->getQueueID(), 'Integer' ),
- 2 => array( $time, 'String' )
+ 2 => array( $date, 'String' )
);
CRM_Core_DAO::executeQuery( $sql, $params );
}
diff --git a/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
b/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
index 45849b2..7bfb17f 100644
--- a/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
+++ b/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
@@ -36,12 +36,12 @@
function getMailing( $source, $templateName, $revision = 0 );
/**
-* Adds a child job with completed date $date, a queue entry,
-* and an Activity record.
+* Adds a child job with completed date $da
[MediaWiki-commits] [Gerrit] Classes to track external mailings to CiviMail - change (wikimedia...crm)
Awight has submitted this change and it was merged.
Change subject: Classes to track external mailings to CiviMail
..
Classes to track external mailings to CiviMail
This commit implements enough functionality to get CiviMail VERP
bounce headers for use with thank you emails. Adding Activity
records will come next.
Change-Id: I27ee5804027fb3280f47cb97b9d265ee4f21f9f9
---
A sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
A sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
A sites/all/modules/wmf_communication/CiviMail/CiviMailingRecord.php
M sites/all/modules/wmf_communication/wmf_communication.info
4 files changed, 330 insertions(+), 0 deletions(-)
Approvals:
Awight: Looks good to me, approved
diff --git
a/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
b/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
new file mode 100644
index 000..13a4de9
--- /dev/null
+++ b/sites/all/modules/wmf_communication/CiviMail/CiviMailQueueRecord.php
@@ -0,0 +1,72 @@
+queue = $queue;
+ $this->emailAddress = $emailAddress;
+ }
+
+ public function getVerp() {
+ $verpAndUrls = CRM_Mailing_BAO_Mailing::getVerpAndUrls(
+ $this->queue->job_id,
+ $this->queue->id,
+ $this->queue->hash,
+ $this->emailAddress );
+
+ return $verpAndUrls[0]['bounce'];
+ }
+
+ public function markBounced( $bounceType ) {
+ //TODO
+ }
+
+ public function getQueueID() {
+ return $this->queue->id;
+ }
+
+ public function markDelivered( $time = null ) {
+ if ( !$time ) {
+ $time = gmdate( 'YmdHis' );
+ }
+ $sql = "INSERT INTO civicrm_mailing_event_delivered (
event_queue_id, time_stamp ) VALUES ( %1, %2 )";
+ $params = array(
+ 1 => array( $this->getQueueID(), 'Integer' ),
+ 2 => array( $time, 'String' )
+ );
+ CRM_Core_DAO::executeQuery( $sql, $params );
+ }
+}
diff --git a/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
b/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
new file mode 100644
index 000..45849b2
--- /dev/null
+++ b/sites/all/modules/wmf_communication/CiviMail/CiviMailStore.php
@@ -0,0 +1,206 @@
+getMailingInternal( $name );
+
+ $transaction = new CRM_Core_Transaction();
+ try {
+ if ( !$mailing ) {
+ $params = array(
+ 'subject' => $subjectTemplate,
+ 'body_html' => $bodyTemplate,
+ 'name' => $name,
+ 'is_completed' => TRUE,
+ //TODO: user picker on TY config page,
or add 'TY mailer' contact
+ 'scheduled_id' => 1
+ );
+ $mailing = CRM_Mailing_BAO_Mailing::add(
$params, CRM_Core_DAO::$_nullArray );
+ }
+
+ $job = $this->getJobInternal( $mailing->id );
+
+ if ( !$job ) {
+ $job = new CRM_Mailing_BAO_Job();
+ $job->start_date = $job->end_date = gmdate(
'YmdHis' );
+ $job->status = 'Complete';
+ $job->job_type = 'external';
+ $job->mailing_id = $mailing->id;
+ $job->save();
+ }
+ $transaction->commit();
+ return new CiviMailingRecord( $name, $mailing->id,
$job->id );
+ }
+ catch ( Exception $e ) {
+ $transaction->rollback();
+ $msg = "Error inserting CiviMail Mailing record $name
-- {$e->getMessage()}";
+ throw new CiviMailingInsertException( $msg, 0, $e );
+ }
+ }
+
+ public function addQueueRecord( $mailingRecord, $emailAddress, $date =
null ) {
+ if ( !$date ) {
+ $date = gmdate( 'YmdHis' );
+ }
+ $email = new CRM_Core_DAO_Email();
+ $email->email = $emailAddress;
+
+ if ( !$email->find() || !$email->fetch() ) {
+ throw new CiviQueueInsertException( "No record of email
$emailAddress in CiviCRM" );
+ }
+ //If there are multiple records for the email address, just use
the first.
+ //They should to be de-duped later, so no need to add extra
mess.
+
[MediaWiki-commits] [Gerrit] typo - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: typo
..
typo
Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 61921e9..4789d56 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -262,7 +262,7 @@
try {
WmfDatabase::transactionalCall(
'recurring_globalcollect_charge',
- array( $contribution_recur['id'], $options )
+ array( $contribution_recur->id, $options )
);
$succeeded[] = $contribution_recur;
--
To view, visit https://gerrit.wikimedia.org/r/153550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] typo - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153550
Change subject: typo
..
typo
Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/50/153550/1
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 61921e9..4789d56 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -262,7 +262,7 @@
try {
WmfDatabase::transactionalCall(
'recurring_globalcollect_charge',
- array( $contribution_recur['id'], $options )
+ array( $contribution_recur->id, $options )
);
$succeeded[] = $contribution_recur;
--
To view, visit https://gerrit.wikimedia.org/r/153550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4dc1f5a383af286f7716e89305db6c0d808c0de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Link default and HK Chinese language variant - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/153549 Change subject: Link default and HK Chinese language variant .. Link default and HK Chinese language variant Symlinks: values-zh -> values-zh-rCN values-zh-rHK -> values-zh-rTW Bug: 69304 Change-Id: I980f4bc866191e2ba26d4e5a6917f26ce56ca9ec --- A wikipedia/res/values-zh A wikipedia/res/values-zh-rHK 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/49/153549/1 diff --git a/wikipedia/res/values-zh b/wikipedia/res/values-zh new file mode 12 index 000..46af1b0 --- /dev/null +++ b/wikipedia/res/values-zh @@ -0,0 +1 @@ +values-zh-rCN \ No newline at end of file diff --git a/wikipedia/res/values-zh-rHK b/wikipedia/res/values-zh-rHK new file mode 12 index 000..79288ab --- /dev/null +++ b/wikipedia/res/values-zh-rHK @@ -0,0 +1 @@ +values-zh-rTW \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/153549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I980f4bc866191e2ba26d4e5a6917f26ce56ca9ec Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old Chinese default language variant - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/153548 Change subject: Remove old Chinese default language variant .. Remove old Chinese default language variant Deleted old values-zh. Bug: 69304 Change-Id: I91bb7c1d563e9c2696e7c653023e0b9082e6 --- D wikipedia/res/values-zh/strings.xml 1 file changed, 0 insertions(+), 211 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/48/153548/1 diff --git a/wikipedia/res/values-zh/strings.xml b/wikipedia/res/values-zh/strings.xml deleted file mode 100644 index c07fb81..000 --- a/wikipedia/res/values-zh/strings.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - 维基百科 - 维基百科测试版 - 是 - 否 - 维基百科崩溃了:( - 将崩溃报告发送给我们 - 崩溃发生时您在干什么? - 搜索维基百科 - 历史 - 历史 - 不能连接网络:( - 网络错误。点击可重试。 - 重试 - 清除历史记录 - 清空书签 - 清空已保存的页面 - 此页面不存在。 - 清除浏览历史？ - 保存的页面 - 保存的页面 - 更新保存的页面 - 更新保存的页面 - 更新所有保存的页面？ - 保存的页面已更新 - 保存页面 - 分享 - 分享到 - 清空所有保存的页面？ - 您确定要清除所有保存的页面么？ - 正在保存页面... - 页面保存成功 - 不能保存所有图像 - 保存页面失败:( - 正在刷新保存的页面... - 删除 - 保存的页面已删除 - 最后更新于%s - 内容以CC BY-SA 3.0协议提供，另有声明者除外 - 一旦保存，则表示您同意使用条款，同时您的贡献采用CC-BY-SA 3.0协议并且不可撤消 - 一旦保存，则表示您同意使用条款，同时以CC-BY-SA 3.0协议不可撤消的发布你的贡献。编辑将归属于您设备的IP地址。如果您登录，您将拥有更多隐私。 - 维基百科语言 - 内容语言 - 搜索 - 搜索 - 阅读其他语言 - 重试 - 本页没有其他语言的版本 - 设置 - 其他语言 - 保存修改 - 重试 - 正在保存... - 编辑已保存！ - 编辑失败！ - 重试 - 取消 - 目录 - 找不到结果 - 为了防止垃圾邮件，请输入下面出现的词 - 重复上面的单词 - 输入验证码 - 修改我的编辑 - 点击验证码重新加载 - 这个保存的页面可能过时，必须刷新才能编辑。您需要刷新页面吗？ - 登录 - 用户名 - 密码 - 显示密码 - 登录 - 登录到维基百科 - 正在登录... - 密码错误 - 用户名错误 - 登录成功！ - 此用户已被封禁 - 尝试登录次数太多。等待几分钟，然后再试。 - 登录失败！ - 没有网络连接 - 注销 - 注销 - 退出你的维基百科账号 - 未登录。 - 已退出 - 还没有保存过页面。 - 保存页面非常棒。试想一下你存为书签后即使在离线时也可以阅读。 - 这里没有最新的页面。 - 你可能把它们全都删掉了。下次你转到一个页面后，可以再回到这里来。 - WIKIPEDIA - 自由的百科全书 - 跳过 - 用户名 - 密码 - 创建账号 - 你还没有一个账号吗？加入维基百科 - 已经有一个账号了？请登录 - 创建一个账号 - 编辑章节 - 验证 - 电子邮件 (可选) - 重置密码 - 密码不一致 - 无效的电子邮件地址 - 用户名已在使用 - 从这个 IP 地址创建的帐户太多。稍后再试。 - 此 IP 地址已经被禁止创建帐户。 - 无法创建账户 - 没有网络连接 - 下一步 - 创建账户 - 常规 - Wikipedia Zero已关闭 - 加载其他条目可能会产生流量费用。 - 搜索Wikipedia Zero - 离开Wikipedia Zero时提示 - 如果您的移动运营商作为Wikipedia Zero的合作伙伴而放弃维基百科应用程序相关的流量接入费用的话，那么不勾选此选项，可以让您及时知道，在您离开维基百科应用程序后，会开始计费。 - Wikipedia Zero常见问题 - Wikipedia Zero - 离开Wikipedia Zero - 将收取流量费用。继续前往外部网站？ - 离开 - 留在这里 - 此维基百科应用程序可免除流量费用。 - 了解详情 - 隐藏 - 设置 - Zero开发模式 - 正在获取预览效果... - 预览编辑 - 正在登录... - 发送应用反馈 - 告诉我们您希望如何改进此页面。这将有助于其他编者快速复核您的编辑。 - 编辑摘要 - 随机 - 正在获取随机页面... - 如果您已登录，您的编辑将被关联到您的账号，而您的 IP 地址将不会公开显示。 - 账号已创建！ - 加载更多 - 我的贡献 - 我的贡献 - 登录并保存 - 匿名保存 - 您的编辑将公开归属于您的用户名，并方便其他编辑者与您联系 - 您的编辑将公开归属于您的IP地址，这会频繁更改 - 发送使用情况报告 - 允许维基媒体收集有关您如何使用该应用程序的信息，这将使应用程序变得更好 - 检测到链接了被封禁的域名（%s）。请将其移除后重试。 - 搜索 - 未找到匹配“%s”的页面 - 无法显示此链接 - 本页已被半保护。 - 本页已被全保护。 - 此页面已获以下保护：%s - 你没有编辑这个页面的权限 - 本页被保护 - 更多 - 更多 - 关于维基百科应用程序 - 版本 - 使用的库 - 贡献者 - 翻译者 - 这个应用程序由translatewiki.net的志愿者翻译。 - 维基媒体基金会制作 - 关于 - 页面未被修改。 - 页面已被修改。您确定不保存您的更改而离开？ - 已封禁 - 您的用户账号被封禁，不能编辑此wiki。 - 您的IP地址被封禁而不能编辑。 - 您想如何改进此页面？ - 下一步 - 保存 - 预览 - 修正笔误 - 修正语法 - 添加链接 - 其他 - 其他您改进页面的方法 - 在页面中查找 - 查找下一个 - 查找上一个 - 关闭查找栏 - 无法连上网络，请重试。 - 重试 - 更新保存的页面时出错 - 正在刷新保存的页面... - 更新完成 - 这可能是没有建设性的编辑。你真的要保存吗？ - 您不能保存此编辑。请返回并修改。 - 一个自动过滤器认为这是一个没有建设性的编辑。可能由以下一种或多种原因造成：
· 全部是大写字母
· 清空条目或广告
· 清除外部链接或图像
· 重复的文字 - 一个自动过滤器认为这次编辑可能没有建设性或是潜在的破坏。
维基百科是一部百科全书，只能中立、有价值的内容才属于这里。 - 更改字体和主题 - 字体大小 - 主题 - 日间 - 夜间 - Android版官方维基百科应用。维基百科是一部自由的百科全书，包括用280种语言撰写的超过3200万条目，是有史以来人类编辑的最全面、使用最广泛的参考书。本应用已完全重写，远超从前。 - -特点： - - 快速：我们这个全新的原生应用可以让你比以前更快的浏览和编辑维基百科。 - - 编辑：你可以编辑维基百科！无论是否登录，我们都非常感谢你做的所有贡献。 - - 最新页面：我们为您提供您的阅读历史，你可以尽情地点击链接而不会迷路。 - - 保存页面：你可以保存选定的页面以便离线阅读，即使你没有数据连接也可以浏览它们。 - - 分享：使用你已有的社交网站应用来分享全人类知识的摘要。 - - 多语言支持：本应用可以让你在任何语言编写的维基百科之间无缝切换的阅读。 - - Wikipedia Zero: 合作的移动运营商可以免除流量费用。 - -代码完全开源。如果你有Java和Android SDK的开发经验，就来fork我们吧！https://github.com/wikimedia/apps-android-wikipedia - -- To view, visit https://gerrit.wikimedia.org/r/153548 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91bb7c1d563e9c2696e7c653023e0b9082e6 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Really fail if OAuth request source IP is invalid. - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Really fail if OAuth request source IP is invalid.
..
Really fail if OAuth request source IP is invalid.
Change-Id: Ieabb95b33a5a9cc433136c70d380cfbde3f2f923
---
M backend/MWOAuthServer.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/backend/MWOAuthServer.php b/backend/MWOAuthServer.php
index 4a36c25..384139b 100644
--- a/backend/MWOAuthServer.php
+++ b/backend/MWOAuthServer.php
@@ -82,27 +82,27 @@
/**
* Ensure the request comes from an approved IP address, if IP
restriction has been
-* setup by the Consumer.
+* setup by the Consumer. It throws an exception if IP address is
invalid.
*
* @param MWOAuthConsumer $consumer
* @param MWOAuthRequest $request
-* @return bool
+* @throws MWOAuthException
*/
private function checkSourceIP( $consumer, $request ) {
$restrictions = $consumer->get( 'restrictions' );
$requestIP = $request->getSourceIP();
if ( !isset( $restrictions['IPAddresses'] ) ) {
- return true; // sanity; should not happen
+ throw new MWOAuthException( 'bad-source-ip' ); //
sanity; should not happen
}
foreach ( $restrictions['IPAddresses'] as $range ) {
if ( \IP::isInRange( $requestIP, $range ) ) {
- return true;
+ return;
}
}
- return false;
+ throw new MWOAuthException( 'bad-source-ip' );
}
/**
diff --git a/i18n/en.json b/i18n/en.json
index 5d059be..538dabf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -183,6 +183,7 @@
"mwoauthdatastore-access-token-not-found": "No approved grant was found
for that authorization token.",
"mwoauthdatastore-request-token-not-found": "Sorry, something went wrong
connecting this application.\nGo back and try to connect your account again, or
contact the application author.\n\nOAuth token not found,
[https://www.mediawiki.org/wiki/Help:OAuth/Errors#E004 E004]",
"mwoauthdatastore-bad-token": "No token was found matching your request.",
+"mwoauthdatastore-bad-source-ip": "The request came from an invalid IP
address.",
"mwoauthdatastore-bad-verifier": "The verification code provided was not
valid.",
"mwoauthdatastore-invalid-token-type": "The requested token type is
invalid.",
"mwoauthgrants-general-error": "There was an error in your OAuth request.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9f4ec31..9914e98 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -188,6 +188,7 @@
"mwoauthdatastore-access-token-not-found": "Error message when an
invalid access token was submitted",
"mwoauthdatastore-request-token-not-found": "Error message when an
invalid request token was submitted",
"mwoauthdatastore-bad-token": "Error message when an invalid token was
submitted",
+ "mwoauthdatastore-bad-source-ip": "Error message when a request comes
from an IP address which is not among those whitelisted",
"mwoauthdatastore-bad-verifier": "Error message when an invalid
verification code was submitted",
"mwoauthdatastore-invalid-token-type": "Error message when an invalid
page was requested",
"mwoauthgrants-general-error": "Generic error, when something
unexpected happened while processing the OAuth request",
--
To view, visit https://gerrit.wikimedia.org/r/153028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieabb95b33a5a9cc433136c70d380cfbde3f2f923
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Mitar
Gerrit-Reviewer: CSteipp
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Schema change for comments on changes for logs - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged.
Change subject: Schema change for comments on changes for logs
..
Schema change for comments on changes for logs
Bug: 31689
Change-Id: Ib4af4bff1d90215bccbc8a185f37828b1212a857
---
M CentralNotice.sql
M patches/CNDatabasePatcher.php
A patches/patch-notice-logging-comments.sql
A patches/patch-template-logging-comments.sql
4 files changed, 24 insertions(+), 2 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralNotice.sql b/CentralNotice.sql
index 536c80e..f1437e7 100644
--- a/CentralNotice.sql
+++ b/CentralNotice.sql
@@ -139,7 +139,8 @@
`notlog_begin_weight` int DEFAULT NULL,
`notlog_end_weight` int DEFAULT NULL,
`notlog_begin_archived` tinyint DEFAULT NULL,
- `notlog_end_archived` tinyint DEFAULT NULL
+ `notlog_end_archived` tinyint DEFAULT NULL,
+ `notlog_comment` varchar(255) DEFAULT NULL
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/notlog_timestamp ON /*_*/cn_notice_log (notlog_timestamp);
CREATE INDEX /*i*/notlog_user_id ON /*_*/cn_notice_log (notlog_user_id,
notlog_timestamp);
@@ -174,7 +175,8 @@
`tmplog_begin_controller_mixin` varbinary(4096) DEFAULT NULL,
`tmplog_end_controller_mixin` varbinary(4096) DEFAULT NULL,
`tmplog_begin_devices` varbinary(512) DEFAULT NULL,
- `tmplog_end_devices` varbinary(512) DEFAULT NULL
+ `tmplog_end_devices` varbinary(512) DEFAULT NULL,
+ `tmplog_comment` varchar(255) DEFAULT NULL
) /*$wgDBTableOptions*/;
CREATE INDEX /*i*/tmplog_timestamp ON /*_*/cn_template_log (tmplog_timestamp);
CREATE INDEX /*i*/tmplog_user_id ON /*_*/cn_template_log (tmplog_user_id,
tmplog_timestamp);
diff --git a/patches/CNDatabasePatcher.php b/patches/CNDatabasePatcher.php
index 8643097..1cee854 100644
--- a/patches/CNDatabasePatcher.php
+++ b/patches/CNDatabasePatcher.php
@@ -130,6 +130,18 @@
$base . '/patch-add_devices.sql', true
)
);
+ $updater->addExtensionUpdate(
+ array(
+'addField', 'cn_template_log',
'template_logging_comments',
+$base .
'/patch-template-logging-comments.sql', true
+ )
+ );;
+ $updater->addExtensionUpdate(
+ array(
+'addField', 'cn_notice_log',
'notice_logging_comments',
+$base .
'/patch-notice-logging-comments.sql', true
+ )
+ );
} elseif ( $updater->getDB()->getType() == 'sqlite' ) {
$updater->addExtensionUpdate(
array(
diff --git a/patches/patch-notice-logging-comments.sql
b/patches/patch-notice-logging-comments.sql
new file mode 100644
index 000..30679bc
--- /dev/null
+++ b/patches/patch-notice-logging-comments.sql
@@ -0,0 +1,4 @@
+-- Update to support comments in campaigns logs
+
+-- Add a comment field to cn_notice_log
+ALTER TABLE /*_*/cn_notice_log ADD `notlog_comment` varchar(255) DEFAULT NULL;
\ No newline at end of file
diff --git a/patches/patch-template-logging-comments.sql
b/patches/patch-template-logging-comments.sql
new file mode 100644
index 000..6c3eaf8
--- /dev/null
+++ b/patches/patch-template-logging-comments.sql
@@ -0,0 +1,4 @@
+-- Update to support comments in template logs
+
+-- Add a comment field to cn_template_log
+ALTER TABLE /*_*/cn_template_log ADD `tmplog_comment` varchar(255) DEFAULT
NULL;
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/152145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4af4bff1d90215bccbc8a185f37828b1212a857
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Springle
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Mark known-failing test so CI goes green - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: QA: Mark known-failing test so CI goes green .. QA: Mark known-failing test so CI goes green I believe @wip should do it, though in local testing the feature still reported "3 scenarios (1 failed, 2 passed)". Change-Id: Iffaebf86b9c2437059fa41c5f32076a9e0912096 --- M tests/browser/features/reply.feature 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/reply.feature b/tests/browser/features/reply.feature index 61a4458..901105a 100644 --- a/tests/browser/features/reply.feature +++ b/tests/browser/features/reply.feature @@ -16,10 +16,13 @@ When I reply with comment "I want to watch this title" Then I should see an unwatch link on the topic + # Broken due to bug 69412 + @wip Scenario: Canceling reply leaves usable form Given I have created a Flow topic with title "Reply watch test" And I start a reply with comment "my form lies over the ocean" And I click the Preview button + # Create topic then click its Reply doesn't have a cancel button (bug 69412), so this fails. And I click the Cancel button and confirm the dialog And I start a reply with comment "bring back my form to me" Then I should see the topic reply form -- To view, visit https://gerrit.wikimedia.org/r/153547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffaebf86b9c2437059fa41c5f32076a9e0912096 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Spage Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: SG Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mark known-failing test so CI goes green - change (mediawiki...Flow)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/153547 Change subject: Mark known-failing test so CI goes green .. Mark known-failing test so CI goes green I believe @wip should do it, though in local testing the feature still reported "3 scenarios (1 failed, 2 passed)". Change-Id: Iffaebf86b9c2437059fa41c5f32076a9e0912096 --- M tests/browser/features/reply.feature 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/47/153547/1 diff --git a/tests/browser/features/reply.feature b/tests/browser/features/reply.feature index 61a4458..c056563 100644 --- a/tests/browser/features/reply.feature +++ b/tests/browser/features/reply.feature @@ -16,10 +16,12 @@ When I reply with comment "I want to watch this title" Then I should see an unwatch link on the topic +@wip Scenario: Canceling reply leaves usable form Given I have created a Flow topic with title "Reply watch test" And I start a reply with comment "my form lies over the ocean" And I click the Preview button + # Create topic then click its Reply doesn't have a cancel button (bug 694412), so this fails. And I click the Cancel button and confirm the dialog And I start a reply with comment "bring back my form to me" Then I should see the topic reply form -- To view, visit https://gerrit.wikimedia.org/r/153547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffaebf86b9c2437059fa41c5f32076a9e0912096 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Spage ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] E2c: Hover behaviour of notifications panel tabs - change (mediawiki...Echo)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153546
Change subject: E2c: Hover behaviour of notifications panel tabs
..
E2c: Hover behaviour of notifications panel tabs
Note no design was defined so have taken this to mean use
mediawiki ui for consistency purposes.
* Use mw-ui-active and mw-ui-quiet for tabs
* Update tests
Change-Id: If7a51b2286cdfe6e839dacc2476c9a578bc7f1df
---
M Resources.php
M modules/overlay/ext.echo.overlay.js
M tests/qunit/overlay/test_ext.echo.overlay.js
3 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/46/153546/1
diff --git a/Resources.php b/Resources.php
index c7f3e2f..1089626 100644
--- a/Resources.php
+++ b/Resources.php
@@ -68,6 +68,7 @@
'ext.echo.desktop',
'mediawiki.util',
'mediawiki.language',
+ 'mediawiki.ui.anchor',
),
'messages' => array(
'echo-overlay-link',
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 188c508..397a3f8 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -275,16 +275,18 @@
label = mw.msg( 'echo-notification-' +
tabName, echoTab.getUnreadIds().length );
$li = $( '' )
+ .appendTo( $ul );
+
+ $( '' )
.on( 'click', function() {
var $this = $( this );
- $ul.find( 'li' ).removeClass(
'mw-echo-section-current' );
- $this.addClass(
'mw-echo-section-current' );
+ $ul.find( 'a' ).removeClass(
'mw-ui-active' ).addClass( 'mw-ui-quiet' );
+ $this.addClass( 'mw-ui-active'
).removeClass( 'mw-ui-quiet');
self._showTabList( $this.data(
'tab' ) );
} )
.data( 'tab', echoTab )
- .addClass( echoTab.name ===
self.activeTabName ? 'mw-echo-section-current' : '' )
- .text( label )
- .appendTo( $ul );
+ .addClass( echoTab.name ===
self.activeTabName ? 'mw-ui-active' : 'mw-ui-quiet' )
+ .text( label ).appendTo( $li );
} );
return $ul;
},
diff --git a/tests/qunit/overlay/test_ext.echo.overlay.js
b/tests/qunit/overlay/test_ext.echo.overlay.js
index c1a52fb..568ed4e 100644
--- a/tests/qunit/overlay/test_ext.echo.overlay.js
+++ b/tests/qunit/overlay/test_ext.echo.overlay.js
@@ -135,7 +135,7 @@
} );
assert.strictEqual( $overlay.find( '.mw-echo-overlay-title ul
li' ).length, 2, 'There are two tabs in header' );
assert.strictEqual( $overlay.find( '.mw-echo-notifications'
).length, 2, 'Overlay contains 2 lists of notifications.' );
- assert.strictEqual( $overlay.find( '.mw-echo-overlay-title li'
).eq( 0 ).hasClass( 'mw-echo-section-current' ),
+ assert.strictEqual( $overlay.find( '.mw-echo-overlay-title a'
).eq( 0 ).hasClass( 'mw-ui-active' ),
true, 'First tab is the selected tab upon opening.' );
assert.strictEqual( this.$badge.text(),
'1', 'The label stays as 1 until you switch tabs.' );
@@ -149,15 +149,15 @@
this.sandbox.stub( mw.echo.overlay, 'api', new this.ApiStub( 1
) );
mw.echo.overlay.buildOverlay( function( $o ) {
$overlay = $o;
- $tabs = $overlay.find( '.mw-echo-overlay-title li' );
+ $tabs = $overlay.find( '.mw-echo-overlay-title li a' );
} );
// switch to 2nd tab
- $overlay.find( '.mw-echo-overlay-title li' ).eq( 1 ).trigger(
'click' );
+ $overlay.find( '.mw-echo-overlay-title li a' ).eq( 1 ).trigger(
'click' );
- assert.strictEqual( $tabs.eq( 0 ).hasClass(
'mw-echo-section-current' ),
+ assert.strictEqual( $tabs.eq( 0 ).hasClass( 'mw-ui-active' ),
false, 'First tab is now the selected tab.' );
- assert.strictEqual( $tabs.eq( 1 ).hasClass(
'mw-echo-section-current' ),
+ assert.strictEqual( $tabs.eq( 1 ).hasClass( 'mw-ui-active' ),
true, 'Second ta
[MediaWiki-commits] [Gerrit] Add ids to Privacy and Help items in CPB - change (mediawiki...VectorBeta)
JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153545
Change subject: Add ids to Privacy and Help items in CPB
..
Add ids to Privacy and Help items in CPB
As requested in
https://www.mediawiki.org/w/index.php?title=Topic:Ry6ddbuimmcrsoyh&fromnotif=1
Change-Id: I3b182145e9da0a3180ce1632c002b93523c861c7
---
M resources/compactPersonalBar/compactPersonalBar.js
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta
refs/changes/45/153545/1
diff --git a/resources/compactPersonalBar/compactPersonalBar.js
b/resources/compactPersonalBar/compactPersonalBar.js
index caad22a..f9cb580 100644
--- a/resources/compactPersonalBar/compactPersonalBar.js
+++ b/resources/compactPersonalBar/compactPersonalBar.js
@@ -119,10 +119,12 @@
addItem( 'preferences', 'preferences', $(
'#pt-preferences' ) ).
addItem( 'preferences', 'beta', $( '#pt-betafeatures' )
).
addItem( 'info', 'privacy', createItem( {
+ id: 'pt-privacy-flyout',
text: mw.msg( 'privacy' ),
href: mw.util.getUrl( mw.msg( 'privacypage' ) )
} ) ).
addItem( 'info', 'help', createItem( {
+ id: 'pt-help-flyout',
text: mw.msg( 'help' ),
href: mw.util.getUrl( mw.msg( 'helppage' ) )
} ) ).
--
To view, visit https://gerrit.wikimedia.org/r/153545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b182145e9da0a3180ce1632c002b93523c861c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: JGonera
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Switch from qunit directly to karma for code coverage... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Switch from qunit directly to karma for code coverage
reports
..
build: Switch from qunit directly to karma for code coverage reports
Change-Id: I4b485c9cedff4bcbe05e442c8f77a4c2be2aa9a7
---
M .gitignore
M Gruntfile.js
M build/moduleUtils.js
M build/modules.json
M build/tasks/buildloader.js
D lib/qunit/qunit.css
D lib/qunit/qunit.js
M modules/ve/tests/ve.qunit.js
M modules/ve/tests/ve.test.utils.js
M package.json
10 files changed, 268 insertions(+), 2,606 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 53c2d99..9c91eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
docs
node_modules
npm-debug.log
+test-coverage
# OS
.DS_Store
diff --git a/Gruntfile.js b/Gruntfile.js
index 0b77ed6..1891868 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,16 +10,20 @@
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-csslint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-contrib-qunit' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadTasks( 'build/tasks' );
+
+ // We want to use `grunt watch` to start this and karma watch together.
+ grunt.renameTask( 'watch', 'runwatch' );
var modules = grunt.file.readJSON( 'build/modules.json' ),
moduleUtils = require( './build/moduleUtils' ),
introBuildFiles = moduleUtils.makeBuildList( modules, [
'visualEditor.buildfiles.intro' ] ),
- coreBuildFiles = moduleUtils.makeBuildList( modules, [
'visualEditor.build' ] );
+ coreBuildFiles = moduleUtils.makeBuildList( modules, [
'visualEditor.build' ] ),
+ testFiles = moduleUtils.makeBuildList( modules, [
'visualEditor.test' ] ).scripts;
function demoMenu( callback ) {
var pages = {},
@@ -37,7 +41,7 @@
grunt.initConfig( {
pkg: grunt.file.readJSON( 'package.json' ),
clean: {
- dist: [ 'dist/*/', 'dist/*.*' ]
+ dist: [ 'dist/*', 'test-coverage/*' ]
},
concat: {
buildJs: {
@@ -119,17 +123,6 @@
pathPrefix: '../../',
indent: '\t\t',
placeholders: { menu: demoMenu }
- },
- test: {
- targetFile: 'modules/ve/tests/index.html',
- template:
'modules/ve/tests/index.html.template',
- modules: modules,
- env: {
- test: true
- },
- load: [ 'visualEditor.test' ],
- pathPrefix: '../../../',
- indent: '\t\t'
}
},
jshint: {
@@ -156,25 +149,82 @@
banana: {
all: 'modules/ve/i18n/'
},
- qunit: {
- unicodejs: 'modules/unicodejs/index.html',
- ve: 'modules/ve/tests/index.html'
+ karma: {
+ options: {
+ frameworks: [ 'qunit' ],
+ reporters: [ 'dots' ],
+ singleRun: true,
+ autoWatch: false
+ },
+ // FIXME: OMG ARGH DIE DIE DIE PLEASE MOVE TO A
DIFFERENT REPO
+ unicodejs: {
+ browsers: [ 'PhantomJS' ],
+ options: {
+ files: [
+ 'lib/jquery/jquery.js',
+
'modules/unicodejs/unicodejs.js',
+
'modules/unicodejs/unicodejs.textstring.js',
+
'modules/unicodejs/unicodejs.graphemebreakproperties.js',
+
'modules/unicodejs/unicodejs.graphemebreak.js',
+
'modules/unicodejs/unicodejs.wordbreakproperties.js',
+
'modules/unicodejs/unicodejs.wordbreak.js',
+
'modules/unicodejs/tests/unicodejs.test.js',
+
'modules/un
[MediaWiki-commits] [Gerrit] Fix phpcs stuff in profileinfo.php - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix phpcs stuff in profileinfo.php
..
Fix phpcs stuff in profileinfo.php
Change-Id: Ia0709ced1ac6365a0c1f7c14c52d2487041a9c3f
---
M profileinfo.php
1 file changed, 37 insertions(+), 18 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/profileinfo.php b/profileinfo.php
index 8120599..762af69 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -163,15 +163,18 @@
}
}
+// @codingStandardsIgnoreStart
class profile_point {
- var $name;
- var $count;
- var $time;
- var $children;
+ // @codingStandardsIgnoreEnd
- static $totaltime, $totalmemory, $totalcount;
+ public $name;
+ public $count;
+ public $time;
+ public $children;
- function __construct( $name, $count, $time, $memory ) {
+ public static $totaltime, $totalmemory, $totalcount;
+
+ public function __construct( $name, $count, $time, $memory ) {
$this->name = $name;
$this->count = $count;
$this->time = $time;
@@ -179,11 +182,11 @@
$this->children = array();
}
- function add_child( $child ) {
+ public function add_child( $child ) {
$this->children[] = $child;
}
- function display( $expand, $indent = 0.0 ) {
+ public function display( $expand, $indent = 0.0 ) {
usort( $this->children, 'compare_point' );
$ex = isset( $expand[$this->name()] );
@@ -214,6 +217,7 @@
name() ) ) . $extet ?>
+
time() / self::$totaltime * 100 ); ?>
memory() / self::$totalmemory * 100 ); ?>
count();
?>
@@ -222,6 +226,7 @@
memoryPerCall() / 1024 ), 2 ); ?>
time() / self::$totalcount ), 2 ); ?>
memory() / self::$totalcount / 1024 ), 2 ); ?>
+
name;
}
- function count() {
+ public function count() {
return $this->count;
}
- function time() {
+ public function time() {
return $this->time;
}
- function memory() {
+ public function memory() {
return $this->memory;
}
- function timePerCall() {
+ public function timePerCall() {
+ // @codingStandardsIgnoreStart
return @( $this->time / $this->count );
+ // @codingStandardsIgnoreEnd
}
- function memoryPerCall() {
+ public function memoryPerCall() {
+ // @codingStandardsIgnoreStart
return @( $this->memory / $this->count );
+ // @codingStandardsIgnoreEnd
}
- function callsPerRequest() {
+ public function callsPerRequest() {
+ // @codingStandardsIgnoreStart
return @( $this->count / self::$totalcount );
+ // @codingStandardsIgnoreEnd
}
- function timePerRequest() {
+ public function timePerRequest() {
+ // @codingStandardsIgnoreStart
return @( $this->time / self::$totalcount );
+ // @codingStandardsIgnoreEnd
}
- function memoryPerRequest() {
+ public function memoryPerRequest() {
+ // @codingStandardsIgnoreStart
return @( $this->memory / self::$totalcount );
+ // @codingStandardsIgnoreEnd
}
- function fmttime() {
+ public function fmttime() {
return sprintf( '%5.02f', $this->time );
}
};
function compare_point( profile_point $a, profile_point $b ) {
+ // @codingStandardsIgnoreStart
global $sort;
+ // @codingStandardsIgnoreEnd
switch ( $sort ) {
case 'name':
return strcmp( $a->name(), $b->name() );
@@ -342,7 +359,9 @@
profile_point::$totalmemory = 0.0;
function getEscapedProfileUrl( $_filter = false, $_sort = false,
$_expand = false ) {
+ // @codingStandardsIgnoreStart
global $filter, $sort, $expand;
+ // @codingStandardsIgnoreEnd
if ( $_expand === false ) {
$_expand = $expand;
--
To view, visit https://gerrit.wikimedia.org/r/153527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0709ced1ac6365a0c1f7c14c52d2487041a9c3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lis
[MediaWiki-commits] [Gerrit] Revert "MonoBook: Use SkinFactory" - change (mediawiki...MonoBook)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153544
Change subject: Revert "MonoBook: Use SkinFactory"
..
Revert "MonoBook: Use SkinFactory"
This reverts commit c3e1a7fa597b51eb2e516e0e5005d6968d98ede7.
Doing it this way is unnecessarily backwards-incompatible,
and there's probably a nicer way to do this.
Change-Id: Iaceeb01526004de006b4f6cb708d1e947e59090c
---
M MonoBook.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook
refs/changes/44/153544/1
diff --git a/MonoBook.php b/MonoBook.php
index 62d8930..97c0cd8 100644
--- a/MonoBook.php
+++ b/MonoBook.php
@@ -40,9 +40,7 @@
$wgMessagesDirs['MonoBook'] = __DIR__ . '/i18n';
// Register skin
-SkinFactory::getDefaultInstance()->register( 'monobook', 'MonoBook',
function() {
- return new SkinMonoBook();
-} );
+$wgValidSkinNames['monobook'] = 'MonoBook';
// Register modules
$wgResourceModules['skins.monobook.styles'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/153544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaceeb01526004de006b4f6cb708d1e947e59090c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "MonoBook: Use SkinFactory" - change (mediawiki...MonoBook)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "MonoBook: Use SkinFactory"
..
Revert "MonoBook: Use SkinFactory"
This reverts commit c3e1a7fa597b51eb2e516e0e5005d6968d98ede7.
Doing it this way is unnecessarily backwards-incompatible,
and there's probably a nicer way to do this.
Change-Id: Iaceeb01526004de006b4f6cb708d1e947e59090c
---
M MonoBook.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MonoBook.php b/MonoBook.php
index 62d8930..97c0cd8 100644
--- a/MonoBook.php
+++ b/MonoBook.php
@@ -40,9 +40,7 @@
$wgMessagesDirs['MonoBook'] = __DIR__ . '/i18n';
// Register skin
-SkinFactory::getDefaultInstance()->register( 'monobook', 'MonoBook',
function() {
- return new SkinMonoBook();
-} );
+$wgValidSkinNames['monobook'] = 'MonoBook';
// Register modules
$wgResourceModules['skins.monobook.styles'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/153544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaceeb01526004de006b4f6cb708d1e947e59090c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work in progress: allow pinch-zoom on image viewer overlay - change (mediawiki...MobileFrontend)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153543
Change subject: Work in progress: allow pinch-zoom on image viewer overlay
..
Work in progress: allow pinch-zoom on image viewer overlay
Switches position:fixed to position:absolute in ImageOverlay,
and adds an Overlay property 'allowZoom' which can be set to
true to disable the disabling of scroll and zoom behavior.
Briefly tested on iOS 7.1 simulator. May explode on other systems.
Bug: 69414
Change-Id: I6de82009409a28c46b36be13f67129c30f4e0891
---
M javascripts/common/Overlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
M less/modules/mediaViewer.less
3 files changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/43/153543/1
diff --git a/javascripts/common/Overlay.js b/javascripts/common/Overlay.js
index d30f969..3991df4 100644
--- a/javascripts/common/Overlay.js
+++ b/javascripts/common/Overlay.js
@@ -25,6 +25,10 @@
* @type {Boolean}
*/
fullScreen: true,
+ /**
+* @type {Boolean}
+*/
+ allowZoom: false,
/**
* use '#mw-mf-viewport' rather than 'body' - for some reasons
this has
@@ -88,7 +92,9 @@
( $overlayContent.scrollTop()
=== 0 && startY < y ) ||
( $overlayContent.scrollTop()
=== contentLenght && startY > y )
) {
- ev.preventDefault();
+ if ( !self.allowZoom ) {
+ ev.preventDefault();
+ }
}
} );
@@ -138,7 +144,9 @@
if ( M.isIos ) {
$window
.on( 'touchmove.ios', function( ev ) {
- ev.preventDefault();
+ if ( !self.allowZoom ) {
+ ev.preventDefault();
+ }
} )
.on( 'resize.ios', function() {
self._resizeContent(
$window.height() );
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 43362f1..5e450f0 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -14,6 +14,7 @@
className: 'overlay media-viewer',
template: M.template.get( 'modules/ImageOverlay.hogan' ),
closeOnBack: true,
+ allowZoom: true,
defaults: {
detailsMsg: mw.msg( 'mobile-frontend-media-details' ),
@@ -56,6 +57,7 @@
show: function() {
this._super();
this._positionImage();
+ M.unlockViewport();
},
_positionImage: function() {
diff --git a/less/modules/mediaViewer.less b/less/modules/mediaViewer.less
index 42a3b6b..abe09e8 100644
--- a/less/modules/mediaViewer.less
+++ b/less/modules/mediaViewer.less
@@ -6,13 +6,13 @@
padding-top: 0;
.main {
- height: auto;
- position: relative;
+ position: absolute;
width: 100%;
+ height: 100%;
}
.image-wrapper {
- position: fixed;
+ position: absolute;
left: 0;
right: 0;
top: 0;
@@ -56,7 +56,7 @@
.details {
bottom: 0;
height: auto;
- position: fixed;
+ position: absolute;
width: 100%;
padding: 8px 10px;
margin: 0;
--
To view, visit https://gerrit.wikimedia.org/r/153543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6de82009409a28c46b36be13f67129c30f4e0891
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SkinFactory: register skins in Setup.php - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153540
Change subject: SkinFactory: register skins in Setup.php
..
SkinFactory: register skins in Setup.php
This un-makes $wgValidSkinNames a legacy thing, and is
more backwards-compatible friendly.
Change-Id: I5c442f3c9e4ee7a4a3980fd02138ee756ef9fa7a
---
M includes/Setup.php
M includes/skins/SkinFactory.php
2 files changed, 25 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/153540/1
diff --git a/includes/Setup.php b/includes/Setup.php
index 935fa15..b100c7a 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -263,8 +263,21 @@
$wgSkipSkins[] = $wgSkipSkin;
}
-// Register a hidden "fallback" skin
-$wgValidSkinNames['fallback'] = 'Fallback'; // SkinFallback
+// Register skins
+// Use a closure to avoid leaking into global state
+call_user_func( function() use ( $wgValidSkinNames ) {
+ $factory = SkinFactory::getDefaultInstance();
+ foreach ( $wgValidSkinNames as $name => $skin ) {
+ $factory->register( $name, $skin, function() use ( $skin ) {
+ $class = "Skin$skin";
+ return new $class;
+ } );
+ }
+ // Register a hidden "fallback" skin
+ $factory->register( 'fallback', 'Fallback', function() {
+ return new SkinFallback;
+ } );
+} );
$wgSkipSkins[] = 'fallback';
if ( $wgLocalInterwiki ) {
diff --git a/includes/skins/SkinFactory.php b/includes/skins/SkinFactory.php
index 51aced9..52eaddd 100644
--- a/includes/skins/SkinFactory.php
+++ b/includes/skins/SkinFactory.php
@@ -40,6 +40,13 @@
private $displayNames = array();
/**
+* Map of name => class name without "Skin" prefix
+* for legacy skins using the autoloader
+* @var array
+*/
+ private $legacySkins = array();
+
+ /**
* @var SkinFactory
*/
private static $self;
@@ -72,10 +79,9 @@
* @return array
*/
private function getLegacySkinNames() {
- global $wgValidSkinNames;
static $skinsInitialised = false;
- if ( !$skinsInitialised || !count( $wgValidSkinNames ) ) {
+ if ( !$skinsInitialised || !count( $this->legacySkins ) ) {
# Get a list of available skins
# Build using the regular expression '^(.*).php$'
# Array keys are all lower case, array value keep the
case used by filename
@@ -117,7 +123,7 @@
"The mechanism will be
removed in MediaWiki 1.25 and the skin will no longer be recognized. " .
"See
https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for information how to
fix this."
);
- $wgValidSkinNames[strtolower(
$aSkin )] = $aSkin;
+ $this->legacySkins[strtolower(
$aSkin )] = $aSkin;
}
}
$skinDir->close();
@@ -125,7 +131,7 @@
$skinsInitialised = true;
wfProfileOut( __METHOD__ . '-init' );
}
- return $wgValidSkinNames;
+ return $this->legacySkins;
}
--
To view, visit https://gerrit.wikimedia.org/r/153540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c442f3c9e4ee7a4a3980fd02138ee756ef9fa7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SkinFallbackTemplate: Use SkinFactory instead of $wgValidSki... - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153542
Change subject: SkinFallbackTemplate: Use SkinFactory instead of
$wgValidSkinNames
..
SkinFallbackTemplate: Use SkinFactory instead of $wgValidSkinNames
Change-Id: I463d263fc24a3e0c589ddc7176b77dffde17d105
---
M includes/skins/SkinFallbackTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/153542/1
diff --git a/includes/skins/SkinFallbackTemplate.php
b/includes/skins/SkinFallbackTemplate.php
index 0703b0e..603ee5c 100644
--- a/includes/skins/SkinFallbackTemplate.php
+++ b/includes/skins/SkinFallbackTemplate.php
@@ -40,7 +40,7 @@
private function buildHelpfulInformationMessage() {
$defaultSkin = $this->config->get( 'DefaultSkin' );
$installedSkins = $this->findInstalledSkins();
- $enabledSkins = $this->config->get( 'ValidSkinNames' );
+ $enabledSkins =
SkinFactory::getDefaultInstance()->getSkinNames();
$enabledSkins = array_change_key_case( $enabledSkins,
CASE_LOWER );
if ( $installedSkins ) {
--
To view, visit https://gerrit.wikimedia.org/r/153542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I463d263fc24a3e0c589ddc7176b77dffde17d105
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register GadgetResourceLoaderModule with an array - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153539
Change subject: Register GadgetResourceLoaderModule with an array
..
Register GadgetResourceLoaderModule with an array
Change-Id: I3245cc60652373a144bd03bb47bc9c57ad9d792d
---
M Gadgets.hooks.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/39/153539/1
diff --git a/Gadgets.hooks.php b/Gadgets.hooks.php
index 3db31d0..4bf67fd 100644
--- a/Gadgets.hooks.php
+++ b/Gadgets.hooks.php
@@ -276,7 +276,10 @@
public static function registerModules( &$resourceLoader ) {
$gadgets = GadgetRepo::getAllGadgets();
foreach ( $gadgets as $gadget ) {
- $resourceLoader->register( $gadget->getModuleName(),
$gadget->getModule() );
+ $resourceLoader->register(
+ $gadget->getModuleName(),
+ array( 'object' => $gadget->getModule() )
+ );
}
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/153539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3245cc60652373a144bd03bb47bc9c57ad9d792d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add MultiConfig for fallback logic - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153541
Change subject: [WIP] Add MultiConfig for fallback logic
..
[WIP] Add MultiConfig for fallback logic
Change-Id: I0ef2fbb86d5c27602d70240219ee08be31e2d09b
---
M includes/AutoLoader.php
M includes/config/Config.php
M includes/config/GlobalVarConfig.php
A includes/config/HashConfig.php
A includes/config/MultiConfig.php
A tests/phpunit/includes/config/MultiConfigTest.php
6 files changed, 248 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/41/153541/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index c535ca0..09fe44f 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -371,6 +371,8 @@
'ConfigException' => 'includes/config/ConfigException.php',
'ConfigFactory' => 'includes/config/ConfigFactory.php',
'GlobalVarConfig' => 'includes/config/GlobalVarConfig.php',
+ 'HashConfig' => 'includes/config/HashConfig.php',
+ 'MultiConfig' => 'includes/config/MultiConfig.php',
# includes/content
'AbstractContent' => 'includes/content/AbstractContent.php',
diff --git a/includes/config/Config.php b/includes/config/Config.php
index 68e90b4..8ba6178 100644
--- a/includes/config/Config.php
+++ b/includes/config/Config.php
@@ -37,6 +37,14 @@
public function get( $name );
/**
+* Check whether a configuration option is set for the given name
+*
+* @param string $name Name of configuration option
+* @return bool
+*/
+ public function has( $name );
+
+ /**
* Set a configuration variable such a "Sitename" to something like "My
Wiki"
*
* @param string $name Name of configuration option
diff --git a/includes/config/GlobalVarConfig.php
b/includes/config/GlobalVarConfig.php
index 0841a00..a19326b 100644
--- a/includes/config/GlobalVarConfig.php
+++ b/includes/config/GlobalVarConfig.php
@@ -49,7 +49,17 @@
* @see Config::get
*/
public function get( $name ) {
+ if ( !$this->has( $name ) ) {
+ throw new ConfigException( __METHOD__ . ": undefined
option: '$name'" );
+ }
return $this->getWithPrefix( $this->prefix, $name );
+ }
+
+ /**
+* @see Config::has
+*/
+ public function has( $name ) {
+ return $this->hasWithPrefix( $this->prefix, $name );
}
/**
@@ -64,15 +74,22 @@
*
* @param string $prefix Prefix to use on the variable, if one.
* @param string $name Variable name without prefix
-* @throws ConfigException
* @return mixed
*/
protected function getWithPrefix( $prefix, $name ) {
+ return $GLOBALS[$prefix . $name];
+ }
+
+ /**
+* Check if a variable with a given prefix is set
+*
+* @param string $prefix Prefix to use on the variable
+* @param string $name Variable name without prefix
+* @return bool
+*/
+ protected function hasWithPrefix( $prefix, $name ) {
$var = $prefix . $name;
- if ( !array_key_exists( $var, $GLOBALS ) ) {
- throw new ConfigException( __METHOD__ . ": undefined
variable: '$var'" );
- }
- return $GLOBALS[$var];
+ return array_key_exists( $var, $GLOBALS );
}
/**
diff --git a/includes/config/HashConfig.php b/includes/config/HashConfig.php
new file mode 100644
index 000..94288bd
--- /dev/null
+++ b/includes/config/HashConfig.php
@@ -0,0 +1,75 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * A Config instance which stores all settings as a member variable
+ *
+ * @since 1.24
+ */
+class HashConfig implements Config {
+
+ /**
+* Array of config settings
+*
+* @var array
+*/
+ private $settings;
+
+ /**
+* @return HashConfig
+*/
+ public static function newInstance() {
+ return new HashConfig;
+ }
+
+ /**
+* @param array $settings Any current settings to pre-load
+*/
+ public function __construct( array $settings = array() ) {
+ $this->settings = $settings;
+ }
+
+ /**
+* @see Config::get
+*/
+ public function get( $name ) {
+ if ( !$this->has( $name ) ) {
+ throw new ConfigException( __METHOD__ . ": undefined
option: '$name'" );
+ }
+
+ return $this->settings[$name];
+ }
+
+ /**
+* @see Config::has
+*/
+ public function has( $name ) {
+ return array_key_exists( $name, $this->settings );
+ }
+
+ /**
+* @see Co
[MediaWiki-commits] [Gerrit] ApiQueryGadgetPages: Remove deprecated getVersion() - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153537
Change subject: ApiQueryGadgetPages: Remove deprecated getVersion()
..
ApiQueryGadgetPages: Remove deprecated getVersion()
Change-Id: I1ea8e230b3755cedeae9f8ac682429c9e2c4ab13
---
M api/ApiQueryGadgetPages.php
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/37/153537/1
diff --git a/api/ApiQueryGadgetPages.php b/api/ApiQueryGadgetPages.php
index 2e528f7..242f770 100644
--- a/api/ApiQueryGadgetPages.php
+++ b/api/ApiQueryGadgetPages.php
@@ -148,9 +148,4 @@
'
api.php?action=query&list=gadgetpages&gpextension=css&gpnamespace=2&gpprefix=Catrope/',
);
}
-
- public function getVersion() {
- return __CLASS__ . ': $Id$';
- }
-
}
--
To view, visit https://gerrit.wikimedia.org/r/153537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ea8e230b3755cedeae9f8ac682429c9e2c4ab13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ApiQueryGadgetCategories: Pass language to wfMessage - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153536
Change subject: ApiQueryGadgetCategories: Pass language to wfMessage
..
ApiQueryGadgetCategories: Pass language to wfMessage
Change-Id: I23028ea630a5cb2232506110bcdbaa26c2398529
---
M api/ApiQueryGadgetCategories.php
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/36/153536/1
diff --git a/api/ApiQueryGadgetCategories.php b/api/ApiQueryGadgetCategories.php
index 9fa5900..b1db5d3 100644
--- a/api/ApiQueryGadgetCategories.php
+++ b/api/ApiQueryGadgetCategories.php
@@ -21,7 +21,8 @@
class ApiQueryGadgetCategories extends ApiQueryBase {
private $props,
- $neededNames;
+ $neededNames,
+ $language;
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'gc' );
@@ -55,7 +56,8 @@
}
if ( isset( $this->props['title'] ) ) {
if ( $category === '' ) {
- $row['title'] =
wfMessage( 'gadgets-uncategorized' )->plain();
+ $row['title'] =
wfMessage( 'gadgets-uncategorized' )
+ ->inLanguage(
$this->language )->plain();
} else {
$row['title'] =
$repo->getCategoryTitle( $category, $this->language );
}
@@ -73,6 +75,7 @@
}
public function getAllowedParams() {
+ global $wgLanguageCode;
return array(
'prop' => array(
ApiBase::PARAM_DFLT => 'name',
@@ -87,7 +90,10 @@
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_ISMULTI => true,
),
- 'language' => null,
+ 'language' => array(
+ ApiBase::PARAM_TYPE => array_keys(
Language::fetchLanguageNames() ),
+ ApiBase::PARAM_DFLT => $wgLanguageCode,
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/153536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23028ea630a5cb2232506110bcdbaa26c2398529
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add type hinting and fix some doc blocks - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153534
Change subject: Add type hinting and fix some doc blocks
..
Add type hinting and fix some doc blocks
Change-Id: If772b8ab633f40b2a31e17a7a692644724dce0c1
---
M backend/GadgetPageList.php
M backend/GadgetRepo.php
M backend/LocalGadgetRepo.php
3 files changed, 19 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/34/153534/1
diff --git a/backend/GadgetPageList.php b/backend/GadgetPageList.php
index 4349210..0df1d8d 100644
--- a/backend/GadgetPageList.php
+++ b/backend/GadgetPageList.php
@@ -18,10 +18,10 @@
class GadgetPageList {
/**
* Determine the extension of a title ('css' or 'js')
-* @param $title Title object
+* @param Title $title
* @return string The extension of the title, or empty string
*/
- public static function determineExtension( $title ) {
+ public static function determineExtension( Title $title ) {
$m = null;
preg_match( '!\.(css|js)$!u', $title->getText(), $m );
return isset( $m[1] ) ? $m[1] : '';
@@ -29,19 +29,19 @@
/**
* Check whether a given title is a gadget page
-* @param $title Title object
+* @param Title $title object
* @return bool True if $title is a CSS/JS page and isn't a redirect,
false otherwise
*/
- public static function isGadgetPage( $title ) {
+ public static function isGadgetPage( Title $title ) {
return ( $title->isCssOrJsPage() || $title->isCssJsSubpage() )
&& !$title->isRedirect();
}
/**
* Get a row for the gadgetpagelist table
-* @param $title Title object
+* @param Title $title
* @return array Database row
*/
- public static function getRowForTitle( $title ) {
+ public static function getRowForTitle( Title $title ) {
return array(
'gpl_extension' => self::determineExtension( $title ),
'gpl_namespace' => $title->getNamespace(),
@@ -56,9 +56,9 @@
* If $title is a CSS/JS page and not a redirect, it is added to the
table.
* If it is a CSS/JS page but is a redirect, it is removed from the
table.
* If it's not a CSS/JS page, it's assumed never to have been added to
begin with, so nothing happens/
-* @param $title Title object
+* @param Title $title
*/
- public static function updatePageStatus( $title ) {
+ public static function updatePageStatus( Title $title ) {
if ( $title->isCssOrJsPage() || $title->isCssJsSubpage() ) {
if ( $title->isRedirect() ) {
self::delete( $title );
@@ -70,9 +70,9 @@
/**
* Add a title to the gadgetpagelist table
-* @param $title Title object
+* @param Title $title
*/
- public static function add( $title ) {
+ public static function add( Title $title ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->insert( 'gadgetpagelist', self::getRowForTitle( $title ),
__METHOD__, array( 'IGNORE' )
@@ -81,9 +81,9 @@
/**
* Delete a title from the gadgetpagelist table
-* @param $title Title object
+* @param Title $title
*/
- public static function delete( $title ) {
+ public static function delete( Title $title ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->delete( 'gadgetpagelist', array(
'gpl_namespace' => $title->getNamespace(),
diff --git a/backend/GadgetRepo.php b/backend/GadgetRepo.php
index 26f4c73..7a8c86f 100644
--- a/backend/GadgetRepo.php
+++ b/backend/GadgetRepo.php
@@ -44,7 +44,7 @@
/**
* Get the Database object for the database this repository is based
on, or null if this
* repository is not based on a database (but e.g. on a remote API)
-* @return Database object (slave connection) or null
+* @return DatabaseBase object (slave connection) or null
*/
abstract public function getDB();
@@ -54,7 +54,7 @@
* from the Gadget object as well. If no Gadget exists by that id,
* it will be created.
* @param $gadget Gadget object
-* @param $timestamp Timestamp to record for this action, or current
timestamp if null
+* @param string $timestamp Timestamp to record for this action, or
current timestamp if null
* @return Status
*/
abstract public function modifyGadget( Gadget $gadget, $timestamp =
null );
@@ -90,7 +90,7 @@
/**
* Get all gadget repositories. Returns the LocalGadgetRepo si
[MediaWiki-commits] [Gerrit] ApiQueryGadgets: fix undefined variable and other cleanup - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153538
Change subject: ApiQueryGadgets: fix undefined variable and other cleanup
..
ApiQueryGadgets: fix undefined variable and other cleanup
Change-Id: I13f9a091776c4b833e7f29d767e4698e95f03b5e
---
M api/ApiQueryGadgets.php
1 file changed, 6 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/38/153538/1
diff --git a/api/ApiQueryGadgets.php b/api/ApiQueryGadgets.php
index ea35a10..e6c2582 100644
--- a/api/ApiQueryGadgets.php
+++ b/api/ApiQueryGadgets.php
@@ -24,7 +24,9 @@
$categories,
$neededIds,
$listAllowed,
- $listEnabled;
+ $listEnabled,
+ $listShared,
+ $language;
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'ga' );
@@ -76,7 +78,7 @@
}
/**
-* @param $gadgets array
+* @param Gadget[] $gadgets
*/
private function applyList( $gadgets ) {
$data = array();
@@ -125,9 +127,9 @@
$user = $this->getUser();
return ( !$this->listAllowed || $gadget->isAllowed( $user ) )
- && ( !$this->listEnabled || $gadget->isEnabled( $user )
)
+ && ( !$this->listEnabled || $gadget->isEnabled( $user )
) // @fixme Gadget::isEnabled is undefined
&& ( !$this->listShared || $gadget->isShared() )
- && ( !$this->categories || isset(
$this->categories[$g->getCategory()] ) );
+ && ( !$this->categories || isset(
$this->categories[$gadget->getCategory()] ) );
}
private function setIndexedTagNameForMetadata( &$metadata ) {
@@ -223,9 +225,4 @@
'api.php?action=query&list=gadgets&gaenabledonly',
);
}
-
- public function getVersion() {
- return __CLASS__ . ': $Id$';
- }
-
}
--
To view, visit https://gerrit.wikimedia.org/r/153538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13f9a091776c4b833e7f29d767e4698e95f03b5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Use ContentHandler for the Gadget namespace - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153535
Change subject: [WIP] Use ContentHandler for the Gadget namespace
..
[WIP] Use ContentHandler for the Gadget namespace
Change-Id: I0c7a0b36918202f7f17c1304fe7b4976e18b1d49
---
M Gadgets.hooks.php
M Gadgets.php
A content/GadgetCssContent.php
A content/GadgetCssContentHandler.php
A content/GadgetJsContent.php
A content/GadgetJsContentHandler.php
A content/GadgetScriptDeletionUpdate.php
A content/GadgetScriptSecondaryDataUpdate.php
8 files changed, 165 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/35/153535/1
diff --git a/Gadgets.hooks.php b/Gadgets.hooks.php
index 534e601..3db31d0 100644
--- a/Gadgets.hooks.php
+++ b/Gadgets.hooks.php
@@ -37,6 +37,25 @@
}
/**
+* @param Title $title
+* @param string $model
+*/
+ public static function onContentHandlerDefaultModelFor( Title $title,
&$model ) {
+ if ( $title->inNamespace( NS_GADGET ) ) {
+ switch ( GadgetPageList::determineExtension( $title ) )
{
+ case 'js':
+ $model = 'GadgetJs';
+ return false;
+ case 'css':
+ $model = 'GadgetCss';
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
* Update the database entry for a gadget if the description page is
* newer than the database entry.
* @param $title Title object
@@ -84,40 +103,6 @@
public static function gadgetDefinitionImport( $title, $origTitle,
$revCount, $sRevCount, $pageInfo ) {
self::gadgetDefinitionUpdateIfChanged( $title );
- return true;
- }
-
- /**
-* ArticleDeleteComplete hook handler.
-*
-* @param $article Article
-* @param $user User
-* @param $reason String: Deletion summary
-* @param $id Int: Page ID
-*/
- public static function cssJsPageDelete( $article, $user, $reason, $id )
{
- GadgetPageList::delete( $article->getTitle() );
- return true;
- }
-
- /**
-* ArticleSaveComplete hook handler.
-*
-* @param $article Article
-* @param $user User
-* @param $text String: New page text
-* @param $summary String: Edit summary
-* @param $isMinor Bool: Whether this was a minor edit
-* @param $isWatch unused
-* @param $section unused
-* @param $flags: Int: Bitmap of flags passed to WikiPage::doEdit()
-* @param $revision: Revision object for the new revision
-*/
- public static function cssOrJsPageSaveComplete( $article, $user, $text,
$summary, $isMinor,
- $isWatch, $section, $flags, $revision )
- {
- $title = $article->getTitle();
- GadgetPageList::updatePageStatus( $title );
return true;
}
diff --git a/Gadgets.php b/Gadgets.php
index ff846d6..4b17cb9 100644
--- a/Gadgets.php
+++ b/Gadgets.php
@@ -116,6 +116,7 @@
$wgHooks['TitleMoveComplete'][] = 'GadgetsHooks::cssOrJsPageMove';
$wgHooks['getUserPermissionsErrors'][] =
'GadgetsHooks::getUserPermissionsErrors';
$wgHooks['UnitTestsList'][] = 'GadgetsHooks::onUnitTestsList';
+$wgHooks['ContentHandlerDefaultModelFor'][] =
'GadgetsHooks::onContentHandlerDefaultModelFor';
$wgExtensionFunctions[] =
'GadgetsHooks::addAPIMessageMapEntries';
$dir = dirname( __FILE__ ) . '/';
@@ -143,10 +144,19 @@
# content/
$wgAutoloadClasses['GadgetDefinitionContent'] = __DIR__ .
'/content/GadgetDefinitionContent.php';
$wgAutoloadClasses['GadgetDefinitionContentHandler'] = __DIR__ .
'/content/GadgetDefinitionContentHandler.php';
+$wgAutoloadClasses['GadgetCssContent'] = __DIR__ .
'/content/GadgetCssContent.php';
+$wgAutoloadClasses['GadgetCssContentHandler'] = __DIR__ .
'/content/GadgetCssContentHandler.php';
+$wgAutoloadClasses['GadgetJsContent'] = __DIR__ .
'/content/GadgetJsContent.php';
+$wgAutoloadClasses['GadgetJsContentHandler'] = __DIR__ .
'/content/GadgetJsContentHandler.php';
+$wgAutoloadClasses['GadgetScriptDeletionUpdate'] = __DIR__ .
'/content/GadgetScriptDeletionUpdate.php';
+$wgAutoloadClasses['GadgetScriptSecondaryDataUpdate'] = __DIR__ .
'/content/GadgetScriptSecondaryDataUpdate.php';
+
$wgAutoloadClasses['GadgetDefinitionDeletionUpdate'] = __DIR__ .
'/content/GadgetDefinitionDeletionUpdate.php';
$wgAutoloadClasses['GadgetDefinitionSecondaryDataUpdate'] = __DIR__ .
'/content/GadgetDefinitionSecondaryDataUpdate.php';
$wgContentHandlers['GadgetD
[MediaWiki-commits] [Gerrit] Fix Help link generation in CPB - change (mediawiki...VectorBeta)
JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153533
Change subject: Fix Help link generation in CPB
..
Fix Help link generation in CPB
Bug: 64909
Change-Id: If3f6e2af46818a85799aa134185a4c342d44c117
---
M resources/compactPersonalBar/compactPersonalBar.js
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta
refs/changes/33/153533/1
diff --git a/resources/compactPersonalBar/compactPersonalBar.js
b/resources/compactPersonalBar/compactPersonalBar.js
index caad22a..3ae7f24 100644
--- a/resources/compactPersonalBar/compactPersonalBar.js
+++ b/resources/compactPersonalBar/compactPersonalBar.js
@@ -10,6 +10,16 @@
var addPortletLinkOld = mw.util.addPortletLink, bar, menu;
+ /* After a very long search, I tracked down the code that generates
+* the Help link in the sidebar to Skin::addToSidebarPlain. The code
+* responsible for this is atrocious and there is absolutely no way
+* to reuse it but it basically checks if the message for a given key
+* is a URL or a page title, which is what we do here too.
+*/
+ function urlFromTitleOrUrl( str ) {
+ return /^(https?:)?\/\//.test(str) ? str : mw.util.getUrl( str
);
+ }
+
function createItem( options ) {
var $a = $( '' ).
text( options.text ).
@@ -120,11 +130,11 @@
addItem( 'preferences', 'beta', $( '#pt-betafeatures' )
).
addItem( 'info', 'privacy', createItem( {
text: mw.msg( 'privacy' ),
- href: mw.util.getUrl( mw.msg( 'privacypage' ) )
+ href: urlFromTitleOrUrl( mw.msg( 'privacypage'
) )
} ) ).
addItem( 'info', 'help', createItem( {
text: mw.msg( 'help' ),
- href: mw.util.getUrl( mw.msg( 'helppage' ) )
+ href: urlFromTitleOrUrl( mw.msg( 'helppage' ) )
} ) ).
addItem( 'end', 'logout', $( '#pt-logout' ) );
--
To view, visit https://gerrit.wikimedia.org/r/153533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3f6e2af46818a85799aa134185a4c342d44c117
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: JGonera
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show metadata in the debug bar - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Show metadata in the debug bar
..
Show metadata in the debug bar
Change-Id: I9c1d0fc16cb68b91e2f19cf75e9f5878fcf98114
---
M modules/ve/ui/styles/ve.ui.DebugBar.css
M modules/ve/ui/ve.ui.DebugBar.js
2 files changed, 72 insertions(+), 49 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/styles/ve.ui.DebugBar.css
b/modules/ve/ui/styles/ve.ui.DebugBar.css
index f25eb81..e876323 100644
--- a/modules/ve/ui/styles/ve.ui.DebugBar.css
+++ b/modules/ve/ui/styles/ve.ui.DebugBar.css
@@ -44,8 +44,9 @@
vertical-align: top;
}
-.ve-ui-debugBar-dump-linmod {
- width: 30%;
+.ve-ui-debugBar-dump-linmod-data,
+.ve-ui-debugBar-dump-linmod-metadata {
+ width: 27%;
}
.ve-ui-debugBar-dump th {
@@ -74,6 +75,10 @@
text-shadow: 0 1px 1px #fff;
}
+.ve-ui-debugBar-dump li .ve-ui-debugBar-dump-undefined {
+ color: #aaa;
+}
+
.ve-ui-debugBar-dump li .ve-ui-debugBar-dump-element {
background-color: #ddeeff;
}
diff --git a/modules/ve/ui/ve.ui.DebugBar.js b/modules/ve/ui/ve.ui.DebugBar.js
index e63e15a..b4feadd 100644
--- a/modules/ve/ui/ve.ui.DebugBar.js
+++ b/modules/ve/ui/ve.ui.DebugBar.js
@@ -22,16 +22,17 @@
this.surface = surface;
this.$commands = this.$( '' ).addClass( 've-ui-debugBar-commands'
);
- this.$dumpLinmod = this.$( '' ).addClass(
've-ui-debugBar-dump-linmod' );
+ this.$dumpLinmodData = this.$( '' ).addClass(
've-ui-debugBar-dump-linmod-data' );
+ this.$dumpLinmodMetadata = this.$( '' ).addClass(
've-ui-debugBar-dump-linmod-metadata' );
this.$dumpView = this.$( '' ).addClass( 've-ui-debugBar-dump-view'
);
this.$dumpModel = this.$( '' ).addClass(
've-ui-debugBar-dump-model' );
this.$dump =
this.$( '' ).append(
- this.$( 'Linear modelView
treeModel tree' ),
+ this.$( 'Linear model dataLinear
model metadataView treeModel tree' ),
this.$( '' ).append(
this.$( '' ).append(
- this.$dumpLinmod, this.$dumpView,
this.$dumpModel
+ this.$dumpLinmodData,
this.$dumpLinmodMetadata, this.$dumpView, this.$dumpModel
)
)
);
@@ -131,46 +132,63 @@
* @param {jQuery.Event} e Event
*/
ve.ui.DebugBar.prototype.onDumpModelButtonClick = function () {
- /*jshint loopfunc:true */
- // linear model dump
- var i, $li, $label, element, text, annotations,
- surface = this.getSurface(),
+ var debugBar = this,
+ surface = debugBar.getSurface(),
documentModel = surface.getModel().getDocument(),
- documentView = surface.getView().getDocument(),
- $ol = this.$( '' );
+ documentView = surface.getView().getDocument();
- for ( i = 0; i < documentModel.data.getLength(); i++ ) {
- $li = this.$( '' );
- $label = this.$( '' );
- element = documentModel.data.getData( i );
- if ( element.type ) {
- $label.addClass( 've-ui-debugBar-dump-element' );
- text = element.type;
- annotations = element.annotations;
- } else if ( ve.isArray( element ) ) {
- $label.addClass( 've-ui-debugBar-dump-achar' );
- text = element[0];
- annotations = element[1];
- } else {
- $label.addClass( 've-ui-debugBar-dump-char' );
- text = element;
- annotations = undefined;
- }
- $label.html( ( text.match( /\S/ ) ? text : ' ' ) + ' ' );
- if ( annotations ) {
- $label.append(
- this.$( '' ).text(
- '[' + documentModel.store.values(
annotations ).map( function ( ann ) {
- return JSON.stringify(
ann.getComparableObject() );
- } ).join( ', ' ) + ']'
- )
- );
- }
+ function dumpLinMod( linearData ) {
+ var i, $li, $label, element, text, annotations, data,
+ $ol = debugBar.$( '' );
- $li.append( $label );
- $ol.append( $li );
+ data = linearData instanceof ve.dm.LinearData ? linearData.data
: linearData;
+
+ for ( i = 0; i < data.length; i++ ) {
+ $li = debugBar.$( '' );
+ $label = debugBar
[MediaWiki-commits] [Gerrit] E2b: Reflect the count in alerts and messages tabs - change (mediawiki...Echo)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153532
Change subject: E2b: Reflect the count in alerts and messages tabs
..
E2b: Reflect the count in alerts and messages tabs
Add test coverage.
Change-Id: Ia5658d2b0c230915cda9309a590b416b0aa73bfe
---
M modules/overlay/ext.echo.overlay.js
M tests/qunit/overlay/test_ext.echo.overlay.js
2 files changed, 19 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/32/153532/1
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index f94dc3d..1a4a827 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -251,9 +251,18 @@
$( this ).show();
tab.markAsRead().done( function( data )
{
self.updateBadgeCount(
data.count, data.rawcount );
+ self._updateTitleElement();
} );
}
} );
+ },
+
+
+ _updateTitleElement: function() {
+ var $header;
+ $header = this.$el.find( '.mw-echo-overlay-title' );
+ this._getTitleElement().insertBefore( $header );
+ $header.remove();
},
_getTabsElement: function() {
@@ -273,7 +282,7 @@
self._showTabList( $this.data(
'tab' ) );
} )
.data( 'tab', echoTab )
- .addClass( i === 0 ?
'mw-echo-section-current' : '' )
+ .addClass( echoTab.name ===
self.activeTabName ? 'mw-echo-section-current' : '' )
.text( label )
.appendTo( $ul );
} );
@@ -295,14 +304,13 @@
notificationsCount = counter.all,
unreadRawTotalCount = counter.unreadRaw,
unreadCount = this.getUnreadCount(),
- tabs = this._getTabsElement(),
$title = $( '' ).addClass(
'mw-echo-overlay-title' );
if ( notificationsCount > 0 && unreadRawTotalCount >
unreadCount ) {
overflow = true;
}
- $title.append( tabs );
+ $title.append( this._getTabsElement() );
this._showTabList( this.tabs[0] );
// If there are more unread notifications than can fit
in the overlay,
@@ -339,6 +347,7 @@
self.tabs.push( tab );
self.notificationCount.all +=
notifications[tabName].index.length;
} );
+ this.activeTabName = this.tabs[0].name;
$overlay.prepend( this._getTitleElement() );
$overlay.append( this._getFooterElement() );
diff --git a/tests/qunit/overlay/test_ext.echo.overlay.js
b/tests/qunit/overlay/test_ext.echo.overlay.js
index e8e2892..c1a52fb 100644
--- a/tests/qunit/overlay/test_ext.echo.overlay.js
+++ b/tests/qunit/overlay/test_ext.echo.overlay.js
@@ -165,23 +165,25 @@
false, 'There are now zero unread notifications.' );
} );
- QUnit.test( 'Tabs have labels with counts in them.', 3, function(
assert ) {
+ QUnit.test( 'Tabs have labels with counts in them.', 4, function(
assert ) {
var $overlay, $tabs, beforeAlertText, afterAlertText;
this.sandbox.stub( mw.echo.overlay, 'api', new this.ApiStub( 1
) );
mw.echo.overlay.buildOverlay( function( $o ) {
$overlay = $o;
$tabs = $overlay.find( '.mw-echo-overlay-title li' );
- beforeAlertText = $tabs.eq( 1 ).text();
- //$tabs.eq( 1 ).trigger( 'click' );
- afterAlertText = $tabs.eq( 1 ).text();
+ beforeAlertText = $overlay.find(
'.mw-echo-overlay-title li' ).eq( 1 ).text();
+ $tabs.eq( 1 ).trigger( 'click' );
+ afterAlertText = $overlay.find( '.mw-echo-overlay-title
li' ).eq( 1 ).text();
} );
// switch to 2nd tab
$tabs = $overlay.find( '.mw-echo-overlay-title li' );
- assert.strictEqual( $tabs.eq( 0 ).text(), 'Messages (0)',
'Check the label has a count in it.' );
+ assert
[MediaWiki-commits] [Gerrit] Show count in Notification overlay tabs - change (mediawiki...Echo)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153531
Change subject: Show count in Notification overlay tabs
..
Show count in Notification overlay tabs
Change-Id: Ice6e870c2f9c160a4234753c278d29013ed2133b
---
M i18n/en.json
M i18n/qqq.json
M modules/overlay/ext.echo.overlay.js
M tests/qunit/overlay/test_ext.echo.overlay.js
4 files changed, 28 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/31/153531/1
diff --git a/i18n/en.json b/i18n/en.json
index c186527..ed9af40 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -92,8 +92,8 @@
"echo-email-batch-body-default": "You have a new notification.",
"echo-email-footer-default": "$2\n\nTo control which emails we send you,
check your
preferences:\n{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}\n\n$1",
"echo-email-footer-default-html": "To control which emails we send you, check your
preferences.\n$1",
-"echo-notification-alert": "Alerts",
-"echo-notification-message": "Messages",
+"echo-notification-alert": "{{PLURAL:$1|Alerts ($1)}}",
+"echo-notification-message": "{{PLURAL:$1|Messages ($1)}}",
"echo-overlay-link": "All notifications",
"echo-mark-all-as-read": "Mark all as read",
"echo-date-today": "Today",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 06ef5a9..29b664c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -112,8 +112,8 @@
"echo-email-batch-body-default": "Default message for Echo e-mail
digest notifications",
"echo-email-footer-default": "Default footer content for Echo text
e-mail notifications. Parameters:\n* $1 - the address of the organization that
sent the email\n* $2 - \"---...\"
({{msg-mw|echo-email-batch-separator}})\n\nFor HTML version, see
{{msg-mw|echo-email-footer-default-html}}.",
"echo-email-footer-default-html": "Default footer content for Echo html
e-mail notifications. Parameters:\n* $1 - the address of the organization that
sent the email\n* $2 - the URL to the notification preference page\nFor
plain-text version, see {{msg-mw|Echo-email-footer-default}}.",
- "echo-notification-alert": "Label for alert notifications tab in Echo
overlay.",
- "echo-notification-message": "Label for message notifications tab in
Echo overlay.",
+ "echo-notification-alert": "Label for alert notifications tab in Echo
overlay.\nParameters:\n* $1 - the number of unread alerts.",
+ "echo-notification-message": "Label for message notifications tab in
Echo overlay.\nParameters:\n* $1 - the number of unread messages.",
"echo-overlay-link": "Link to \"all notifications\" at the bottom of
the overlay.\n{{Identical|All notifications}}",
"echo-overlay-title": "Title at the top of the notifications overlay.
Should include bold tags.",
"echo-overlay-title-overflow": "Title at the top of the notifications
overlay when there are additional unread notifications that are not being
shown.\n\nParameters:\n* $1 - the number of unread notifications being shown\n*
$2 - the total number of unread notifications that exist",
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 6f2abfa..f94dc3d 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -40,7 +40,10 @@
'token': mw.user.tokens.get(
'editToken' )
} ) ).then( function ( result ) {
return
result.query.echomarkread[self.name];
- } );
+ } ).done( function() {
+ // reset internal state of unread
messages
+ self.unread = [];
+ })
} else {
return new $.Deferred();
}
@@ -260,8 +263,7 @@
$.each( this.tabs, function( i, echoTab ) {
var
tabName = echoTab.name,
- // @todo: Pass the number of unread
messages
- label = mw.msg( 'echo-notification-' +
tabName );
+ label = mw.msg( 'echo-notification-' +
tabName, echoTab.getUnreadIds().length );
$li = $( '' )
.on( 'click', function() {
diff --git a/tests/qunit/overlay/test_ext.echo.overlay.js
b/tests/qunit/overlay/test_ext.echo.overlay.js
index f3f3c1d..e8e2892 100644
--- a/tests/qunit/overlay/test_ext.echo.overlay.js
+++ b/tests/qunit/overlay/test_ext.echo.overlay.js
@@ -165,4 +165,23 @@
false, 'There are now zero unread n
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...crm)
Awight has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD Change-Id: Ie797eb9a7aae36d9d7b2a1d5ad0ddec90fed3af4 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/153530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie797eb9a7aae36d9d7b2a1d5ad0ddec90fed3af4 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Awight Gerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...crm)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/153530 Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD Change-Id: Ie797eb9a7aae36d9d7b2a1d5ad0ddec90fed3af4 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/30/153530/1 -- To view, visit https://gerrit.wikimedia.org/r/153530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie797eb9a7aae36d9d7b2a1d5ad0ddec90fed3af4 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually check annotations in paste test - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Actually check annotations in paste test
..
Actually check annotations in paste test
Just checking that we get store index 0 doesn't inspire a lot of confidence.
Change-Id: I77156dec9dd2b06b00347ae3e23cc7c5f3a86adb
---
M modules/ve/tests/ce/ve.ce.Surface.test.js
1 file changed, 20 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/tests/ce/ve.ce.Surface.test.js
b/modules/ve/tests/ce/ve.ce.Surface.test.js
index b9dc335..61e339f 100644
--- a/modules/ve/tests/ce/ve.ce.Surface.test.js
+++ b/modules/ve/tests/ce/ve.ce.Surface.test.js
@@ -610,7 +610,11 @@
{ type: 'retain', length: 4 },
{
type: 'replace',
- insert: [ ['B', [0]],
'a', ['r', [0]] ],
+ insert: [
+ ['B', [ { type:
'textStyle/bold', attributes: { nodeName: 'b' } } ]],
+ 'a',
+ ['r', [ { type:
'textStyle/bold', attributes: { nodeName: 'b' } } ]]
+ ],
remove: []
},
{ type: 'retain', length: 5 }
@@ -792,11 +796,24 @@
QUnit.expect( cases.length * 2 );
function testRunner( documentHtml, pasteHtml, fromVe, useClipboardData,
range, expectedOps, pasteSpecial, expectedRange, msg ) {
- var i, txs, ops,
+ var i, j, txs, ops,
e = {},
surface = ve.test.utils.createSurfaceFromHtml(
documentHtml || exampleDoc ),
view = surface.getView(),
- model = surface.getModel();
+ model = surface.getModel(),
+ doc = model.getDocument();
+
+ // Preprocess annotations inside expectedOps
+ for ( i = 0; i < expectedOps.length; i++ ) {
+ for ( j = 0; j < expectedOps[i].length; j++ ) {
+ if ( expectedOps[i][j].remove ) {
+ ve.dm.example.preprocessAnnotations(
expectedOps[i][j].remove, doc.getStore() );
+ }
+ if ( expectedOps[i][j].insert ) {
+ ve.dm.example.preprocessAnnotations(
expectedOps[i][j].insert, doc.getStore() );
+ }
+ }
+ }
// Paste sequence
model.setSelection( range );
--
To view, visit https://gerrit.wikimedia.org/r/153359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77156dec9dd2b06b00347ae3e23cc7c5f3a86adb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] X on notification item to mark as read - change (mediawiki...Echo)
Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153529
Change subject: X on notification item to mark as read
..
X on notification item to mark as read
This will need the corresponding Flow patch: 152808
@Todo - Replace the X with a real wiki image?
Change-Id: Id643c0233e944725d6b104fc0cede2ef9a632044
---
M modules/overlay/ext.echo.overlay.js
M modules/overlay/ext.echo.overlay.less
2 files changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/29/153529/1
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index dc25cf7..7c137b0 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -209,6 +209,19 @@
// be auto makred as read
if ( !data.targetpage ) {
self.unreadAutoMark.push( id );
+ } else {
+ // If this notification doesn't
have a target page,
+ // show the X icon to mark
notification as read
+ $li.append(
+ $( '')
+ .addClass(
'mw-echo-unread-dismiss' )
+ // @Todo -
replace with a CSS X
+ .append( 'X' )
+ .click(
function( e ) {
+
e.preventDefault();
+
self.manualMarkAsRead( id, $li );
+ } )
+ );
}
self.unread.push( id );
}
@@ -304,6 +317,29 @@
}
} );
}
+ },
+ /**
+* Manually mark a notification as read
+* @param int Notification event id
+* @param {JQuery} The notification container for the event id
+* @method
+*/
+ manualMarkAsRead: function( id, $notifDiv ) {
+ var self = this;
+
+ this.api.postWithToken( 'edit',
mw.echo.desktop.appendUseLang( {
+ 'action' : 'echomarkread',
+ 'list' : id
+ } ) ).done( function ( result ) {
+ var count;
+ if ( result.query.echomarkread.count !==
undefined ) {
+ count = result.query.echomarkread.count;
+ self.updateCount( count,
result.query.echomarkread.rawcount );
+ // Remove the stuff for unread
notifications
+ $notifDiv.removeClass( 'mw-echo-unread'
);
+ $notifDiv.find(
'.mw-echo-unread-dismiss' ).remove();
+ }
+ } );
}
};
diff --git a/modules/overlay/ext.echo.overlay.less
b/modules/overlay/ext.echo.overlay.less
index 2d30df4..996b0d9 100644
--- a/modules/overlay/ext.echo.overlay.less
+++ b/modules/overlay/ext.echo.overlay.less
@@ -52,6 +52,7 @@
}
li.mw-echo-notification {
+ position: relative;
display: block;
padding: 0;
@@ -84,6 +85,13 @@
background-color: #F9F9F9;
}
}
+
+ .mw-echo-unread-dismiss {
+ position: absolute;
+ top: 7px;
+ right: 7px;
+ font-size: 20px;
+ }
}
&:last-child {
--
To view, visit https://gerrit.wikimedia.org/r/153529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id643c0233e944725d6b104fc0cede2ef9a632044
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org
[MediaWiki-commits] [Gerrit] copy n paste typo - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: copy n paste typo
..
copy n paste typo
Change-Id: If7b557c817a9ef02f7040c0307c1abadb1c70435
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index def6a93..a4a2752 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -376,12 +376,12 @@
'tag_id' => $supported_tags[$tag]
));
} catch ( CiviCRM_API3_Exception $ex ) {
-$stacked_ex[] = "Failed to add tag {$tag} to contact ID
{$contribution_result['id']}. Error: " . $ex->getMessage();
+$stacked_ex[] = "Failed to add tag {$tag} to contribution ID
{$contribution_result['id']}. Error: " . $ex->getMessage();
}
}
if ( !empty( $stacked_ex ) ) {
throw new WmfException(
-"IMPORT_CONTACT",
+"IMPORT_CONTRIB",
implode( "\n", $stacked_ex )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/153521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7b557c817a9ef02f7040c0307c1abadb1c70435
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (FR #1623) Need to add a tag to track backfill - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: (FR #1623) Need to add a tag to track backfill
..
(FR #1623) Need to add a tag to track backfill
Change-Id: I5897717f0edc2ffadccfbe087987645cb54590ba
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 39a6b5b..a96f10a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -839,3 +839,28 @@
);
wmf_civicrm_create_option_values( 'payment_instrument',
$payment_instruments );
}
+
+/**
+ * Create UnrecordedCharge contribution tag
+ */
+function wmf_civicrm_update_7021()
+{
+$ret = array();
+$api = wmf_civicrm_bootstrap_civi();
+$success = $api->Tag->get(array(
+'name' => 'UnrecordedCharge',
+'used_for' => 'civicrm_contribution',
+));
+if (!count($api->values)) {
+$success = $api->Tag->create(array(
+'name' => 'UnrecordedCharge',
+'description' => 'For donations which have already been charged,
but were not recorded in Civi at the time.',
+'is_selectable' => false,
+'is_reserved' => true,
+'used_for' => 'civicrm_contribution'
+));
+if (!$success) {
+throw new Exception( $api->errorMsg() );
+}
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/153508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5897717f0edc2ffadccfbe087987645cb54590ba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Manual import of translations from TWN .. Manual import of translations from TWN bug: 69304 Change-Id: I5d3d12c720a353a6f0aee2704f6b3480728ed4ac --- M wikipedia/res/values-bn/strings.xml M wikipedia/res/values-es/strings.xml M wikipedia/res/values-ja/strings.xml M wikipedia/res/values-lb/strings.xml M wikipedia/res/values-pt/strings.xml M wikipedia/res/values-ro/strings.xml M wikipedia/res/values-sk/strings.xml M wikipedia/res/values-tr/strings.xml A wikipedia/res/values-zh-rCN/strings.xml A wikipedia/res/values-zh-rTW/strings.xml 10 files changed, 529 insertions(+), 12 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/values-bn/strings.xml b/wikipedia/res/values-bn/strings.xml index 76be935..af33909 100644 --- a/wikipedia/res/values-bn/strings.xml +++ b/wikipedia/res/values-bn/strings.xml @@ -155,6 +155,7 @@ আরও আরও উইকিপিডিয়া অ্যাপ সম্পর্কে + গোপনীয়তা নীতি সংস্করণ ব্যবহৃত লাইব্রেরীসমূহ অবদানকারনগণ diff --git a/wikipedia/res/values-es/strings.xml b/wikipedia/res/values-es/strings.xml index a5e2472..d27df56 100644 --- a/wikipedia/res/values-es/strings.xml +++ b/wikipedia/res/values-es/strings.xml @@ -86,8 +86,10 @@ Cerrar sesión de tu cuenta de Wikipedia Sesión no iniciada. Sesión cerrada + No hay páginas guardadas aún. Las páginas guardadas son bastante impresionantes. Piensa en ellas como marcadores que se pueden leer incluso cuando estás sin conexión. - Tu historial está vacío. + No hay páginas recientes aquí. + Probablemente borraste el historial. La próxima vez que vayas a una página puedes recuperarla desde aquí. WIKIPEDIA La enciclopedia libre Omitir @@ -195,6 +197,10 @@ Actualización completa Página guardada Recargar página + Esta parece una edición no constructiva. ¿Estás seguro de que quieres guardarla? + No puedes guardar esta edición. Por favor vuelve atrás y cámbiala. + Un filtro automático ha identificado esta edición como potencialmente no constructiva. Puede contener uno o más de los siguientes:
· Escrito en mayúsculas
· Articulos en blanco o spam
· Enlaces externos irrelevantes o imágenes
· Caracteres repetidos + Un filtro automático ha identificado esta edición como potencialmente no constructiva, o probable vandalismo.
Wikipedia es una enciclopedía y sólo contenido neutral y notable pertenece aquí. Problemas de la página Tipo de letra y tema Tamaño de letra diff --git a/wikipedia/res/values-ja/strings.xml b/wikipedia/res/values-ja/strings.xml index d3e57c4..c08074f 100644 --- a/wikipedia/res/values-ja/strings.xml +++ b/wikipedia/res/values-ja/strings.xml @@ -17,7 +17,7 @@ ブックマークを空にする 保存したページをすべて消去 このページは存在しません - 今日は何の日 + 今日のメインページ 閲覧履歴を消去しますか? 保存したページ 保存したページ diff --git a/wikipedia/res/values-lb/strings.xml b/wikipedia/res/values-lb/strings.xml index a969d23..9d546c0 100644 --- a/wikipedia/res/values-lb/strings.xml +++ b/wikipedia/res/values-lb/strings.xml @@ -189,7 +189,9 @@ Aktualisatioun fäerdeg Säit gespäichert Säit aktualiséieren + Dëst gesäit no enger wéineg konstruktiver Ännerung aus. Sidd Dir sécher datt Dir se späichere wëllt? Dir däerft dës Ännerung net späicheren. Gitt w.e.g. zréck an ännert se. + En automatesche Filter huet dës Ännerung als méiglecherweis net konstruktiv identifizéiert. Et ka sinn dat eent oder méi vun dësen Elementer dra virkommen:
· Alles ass a grousse Buschtawe geschriwwen
Artikelen eidelmaachen oder Spam drasetzen
Irrelevant extern Linken oder Biller
Zeeche widderhuelen Problemer mat der Säit Schrëftgréisst Faarfschema diff --git a/wikipedia/res/values-pt/strings.xml b/wikipedia/res/values-pt/strings.xml index b71085b..102a93e 100644 --- a/wikipedia/res/values-pt/strings.xml +++ b/wikipedia/res/values-pt/strings.xml @@ -25,18 +25,18 @@ Atualizar páginas guardadas Atualizar todas as páginas guardadas? Páginas guardadas atualizadas - Gravar página + Guardar página Partilhar Partilhar via Limpar todas as páginas guardadas? Tem a certeza que pretende remover todas as páginas guardadas? - A gravar página... - Página gravada com êxito + A guardar página... + Página guardada com êxito Não foi possível salvar todas as imagens - Falha ao gravar a página :( - A recarregar página gravada... + Falha ao guardar a página :( + A recarregar página guardada... Eliminar - Página(s) gravada(s) eliminada(s) + Página(s) guardada(s) eliminada(s) Pesquisar Nenhuma página é correspondente com \'%s\' Última atualização: %s diff --git a/wikipedia/res/values-ro/strings.xml b/wikipedia/res/values-ro/strings.xml index b38e1e6..0c28d48 100644 --- a/wikipedia/res/values-ro/strings.xml +++ b/wikipedia/res/
[MediaWiki-commits] [Gerrit] enable gelf logging from hadoop workers - change (operations/puppet)
Gage has submitted this change and it was merged.
Change subject: enable gelf logging from hadoop workers
..
enable gelf logging from hadoop workers
Change-Id: Ifd06469ccc5fbb5a603ef59f8c7458cf3e24049a
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 899593a..9a7885b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -186,6 +186,7 @@
# used for Hadoop network topology awareness.
node /analytics10(11|1[3-7]|19|2[089]|3[0-9]|4[01]).eqiad.wmnet/ {
$nagios_group = 'analytics_eqiad'
+$gelf_logging_enabled = true
# ganglia cluster name.
$cluster = 'analytics'
# analytics1014 is analytics Ganglia aggregator for Row C
--
To view, visit https://gerrit.wikimedia.org/r/153528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd06469ccc5fbb5a603ef59f8c7458cf3e24049a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage
Gerrit-Reviewer: Gage
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing messages from MW - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Add missing messages from MW
..
Add missing messages from MW
Change-Id: Ia1c2ca21e85961cfa4faddc76fd8673ffc9aaf39
---
M modules/ve/i18n/en.json
M modules/ve/i18n/qqq.json
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/i18n/en.json b/modules/ve/i18n/en.json
index 4254f5c..22c0abd 100644
--- a/modules/ve/i18n/en.json
+++ b/modules/ve/i18n/en.json
@@ -93,10 +93,12 @@
"visualeditor-specialcharacter-button-tooltip": "Special character",
"visualeditor-specialcharacterinspector-title": "Special character",
"visualeditor-specialcharinspector-characterlist-insert":
"{\n\t\"Symbols\": {\n\t\t\"−\": \"−\",\n\t\t\"—\": \"—\",\n\t\t\"°\":
\"°\",\n\t\t\"′\": \"′\",\n\t\t\"″\": \"″\",\n\t\t\"←\": \"←\",\n\t\t\"→\":
\"→\",\n\t\t\"« »\" : \"« »\",\n\t\t\"“”\" : \"“”\",\n\t\t\"#\" :
\"#\",\n\t\t\"@\" : \"@\",\n\t\t\"|\" : \"|\",\n\t\t\"~\" : \"~\",\n\t\t\"§\":
\"§\",\n\t\t\"•\" : \"•\",\n\t\t\"·\": \"·\",\n\t\t\"…\" : \"…\",\n\t\t\"€\" :
\"€\"\n\t},\n\t\"Accents\": {\n\t\t\"Æ\" : \"Æ\",\n\t\t\"æ\" :
\"æ\",\n\t\t\"À\" : \"À\",\n\t\t\"à\" : \"à\",\n\t\t\"Â\" : \"Â\",\n\t\t\"â\" :
\"â\",\n\t\t\"Ä\" : \"Ä\",\n\t\t\"ä\" : \"ä\",\n\t\t\"Å\" : \"Å\",\n\t\t\"å\" :
\"å\",\n\t\t\"Ç\" : \"Ç\",\n\t\t\"ç\" : \"ç\",\n\t\t\"È\" : \"È\",\n\t\t\"è\" :
\"è\",\n\t\t\"É\" : \"É\",\n\t\t\"é\" : \"é\",\n\t\t\"Ê\" : \"Ê\",\n\t\t\"ê\" :
\"ê\",\n\t\t\"Ë\" : \"Ë\",\n\t\t\"ë\" : \"ë\",\n\t\t\"Î\" : \"Î\",\n\t\t\"î\" :
\"î\",\n\t\t\"Ï\" : \"Ï\",\n\t\t\"ï\" : \"ï\",\n\t\t\"Ô\" : \"Ô\",\n\t\t\"ô\" :
\"ô\",\n\t\t\"Ö\" : \"Ö\",\n\t\t\"ö\" : \"ö\",\n\t\t\"Ø\" : \"Ø\",\n\t\t\"ø\" :
\"ø\",\n\t\t\"Ù\" : \"Ù\",\n\t\t\"ù\" : \"ù\",\n\t\t\"Û\" : \"Û\",\n\t\t\"û\" :
\"û\",\n\t\t\"Ü\" : \"Ü\",\n\t\t\"ü\" : \"ü\",\n\t\t\"Ÿ\" : \"Ÿ\",\n\t\t\"ÿ\" :
\"ÿ\",\n\t\t\"Œ\" : \"Œ\",\n\t\t\"œ\" : \"œ\"\n\t},\n\t\"Mathematical\":
{\n\t\t\"−\": \"−\",\n\t\t\"×\": \"×\",\n\t\t\"÷\": \"÷\",\n\t\t\"≈\":
\"≈\",\n\t\t\"≠\": \"≠\",\n\t\t\"≤\": \"≤\",\n\t\t\"≥\": \"≥\",\n\t\t\"±\":
\"±\",\n\t\t\"¹\" : \"¹\",\n\t\t\"²\" : \"²\",\n\t\t\"³\" : \"³\",\n\t\t\"⁴\" :
\"⁴\",\n\t\t\"⁵\" : \"⁵\",\n\t\t\"⁶\" : \"⁶\",\n\t\t\"⁷\" : \"⁷\",\n\t\t\"⁸\" :
\"⁸\",\n\t\t\"⁹\" : \"⁹\",\n\t\t\"⁰\" : \"⁰\",\n\t\t\"½\" : \"½\"\n\t}\n}",
+"visualeditor-toolbar-format-tooltip": "Format paragraph",
"visualeditor-toolbar-history": "History",
"visualeditor-toolbar-insert": "Insert",
"visualeditor-toolbar-paragraph-format": "Formatting",
"visualeditor-toolbar-structure": "Structure",
+"visualeditor-toolbar-style-tooltip": "Style text",
"visualeditor-toolbar-text-style": "Styling",
"visualeditor-version-label": "Version"
}
diff --git a/modules/ve/i18n/qqq.json b/modules/ve/i18n/qqq.json
index 1039764..3659628 100644
--- a/modules/ve/i18n/qqq.json
+++ b/modules/ve/i18n/qqq.json
@@ -97,10 +97,12 @@
"visualeditor-specialcharacter-button-tooltip": "Tooltip text for the
insert character button.\n{{Identical|Special character}}",
"visualeditor-specialcharacterinspector-title": "Used as title for
special character inspector.\n{{Identical|Special character}}",
"visualeditor-specialcharinspector-characterlist-insert": "This is a
JSON string defining the special characters that can be inserted using the
special character insertion tool.\n{{doc-important|Please make sure it is a
valid JSON string.}}\n{{Optional}}",
+ "visualeditor-toolbar-format-tooltip": "Tooltip text for the paragraph
formatting menu which contains the following items:\n*
{{msg-mw|Visualeditor-formatdropdown-format-paragraph}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading1}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading2}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading3}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading4}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading5}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading6}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-preformatted}}",
"visualeditor-toolbar-history": "Label text for the 'history' menu in
the toolbar of the undo and redo tools.\n\nSee also:\n*
{{msg-mw|visualeditor-toolbar-insert}}\n*
{{msg-mw|visualeditor-toolbar-paragraph-format}}\n*
{{msg-mw|visualeditor-toolbar-structure}}\n*
{{msg-mw|visualeditor-toolbar-text-style}}\n{{Identical|History}}",
"visualeditor-toolbar-insert": "Label text for the 'insert' menu in the
toolbar of tools that let you add items, like images.\n\nSee also:\n*
{{msg-mw|visualeditor-toolbar-history}}\n*
{{msg-mw|visualeditor-toolbar-paragraph-format}}\n*
{{msg-mw|visualeditor-toolbar-structure}}\n*
{{msg-mw|visualeditor-toolbar-text-style}}\n{{Identical|Insert}}",
"visualeditor-toolbar-paragraph-format": "La
[MediaWiki-commits] [Gerrit] rm old puppet_disabled check, replaced by new chk - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: rm old puppet_disabled check,replaced by new chk
..
rm old puppet_disabled check,replaced by new chk
the new "puppet run" check should also detect
those disabled puppet agents, so keeping the old
one would just cause duplicate alarms and longer/slower
Icinga config
Change-Id: I46d8e23ea0a96395252dc9323cb24c49f70614cf
---
D modules/base/files/monitoring/check_puppet_disabled
M modules/base/manifests/monitoring/host.pp
2 files changed, 0 insertions(+), 27 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/files/monitoring/check_puppet_disabled
b/modules/base/files/monitoring/check_puppet_disabled
deleted file mode 100755
index 1dfe857..000
--- a/modules/base/files/monitoring/check_puppet_disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/monitoring/check_puppet_disabled
-#
-#
-# if lock file exists and has 0 size, then the lock is not part of a puppetrun
-# (Normal puppetrun locks contain process pid)
-#
-
-FILE=/var/lib/puppet/state/agent_disabled.lock
-
-test -f $FILE && ! test -s $FILE && echo "WARNING: Orphan puppetlock detected"
&& exit 1
-
-echo "OK"
-exit 0
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index 3f28670..d68c7cd 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -57,13 +57,6 @@
mode => '0555',
source => 'puppet:///modules/base/monitoring/check-raid.py';
}
-file { '/usr/local/lib/nagios/plugins/check_puppet_disabled':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode => '0555',
-source => 'puppet:///modules/base/monitoring/check_puppet_disabled';
-}
file { '/usr/local/lib/nagios/plugins/check_puppetrun':
ensure => present,
owner => 'root',
@@ -118,10 +111,6 @@
nrpe::monitor_service { 'dpkg':
description => 'DPKG',
nrpe_command => '/usr/local/lib/nagios/plugins/check_dpkg',
-}
-nrpe::monitor_service { 'puppet_disabled':
-description => 'puppet disabled',
-nrpe_command => '/usr/local/lib/nagios/plugins/check_puppet_disabled',
}
$warninginterval = $base::puppet::params::freshnessinterval
$criticalinterval = $base::puppet::params::freshnessinterval * 2
--
To view, visit https://gerrit.wikimedia.org/r/142560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46d8e23ea0a96395252dc9323cb24c49f70614cf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enable gelf logging from hadoop workers - change (operations/puppet)
Gage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153528
Change subject: enable gelf logging from hadoop workers
..
enable gelf logging from hadoop workers
Change-Id: Ifd06469ccc5fbb5a603ef59f8c7458cf3e24049a
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/153528/1
diff --git a/manifests/site.pp b/manifests/site.pp
index fb7393f..3bd2944 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -186,6 +186,7 @@
# used for Hadoop network topology awareness.
node /analytics10(11|1[3-7]|19|2[089]|3[0-9]|4[01]).eqiad.wmnet/ {
$nagios_group = 'analytics_eqiad'
+$gelf_logging_enabled = true
# ganglia cluster name.
$cluster = 'analytics'
# analytics1014 is analytics Ganglia aggregator for Row C
--
To view, visit https://gerrit.wikimedia.org/r/153528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd06469ccc5fbb5a603ef59f8c7458cf3e24049a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Registry: Guard against Object prototype keys in lookup() - change (oojs/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Registry: Guard against Object prototype keys in lookup()
..
Registry: Guard against Object prototype keys in lookup()
See also a422b0b which fixed this previously for EventEmitter.
hasOwnProperty makes .lookup('constructor') and other inherited
prototype keys work correctly.
Using lookup everywhere makes it possible to override it usefully.
Change-Id: Ieda909509fdafcacc5fe7b795737106716f4ec42
---
M src/Factory.js
M src/Registry.js
M tests/unit/Registry.test.js
3 files changed, 18 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Factory.js b/src/Factory.js
index 365dbd2..5d47044 100644
--- a/src/Factory.js
+++ b/src/Factory.js
@@ -60,12 +60,12 @@
* @throws {Error} Unknown object name
*/
oo.Factory.prototype.create = function ( name ) {
- var args, obj, constructor;
+ var args, obj,
+ constructor = this.lookup( name );
- if ( !this.registry.hasOwnProperty( name ) ) {
+ if ( !constructor ) {
throw new Error( 'No class registered by that name: ' + name );
}
- constructor = this.registry[name];
// Convert arguments to array and shift the first argument (name) off
args = Array.prototype.slice.call( arguments, 1 );
diff --git a/src/Registry.js b/src/Registry.js
index 8f58163..7589290 100644
--- a/src/Registry.js
+++ b/src/Registry.js
@@ -1,3 +1,5 @@
+/*global hasOwn */
+
/**
* @class OO.Registry
* @mixins OO.EventEmitter
@@ -59,5 +61,7 @@
* @return {Mixed|undefined} Data associated with symbolic name
*/
oo.Registry.prototype.lookup = function ( name ) {
- return this.registry[name];
+ if ( hasOwn.call( this.registry, name ) ) {
+ return this.registry[name];
+ }
};
diff --git a/tests/unit/Registry.test.js b/tests/unit/Registry.test.js
index 1a5c711..efdca80 100644
--- a/tests/unit/Registry.test.js
+++ b/tests/unit/Registry.test.js
@@ -13,13 +13,22 @@
assert.strictEqual( registry.lookup( 'registry-item-3' ), 23 );
} );
- QUnit.test( 'lookup', 2, function ( assert ) {
+ QUnit.test( 'lookup', 6, function ( assert ) {
var registry = new oo.Registry();
registry.register( 'registry-item-1', 1 );
assert.strictEqual( registry.lookup( 'registry-item-1' ), 1 );
assert.strictEqual( registry.lookup( 'registry-item-2' ),
undefined );
+
+ assert.strictEqual( registry.lookup( 'hasOwnProperty' ),
undefined );
+ assert.strictEqual( registry.lookup( 'prototype' ), undefined );
+
+ registry.register( 'hasOwnProperty', 50 );
+ assert.strictEqual( registry.lookup( 'hasOwnProperty' ), 50 );
+
+ registry.register( 'prototype', 20 );
+ assert.strictEqual( registry.lookup( 'prototype' ), 20 );
} );
}( OO ) );
--
To view, visit https://gerrit.wikimedia.org/r/153356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieda909509fdafcacc5fe7b795737106716f4ec42
Gerrit-PatchSet: 5
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Trevor Parscal
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 phpcs stuff in profileinfo.php - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153527
Change subject: Fix phpcs stuff in profileinfo.php
..
Fix phpcs stuff in profileinfo.php
Change-Id: Ia0709ced1ac6365a0c1f7c14c52d2487041a9c3f
---
M profileinfo.php
1 file changed, 37 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/27/153527/1
diff --git a/profileinfo.php b/profileinfo.php
index 8120599..762af69 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -163,15 +163,18 @@
}
}
+// @codingStandardsIgnoreStart
class profile_point {
- var $name;
- var $count;
- var $time;
- var $children;
+ // @codingStandardsIgnoreEnd
- static $totaltime, $totalmemory, $totalcount;
+ public $name;
+ public $count;
+ public $time;
+ public $children;
- function __construct( $name, $count, $time, $memory ) {
+ public static $totaltime, $totalmemory, $totalcount;
+
+ public function __construct( $name, $count, $time, $memory ) {
$this->name = $name;
$this->count = $count;
$this->time = $time;
@@ -179,11 +182,11 @@
$this->children = array();
}
- function add_child( $child ) {
+ public function add_child( $child ) {
$this->children[] = $child;
}
- function display( $expand, $indent = 0.0 ) {
+ public function display( $expand, $indent = 0.0 ) {
usort( $this->children, 'compare_point' );
$ex = isset( $expand[$this->name()] );
@@ -214,6 +217,7 @@
name() ) ) . $extet ?>
+
time() / self::$totaltime * 100 ); ?>
memory() / self::$totalmemory * 100 ); ?>
count();
?>
@@ -222,6 +226,7 @@
memoryPerCall() / 1024 ), 2 ); ?>
time() / self::$totalcount ), 2 ); ?>
memory() / self::$totalcount / 1024 ), 2 ); ?>
+
name;
}
- function count() {
+ public function count() {
return $this->count;
}
- function time() {
+ public function time() {
return $this->time;
}
- function memory() {
+ public function memory() {
return $this->memory;
}
- function timePerCall() {
+ public function timePerCall() {
+ // @codingStandardsIgnoreStart
return @( $this->time / $this->count );
+ // @codingStandardsIgnoreEnd
}
- function memoryPerCall() {
+ public function memoryPerCall() {
+ // @codingStandardsIgnoreStart
return @( $this->memory / $this->count );
+ // @codingStandardsIgnoreEnd
}
- function callsPerRequest() {
+ public function callsPerRequest() {
+ // @codingStandardsIgnoreStart
return @( $this->count / self::$totalcount );
+ // @codingStandardsIgnoreEnd
}
- function timePerRequest() {
+ public function timePerRequest() {
+ // @codingStandardsIgnoreStart
return @( $this->time / self::$totalcount );
+ // @codingStandardsIgnoreEnd
}
- function memoryPerRequest() {
+ public function memoryPerRequest() {
+ // @codingStandardsIgnoreStart
return @( $this->memory / self::$totalcount );
+ // @codingStandardsIgnoreEnd
}
- function fmttime() {
+ public function fmttime() {
return sprintf( '%5.02f', $this->time );
}
};
function compare_point( profile_point $a, profile_point $b ) {
+ // @codingStandardsIgnoreStart
global $sort;
+ // @codingStandardsIgnoreEnd
switch ( $sort ) {
case 'name':
return strcmp( $a->name(), $b->name() );
@@ -342,7 +359,9 @@
profile_point::$totalmemory = 0.0;
function getEscapedProfileUrl( $_filter = false, $_sort = false,
$_expand = false ) {
+ // @codingStandardsIgnoreStart
global $filter, $sort, $expand;
+ // @codingStandardsIgnoreEnd
if ( $_expand === false ) {
$_expand = $expand;
--
To view, visit https://gerrit.wikimedia.org/r/153527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0709ced1ac6365a0c1f7c14c52d2487041a9c3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.o
[MediaWiki-commits] [Gerrit] Hadoop role: depend on JARs for GELF, pass param - change (operations/puppet)
Gage has submitted this change and it was merged.
Change subject: Hadoop role: depend on JARs for GELF, pass param
..
Hadoop role: depend on JARs for GELF, pass param
* rework of https://gerrit.wikimedia.org/r/#/c/140677/
* logstash-gelf.jar is now packaged as liblogstash-gelf-java
Change-Id: I129ee2c00d174c4c190321040afc52c65da38581
---
M manifests/role/analytics/hadoop.pp
1 file changed, 27 insertions(+), 0 deletions(-)
Approvals:
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index ea6de64..056acd9 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -55,6 +55,8 @@
$mapreduce_output_compression_type= 'BLOCK'
$mapreduce_job_reuse_jvm_num_tasks= 1
$fair_scheduler_template = 'hadoop/fair-scheduler.xml.erb'
+# setting this to false or undef interferes with defining it within a node
+#$gelf_logging_enabled = true
# Configs specific to Production.
@@ -127,6 +129,7 @@
# TODO: use variables from new ganglia module once it is finished.
$ganglia_host = '239.192.1.32'
$ganglia_port = 8649
+$gelf_logging_host= "logstash1001.eqiad.wmnet"
}
# Configs specific to Labs.
@@ -178,6 +181,7 @@
$ganglia_host = 'aggregator.eqiad.wmflabs'
$ganglia_port = 50090
+$gelf_logging_host= "127.0.0.1"
# Hadoop directories in labs should be automatically created.
# This conditional could be added to each of the main classes
@@ -237,6 +241,9 @@
net_topology_script_template =>
$net_topology_script_template,
# Use fair-scheduler.xml.erb to define FairScheduler queues.
fair_scheduler_template => $fair_scheduler_template,
+gelf_logging_enabled => $gelf_logging_enabled,
+gelf_logging_host=> $gelf_logging_host,
+gelf_logging_port=> $gelf_logging_port,
}
# If in production AND the current node is a journalnode, then
@@ -248,6 +255,26 @@
require => Class['cdh::hadoop'],
}
}
+if $gelf_logging_enabled {
+package { 'libjson-simple-java':
+ensure => 'installed',
+}
+# symlink into hadoop classpath
+file { '/usr/lib/hadoop/lib/json_simple-1.1.jar':
+ensure => 'link',
+target => '/usr/share/java/json_simple-1.1.jar',
+require => Package['libjson-simple-java'],
+}
+package { 'liblogstash-gelf-java':
+ensure => 'installed',
+}
+# symlink into hadoop classpath
+file { '/usr/lib/hadoop/lib/logstash-gelf.jar':
+ensure => 'link',
+target => '/usr/share/java/logstash-gelf.jar',
+require => Package['liblogstash-gelf-java'],
+}
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/153526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I129ee2c00d174c4c190321040afc52c65da38581
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage
Gerrit-Reviewer: Gage
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hadoop role: depend on JARs for GELF, pass param - change (operations/puppet)
Gage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153526
Change subject: Hadoop role: depend on JARs for GELF, pass param
..
Hadoop role: depend on JARs for GELF, pass param
* rework of https://gerrit.wikimedia.org/r/#/c/140677/
* logstash-gelf.jar is now packaged as liblogstash-gelf-java
Change-Id: I129ee2c00d174c4c190321040afc52c65da38581
---
M manifests/role/analytics/hadoop.pp
1 file changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/153526/1
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index ea6de64..056acd9 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -55,6 +55,8 @@
$mapreduce_output_compression_type= 'BLOCK'
$mapreduce_job_reuse_jvm_num_tasks= 1
$fair_scheduler_template = 'hadoop/fair-scheduler.xml.erb'
+# setting this to false or undef interferes with defining it within a node
+#$gelf_logging_enabled = true
# Configs specific to Production.
@@ -127,6 +129,7 @@
# TODO: use variables from new ganglia module once it is finished.
$ganglia_host = '239.192.1.32'
$ganglia_port = 8649
+$gelf_logging_host= "logstash1001.eqiad.wmnet"
}
# Configs specific to Labs.
@@ -178,6 +181,7 @@
$ganglia_host = 'aggregator.eqiad.wmflabs'
$ganglia_port = 50090
+$gelf_logging_host= "127.0.0.1"
# Hadoop directories in labs should be automatically created.
# This conditional could be added to each of the main classes
@@ -237,6 +241,9 @@
net_topology_script_template =>
$net_topology_script_template,
# Use fair-scheduler.xml.erb to define FairScheduler queues.
fair_scheduler_template => $fair_scheduler_template,
+gelf_logging_enabled => $gelf_logging_enabled,
+gelf_logging_host=> $gelf_logging_host,
+gelf_logging_port=> $gelf_logging_port,
}
# If in production AND the current node is a journalnode, then
@@ -248,6 +255,26 @@
require => Class['cdh::hadoop'],
}
}
+if $gelf_logging_enabled {
+package { 'libjson-simple-java':
+ensure => 'installed',
+}
+# symlink into hadoop classpath
+file { '/usr/lib/hadoop/lib/json_simple-1.1.jar':
+ensure => 'link',
+target => '/usr/share/java/json_simple-1.1.jar',
+require => Package['libjson-simple-java'],
+}
+package { 'liblogstash-gelf-java':
+ensure => 'installed',
+}
+# symlink into hadoop classpath
+file { '/usr/lib/hadoop/lib/logstash-gelf.jar':
+ensure => 'link',
+target => '/usr/share/java/logstash-gelf.jar',
+require => Package['liblogstash-gelf-java'],
+}
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/153526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I129ee2c00d174c4c190321040afc52c65da38581
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/153525 Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: Ieb31c8323d2e502f2b886952b312686b3c634b9e --- M wikipedia/ast.lproj/Localizable.strings A wikipedia/av.lproj/Main_iPhone.strings M wikipedia/br.lproj/Localizable.strings M wikipedia/ca.lproj/Localizable.strings M wikipedia/ca.lproj/Main_iPhone.strings M wikipedia/ce.lproj/Localizable.strings M wikipedia/de.lproj/Localizable.strings M wikipedia/es.lproj/Localizable.strings M wikipedia/fi.lproj/Localizable.strings M wikipedia/fr.lproj/Localizable.strings M wikipedia/he.lproj/Localizable.strings M wikipedia/lb.lproj/Localizable.strings M wikipedia/mk.lproj/Localizable.strings M wikipedia/nl.lproj/Localizable.strings M wikipedia/nl.lproj/Main_iPhone.strings M wikipedia/pl.lproj/Localizable.strings M wikipedia/pt.lproj/Localizable.strings M wikipedia/qqq.lproj/Localizable.strings M wikipedia/ro.lproj/Localizable.strings M wikipedia/ru.lproj/Localizable.strings M wikipedia/sk.lproj/Localizable.strings M wikipedia/sk.lproj/Main_iPhone.strings M wikipedia/sv.lproj/Localizable.strings A wikipedia/wuu.lproj/InfoPlist.strings M wikipedia/zh-hans.lproj/Localizable.strings M wikipedia/zh-hant.lproj/Localizable.strings M wikipedia/zh-hant.lproj/Main_iPhone.strings 27 files changed, 275 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/25/153525/1 diff --git a/wikipedia/ast.lproj/Localizable.strings b/wikipedia/ast.lproj/Localizable.strings index 9074827..ea7e178 100644 --- a/wikipedia/ast.lproj/Localizable.strings +++ b/wikipedia/ast.lproj/Localizable.strings @@ -169,3 +169,14 @@ "abuse-filter-disallow-heading" = "Nun pues guardar esta edición. Por favor vuelvi atrás y cámbiala."; "abuse-filter-disallow-unconstructive" = "Un filtru automático identificó esta edición como potencialmente non constructiva o como intentu de vandalismu."; "abuse-filter-disallow-notable" = "Wikipedia ye una enciclopedia y sólo cabe equí el conteníu neutral y notable."; +"menu-edit-accessibility-label" = "Editar"; +"menu-close-accessibility-label" = "Zarrar"; +"menu-preview-accessibility-label" = "Vista previa"; +"menu-back-accessibility-label" = "Anterior"; +"menu-forward-accessibility-label" = "Siguiente"; +"menu-w-accessibility-label" = "Menú"; +"menu-toc-accessibility-label" = "Conteníu"; +"menu-search-accessibility-label" = "Guetar"; +"menu-cancel-accessibility-label" = "Encaboxar"; +"menu-share-accessibility-label" = "Compartir"; +"menu-more-accessibility-label" = "Más axustes"; diff --git a/wikipedia/av.lproj/Main_iPhone.strings b/wikipedia/av.lproj/Main_iPhone.strings new file mode 100644 index 000..588cc32 --- /dev/null +++ b/wikipedia/av.lproj/Main_iPhone.strings @@ -0,0 +1,12 @@ +// Messages for Avaric (авар) +// Exported from translatewiki.net +// Author: Gazimagomedov +// Author: Аль-Гимравий + +"5cT-2Y-0Ie.placeholder" = "ГIахьалчиясул цIар"; +"LfM-01-aCF.text" = "ЦIебесеб"; +"P6J-IE-CiO.text" = "Гъоркьо биччантезе"; +"PCr-0J-fBj.placeholder" = "Пароль"; +"Wff-o9-AdH.text" = "Жаниве лъугьине"; +"jiW-Cg-oL3.text" = "Аккаунт гьабизе"; +"mAk-1N-jPC.placeholder" = "ГIахьалчиясул цIар"; diff --git a/wikipedia/br.lproj/Localizable.strings b/wikipedia/br.lproj/Localizable.strings index 5c6a429..ee951bc 100644 --- a/wikipedia/br.lproj/Localizable.strings +++ b/wikipedia/br.lproj/Localizable.strings @@ -150,3 +150,12 @@ "abuse-filter-warning-subheading" = "E-barzh hoc'h aozadenn e c'hall bezañ unan eus an elfennoù-mañ :"; "abuse-filter-warning-caps" = "Testenn e PENNLIZHERENNOÙ"; "abuse-filter-warning-repeat" = "Arouezennoù adskrivet"; +"menu-edit-accessibility-label" = "Kemmañ"; +"menu-close-accessibility-label" = "Serriñ"; +"menu-preview-accessibility-label" = "Rakwelet"; +"menu-back-accessibility-label" = "Distreiñ"; +"menu-forward-accessibility-label" = "Treuzkas"; +"menu-w-accessibility-label" = "Lañser"; +"menu-search-accessibility-label" = "Klask"; +"menu-cancel-accessibility-label" = "Nullañ"; +"menu-share-accessibility-label" = "Rannañ"; diff --git a/wikipedia/ca.lproj/Localizable.strings b/wikipedia/ca.lproj/Localizable.strings index 5a39ae4..dcf6a79 100644 --- a/wikipedia/ca.lproj/Localizable.strings +++ b/wikipedia/ca.lproj/Localizable.strings @@ -139,3 +139,13 @@ "license-footer-text" = "El contingut està disponible sota $1"; "license-footer-name" = "CC-BY-SA 3.0"; "table-of-contents-heading" = "Continguts"; +"menu-edit-accessibility-label" = "Edita"; +"menu-close-accessibility-label" = "Tanca"; +"menu-preview-accessibility-label" = "Vista prèvia"; +"menu-back-accessibility-label" = "Enrere"; +"menu-forward-accessibility-label" = "Endavant"; +"menu-w-accessibility-label" = "Menú"; +"menu-toc-accessibility-label" = "Contingut"; +"menu-search-accessibility-label" = "Cerca"; +"menu-ca
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 27e3b03..306451a - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/153524 Change subject: Syncronize VisualEditor: 27e3b03..306451a .. Syncronize VisualEditor: 27e3b03..306451a Change-Id: Id1e7137519866f41a1b41aa6f5e344bc4a923d30 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/24/153524/1 diff --git a/VisualEditor b/VisualEditor index 27e3b03..306451a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 27e3b037816f1225061ff803692ef770ecf63eea +Subproject commit 306451a7bd3ea4543ffd795318e2bb1ac795c2ed -- To view, visit https://gerrit.wikimedia.org/r/153524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1e7137519866f41a1b41aa6f5e344bc4a923d30 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 27e3b03..306451a - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 27e3b03..306451a .. Syncronize VisualEditor: 27e3b03..306451a Change-Id: Id1e7137519866f41a1b41aa6f5e344bc4a923d30 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 27e3b03..306451a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 27e3b037816f1225061ff803692ef770ecf63eea +Subproject commit 306451a7bd3ea4543ffd795318e2bb1ac795c2ed -- To view, visit https://gerrit.wikimedia.org/r/153524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1e7137519866f41a1b41aa6f5e344bc4a923d30 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove deprecated config related to fundraising/aluminium - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: remove deprecated config related to fundraising/aluminium
..
remove deprecated config related to fundraising/aluminium
Change-Id: Iade7f550838fa59ae27fefe0c9b1998798d26bd5
---
M files/dsh/group/misc_eqiad
D files/misc/scripts/drush-wrapper
D files/misc/scripts/dump_fundraisingdb
D files/sudo/sudoers.drupal_fundraising
M manifests/misc/fundraising.pp
D manifests/role/fundraising.pp
M manifests/site.pp
M modules/base/manifests/init.pp
8 files changed, 0 insertions(+), 412 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/misc_eqiad b/files/dsh/group/misc_eqiad
index 0b96e81..3cde52f 100644
--- a/files/dsh/group/misc_eqiad
+++ b/files/dsh/group/misc_eqiad
@@ -1,4 +1,3 @@
-aluminium
antimony
calcium
carbon
diff --git a/files/misc/scripts/drush-wrapper b/files/misc/scripts/drush-wrapper
deleted file mode 100644
index de23b46..000
--- a/files/misc/scripts/drush-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# this is puppetized
-#sudo -u www-data /srv/drush/drush.php $@
-sudo -u www-data /usr/local/drush/drush.php $@
diff --git a/files/misc/scripts/dump_fundraisingdb
b/files/misc/scripts/dump_fundraisingdb
deleted file mode 100755
index f04fe10..000
--- a/files/misc/scripts/dump_fundraisingdb
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use Sys::Syslog;
-use IPC::Open3;
-use IO::Select;
-
-my $conf = {
- 'LOCALDIR' => '/a/archive/database_dumps',
- 'KEEPDAYS' => {
- 'db1025' => 7,
- 'db1013' => 7,
- },
- 'SENDER' => 'r...@wikimedia.org',
- 'SUCCESS-RECIPIENT' => 'jgr...@wikimedia.org',
- 'FAILURE-RECIPIENT' => 'jgr...@wikimedia.org',
- 'DB' => {
- 'civicrm' => 'civicrm --single_transaction',
- 'dev_civicrm' => 'dev_civicrm --single_transaction',
- 'dev_drupal' => 'dev_drupal --single_transaction',
- 'dev_fundraising' => 'dev_fundraising --single_transaction',
- 'drupal' => 'drupal --single_transaction',
- 'fundraisingwiki' => 'fundraisingwiki --single_transaction',
- 'pgehres' => 'pgehres --single_transaction',
- },
- 'IDENT' => ($0 =~ /([^\/]+)$/) ? $1 : $0,
- 'HOSTNAME' => `hostname --short`,
-};
-
-chomp $conf->{'HOSTNAME'};
-
-# invoking user chooses specific db's from the list
-my ($e,@requested_dbs);
-if (defined @ARGV[0]) {
- for (@ARGV) {
- chomp;
- if (defined $conf->{'DB'}->{$_}) {
- push @requested_dbs, $_;
- } else {
- printlog("no database '$_' configured in
$conf->{'IDENT'}");
- $e->{'report'} .= "no database '$_' configured in
$conf->{'IDENT'}\n";
- $e->{'errors'}++;
- }
- }
-} else {
- @requested_dbs = keys %{$conf->{'DB'}};
-}
-
-printlog('start!');
-
-# purge old files if KEEPDAYS is set
-if ($conf->{'KEEPDAYS'}->{$conf->{'HOSTNAME'}} =~ /^(\d+)$/) {
- $e->{'report'} .= "purge files in $conf->{'LOCALDIR'} older than
$conf->{'KEEPDAYS'}->{$conf->{'HOSTNAME'}} days\n";
- opendir DIR, $conf->{'LOCALDIR'} or die "can't open
$conf->{'LOCALDIR'}: $!";
- for my $file (sort readdir DIR) {
- next if $file =~ /^\./;
- my $file_date = (stat("$conf->{'LOCALDIR'}/$file"))[9];
- if ( (time - $file_date)/86400 >
$conf->{'KEEPDAYS'}->{$conf->{'HOSTNAME'}}) {
- printlog("rm $conf->{'LOCALDIR'}/$file");
- unlink "$conf->{'LOCALDIR'}/$file";
- }
- }
- close DIR;
-}
-
-# cycle through db's and dump-compress them
-for my $db (@requested_dbs) {
- my $date = `date +%Y%m%d-%H%M%S`;
- chomp $date;
- printlog("start
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.gz");
- $e->{'report'} .= "start dump $db to
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.gz\n";
- # use .tmp suffix on uncompressed and in-progress .gz so we can ignore
them for rsync jobs
- monitor_shell_call("mysqldump $conf->{'DB'}->{$db} >
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp");
- if (-e "$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp") {
- monitor_shell_call("gzip --suffix .gz.tmp
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp");
- rename
"$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp.gz.tmp",
"$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.gz";
- } else {
- printlog("no
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp to gzip?");
- $e->{'report'} .= "no
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp to gzip?\n";
-
[MediaWiki-commits] [Gerrit] copy n paste typo - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153521
Change subject: copy n paste typo
..
copy n paste typo
Change-Id: If7b557c817a9ef02f7040c0307c1abadb1c70435
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/21/153521/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index def6a93..a4a2752 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -376,12 +376,12 @@
'tag_id' => $supported_tags[$tag]
));
} catch ( CiviCRM_API3_Exception $ex ) {
-$stacked_ex[] = "Failed to add tag {$tag} to contact ID
{$contribution_result['id']}. Error: " . $ex->getMessage();
+$stacked_ex[] = "Failed to add tag {$tag} to contribution ID
{$contribution_result['id']}. Error: " . $ex->getMessage();
}
}
if ( !empty( $stacked_ex ) ) {
throw new WmfException(
-"IMPORT_CONTACT",
+"IMPORT_CONTRIB",
implode( "\n", $stacked_ex )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/153521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7b557c817a9ef02f7040c0307c1abadb1c70435
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove deprecated config related to fundraising/aluminium - change (operations/puppet)
Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153517
Change subject: remove deprecated config related to fundraising/aluminium
..
remove deprecated config related to fundraising/aluminium
Change-Id: Iade7f550838fa59ae27fefe0c9b1998798d26bd5
---
M files/dsh/group/misc_eqiad
D files/misc/scripts/drush-wrapper
D files/misc/scripts/dump_fundraisingdb
D files/sudo/sudoers.drupal_fundraising
M manifests/misc/fundraising.pp
D manifests/role/fundraising.pp
M manifests/site.pp
M modules/base/manifests/init.pp
8 files changed, 0 insertions(+), 412 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/153517/1
diff --git a/files/dsh/group/misc_eqiad b/files/dsh/group/misc_eqiad
index 0b96e81..3cde52f 100644
--- a/files/dsh/group/misc_eqiad
+++ b/files/dsh/group/misc_eqiad
@@ -1,4 +1,3 @@
-aluminium
antimony
calcium
carbon
diff --git a/files/misc/scripts/drush-wrapper b/files/misc/scripts/drush-wrapper
deleted file mode 100644
index de23b46..000
--- a/files/misc/scripts/drush-wrapper
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# this is puppetized
-#sudo -u www-data /srv/drush/drush.php $@
-sudo -u www-data /usr/local/drush/drush.php $@
diff --git a/files/misc/scripts/dump_fundraisingdb
b/files/misc/scripts/dump_fundraisingdb
deleted file mode 100755
index f04fe10..000
--- a/files/misc/scripts/dump_fundraisingdb
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use Sys::Syslog;
-use IPC::Open3;
-use IO::Select;
-
-my $conf = {
- 'LOCALDIR' => '/a/archive/database_dumps',
- 'KEEPDAYS' => {
- 'db1025' => 7,
- 'db1013' => 7,
- },
- 'SENDER' => 'r...@wikimedia.org',
- 'SUCCESS-RECIPIENT' => 'jgr...@wikimedia.org',
- 'FAILURE-RECIPIENT' => 'jgr...@wikimedia.org',
- 'DB' => {
- 'civicrm' => 'civicrm --single_transaction',
- 'dev_civicrm' => 'dev_civicrm --single_transaction',
- 'dev_drupal' => 'dev_drupal --single_transaction',
- 'dev_fundraising' => 'dev_fundraising --single_transaction',
- 'drupal' => 'drupal --single_transaction',
- 'fundraisingwiki' => 'fundraisingwiki --single_transaction',
- 'pgehres' => 'pgehres --single_transaction',
- },
- 'IDENT' => ($0 =~ /([^\/]+)$/) ? $1 : $0,
- 'HOSTNAME' => `hostname --short`,
-};
-
-chomp $conf->{'HOSTNAME'};
-
-# invoking user chooses specific db's from the list
-my ($e,@requested_dbs);
-if (defined @ARGV[0]) {
- for (@ARGV) {
- chomp;
- if (defined $conf->{'DB'}->{$_}) {
- push @requested_dbs, $_;
- } else {
- printlog("no database '$_' configured in
$conf->{'IDENT'}");
- $e->{'report'} .= "no database '$_' configured in
$conf->{'IDENT'}\n";
- $e->{'errors'}++;
- }
- }
-} else {
- @requested_dbs = keys %{$conf->{'DB'}};
-}
-
-printlog('start!');
-
-# purge old files if KEEPDAYS is set
-if ($conf->{'KEEPDAYS'}->{$conf->{'HOSTNAME'}} =~ /^(\d+)$/) {
- $e->{'report'} .= "purge files in $conf->{'LOCALDIR'} older than
$conf->{'KEEPDAYS'}->{$conf->{'HOSTNAME'}} days\n";
- opendir DIR, $conf->{'LOCALDIR'} or die "can't open
$conf->{'LOCALDIR'}: $!";
- for my $file (sort readdir DIR) {
- next if $file =~ /^\./;
- my $file_date = (stat("$conf->{'LOCALDIR'}/$file"))[9];
- if ( (time - $file_date)/86400 >
$conf->{'KEEPDAYS'}->{$conf->{'HOSTNAME'}}) {
- printlog("rm $conf->{'LOCALDIR'}/$file");
- unlink "$conf->{'LOCALDIR'}/$file";
- }
- }
- close DIR;
-}
-
-# cycle through db's and dump-compress them
-for my $db (@requested_dbs) {
- my $date = `date +%Y%m%d-%H%M%S`;
- chomp $date;
- printlog("start
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.gz");
- $e->{'report'} .= "start dump $db to
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.gz\n";
- # use .tmp suffix on uncompressed and in-progress .gz so we can ignore
them for rsync jobs
- monitor_shell_call("mysqldump $conf->{'DB'}->{$db} >
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp");
- if (-e "$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp") {
- monitor_shell_call("gzip --suffix .gz.tmp
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp");
- rename
"$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp.gz.tmp",
"$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.gz";
- } else {
- printlog("no
$conf->{'LOCALDIR'}/$db.$date.$conf->{'HOSTNAME'}.sql.tmp to gzip?");
- $e->{'report'} .= "no
$conf->{'LOCALDIR'}/$db.$date.$co
[MediaWiki-commits] [Gerrit] Zero: updated 436-01 436-04 - both unified, both support https - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Zero: updated 436-01 436-04 - both unified, both support https
..
Zero: updated 436-01 436-04 - both unified, both support https
Change-Id: I636d965f975cca539354d61d6c4494566f302bf3
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 9e2681c..53252c1 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -245,6 +245,7 @@
} else if ((req.http.X-Forwarded-By != "Opera" && (
req.http.X-CS2 == "426-04" ||
req.http.X-CS2 == "250-99" ||
+ req.http.X-CS2 == "436-01" ||
req.http.X-CS2 == "436-04"
)) ||
req.http.X-CS2 ~ "^TESTON.*") {
@@ -334,12 +335,14 @@
// until they finish their migration
// According to qchris, analytics can handle language and
subdomain, but not proxy or https
unset req.http.X-CS;
- if (req.http.X-CS2 == "426-04") {
+ if (req.http.X-CS2 == "426-04" ||
+ req.http.X-CS2 == "436-01" ||
+ req.http.X-CS2 == "436-04"
+ ) {
+ // These carriers support HTTPS DIRECT connections (no
proxies)
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
- } else if (req.http.X-CS2 == "436-04") {
- set req.http.X-CS = req.http.X-CS2;
} else if (!req.http.X-Forwarded-Proto &&
!req.http.X-Forwarded-By) {
// Default for NON-HTTPS DIRECT connections
// Handles: 250-99
--
To view, visit https://gerrit.wikimedia.org/r/153505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I636d965f975cca539354d61d6c4494566f302bf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (FR #1623) Need to add a tag to track backfill - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153508
Change subject: (FR #1623) Need to add a tag to track backfill
..
(FR #1623) Need to add a tag to track backfill
Change-Id: I5897717f0edc2ffadccfbe087987645cb54590ba
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/08/153508/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 39a6b5b..a96f10a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -839,3 +839,28 @@
);
wmf_civicrm_create_option_values( 'payment_instrument',
$payment_instruments );
}
+
+/**
+ * Create UnrecordedCharge contribution tag
+ */
+function wmf_civicrm_update_7021()
+{
+$ret = array();
+$api = wmf_civicrm_bootstrap_civi();
+$success = $api->Tag->get(array(
+'name' => 'UnrecordedCharge',
+'used_for' => 'civicrm_contribution',
+));
+if (!count($api->values)) {
+$success = $api->Tag->create(array(
+'name' => 'UnrecordedCharge',
+'description' => 'For donations which have already been charged,
but were not recorded in Civi at the time.',
+'is_selectable' => false,
+'is_reserved' => true,
+'used_for' => 'civicrm_contribution'
+));
+if (!$success) {
+throw new Exception( $api->errorMsg() );
+}
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/153508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5897717f0edc2ffadccfbe087987645cb54590ba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero: updated 436-01 436-04 - both unified, both support https - change (operations/puppet)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153505
Change subject: Zero: updated 436-01 436-04 - both unified, both support https
..
Zero: updated 436-01 436-04 - both unified, both support https
Change-Id: I636d965f975cca539354d61d6c4494566f302bf3
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/153505/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 9e2681c..53252c1 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -245,6 +245,7 @@
} else if ((req.http.X-Forwarded-By != "Opera" && (
req.http.X-CS2 == "426-04" ||
req.http.X-CS2 == "250-99" ||
+ req.http.X-CS2 == "436-01" ||
req.http.X-CS2 == "436-04"
)) ||
req.http.X-CS2 ~ "^TESTON.*") {
@@ -334,12 +335,14 @@
// until they finish their migration
// According to qchris, analytics can handle language and
subdomain, but not proxy or https
unset req.http.X-CS;
- if (req.http.X-CS2 == "426-04") {
+ if (req.http.X-CS2 == "426-04" ||
+ req.http.X-CS2 == "436-01" ||
+ req.http.X-CS2 == "436-04"
+ ) {
+ // These carriers support HTTPS DIRECT connections (no
proxies)
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
- } else if (req.http.X-CS2 == "436-04") {
- set req.http.X-CS = req.http.X-CS2;
} else if (!req.http.X-Forwarded-Proto &&
!req.http.X-Forwarded-By) {
// Default for NON-HTTPS DIRECT connections
// Handles: 250-99
--
To view, visit https://gerrit.wikimedia.org/r/153505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I636d965f975cca539354d61d6c4494566f302bf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update token handling for core API change - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged.
Change subject: Update token handling for core API change
..
Update token handling for core API change
Core change I2793a3f2 changes API handling in a way that needs updates
to extensions for proper operation:
* needsToken() now returns a string
* Most custom token types are being replaced with a 'csrf' token (the
former 'edit' token); any others need a new hook.
* All tokens must use a static salt. Compat with web UI using non-static
tokens is supported and also serves to handle the now-deprecated token
fetching.
* Documentation in getParamDescription() should return a string (not
array) for 'token', as the signal to core that it should be replaced
with a standardized message.
When compatibility with earlier versions of MediaWiki is no longer
maintained, the entry for 'token' from getAllowedParams() and
getParamDescription() may be removed, as may getTokenSalt(). This patch
leaves them in place.
Note this is intended to be compatible with earlier versions of
MediaWiki, and so should be safe to merge before the core change.
Change-Id: I2e401c697d3b61b1fd76862d4061c225b48b504c
---
M api/ApiNovaAddress.php
M api/ApiNovaInstance.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/api/ApiNovaAddress.php b/api/ApiNovaAddress.php
index 73ec488..95c07c8 100644
--- a/api/ApiNovaAddress.php
+++ b/api/ApiNovaAddress.php
@@ -110,7 +110,7 @@
}
public function needsToken() {
- return true;
+ return 'csrf';
}
public function getTokenSalt() {
diff --git a/api/ApiNovaInstance.php b/api/ApiNovaInstance.php
index 4bd596a..ca9cbb4 100644
--- a/api/ApiNovaInstance.php
+++ b/api/ApiNovaInstance.php
@@ -121,7 +121,7 @@
}
public function needsToken() {
- return true;
+ return 'csrf';
}
public function getTokenSalt() {
--
To view, visit https://gerrit.wikimedia.org/r/153101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e401c697d3b61b1fd76862d4061c225b48b504c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Anomie
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix visibility in SkinFallback and StubObject - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153498
Change subject: Fix visibility in SkinFallback and StubObject
..
Fix visibility in SkinFallback and StubObject
Change-Id: Ie4c1aabd966fcdf87a9129ceb59c058740292f2e
---
M includes/SkinFallback.php
M includes/StubObject.php
2 files changed, 13 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/153498/1
diff --git a/includes/SkinFallback.php b/includes/SkinFallback.php
index f50eabc..a72520a 100644
--- a/includes/SkinFallback.php
+++ b/includes/SkinFallback.php
@@ -12,7 +12,8 @@
* SkinTemplate class for the fallback skin
*/
class SkinFallback extends SkinTemplate {
- var $skinname = 'fallback', $template = 'SkinFallbackTemplate';
+ public $skinname = 'fallback';
+ public $template = 'SkinFallbackTemplate';
/**
* Add CSS via ResourceLoader
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 73952da..7dcc69e 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -42,6 +42,7 @@
* which refers to it should be kept to a minimum.
*/
class StubObject {
+
/** @var null|string */
protected $global;
@@ -58,7 +59,7 @@
* @param string $class Name of the class of the real object.
* @param array $params Parameters to pass to constructor of the real
object.
*/
- function __construct( $global = null, $class = null, $params = array()
) {
+ public function __construct( $global = null, $class = null, $params =
array() ) {
$this->global = $global;
$this->class = $class;
$this->params = $params;
@@ -71,7 +72,7 @@
* @param object $obj Object to check.
* @return bool True if $obj is not an instance of StubObject class.
*/
- static function isRealObject( $obj ) {
+ public static function isRealObject( $obj ) {
return is_object( $obj ) && !$obj instanceof StubObject;
}
@@ -83,7 +84,7 @@
* @param object $obj Object to check.
* @return void
*/
- static function unstub( &$obj ) {
+ public static function unstub( &$obj ) {
if ( $obj instanceof StubObject ) {
$obj = $obj->_unstub( 'unstub', 3 );
}
@@ -100,7 +101,7 @@
* @param array $args Arguments
* @return mixed
*/
- function _call( $name, $args ) {
+ public function _call( $name, $args ) {
$this->_unstub( $name, 5 );
return call_user_func_array( array( $GLOBALS[$this->global],
$name ), $args );
}
@@ -109,7 +110,7 @@
* Create a new object to replace this stub object.
* @return object
*/
- function _newObject() {
+ public function _newObject() {
return MWFunction::newObj( $this->class, $this->params );
}
@@ -121,7 +122,7 @@
* @param array $args Arguments
* @return mixed
*/
- function __call( $name, $args ) {
+ public function __call( $name, $args ) {
return $this->_call( $name, $args );
}
@@ -137,7 +138,7 @@
* @return object The unstubbed version of itself
* @throws MWException
*/
- function _unstub( $name = '_unstub', $level = 2 ) {
+ public function _unstub( $name = '_unstub', $level = 2 ) {
static $recursionLevel = 0;
if ( !$GLOBALS[$this->global] instanceof StubObject ) {
@@ -170,18 +171,18 @@
*/
class StubUserLang extends StubObject {
- function __construct() {
+ public function __construct() {
parent::__construct( 'wgLang' );
}
- function __call( $name, $args ) {
+ public function __call( $name, $args ) {
return $this->_call( $name, $args );
}
/**
* @return Language
*/
- function _newObject() {
+ public function _newObject() {
return RequestContext::getMain()->getLanguage();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/153498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4c1aabd966fcdf87a9129ceb59c058740292f2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero: 436-06 added to unified and added https - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Zero: 436-06 added to unified and added https
..
Zero: 436-06 added to unified and added https
Change-Id: I0ef959f459262fdca6c54110ebcef82414f4a738
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 3707cdf..9e2681c 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -244,7 +244,8 @@
}
} else if ((req.http.X-Forwarded-By != "Opera" && (
req.http.X-CS2 == "426-04" ||
- req.http.X-CS2 == "250-99"
+ req.http.X-CS2 == "250-99" ||
+ req.http.X-CS2 == "436-04"
)) ||
req.http.X-CS2 ~ "^TESTON.*") {
//
@@ -337,6 +338,8 @@
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
+ } else if (req.http.X-CS2 == "436-04") {
+ set req.http.X-CS = req.http.X-CS2;
} else if (!req.http.X-Forwarded-Proto &&
!req.http.X-Forwarded-By) {
// Default for NON-HTTPS DIRECT connections
// Handles: 250-99
--
To view, visit https://gerrit.wikimedia.org/r/153481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ef959f459262fdca6c54110ebcef82414f4a738
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero: 436-06 added to unified and added https - change (operations/puppet)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153481
Change subject: Zero: 436-06 added to unified and added https
..
Zero: 436-06 added to unified and added https
Change-Id: I0ef959f459262fdca6c54110ebcef82414f4a738
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/153481/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 3707cdf..9e2681c 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -244,7 +244,8 @@
}
} else if ((req.http.X-Forwarded-By != "Opera" && (
req.http.X-CS2 == "426-04" ||
- req.http.X-CS2 == "250-99"
+ req.http.X-CS2 == "250-99" ||
+ req.http.X-CS2 == "436-04"
)) ||
req.http.X-CS2 ~ "^TESTON.*") {
//
@@ -337,6 +338,8 @@
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
+ } else if (req.http.X-CS2 == "436-04") {
+ set req.http.X-CS = req.http.X-CS2;
} else if (!req.http.X-Forwarded-Proto &&
!req.http.X-Forwarded-By) {
// Default for NON-HTTPS DIRECT connections
// Handles: 250-99
--
To view, visit https://gerrit.wikimedia.org/r/153481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ef959f459262fdca6c54110ebcef82414f4a738
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Install libgd-gd2-perl - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Tools: Install libgd-gd2-perl .. Tools: Install libgd-gd2-perl Bug: 67199 Change-Id: I7c5c3f1a709541126cd1ce711d36b5df891df292 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 28f25c5..a669ea8 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -75,6 +75,7 @@ 'libdigest-crc-perl', 'libdigest-hmac-perl', 'libfile-nfslock-perl', +'libgd-gd2-perl', # Bug 67199. 'libhtml-format-perl', 'libhtml-html5-entities-perl', 'libhtml-parser-perl', -- To view, visit https://gerrit.wikimedia.org/r/151416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c5c3f1a709541126cd1ce711d36b5df891df292 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Andre Engels Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Petrb Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: coren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manual import of translations from TWN - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/153472 Change subject: Manual import of translations from TWN .. Manual import of translations from TWN Change-Id: I5d3d12c720a353a6f0aee2704f6b3480728ed4ac --- M wikipedia/res/values-bn/strings.xml M wikipedia/res/values-es/strings.xml M wikipedia/res/values-ja/strings.xml M wikipedia/res/values-lb/strings.xml M wikipedia/res/values-pt/strings.xml M wikipedia/res/values-ro/strings.xml M wikipedia/res/values-sk/strings.xml M wikipedia/res/values-tr/strings.xml A wikipedia/res/values-zh-rCN/strings.xml A wikipedia/res/values-zh-rTW/strings.xml 10 files changed, 529 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/72/153472/1 diff --git a/wikipedia/res/values-bn/strings.xml b/wikipedia/res/values-bn/strings.xml index 76be935..af33909 100644 --- a/wikipedia/res/values-bn/strings.xml +++ b/wikipedia/res/values-bn/strings.xml @@ -155,6 +155,7 @@ আরও আরও উইকিপিডিয়া অ্যাপ সম্পর্কে + গোপনীয়তা নীতি সংস্করণ ব্যবহৃত লাইব্রেরীসমূহ অবদানকারনগণ diff --git a/wikipedia/res/values-es/strings.xml b/wikipedia/res/values-es/strings.xml index a5e2472..d27df56 100644 --- a/wikipedia/res/values-es/strings.xml +++ b/wikipedia/res/values-es/strings.xml @@ -86,8 +86,10 @@ Cerrar sesión de tu cuenta de Wikipedia Sesión no iniciada. Sesión cerrada + No hay páginas guardadas aún. Las páginas guardadas son bastante impresionantes. Piensa en ellas como marcadores que se pueden leer incluso cuando estás sin conexión. - Tu historial está vacío. + No hay páginas recientes aquí. + Probablemente borraste el historial. La próxima vez que vayas a una página puedes recuperarla desde aquí. WIKIPEDIA La enciclopedia libre Omitir @@ -195,6 +197,10 @@ Actualización completa Página guardada Recargar página + Esta parece una edición no constructiva. ¿Estás seguro de que quieres guardarla? + No puedes guardar esta edición. Por favor vuelve atrás y cámbiala. + Un filtro automático ha identificado esta edición como potencialmente no constructiva. Puede contener uno o más de los siguientes:
· Escrito en mayúsculas
· Articulos en blanco o spam
· Enlaces externos irrelevantes o imágenes
· Caracteres repetidos + Un filtro automático ha identificado esta edición como potencialmente no constructiva, o probable vandalismo.
Wikipedia es una enciclopedía y sólo contenido neutral y notable pertenece aquí. Problemas de la página Tipo de letra y tema Tamaño de letra diff --git a/wikipedia/res/values-ja/strings.xml b/wikipedia/res/values-ja/strings.xml index d3e57c4..c08074f 100644 --- a/wikipedia/res/values-ja/strings.xml +++ b/wikipedia/res/values-ja/strings.xml @@ -17,7 +17,7 @@ ブックマークを空にする 保存したページをすべて消去 このページは存在しません - 今日は何の日 + 今日のメインページ 閲覧履歴を消去しますか? 保存したページ 保存したページ diff --git a/wikipedia/res/values-lb/strings.xml b/wikipedia/res/values-lb/strings.xml index a969d23..9d546c0 100644 --- a/wikipedia/res/values-lb/strings.xml +++ b/wikipedia/res/values-lb/strings.xml @@ -189,7 +189,9 @@ Aktualisatioun fäerdeg Säit gespäichert Säit aktualiséieren + Dëst gesäit no enger wéineg konstruktiver Ännerung aus. Sidd Dir sécher datt Dir se späichere wëllt? Dir däerft dës Ännerung net späicheren. Gitt w.e.g. zréck an ännert se. + En automatesche Filter huet dës Ännerung als méiglecherweis net konstruktiv identifizéiert. Et ka sinn dat eent oder méi vun dësen Elementer dra virkommen:
· Alles ass a grousse Buschtawe geschriwwen
Artikelen eidelmaachen oder Spam drasetzen
Irrelevant extern Linken oder Biller
Zeeche widderhuelen Problemer mat der Säit Schrëftgréisst Faarfschema diff --git a/wikipedia/res/values-pt/strings.xml b/wikipedia/res/values-pt/strings.xml index b71085b..102a93e 100644 --- a/wikipedia/res/values-pt/strings.xml +++ b/wikipedia/res/values-pt/strings.xml @@ -25,18 +25,18 @@ Atualizar páginas guardadas Atualizar todas as páginas guardadas? Páginas guardadas atualizadas - Gravar página + Guardar página Partilhar Partilhar via Limpar todas as páginas guardadas? Tem a certeza que pretende remover todas as páginas guardadas? - A gravar página... - Página gravada com êxito + A guardar página... + Página guardada com êxito Não foi possível salvar todas as imagens - Falha ao gravar a página :( - A recarregar página gravada... + Falha ao guardar a página :( + A recarregar página guardada... Eliminar - Página(s) gravada(s) eliminada(s) + Página(s) guardada(s) eliminada(s) Pesquisar Nenhuma página é correspondente com \'%s\' Última atualização: %s diff --git a/wikipedia/res/values-ro/strings.xml b/wikipedia/res/values-ro/strings.xml index b38e1e6..0c28d48 100644 --- a/wikipedia/res/value
[MediaWiki-commits] [Gerrit] Tools: Sort package lists alphabetically - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Tools: Sort package lists alphabetically
..
Tools: Sort package lists alphabetically
Change-Id: I80ba3286448913880c23468e653458b48422a146
---
M modules/toollabs/manifests/dev_environ.pp
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index 8e6991f..b5e9547 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -51,20 +51,20 @@
'libxml2-dev',
'libxslt1-dev',
'libzbar-dev', # Bug 56996
-'lintian',
'links',
+'lintian',
'lynx',
'maven',
'mc', # Popular{{cn}} on Toolserver
'mercurial',
'npm',
'openjdk-7-jdk',
+'p7zip-full', # requested by Betacommand to extract files using 7zip
'pastebinit',
'pep8',# Bug 57863
'pyflakes',# Bug 57863
-'p7zip-full', # requested by Betacommand to extract files using 7zip
-'python-dev',
'python-coverage', # Bug 57002
+'python-dev',
'qt4-qmake',
'sbt',
'sqlite3',
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index a17d777..28f25c5 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -54,6 +54,7 @@
'tcl8.6',
# Perl libraries
+'libberkeleydb-perl', # Bug 58785
'libbot-basicbot-perl',
'libbsd-resource-perl',# Bug 54690.
'libcache-memcached-fast-perl',
@@ -63,7 +64,6 @@
'libcrypt-gcrypt-perl',
'libcrypt-openssl-bignum-perl',
'libcrypt-openssl-rsa-perl',
-'libberkeleydb-perl', # Bug 58785
'libdata-compare-perl',# For Checkwiki.
'libdata-dumper-simple-perl',
'libdatetime-format-duration-perl',
@@ -75,8 +75,8 @@
'libdigest-crc-perl',
'libdigest-hmac-perl',
'libfile-nfslock-perl',
-'libhtml-html5-entities-perl',
'libhtml-format-perl',
+'libhtml-html5-entities-perl',
'libhtml-parser-perl',
'libhtml-template-perl', # Bug 57123
'libhttp-message-perl',
@@ -111,8 +111,8 @@
'libtimedate-perl',
'liburi-encode-perl',
'liburi-perl',
-'libwww-perl',
'libwww-mechanize-perl', # Bug 57118
+'libwww-perl',
'libxml-libxml-perl',
'libxml-parser-perl',
'libxml-simple-perl',
@@ -156,20 +156,20 @@
'python-problem-report',
'python-pyexiv2', # Bug 59122.
'python-pyinotify',# Bug 57003
-'python-svn', # Bug 56996
-'python-rsvg', # Bug 56996
-'python-zbar', # Bug 56996
'python-redis',
'python-requests',
+'python-rsvg', # Bug 56996
'python-scipy',
'python-sqlalchemy',
-'python-twitter',
+'python-svn', # Bug 56996
'python-twisted',
+'python-twitter',
'python-virtualenv',
'python-wadllib',
'python-webpy',
'python-werkzeug',
'python-wikitools',
+'python-zbar', # Bug 56996
'python-zmq',
# PHP libraries
@@ -289,9 +289,9 @@
'graphicsmagick', # Bug 56995
'graphviz',
'imagemagick', # Bug 63000
+'iotop', # useful for labs admins to monitor
tools
'jq', # Bug #65049.
'ksh',
-'iotop', # useful for labs admins to monitor
tools
'libaio1', # Bug 68615
'libav-tools', # Bug #53870.
'libdmtx0a', # Bug #53867.
@@ -323,8 +323,6 @@
'mariadb-client', # For /usr/bin/mysql.
'mdbtools',# Bug #48805.
'openbabel', # Bug #66995
-'socat', # Bug 57005
-'supybot', # Bug 61088.
'p7zip',
'pdf2svg', # Bug #68092.
'pdftk', # Bug #65048.
@@ -335,9 +333,11 @@
'pstoedit',# Bug 57000
'pv', # Bug 57001
'rrdtool', # Bug 57004
-'ufraw-batch', # Bug 57008
+'socat',
[MediaWiki-commits] [Gerrit] Fix phpcs issues in actions and revisiondelete dirs - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153469
Change subject: Fix phpcs issues in actions and revisiondelete dirs
..
Fix phpcs issues in actions and revisiondelete dirs
Change-Id: I54c1e336b8c44ff8720ac38c8b2d68ede42af305
---
M includes/actions/UnprotectAction.php
M includes/revisiondelete/RevDelFileItem.php
M includes/revisiondelete/RevDelFileList.php
M includes/revisiondelete/RevDelRevisionItem.php
M includes/revisiondelete/RevDelRevisionList.php
5 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/69/153469/1
diff --git a/includes/actions/UnprotectAction.php
b/includes/actions/UnprotectAction.php
index 6234aba..bc28c8e 100644
--- a/includes/actions/UnprotectAction.php
+++ b/includes/actions/UnprotectAction.php
@@ -40,4 +40,4 @@
$this->page->unprotect();
}
-}
\ No newline at end of file
+}
diff --git a/includes/revisiondelete/RevDelFileItem.php
b/includes/revisiondelete/RevDelFileItem.php
index d9472e7..a6517fe 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -24,7 +24,7 @@
*/
class RevDelFileItem extends RevDelItem {
/** @var File */
- var $file;
+ public $file;
public function __construct( $list, $row ) {
parent::__construct( $list, $row );
diff --git a/includes/revisiondelete/RevDelFileList.php
b/includes/revisiondelete/RevDelFileList.php
index 8714a5e..57e15d8 100644
--- a/includes/revisiondelete/RevDelFileList.php
+++ b/includes/revisiondelete/RevDelFileList.php
@@ -24,13 +24,13 @@
*/
class RevDelFileList extends RevDelList {
/** @var array */
- var $storeBatch;
+ public $storeBatch;
/** @var array */
- var $deleteBatch;
+ public $deleteBatch;
/** @var array */
- var $cleanupBatch;
+ public $cleanupBatch;
public function getType() {
return 'oldimage';
diff --git a/includes/revisiondelete/RevDelRevisionItem.php
b/includes/revisiondelete/RevDelRevisionItem.php
index 81ca3d6..300ce6a 100644
--- a/includes/revisiondelete/RevDelRevisionItem.php
+++ b/includes/revisiondelete/RevDelRevisionItem.php
@@ -24,7 +24,7 @@
*/
class RevDelRevisionItem extends RevDelItem {
/** @var Revision */
- var $revision;
+ public $revision;
public function __construct( $list, $row ) {
parent::__construct( $list, $row );
diff --git a/includes/revisiondelete/RevDelRevisionList.php
b/includes/revisiondelete/RevDelRevisionList.php
index 6c47d4a..2545072 100644
--- a/includes/revisiondelete/RevDelRevisionList.php
+++ b/includes/revisiondelete/RevDelRevisionList.php
@@ -30,7 +30,7 @@
*/
class RevDelRevisionList extends RevDelList {
/** @var int */
- var $currentRevId;
+ public $currentRevId;
public function getType() {
return 'revision';
--
To view, visit https://gerrit.wikimedia.org/r/153469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54c1e336b8c44ff8720ac38c8b2d68ede42af305
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Install php5-imagick - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Tools: Install php5-imagick .. Tools: Install php5-imagick Bug: 69078 Change-Id: I2805392b149c8e23a5cd5ebe4c41a351e19d06ff --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 09c34bb..a17d777 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -176,6 +176,7 @@ 'php5-cli', 'php5-curl', 'php5-gd', +'php5-imagick',# Bug 69078. 'php5-intl', # Bug 55652 'php5-mcrypt', 'php5-mysql', -- To view, visit https://gerrit.wikimedia.org/r/151551 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2805392b149c8e23a5cd5ebe4c41a351e19d06ff Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Danmichaelo Gerrit-Reviewer: Petrb Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: coren 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 sub-directories to phpunit test - change (mediawiki...Echo)
Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153458
Change subject: Add sub-directories to phpunit test
..
Add sub-directories to phpunit test
Change-Id: Ie5bb127f1ba36bd799f87535b14cd3712ad08a3c
---
M Hooks.php
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/58/153458/1
diff --git a/Hooks.php b/Hooks.php
index 8eb741b..ed5e7bc 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -768,8 +768,22 @@
* @return bool true in all cases
*/
static function getUnitTests( &$files ) {
- $files = array_merge( $files, glob( __DIR__ .
'/tests/*Test.php' ) );
+ // @codeCoverageIgnoreStart
+ $directoryIterator = new RecursiveDirectoryIterator( __DIR__ .
'/tests/' );
+
+ /**
+* @var SplFileInfo $fileInfo
+*/
+ $ourFiles = array();
+ foreach ( new RecursiveIteratorIterator( $directoryIterator )
as $fileInfo ) {
+ if ( substr( $fileInfo->getFilename(), -8 ) ===
'Test.php' ) {
+ $ourFiles[] = $fileInfo->getPathname();
+ }
+ }
+
+ $files = array_merge( $files, $ourFiles );
return true;
+ // @codeCoverageIgnoreEnd
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/153458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5bb127f1ba36bd799f87535b14cd3712ad08a3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add @codingStandardsIgnore tags to parser classes - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153457
Change subject: Add @codingStandardsIgnore tags to parser classes
..
Add @codingStandardsIgnore tags to parser classes
Change-Id: I16d19de3d2b2461a68030afd3a79aa59c9e948d4
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
2 files changed, 46 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/153457/1
diff --git a/includes/parser/Preprocessor_DOM.php
b/includes/parser/Preprocessor_DOM.php
index f4e4dd1..6136555 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -23,8 +23,10 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class Preprocessor_DOM implements Preprocessor {
+ // @codingStandardsIgnoreEnd
/**
* @var Parser
@@ -952,8 +954,10 @@
/**
* An expansion frame, used as a context to expand the result of
preprocessToObj()
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPFrame_DOM implements PPFrame {
+ // @codingStandardsIgnoreEnd
/**
* @var Preprocessor
@@ -1547,8 +1551,11 @@
/**
* Expansion frame with template arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPTemplateFrame_DOM extends PPFrame_DOM {
+ // @codingStandardsIgnoreEnd
+
public $numberedArgs, $namedArgs;
/**
@@ -1711,8 +1718,11 @@
/**
* Expansion frame with custom arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPCustomFrame_DOM extends PPFrame_DOM {
+ // @codingStandardsIgnoreEnd
+
public $args;
public function __construct( $preprocessor, $args ) {
@@ -1757,8 +1767,10 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPNode_DOM implements PPNode {
+ // @codingStandardsIgnoreEnd
/**
* @var DOMElement
diff --git a/includes/parser/Preprocessor_Hash.php
b/includes/parser/Preprocessor_Hash.php
index d7f5953..f751832 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -26,8 +26,10 @@
* * attribute nodes are children
* * "" nodes that aren't at the top are replaced with
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class Preprocessor_Hash implements Preprocessor {
+ // @codingStandardsIgnoreEnd
/**
* @var Parser
@@ -759,8 +761,11 @@
/**
* Stack class to help Preprocessor::preprocessToObj()
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDStack_Hash extends PPDStack {
+ // @codingStandardsIgnoreEnd
+
public function __construct() {
$this->elementClass = 'PPDStackElement_Hash';
parent::__construct();
@@ -770,8 +775,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDStackElement_Hash extends PPDStackElement {
+ // @codingStandardsIgnoreENd
+
public function __construct( $data = array() ) {
$this->partClass = 'PPDPart_Hash';
parent::__construct( $data );
@@ -808,8 +816,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDPart_Hash extends PPDPart {
+ // @codingStandardsIgnoreEnd
+
public function __construct( $out = '' ) {
$accum = new PPDAccum_Hash;
if ( $out !== '' ) {
@@ -821,8 +832,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPDAccum_Hash {
+ // @codingStandardsIgnoreEnd
+
public $firstNode, $lastNode;
public function __construct() {
@@ -889,8 +903,10 @@
/**
* An expansion frame, used as a context to expand the result of
preprocessToObj()
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPFrame_Hash implements PPFrame {
+ // @codingStandardsIgnoreEnd
/**
* @var Parser
@@ -1453,8 +1469,11 @@
/**
* Expansion frame with template arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPTemplateFrame_Hash extends PPFrame_Hash {
+ // @codingStandardsIgnoreEnd
+
public $numberedArgs, $namedArgs, $parent;
public $numberedExpansionCache, $namedExpansionCache;
@@ -1633,8 +1652,11 @@
/**
* Expansion frame with custom arguments
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPCustomFrame_Hash extends PPFrame_Hash {
+ // @codingStandardsIgnoreEnd
+
public $args;
public function __construct( $preprocessor, $args ) {
@@ -1683,8 +1705,11 @@
/**
* @ingroup Parser
+ * @codingStandardsIgnoreStart
*/
class PPNode_Hash_Tree implements PPNode {
+ // @codingStandardsIgnoreEnd
+
public $name, $firstChild, $lastChild, $nextSibling;
public function __construct( $name ) {
@@ -1905,8 +1930,11 @@
/**
* @ingroup Parser
+ *
[MediaWiki-commits] [Gerrit] Improved the VERP generation by cutting down the hmac hash - change (mediawiki...BounceHandler)
01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153450
Change subject: Improved the VERP generation by cutting down the hmac hash
..
Improved the VERP generation by cutting down the hmac hash
The $local_part of a standard email should be < 64 which was not
taken care of earlier, and there was high chances of crossing it.
Cutting down securely the hmac hash looks fine, as per security
experts.
Added a prefix such as 'wiki-' so that the email-id looks good, and
easy to parse by exim
Change-Id: I167c018be679f6f1535824e94d5aa380dda069a7
---
M BounceHandler.php
M BounceHandlerHooks.php
M includes/ProcessBounceEmails.php
M includes/VerpAddressGenerator.php
M tests/VERPEncodeDecodeTest.php
5 files changed, 23 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler
refs/changes/50/153450/1
diff --git a/BounceHandler.php b/BounceHandler.php
index 9e34cd2..f3f6b0a 100644
--- a/BounceHandler.php
+++ b/BounceHandler.php
@@ -49,11 +49,12 @@
/**
* VERP Configurations
- * wgEnableVERP - Engales VERP for bounce handling
- * wgVERPalgo - Algorithm to hash the return path address.Possible algorithms
are
+ * wgVERPprefix - The prefix of the VERP address.
+ * wgVERPalgorithm - Algorithm to hash the return path address.Possible
algorithms are
* md2. md4, md5, sha1, sha224, sha256, sha384, ripemd128, ripemd160,
whirlpool and more.
* wgVERPsecret - The secret key to hash the return path address
*/
+$wgVERPprefix = 'wiki';
$wgVERPalgorithm = 'md5';
$wgVERPsecret = 'MediawikiVERP';
$wgVERPAcceptTime = 259200; //3 days time
diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index 3817cb9..6f55bcb 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -12,7 +12,7 @@
* @return bool true
*/
public static function onVERPAddressGenerate( $recip, &$returnPath ) {
- global $wgVERPalgorithm, $wgVERPsecret, $wgServer, $wgSMTP;
+ global $wgVERPprefix, $wgVERPalgorithm, $wgVERPsecret,
$wgServer, $wgSMTP;
$user = User::newFromName( $recip[0]->name );
if ( !$user ) {
return true;
@@ -23,7 +23,7 @@
} else {
return true;
}
- $verpAddress = new VerpAddressGenerator( $wgVERPalgorithm,
$wgVERPsecret, $wgServer, $wgSMTP );
+ $verpAddress = new VerpAddressGenerator( $wgVERPprefix,
$wgVERPalgorithm, $wgVERPsecret, $wgServer, $wgSMTP );
$returnPath = $verpAddress->generateVERP( $uid );
return true;
diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index 6159313..5769a4a 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -61,12 +61,12 @@
$failedUser = array();
preg_match( '~(.*?)@~', $hashedEmail, $hashedPart );
$hashedVERPPart = explode( '-', $hashedPart[1] );
- $hashedData = $hashedVERPPart[0]. '-'. $hashedVERPPart[1]. '-'.
$hashedVERPPart[2];
- $bounceTime = base_convert( $hashedVERPPart[2], 36, 10 );
- if ( base64_encode( hash_hmac( $wgVERPalgorithm, $hashedData,
$wgVERPsecret, true ) ) === $hashedVERPPart[3] &&
- $currentTime - $bounceTime < $wgVERPAcceptTime ) {
- $failedUser[ 'wikiId' ] = str_replace( '.', '-',
$hashedVERPPart[0] );
- $failedUser[ 'rawUserId' ] = base_convert(
$hashedVERPPart[1], 36, 10 );
+ $hashedData = $hashedVERPPart[0]. '-'. $hashedVERPPart[1]. '-'.
$hashedVERPPart[2]. '-'. $hashedVERPPart[3];
+ $bounceTime = base_convert( $hashedVERPPart[3], 36, 10 );
+ if ( base64_encode( substr( hash_hmac( $wgVERPalgorithm,
$hashedData, $wgVERPsecret, true ), 0, 12 ) ) === $hashedVERPPart[4]
+ && $currentTime - $bounceTime < $wgVERPAcceptTime ) {
+ $failedUser[ 'wikiId' ] = str_replace( '.', '-',
$hashedVERPPart[1] );
+ $failedUser[ 'rawUserId' ] = base_convert(
$hashedVERPPart[2], 36, 10 );
$failedUser[ 'rawEmail' ] = self::getOriginalEmail(
$failedUser );
$failedUser[ 'bounceTime' ] = $bounceTime;
return $failedUser;
diff --git a/includes/VerpAddressGenerator.php
b/includes/VerpAddressGenerator.php
index db76ebc..d8d916b 100644
--- a/includes/VerpAddressGenerator.php
+++ b/includes/VerpAddressGenerator.php
@@ -33,6 +33,10 @@
/**
* @var string
*/
+ protected $prefix;
+ /**
+* @var string
+*/
protected $algorithm;
/**
@@ -51,12 +55,14 @@
protected $smtp;
/**
+* @param string $prefix
* @param string $algorithm
[MediaWiki-commits] [Gerrit] Tools: Remove lint - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Tools: Remove lint
..
Tools: Remove lint
This leaves a few spots where puppet-lint complains about lines with
more than 80 characters, but changing those just for the sake of it
would be cumbersome and needs to be addressed by a proper refactoring.
Change-Id: Iac4fa7cedcb17a01fe99099c0305dc24c2c5017e
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/dev_environ.pp
M modules/toollabs/manifests/exec_environ.pp
M modules/toollabs/manifests/execnode.pp
M modules/toollabs/manifests/gridnode.pp
M modules/toollabs/manifests/hba.pp
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/mailrelay.pp
M modules/toollabs/manifests/master.pp
M modules/toollabs/manifests/proxy.pp
M modules/toollabs/manifests/redis.pp
M modules/toollabs/manifests/shadow.pp
M modules/toollabs/manifests/submit.pp
M modules/toollabs/manifests/webnode.pp
15 files changed, 65 insertions(+), 65 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 89be6c2..834e4b7 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -33,15 +33,15 @@
mode => '0755',
owner => 'root',
group => 'root',
-source =>
"puppet:///modules/toollabs/40-${instanceproject}-bastion-banner",
+source =>
"puppet:///modules/toollabs/40-${::instanceproject}-bastion-banner",
}
-file { "${store}/submithost-${::fqdn}":
+file { "${toollabs::store}/submithost-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode=> '0444',
-require => File[$store],
+require => File[$toollabs::store],
content => "${::ipaddress}\n",
}
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index caa72fd..8e6991f 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -77,15 +77,15 @@
# pastebinit configuration for http://tools.wmflabs.org/paste/.
file { '/etc/pastebin.d':
-require => Package['pastebinit'],
ensure => 'directory',
+require => Package['pastebinit'],
owner => 'root',
group => 'root',
mode=> '0555',
}
file { '/etc/pastebin.d/tools.conf':
-require => File['/etc/pastebin.d'],
ensure => 'file',
+require => File['/etc/pastebin.d'],
source => 'puppet:///modules/toollabs/pastebinit.conf',
owner => 'root',
group => 'root',
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index 973d227..09c34bb 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -184,10 +184,10 @@
'php5-sqlite',
'php5-xsl',
-# Fonts
-'fonts-ipafont-gothic',# for vCat tool (Japanese fonts)
-'fonts-unfonts-core', # for vCat tool (Korean fonts)
-'ttf-indic-fonts', # for vCat tool (fonts for many Indic
languages)
+# Fonts for vCat tool.
+'fonts-ipafont-gothic',# Japanese fonts.
+'fonts-unfonts-core', # Korean fonts.
+'ttf-indic-fonts', # Many Indic languages.
# tcl packages
'mysqltcl',
diff --git a/modules/toollabs/manifests/execnode.pp
b/modules/toollabs/manifests/execnode.pp
index 14b03c4..19ac4af 100644
--- a/modules/toollabs/manifests/execnode.pp
+++ b/modules/toollabs/manifests/execnode.pp
@@ -20,7 +20,7 @@
}
class { 'toollabs::hba':
-store => $store,
+store => $toollabs::store,
}
file { '/etc/update-motd.d/40-exechost-banner':
@@ -28,18 +28,17 @@
mode => '0755',
owner => 'root',
group => 'root',
-source =>
"puppet:///modules/toollabs/40-${instanceproject}-exechost-banner",
+source =>
"puppet:///modules/toollabs/40-${::instanceproject}-exechost-banner",
}
-file { "${store}/execnode-${::fqdn}":
+file { "${toollabs::store}/execnode-${::fqdn}":
ensure => file,
owner => 'root',
group => 'root',
mode=> '0444',
-require => File[$store],
+require => File[$toollabs::store],
content => "${::ipaddress}\n",
}
# TODO: grid node setup
}
-
diff --git a/modules/toollabs/manifests/gridnode.pp
b/modules/toollabs/manifests/gridnode.pp
index 4d09dac..0f4da43 100644
--- a/modules/toollabs/manifests/gridnode.pp
+++ b/modules/toollabs/manifests/gridnode.pp
@@ -10,9 +10,9 @@
#
class toollabs::gridnode inherits tool
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into deployment - change (wikimedia...crm)
Awight has submitted this change and it was merged.
Change subject: Merge remote-tracking branch 'origin/master' into deployment
..
Merge remote-tracking branch 'origin/master' into deployment
Change-Id: Id70abd01a4cbb401a5a1617bcd223ec7a351bc07
---
D sites/all/modules/queue2civicrm/tests/data/donation.json
D sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
D sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
D sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
D sites/all/modules/queue2civicrm/tests/data/refund.json
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/NameSplitTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
11 files changed, 0 insertions(+), 758 deletions(-)
Approvals:
Awight: Looks good to me, approved
diff --git a/sites/all/modules/queue2civicrm/tests/data/donation.json
b/sites/all/modules/queue2civicrm/tests/data/donation.json
deleted file mode 100644
index 00728d2..000
--- a/sites/all/modules/queue2civicrm/tests/data/donation.json
+++ /dev/null
@@ -1,47 +0,0 @@
-<<< HEAD (9a63b8 (FR #1845) Assert no unconsumed tokens while rendering
thank)
-===
-{
-"anonymous": "1",
-"city_2": "cc",
-"city": "cc",
-"comment": "",
-"contribution_tracking_id": "441",
-"country_2": "DE",
-"country": "IL",
-"currency": "PLN",
-"date": 1234567,
-"email": "test+...@local.net",
-"fee": "0",
-"first_name_2": "b",
-"first_name": "firrst",
-"gateway_account": "default",
-"gateway": "globalcollect",
-"gateway_txn_id": "3611204184",
-"gross": "952.34",
-"language": "en",
-"last_name_2": "w",
-"last_name": "laast",
-"middle_name": "",
-"optout": "1",
-"original_currency": "PLN",
-"original_gross": "952.34",
-"payment_method": "cc",
-"payment_submethod": "visa",
-"postal_code": "11122",
-"postal_code_2": "11122",
-"premium_language": "en",
-"referrer":
"http://payments.local.net/index.php/Special:GlobalCollectGateway?uselang=en&masthead=none&form_name=RapidHtml&text_template=2010/JimmyQuote-green&appeal=JimmyQuote-green&language=ar&ffname=cc_vma&amount=12.34¤cy_code=BRL";,
-"response": "Original Response Status (pre-SET_PAYMENT): 600",
-"size": "",
-"state_province_2": "AL",
-"state_province": "Haifa",
-"street_address_2": "st 2nd.",
-"street_address": "ss",
-"supplemental_address_1": "",
-"supplemental_address_2": "",
-"user_ip": "127.0.0.2",
-"utm_campaign": "",
-"utm_medium": "",
-"utm_source": "..cc"
-}
->>> BRANCH (af4497 Comment that HHVM will mess up this code)
diff --git a/sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
b/sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
deleted file mode 100644
index d6aab1b..000
--- a/sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-"business": "t...@wikimedia.org",
-"charset": "UTF-8",
-"custom": "21578120",
-"first_name": "Warsaw",
-"ipn_track_id": "a2586200c313f",
-"item_name": "Foo",
-"item_number": "DONATE",
-"last_name": "Nato",
-"mc_currency": "",
-"notify_version": "3.7",
-"payer_email": "n...@localhost.net",
-"payer_id": "XTJGLNXXEG3H8",
-"payer_status": "verified",
-"receiver_email": "t...@wikimedia.org",
-"residence_country": "US",
-"subscr_id": "S-3MB38092GW5615720",
-"txn_type": "subscr_eot",
-"verify_sign": "Acb5jgF7-dzo0JtZzwmhjYr8lRJsAizy-qiDD5TGaZVGwj583klds2Ov"
-}
diff --git a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
b/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
deleted file mode 100644
index dc9855a..000
--- a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
+++ /dev/null
@@ -1,43 +0,0 @@
-<<< HEAD (9a63b8 (FR #1845) Assert no unconsumed tokens while rendering
thank)
-===
-{
-"address_city": "Edmonton",
-"address_country": "Canada",
-"address_country_code": "CA",
-"address_name": "Gen Russ",
-"address_state": "Alberta",
-"address_status": "confirmed",
-"address_street": "1211122 132 st",
-"address_zip": "T4V 2L2",
-"business": "t...@wikimedia.org",
-"charset": "UTF-8",
-"custom": "15017277",
-"first_name": "Gen",
-"gateway": "paypal",
-"ipn_track_id": "aab364ce13499",
-"item_name": "Donation to the Wikimedia Foundation",
-"item_number": "DONATE",
-"last_name": "Russ",
-"mc_currency": "CAD",
-"mc_fee": "0.33",
-"mc_gross": "3.00",
-"notify_version": "3.7"
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into deployment - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153443
Change subject: Merge remote-tracking branch 'origin/master' into deployment
..
Merge remote-tracking branch 'origin/master' into deployment
Change-Id: Id70abd01a4cbb401a5a1617bcd223ec7a351bc07
---
D sites/all/modules/queue2civicrm/tests/data/donation.json
D sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
D sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
D sites/all/modules/queue2civicrm/tests/data/recurring_signup.json
D sites/all/modules/queue2civicrm/tests/data/refund.json
D sites/all/modules/queue2civicrm/tests/includes/Message.php
D sites/all/modules/queue2civicrm/tests/phpunit/ProcessMessageTest.php
D sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/NameSplitTest.php
D sites/all/modules/wmf_civicrm/tests/phpunit/RecurringTest.php
D sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
11 files changed, 0 insertions(+), 758 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/43/153443/1
diff --git a/sites/all/modules/queue2civicrm/tests/data/donation.json
b/sites/all/modules/queue2civicrm/tests/data/donation.json
deleted file mode 100644
index 00728d2..000
--- a/sites/all/modules/queue2civicrm/tests/data/donation.json
+++ /dev/null
@@ -1,47 +0,0 @@
-<<< HEAD (9a63b8 (FR #1845) Assert no unconsumed tokens while rendering
thank)
-===
-{
-"anonymous": "1",
-"city_2": "cc",
-"city": "cc",
-"comment": "",
-"contribution_tracking_id": "441",
-"country_2": "DE",
-"country": "IL",
-"currency": "PLN",
-"date": 1234567,
-"email": "test+...@local.net",
-"fee": "0",
-"first_name_2": "b",
-"first_name": "firrst",
-"gateway_account": "default",
-"gateway": "globalcollect",
-"gateway_txn_id": "3611204184",
-"gross": "952.34",
-"language": "en",
-"last_name_2": "w",
-"last_name": "laast",
-"middle_name": "",
-"optout": "1",
-"original_currency": "PLN",
-"original_gross": "952.34",
-"payment_method": "cc",
-"payment_submethod": "visa",
-"postal_code": "11122",
-"postal_code_2": "11122",
-"premium_language": "en",
-"referrer":
"http://payments.local.net/index.php/Special:GlobalCollectGateway?uselang=en&masthead=none&form_name=RapidHtml&text_template=2010/JimmyQuote-green&appeal=JimmyQuote-green&language=ar&ffname=cc_vma&amount=12.34¤cy_code=BRL";,
-"response": "Original Response Status (pre-SET_PAYMENT): 600",
-"size": "",
-"state_province_2": "AL",
-"state_province": "Haifa",
-"street_address_2": "st 2nd.",
-"street_address": "ss",
-"supplemental_address_1": "",
-"supplemental_address_2": "",
-"user_ip": "127.0.0.2",
-"utm_campaign": "",
-"utm_medium": "",
-"utm_source": "..cc"
-}
->>> BRANCH (af4497 Comment that HHVM will mess up this code)
diff --git a/sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
b/sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
deleted file mode 100644
index d6aab1b..000
--- a/sites/all/modules/queue2civicrm/tests/data/paypal_eot.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-"business": "t...@wikimedia.org",
-"charset": "UTF-8",
-"custom": "21578120",
-"first_name": "Warsaw",
-"ipn_track_id": "a2586200c313f",
-"item_name": "Foo",
-"item_number": "DONATE",
-"last_name": "Nato",
-"mc_currency": "",
-"notify_version": "3.7",
-"payer_email": "n...@localhost.net",
-"payer_id": "XTJGLNXXEG3H8",
-"payer_status": "verified",
-"receiver_email": "t...@wikimedia.org",
-"residence_country": "US",
-"subscr_id": "S-3MB38092GW5615720",
-"txn_type": "subscr_eot",
-"verify_sign": "Acb5jgF7-dzo0JtZzwmhjYr8lRJsAizy-qiDD5TGaZVGwj583klds2Ov"
-}
diff --git a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
b/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
deleted file mode 100644
index dc9855a..000
--- a/sites/all/modules/queue2civicrm/tests/data/recurring_payment.json
+++ /dev/null
@@ -1,43 +0,0 @@
-<<< HEAD (9a63b8 (FR #1845) Assert no unconsumed tokens while rendering
thank)
-===
-{
-"address_city": "Edmonton",
-"address_country": "Canada",
-"address_country_code": "CA",
-"address_name": "Gen Russ",
-"address_state": "Alberta",
-"address_status": "confirmed",
-"address_street": "1211122 132 st",
-"address_zip": "T4V 2L2",
-"business": "t...@wikimedia.org",
-"charset": "UTF-8",
-"custom": "15017277",
-"first_name": "Gen",
-"gateway": "paypal",
-"ipn_track_id": "aab364ce13499",
-"item_name": "Donation to the Wikimedia Foundation",
-"item_number": "DONATE",
-"last_name": "Russ",
-"mc_currency": "CA
[MediaWiki-commits] [Gerrit] Pause video/audio when closing dialog - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Pause video/audio when closing dialog
..
Pause video/audio when closing dialog
Silly Gilles, thisref is the thumbnail, not the dialog.
Bug: 69408
Change-Id: I1608b02ba0e64b3a857f79fec41ec8419d03e41a
---
M resources/mw.PopUpThumbVideo.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.PopUpThumbVideo.js b/resources/mw.PopUpThumbVideo.js
index 44bb941..457ddd2 100644
--- a/resources/mw.PopUpThumbVideo.js
+++ b/resources/mw.PopUpThumbVideo.js
@@ -18,7 +18,7 @@
'content' :
$videoContainer,
'close' : function(){
// On close
pause the video on close ( so that playback does not continue )
- var domEl = $(
thisref ).find( 'video,audio' ).get(0);
+ var domEl = $(
this ).find( 'video,audio' ).get(0);
if( domEl &&
domEl.pause ) {
domEl.pause();
}
--
To view, visit https://gerrit.wikimedia.org/r/153438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1608b02ba0e64b3a857f79fec41ec8419d03e41a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Travis CI: Drop 5.3 as a build target" - change (mediawiki/core)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/153439 Change subject: Revert "Travis CI: Drop 5.3 as a build target" .. Revert "Travis CI: Drop 5.3 as a build target" This reverts commit 420f55ad976a4929fdc9b1eff9ed2b6044c633d6. Change-Id: I4c8aa600c72041daf49ed6158b9375bdcc5c9015 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/39/153439/1 diff --git a/.travis.yml b/.travis.yml index 64075f1..4e03068 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ php: - hhvm-nightly + - 5.3 services: - mysql -- To view, visit https://gerrit.wikimedia.org/r/153439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c8aa600c72041daf49ed6158b9375bdcc5c9015 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pause video/audio when closing dialog - change (mediawiki...TimedMediaHandler)
MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153438
Change subject: Pause video/audio when closing dialog
..
Pause video/audio when closing dialog
Silly Gilles, thisref is the thumbnail, not the dialog.
Bug: 69408
Change-Id: I1608b02ba0e64b3a857f79fec41ec8419d03e41a
---
M resources/mw.PopUpThumbVideo.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/38/153438/1
diff --git a/resources/mw.PopUpThumbVideo.js b/resources/mw.PopUpThumbVideo.js
index 44bb941..457ddd2 100644
--- a/resources/mw.PopUpThumbVideo.js
+++ b/resources/mw.PopUpThumbVideo.js
@@ -18,7 +18,7 @@
'content' :
$videoContainer,
'close' : function(){
// On close
pause the video on close ( so that playback does not continue )
- var domEl = $(
thisref ).find( 'video,audio' ).get(0);
+ var domEl = $(
this ).find( 'video,audio' ).get(0);
if( domEl &&
domEl.pause ) {
domEl.pause();
}
--
To view, visit https://gerrit.wikimedia.org/r/153438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1608b02ba0e64b3a857f79fec41ec8419d03e41a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't limit the height of CPB - change (mediawiki...VectorBeta)
JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153437
Change subject: Don't limit the height of CPB
..
Don't limit the height of CPB
This means we can't so height animation in CSS, but opacity-only
animation seems pleasent enough to the eye.
We can't limit height because we don't know how many item CPB will
contain if people install additional gadgets.
Bug: 65285
Change-Id: I8d6551bccc5cbb85ff4b4dd4afb53e15dc6a163e
---
M resources/compactPersonalBar/compactPersonalBar.less
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta
refs/changes/37/153437/1
diff --git a/resources/compactPersonalBar/compactPersonalBar.less
b/resources/compactPersonalBar/compactPersonalBar.less
index 13abe8c..ee49c42 100644
--- a/resources/compactPersonalBar/compactPersonalBar.less
+++ b/resources/compactPersonalBar/compactPersonalBar.less
@@ -53,11 +53,11 @@
opacity: 0;
overflow: hidden;
- .transition(max-height @fadeDuration @fadeDelay,
opacity @fadeDuration @fadeDelay;);
+ .transition(max-height 0s @fadeDelay, opacity
@fadeDuration @fadeDelay;);
}
&:hover ul {
- max-height: 30em;
+ max-height: px;
opacity: 1;
}
--
To view, visit https://gerrit.wikimedia.org/r/153437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d6551bccc5cbb85ff4b4dd4afb53e15dc6a163e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: JGonera
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove messages defined in core - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153436
Change subject: Remove messages defined in core
..
Remove messages defined in core
Depends on Ia1c2ca2 in core.
Change-Id: I2d6aeb7f41e445c7b400187220f113aacd0a3bf2
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
2 files changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/36/153436/1
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 071e287..bb68f77 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -240,9 +240,7 @@
"visualeditor-settings-tool": "Page settings",
"visualeditor-timeout":"It looks like this editor is currently
unavailable. Would you like to edit in source mode instead?",
"visualeditor-toolbar-cite-label": "Cite",
-"visualeditor-toolbar-format-tooltip": "Format paragraph",
"visualeditor-toolbar-savedialog": "Save page",
-"visualeditor-toolbar-style-tooltip": "Style text",
"visualeditor-usernamespacepagelink": "Project:User namespace",
"visualeditor-viewpage-savewarning": "Are you sure you want to go back to
view mode without saving first?",
"visualeditor-viewpage-savewarning-title": "Are you sure?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 8425aab..2b978de 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -249,9 +249,7 @@
"visualeditor-timeout": "Text (JavaScript confirm()) shown when the
editor fails to load properly due to a 504 Gateway Timeout error.",
"visualeditor-toolbar-cancel": "Label text for button to exit from
VisualEditor.\n{{Identical|Cancel}}",
"visualeditor-toolbar-cite-label": "Label text for the toolbar button
for inserting customized references.\n{{Identical|Cite}}",
- "visualeditor-toolbar-format-tooltip": "Tooltip text for the paragraph
formatting menu which contains the following items:\n*
{{msg-mw|Visualeditor-formatdropdown-format-paragraph}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading1}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading2}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading3}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading4}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading5}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading6}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-preformatted}}",
"visualeditor-toolbar-savedialog": "Label text for button to open save
dialog.\n\nUsed in:\n*
{{msg-mw|Guidedtour-tour-gettingstartedtasktoolbarve-click-save-description}}.\n{{Identical|Save
page}}",
- "visualeditor-toolbar-style-tooltip": "Tooltip text for the text
styling menu which has the following items:\n*
{{msg-mw|Visualeditor-annotationbutton-bold-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-code-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-italic-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-language-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-link-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-strikethrough-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-subscript-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-superscript-tooltip}}\n*
{{msg-mw|Visualeditor-annotationbutton-underline-tooltip}}",
"visualeditor-usernamespacepagelink": "Name of a page describing the
user namespace (NS2) in this project.\n{{doc-important|Do not translate
\"Project\"; it is automatically converted to the wiki's project namespace.}}",
"visualeditor-viewpage-savewarning": "Text shown when the user tries to
leave the editor without saving their changes.\n\nFollowed by the following
buttons:\n* {{msg-mw|Visualeditor-viewpage-savewarning-discard}}\n*
{{msg-mw|Visualeditor-viewpage-savewarning-keep}}",
"visualeditor-viewpage-savewarning-title": "Title of the dialog shown
when the user tries to leave the editor without saving their
changes.\n\nFollowed by the following buttons:\n*
{{msg-mw|Visualeditor-viewpage-savewarning-discard}}\n*
{{msg-mw|Visualeditor-viewpage-savewarning-keep}}",
--
To view, visit https://gerrit.wikimedia.org/r/153436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d6aeb7f41e445c7b400187220f113aacd0a3bf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add zuul trigger for codesniffer phplint - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add zuul trigger for codesniffer phplint .. Add zuul trigger for codesniffer phplint Change-Id: Ia38363ddf23c79ef6f58546425dbf976ba75417b --- M layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 8f9982b..d439083 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2152,6 +2152,12 @@ gate-and-submit: - mw-tools-codeutils-phplint + - name: mediawiki/tools/codesniffer +check-voter: + - mw-tools-codesniffer-phplint +gate-and-submit: + - mw-tools-codesniffer-phplint + - name: mediawiki/tools/dippybird check-voter: - mw-tools-dippybird-phplint -- To view, visit https://gerrit.wikimedia.org/r/153418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia38363ddf23c79ef6f58546425dbf976ba75417b Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing messages from MW - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153435
Change subject: Add missing messages from MW
..
Add missing messages from MW
Change-Id: Ia1c2ca21e85961cfa4faddc76fd8673ffc9aaf39
---
M modules/ve/i18n/en.json
M modules/ve/i18n/qqq.json
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/35/153435/1
diff --git a/modules/ve/i18n/en.json b/modules/ve/i18n/en.json
index 4254f5c..22c0abd 100644
--- a/modules/ve/i18n/en.json
+++ b/modules/ve/i18n/en.json
@@ -93,10 +93,12 @@
"visualeditor-specialcharacter-button-tooltip": "Special character",
"visualeditor-specialcharacterinspector-title": "Special character",
"visualeditor-specialcharinspector-characterlist-insert":
"{\n\t\"Symbols\": {\n\t\t\"−\": \"−\",\n\t\t\"—\": \"—\",\n\t\t\"°\":
\"°\",\n\t\t\"′\": \"′\",\n\t\t\"″\": \"″\",\n\t\t\"←\": \"←\",\n\t\t\"→\":
\"→\",\n\t\t\"« »\" : \"« »\",\n\t\t\"“”\" : \"“”\",\n\t\t\"#\" :
\"#\",\n\t\t\"@\" : \"@\",\n\t\t\"|\" : \"|\",\n\t\t\"~\" : \"~\",\n\t\t\"§\":
\"§\",\n\t\t\"•\" : \"•\",\n\t\t\"·\": \"·\",\n\t\t\"…\" : \"…\",\n\t\t\"€\" :
\"€\"\n\t},\n\t\"Accents\": {\n\t\t\"Æ\" : \"Æ\",\n\t\t\"æ\" :
\"æ\",\n\t\t\"À\" : \"À\",\n\t\t\"à\" : \"à\",\n\t\t\"Â\" : \"Â\",\n\t\t\"â\" :
\"â\",\n\t\t\"Ä\" : \"Ä\",\n\t\t\"ä\" : \"ä\",\n\t\t\"Å\" : \"Å\",\n\t\t\"å\" :
\"å\",\n\t\t\"Ç\" : \"Ç\",\n\t\t\"ç\" : \"ç\",\n\t\t\"È\" : \"È\",\n\t\t\"è\" :
\"è\",\n\t\t\"É\" : \"É\",\n\t\t\"é\" : \"é\",\n\t\t\"Ê\" : \"Ê\",\n\t\t\"ê\" :
\"ê\",\n\t\t\"Ë\" : \"Ë\",\n\t\t\"ë\" : \"ë\",\n\t\t\"Î\" : \"Î\",\n\t\t\"î\" :
\"î\",\n\t\t\"Ï\" : \"Ï\",\n\t\t\"ï\" : \"ï\",\n\t\t\"Ô\" : \"Ô\",\n\t\t\"ô\" :
\"ô\",\n\t\t\"Ö\" : \"Ö\",\n\t\t\"ö\" : \"ö\",\n\t\t\"Ø\" : \"Ø\",\n\t\t\"ø\" :
\"ø\",\n\t\t\"Ù\" : \"Ù\",\n\t\t\"ù\" : \"ù\",\n\t\t\"Û\" : \"Û\",\n\t\t\"û\" :
\"û\",\n\t\t\"Ü\" : \"Ü\",\n\t\t\"ü\" : \"ü\",\n\t\t\"Ÿ\" : \"Ÿ\",\n\t\t\"ÿ\" :
\"ÿ\",\n\t\t\"Œ\" : \"Œ\",\n\t\t\"œ\" : \"œ\"\n\t},\n\t\"Mathematical\":
{\n\t\t\"−\": \"−\",\n\t\t\"×\": \"×\",\n\t\t\"÷\": \"÷\",\n\t\t\"≈\":
\"≈\",\n\t\t\"≠\": \"≠\",\n\t\t\"≤\": \"≤\",\n\t\t\"≥\": \"≥\",\n\t\t\"±\":
\"±\",\n\t\t\"¹\" : \"¹\",\n\t\t\"²\" : \"²\",\n\t\t\"³\" : \"³\",\n\t\t\"⁴\" :
\"⁴\",\n\t\t\"⁵\" : \"⁵\",\n\t\t\"⁶\" : \"⁶\",\n\t\t\"⁷\" : \"⁷\",\n\t\t\"⁸\" :
\"⁸\",\n\t\t\"⁹\" : \"⁹\",\n\t\t\"⁰\" : \"⁰\",\n\t\t\"½\" : \"½\"\n\t}\n}",
+"visualeditor-toolbar-format-tooltip": "Format paragraph",
"visualeditor-toolbar-history": "History",
"visualeditor-toolbar-insert": "Insert",
"visualeditor-toolbar-paragraph-format": "Formatting",
"visualeditor-toolbar-structure": "Structure",
+"visualeditor-toolbar-style-tooltip": "Style text",
"visualeditor-toolbar-text-style": "Styling",
"visualeditor-version-label": "Version"
}
diff --git a/modules/ve/i18n/qqq.json b/modules/ve/i18n/qqq.json
index 1039764..3659628 100644
--- a/modules/ve/i18n/qqq.json
+++ b/modules/ve/i18n/qqq.json
@@ -97,10 +97,12 @@
"visualeditor-specialcharacter-button-tooltip": "Tooltip text for the
insert character button.\n{{Identical|Special character}}",
"visualeditor-specialcharacterinspector-title": "Used as title for
special character inspector.\n{{Identical|Special character}}",
"visualeditor-specialcharinspector-characterlist-insert": "This is a
JSON string defining the special characters that can be inserted using the
special character insertion tool.\n{{doc-important|Please make sure it is a
valid JSON string.}}\n{{Optional}}",
+ "visualeditor-toolbar-format-tooltip": "Tooltip text for the paragraph
formatting menu which contains the following items:\n*
{{msg-mw|Visualeditor-formatdropdown-format-paragraph}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading1}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading2}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading3}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading4}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading5}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-mw-heading6}}\n*
{{msg-mw|Visualeditor-formatdropdown-format-preformatted}}",
"visualeditor-toolbar-history": "Label text for the 'history' menu in
the toolbar of the undo and redo tools.\n\nSee also:\n*
{{msg-mw|visualeditor-toolbar-insert}}\n*
{{msg-mw|visualeditor-toolbar-paragraph-format}}\n*
{{msg-mw|visualeditor-toolbar-structure}}\n*
{{msg-mw|visualeditor-toolbar-text-style}}\n{{Identical|History}}",
"visualeditor-toolbar-insert": "Label text for the 'insert' menu in the
toolbar of tools that let you add items, like images.\n\nSee also:\n*
{{msg-mw|visualeditor-toolbar-history}}\n*
{{msg-mw|visualeditor-toolbar-paragraph-format}}\n*
{{msg-mw|visualeditor-toolbar-structure}}\n*
{{msg-mw|visualeditor-toolbar-text-style}}\n{{Identical|Insert}}",
[MediaWiki-commits] [Gerrit] Logstash filter changes to support messages from Hadoop - change (operations/puppet)
Gage has submitted this change and it was merged.
Change subject: Logstash filter changes to support messages from Hadoop
..
Logstash filter changes to support messages from Hadoop
* Refactor of https://gerrit.wikimedia.org/r/#/c/140623
* Incorporated feedback from BDavis to eliminate leading underscores and
conform with Monolog notions of "type" and "channel"
* Only affects messages where type="Hadoop"
Change-Id: I78e6e2a3a8bafbda76c7f6dec55a69233037f2b6
---
M files/logstash/filter-gelf.conf
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logstash/filter-gelf.conf b/files/logstash/filter-gelf.conf
index 65cc958..23f8711 100644
--- a/files/logstash/filter-gelf.conf
+++ b/files/logstash/filter-gelf.conf
@@ -1,5 +1,15 @@
filter {
if [type] == "gelf" {
+if [facility] == "Hadoop" {
+ mutate {
+replace => [ "channel", "%{_SourceSimpleClassName}" ]
+replace => [ "Severity", "%{_Severity}" ]
+replace => [ "ClassName", "%{_SourceClassName}" ]
+replace => [ "MethodName", "%{_SourceMethodName}" ]
+replace => [ "Thread", "%{_Thread}" ]
+replace => [ "LoggerName", "%{_LoggerName}" ]
+ }
+}
mutate {
# tag gelf messages for storage in elasticsearch
add_tag => [ "es", "gelf" ]
--
To view, visit https://gerrit.wikimedia.org/r/153434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78e6e2a3a8bafbda76c7f6dec55a69233037f2b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage
Gerrit-Reviewer: Gage
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 job for codecoverage phplint - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add job for codecoverage phplint
..
Add job for codecoverage phplint
Change-Id: Ie6de95ebab0ae062f8410841a957477a89687fb4
---
M mediawiki-tools.yaml
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-tools.yaml b/mediawiki-tools.yaml
index 768fbfd..55edcac 100644
--- a/mediawiki-tools.yaml
+++ b/mediawiki-tools.yaml
@@ -6,6 +6,12 @@
- python-jobs
- project:
+name: 'mw-tools-codesniffer'
+
+jobs:
+ - '{name}-phplint'
+
+- project:
name: 'mw-tools-dippybird'
jobs:
--
To view, visit https://gerrit.wikimedia.org/r/153417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6de95ebab0ae062f8410841a957477a89687fb4
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
