[MediaWiki-commits] [Gerrit] [WIP] Add Graphite module & role - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92271
Change subject: [WIP] Add Graphite module & role
..
[WIP] Add Graphite module & role
Work-in-progress.
What is included:
-
- Carbon / Whisper configs.
Still to be done:
-
- Graphite webapp & its dependencies:
- memcached
- apache + mod_wsgi or nginx + gunicorn
- aggregation-rules.conf
- monitoring
- decomissioning
Things that could be controversial:
---
- The Upstart configs are my own invention. Graphite ships with a crummy init.d
script that only works for basic setups. Most people roll their own, but I
thought I could do a better job, esp. since I still had my EventLogging work
to refer to.
- The one-size-fits-all retention schema. I settled on it after concluding that
the uniformity and simplicity provided by having one retention policy was a
better & safer bet than trying to improve resource utilization by auguring
the future.
- File layout. Graphite keeps almost everything in /opt/graphite by default,
but it is possible to configure it to use FHS-compliant locations. I decided
to stick with /opt/graphite because it is routinely taken for granted by
authors of blog posts, mailing list posts, etc., and even the Graphite docs
themselves, and I found that having to constantly map /opt/graphite paths to
their FHS equivalents was mentally taxing.
Change-Id: If563923aa55aef77111637aacbb6a93950d9066e
---
A manifests/role/graphite.pp
M manifests/site.pp
A modules/graphite/files/carbon-upstart/cache.conf
A modules/graphite/files/carbon-upstart/init.conf
A modules/graphite/files/carbon-upstart/relay.conf
A modules/graphite/files/graphite.limits.conf
A modules/graphite/lib/puppet/parser/functions/configparser_format.rb
A modules/graphite/manifests/init.pp
8 files changed, 239 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/92271/1
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
new file mode 100644
index 000..7383a31
--- /dev/null
+++ b/manifests/role/graphite.pp
@@ -0,0 +1,72 @@
+class role::graphite {
+class { 'graphite':
+retention => {
+# Retain data at a one-minute resolution for one year and at a
+# ten-minute resolution for ten years. It's clear & easy to
remember.
+# Avoid making this more complicated that it needs to be.
+'default' => {
+pattern=> '.*',
+retentions => '1m:1y,10m:10y',
+},
+},
+
+# All metric data goes through a single carbon-relay instance, which
+# forwards each data point to one of four carbon-cache instances,
using a
+# consistent hash ring to distribute the load.
+#
+# Why is this necessary? Because carbon-cache is CPU-bound, and the
Python
+# GIL prevents it from utilizing multiple processor cores efficiently.
+#
+# cf. "Single node, multiple carbon-caches"
+# .
+carbon => {
+'cache' => {
+log_updates => false,# Don't log Whisper
updates.
+user => undef,# Don't suid;
Upstart will do it for us.
+line_receiver_interface => '127.0.0.1', # Only the relay
binds to 0.0.0.0.
+pickle_receiver_interface => '127.0.0.1',
+
+},
+
+## Carbon caches ##
+
+'cache:a' => {
+line_receiver_port => 2103,
+pickle_receiver_port => 2104,
+cache_query_port => 7102,
+},
+'cache:b' => {
+line_receiver_port => 2203,
+pickle_receiver_port => 2204,
+cache_query_port => 7202,
+},
+'cache:c' => {
+line_receiver_port => 2303,
+pickle_receiver_port => 2304,
+cache_query_port => 7302,
+},
+'cache:d' => {
+line_receiver_port => 2403,
+pickle_receiver_port => 2404,
+cache_query_port => 7402,
+},
+
+## Carbon relay ##
+
+'relay' => {
+line_receiver_interface => '0.0.0.0',
+pickle_receiver_interface => '0.0.0.0',
+relay_method => 'consistent-hashing',
+destinations => [
+'127.0.0.1:2104:a',
+'127.0.0.1:2204:b',
+'127.0.0.1:2304:c',
+'127.0.0.1:2404:d',
+
[MediaWiki-commits] [Gerrit] Unbreak some unit tests - change (mediawiki...Echo)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92270
Change subject: Unbreak some unit tests
..
Unbreak some unit tests
Not all installations will have a user with the id of 2,
like jenkins. At some point User::getOption is called, which
requires loading the user from the database, except it
doesn't exist. At which point the user id is reset to 0,
so it becomes an anonymous user, breaking the test.
Since the MediaWiki test runner automatically
creates a test user, we can safely assume that there is
a user with the id 1.
Change-Id: Iacf904d04f1ff5aaf584cb98c3083ef6d7d89cea
---
M tests/EmailFormatterTest.php
M tests/NotificationFormatterTest.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/70/92270/1
diff --git a/tests/EmailFormatterTest.php b/tests/EmailFormatterTest.php
index a8609d5..ef69e5b 100644
--- a/tests/EmailFormatterTest.php
+++ b/tests/EmailFormatterTest.php
@@ -19,10 +19,10 @@
$formatter = EchoNotificationFormatter::factory(
$wgEchoNotifications[$event->getType()] );
$formatter->setOutputFormat( 'email' );
- $user = User::newFromId( 2 );
+ $user = User::newFromId( 1 );
$user->setName( 'Test' );
$user->setOption( 'echo-email-format',
EchoHooks::EMAIL_FORMAT_HTML );
-
+
$this->emailSingle = new EchoEmailSingle( $formatter, $event,
$user );
$content[$event->getCategory()][] =
EchoNotificationController::formatNotification( $event, $user, 'email',
'emaildigest' );
diff --git a/tests/NotificationFormatterTest.php
b/tests/NotificationFormatterTest.php
index 43eb84b..c2d63de 100644
--- a/tests/NotificationFormatterTest.php
+++ b/tests/NotificationFormatterTest.php
@@ -206,7 +206,7 @@
$formatter->setOutputFormat( $format );
// Notification users can not be anonymous, use a fake user id
- return $formatter->format( $event, User::newFromId( 2 ), $type
);
+ return $formatter->format( $event, User::newFromId( 1 ), $type
);
}
protected function mockEvent( $type, array $extra = array(), Revision
$rev = null ) {
--
To view, visit https://gerrit.wikimedia.org/r/92270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacf904d04f1ff5aaf584cb98c3083ef6d7d89cea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Another debug output for ESI beta testing - change (mediawiki...ZeroRatedMobileAccess)
jenkins-bot has submitted this change and it was merged.
Change subject: Another debug output for ESI beta testing
..
Another debug output for ESI beta testing
This patch should not affect production -- X-FORCE-ESI is unset
by varnish.
Change-Id: I8ff0f41a6b38cd876754ae8c5a889117c4889324
---
M includes/PageRenderingHooks.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 5d4f0a6..4934733 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -422,6 +422,12 @@
global $wgZeroRatedMobileAccessEnableESI;
// fixme: temporary until we stabilize it, then remove
X-FORCE-ESI check
$esiHeader = $this->request->getHeader( 'X-FORCE-ESI' );
+ if ( $esiHeader === 'TMP1' ) {
+ return 'http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
+ } elseif ( $esiHeader === 'TMP2' ) {
+ return 'http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
+ }
+
if ( $wgZeroRatedMobileAccessEnableESI === true || $esiHeader )
{
# Add an 'Enable-ESI' header for varnish
$this->request->response()->header( 'Enable-ESI: 1' );
--
To view, visit https://gerrit.wikimedia.org/r/92269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ff0f41a6b38cd876754ae8c5a889117c4889324
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Another debug output for ESI beta testing - change (mediawiki...ZeroRatedMobileAccess)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92269
Change subject: Another debug output for ESI beta testing
..
Another debug output for ESI beta testing
This patch should not affect production -- X-FORCE-ESI is unset
by varnish.
Change-Id: I8ff0f41a6b38cd876754ae8c5a889117c4889324
---
M includes/PageRenderingHooks.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/69/92269/1
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 5d4f0a6..4934733 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -422,6 +422,12 @@
global $wgZeroRatedMobileAccessEnableESI;
// fixme: temporary until we stabilize it, then remove
X-FORCE-ESI check
$esiHeader = $this->request->getHeader( 'X-FORCE-ESI' );
+ if ( $esiHeader === 'TMP1' ) {
+ return 'http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
+ } elseif ( $esiHeader === 'TMP2' ) {
+ return 'http://en.m.wikipedia.beta.wmflabs.org/w/index.php?title=Special:ZeroRatedMobileAccess&renderesibanner=1";
onerror="continue"/>';
+ }
+
if ( $wgZeroRatedMobileAccessEnableESI === true || $esiHeader )
{
# Add an 'Enable-ESI' header for varnish
$this->request->response()->header( 'Enable-ESI: 1' );
--
To view, visit https://gerrit.wikimedia.org/r/92269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ff0f41a6b38cd876754ae8c5a889117c4889324
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually run all the unit tests - change (mediawiki...Echo)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92268
Change subject: Actually run all the unit tests
..
Actually run all the unit tests
Change-Id: Ia411cc32f0d0ac17ce43cbe20be17773cad055a7
---
M Hooks.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/68/92268/1
diff --git a/Hooks.php b/Hooks.php
index 7fe6c61..758a1c5 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -737,8 +737,7 @@
* @return bool true in all cases
*/
static function getUnitTests( &$files ) {
- $dir = dirname( __FILE__ ) . '/tests';
- $files[] = "$dir/DiscussionParserTest.php";
+ $files += glob( __DIR__ . '/tests/*Test.php' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/92268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia411cc32f0d0ac17ce43cbe20be17773cad055a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Remove references to 'olivneh' account from node defs - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92267
Change subject: Remove references to 'olivneh' account from node defs
..
Remove references to 'olivneh' account from node defs
'olivneh' is now disabled; I use 'ori'. Because I have files in my home
directory on some of these systems, I am not purging the account from the
systems it was on, merely removing it from the manifest. I also removed
groups::wikidev from vanadium, professor, nickel & tungsten, where it was added
as part of granting me access. No other accounts in the wikidev group were
specified for these systems.
Change-Id: Ic90a73af0df6f608085721866b46d1e431eaed47
---
M manifests/site.pp
1 file changed, 3 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/92267/1
diff --git a/manifests/site.pp b/manifests/site.pp
index adae38d..e701a6f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2135,15 +2135,9 @@
include standard,
ganglia::web,
-misc::monitoring::views,
-groups::wikidev,
-accounts::olivneh
+misc::monitoring::views
install_certificate{ "star.wikimedia.org": }
-
- sudo_user { 'olivneh':
- privileges => ['ALL = (ALL) NOPASSWD: ALL'],
- }
}
node /^osm-cp100[1-4]\.wikimedia\.org$/ {
@@ -2209,13 +2203,7 @@
ganglia,
ntp::client,
udpprofile::collector,
-misc::graphite,
-groups::wikidev,
-accounts::olivneh
-
-sudo_user { 'olivneh':
-privileges => ['ALL = (ALL) NOPASSWD: ALL'],
-}
+misc::graphite
}
node "project1.wikimedia.org" {
@@ -2600,7 +2588,6 @@
accounts::mflaschen, # RT 4796
accounts::mgrover, # RT 4600
accounts::mlitn, # RT 4959
-accounts::olivneh, # RT 3451
accounts::otto,
accounts::reedy,
accounts::rfaulk,# RT 5040
@@ -2806,13 +2793,11 @@
$gid=500
include standard,
-groups::wikidev,
-accounts::olivneh,
role::eventlogging,
role::ipython_notebook,
role::logging::mediawiki::errors
-sudo_user { [ 'otto', 'olivneh' ]:
+sudo_user { 'otto':
privileges => ['ALL = (ALL) NOPASSWD: ALL'],
}
}
@@ -2821,28 +2806,15 @@
# and MediaWiki errors. Non-critical at the moment. See RT #5514.
node 'hafnium.wikimedia.org' {
include standard,
-groups::wikidev,
-accounts::olivneh,
role::eventlogging::graphite,
misc::graphite::navtiming,
webperf
-
-sudo_user { 'olivneh':
-privileges => ['ALL = (ALL) NOPASSWD: ALL'],
-}
}
# StatsD & Graphite host for eqiad. Slotted to replace professor.pmtpa.
# RT #5871
node 'tungsten.eqiad.wmnet' {
-# services
include standard, role::statsd
-
-# access
-include groups::wikidev, accounts::olivneh
-sudo_user { 'olivneh':
-privileges => ['ALL = (ALL) NOPASSWD: ALL'],
-}
}
node "virt1000.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/92267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic90a73af0df6f608085721866b46d1e431eaed47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only allow throttling if object caching is enabled... - change (mediawiki...AbuseFilter)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92266
Change subject: Only allow throttling if object caching is enabled...
..
Only allow throttling if object caching is enabled...
...otherwise it doesn't work.
This change add 2 checks for object caching, one for the filter
configuration interface, and one for the actual throttle checking.
Bug: 50894
Change-Id: I89ebcc6ff7d91d3a9ad8e744c0c4ff3e33e3b673
---
M AbuseFilter.class.php
M Views/AbuseFilterViewEdit.php
2 files changed, 46 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/66/92266/1
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 61939ce..2444562 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -702,6 +702,7 @@
* the errors and warnings to be shown to the user to explain
the actions.
*/
public static function executeFilterActions( $filters, $title, $vars ) {
+ global $wgMainCacheType;
wfProfileIn( __METHOD__ );
$actionsByFilter = self::getConsequencesForFilters( $filters );
@@ -717,7 +718,9 @@
$global_filter = ( preg_match( '/^global-/', $filter )
== 1);
- if ( !empty( $actions['throttle'] ) ) {
+ // If the filter is throttled and throttling is
available via object
+ // caching, check to see if the user has hit the
throttle.
+ if ( !empty( $actions['throttle'] ) && $wgMainCacheType
) {
$parameters =
$actions['throttle']['parameters'];
$throttleId = array_shift( $parameters );
list( $rateCount, $ratePeriod ) = explode( ',',
array_shift( $parameters ) );
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 155d5e3..6a15bcd 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -581,7 +581,7 @@
* @return string
*/
function buildConsequenceSelector( $action, $set, $parameters, $row ) {
- global $wgAbuseFilterAvailableActions;
+ global $wgAbuseFilterAvailableActions, $wgMainCacheType;
if ( !in_array( $action, $wgAbuseFilterAvailableActions ) ) {
return '';
@@ -597,45 +597,50 @@
switch( $action ) {
case 'throttle':
- $throttleSettings = Xml::checkLabel(
- $this->msg(
'abusefilter-edit-action-throttle' )->text(),
- 'wpFilterActionThrottle',
-
"mw-abusefilter-action-checkbox-$action",
- $set,
- array( 'class' =>
'mw-abusefilter-action-checkbox' ) + $cbReadOnlyAttrib );
- $throttleFields = array();
-
- if ( $set ) {
- array_shift( $parameters );
- $throttleRate = explode( ',',
$parameters[0] );
- $throttleCount = $throttleRate[0];
- $throttlePeriod = $throttleRate[1];
-
- $throttleGroups = implode( "\n",
array_slice( $parameters, 1 ) );
+ // Throttling is only available via object
caching
+ if ( !$wgMainCacheType ) {
+ return '';
} else {
- $throttleCount = 3;
- $throttlePeriod = 60;
+ $throttleSettings = Xml::checkLabel(
+ $this->msg(
'abusefilter-edit-action-throttle' )->text(),
+ 'wpFilterActionThrottle',
+
"mw-abusefilter-action-checkbox-$action",
+ $set,
+ array( 'class' =>
'mw-abusefilter-action-checkbox' ) + $cbReadOnlyAttrib );
+ $throttleFields = array();
- $throttleGroups = "user\n";
+ if ( $set ) {
+ array_shift( $parameters );
+ $throttleRate = explode( ',',
$parameters[0] );
+ $throttleCount =
$throttleRate[0];
+ $th
[MediaWiki-commits] [Gerrit] Correcting timestamp request in loading deleted revisions - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Correcting timestamp request in loading deleted revisions .. Correcting timestamp request in loading deleted revisions I checked it and it worked correctly, you can test it by adding "print self._deletedRevs" before line 1325 Bug: 54546 Change-Id: I054097840cc6d69da107425868f92357cf12ce50 --- M pywikibot/page.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index cb06350..78ce1d0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1324,8 +1324,8 @@ if hasattr(self, "_deletedRevs"): if timestamp in self._deletedRevs and ( (not retrieveText) -or "content" in self._deletedRevs["timestamp"]): -return self._deletedRevs["timestamp"] +or "content" in self._deletedRevs[timestamp]): +return self._deletedRevs[timestamp] for item in self.site.deletedrevs(self, start=timestamp, get_text=retrieveText, total=1): # should only be one item with one revision -- To view, visit https://gerrit.wikimedia.org/r/92255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I054097840cc6d69da107425868f92357cf12ce50 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updating vikidia languages: +it, +ru - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: updating vikidia languages: +it, +ru
..
updating vikidia languages: +it, +ru
Change-Id: I028882145592ec950de8ace36527aca3aa37b0bd
---
M pywikibot/families/vikidia_family.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/vikidia_family.py
b/pywikibot/families/vikidia_family.py
index de1c805..635571c 100644
--- a/pywikibot/families/vikidia_family.py
+++ b/pywikibot/families/vikidia_family.py
@@ -13,6 +13,8 @@
self.langs = {
'fr': 'fr.vikidia.org',
'es': 'es.vikidia.org',
+'it': 'it.vikidia.org',
+'ru': 'ru.vikidia.org',
}
# Wikimedia wikis all use "bodyContent" as the id of the
--
To view, visit https://gerrit.wikimedia.org/r/92265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I028882145592ec950de8ace36527aca3aa37b0bd
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Linedwell
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updating vikidia languages: +it, +ru - change (pywikibot/core)
Linedwell has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92265
Change subject: updating vikidia languages: +it, +ru
..
updating vikidia languages: +it, +ru
Change-Id: I028882145592ec950de8ace36527aca3aa37b0bd
---
M pywikibot/families/vikidia_family.py
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/65/92265/1
diff --git a/pywikibot/families/vikidia_family.py
b/pywikibot/families/vikidia_family.py
index de1c805..f531c24 100644
--- a/pywikibot/families/vikidia_family.py
+++ b/pywikibot/families/vikidia_family.py
@@ -13,6 +13,9 @@
self.langs = {
'fr': 'fr.vikidia.org',
'es': 'es.vikidia.org',
+'it': 'it.vikidia.org',
+'ru': 'ru.vikidia.org',
+
}
# Wikimedia wikis all use "bodyContent" as the id of the
--
To view, visit https://gerrit.wikimedia.org/r/92265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I028882145592ec950de8ace36527aca3aa37b0bd
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Linedwell
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing documentation for memcached. - change (mediawiki/core)
Kaldari has uploaded a new change for review. https://gerrit.wikimedia.org/r/92264 Change subject: Fixing documentation for memcached. .. Fixing documentation for memcached. I believe that MediaWiki's memcached client does support PECL now. Also fixing a typo. Change-Id: Ibcf9c25d077b19de733cc79b5664437479f23a3b --- M docs/memcached.txt 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/92264/1 diff --git a/docs/memcached.txt b/docs/memcached.txt index f54a4e7..0785c4a 100644 --- a/docs/memcached.txt +++ b/docs/memcached.txt @@ -78,7 +78,6 @@ == PHP client for memcached == MediaWiki uses a fork of Ryan T. Dean's pure-PHP memcached client. -The newer PECL module is not yet supported. MediaWiki uses three object for object caching: * $wgMemc, controlled by $wgMainCacheType @@ -91,7 +90,7 @@ disable itself fairly smoothly. By default, $wgMemc is used but when it is $parserMemc or $messageMemc -this is mentionned below. +this is mentioned below. == Keys used == -- To view, visit https://gerrit.wikimedia.org/r/92264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcf9c25d077b19de733cc79b5664437479f23a3b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Kaldari ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't break $wgFileExtensions structure when removing 'mp4' - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't break $wgFileExtensions structure when removing 'mp4'
..
Don't break $wgFileExtensions structure when removing 'mp4'
Bug: 55366
Change-Id: I961070c1330f2492adac67d0dbb4066ad88b9819
---
M TimedMediaHandler.hooks.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 0a41b97..47a7f6e 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -18,10 +18,9 @@
// Remove mp4 if not enabled:
if( $wgTmhEnableMp4Uploads === false ){
- foreach( $wgFileExtensions as $inx => $val ) {
- if( $val == 'mp4' ){
- unset( $wgFileExtensions[$inx] );
- }
+ $index = array_search( 'mp4', $wgFileExtensions );
+ if ( $index !== false ) {
+ array_splice( $wgFileExtensions, $index, 1 );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/87715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I961070c1330f2492adac67d0dbb4066ad88b9819
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: J
Gerrit-Reviewer: Kelson
Gerrit-Reviewer: Mdale
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop using prettifyIP for user links - change (mediawiki/core)
TTO has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92263
Change subject: Stop using prettifyIP for user links
..
Stop using prettifyIP for user links
At the moment, the display of IPv6 addresses is inconsistent: almost
everywhere (e.g. user pages, top of Special:Contribs) they are displayed
in the normalised form, while in places that use Linker::userLink
(history, diffs, etc) they are displayed in a supposedly "pretty" form.
For consistency, it would be better just to stick to showing the internal
representation of IPv6 addresses everywhere in MediaWiki. It would be too
messy to switch over to pretty representations everywhere at this point.
This leaves IP::prettifyIP unused in the core code, but extensions could
still be using it...
Bug: 44161
Change-Id: Ief2e0093a16df291e8ba40e1f33d829b4d8436c5
---
M includes/Linker.php
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/92263/1
diff --git a/includes/Linker.php b/includes/Linker.php
index 23ece75..c73746d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1098,9 +1098,6 @@
public static function userLink( $userId, $userName, $altUserName =
false ) {
if ( $userId == 0 ) {
$page = SpecialPage::getTitleFor( 'Contributions',
$userName );
- if ( $altUserName === false ) {
- $altUserName = IP::prettifyIP( $userName );
- }
} else {
$page = Title::makeTitle( NS_USER, $userName );
}
--
To view, visit https://gerrit.wikimedia.org/r/92263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief2e0093a16df291e8ba40e1f33d829b4d8436c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Tests for the built-in notification types - change (mediawiki...Echo)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92261
Change subject: [WIP] Tests for the built-in notification types
..
[WIP] Tests for the built-in notification types
Change-Id: Ie93eff0a9a75a4a9816c81d57b7530149a14bb7a
---
A tests/NotificationsTest.php
1 file changed, 40 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/61/92261/1
diff --git a/tests/NotificationsTest.php b/tests/NotificationsTest.php
new file mode 100644
index 000..e3fbd4c
--- /dev/null
+++ b/tests/NotificationsTest.php
@@ -0,0 +1,40 @@
+setName( 'Dummy' );
+ $user->addToDatabase();
+
+ $context = new DerivativeContext( RequestContext::getMain() );
+ $context->setUser( $sysop );
+ $ur = new UserrightsPage();
+ $ur->setContext( $context );
+ $ur->doSaveUserGroups( $user, array('sysop'), array(), 'reason'
);
+ $event = self::getLatestNotification( $user );
+ $this->assertEquals( $event->getType(), 'user-rights' );
+ $extra = $event->getExtra();
+ $this->assertArrayHasKey( 'add', $extra );
+ $this->assertArrayEquals( array( 'sysop' ), $extra['add'] );
+ $this->assertArrayEquals( array(), $extra['remove'] );
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/92261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie93eff0a9a75a4a9816c81d57b7530149a14bb7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] add - ref to Git-Tools. - change (sartoris)
preilly has submitted this change and it was merged. Change subject: add - ref to Git-Tools. .. add - ref to Git-Tools. Change-Id: Idc3388aba8e0b1070e7074da62ee4937ebd33e36 --- M README.rst 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: preilly: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/README.rst b/README.rst index 0fe1bf6..98c9f8a 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,10 @@ Sartoris -This is the Sartoris project. -It is a tool to manage using git as a deployment management tool +This is the Sartoris project. It is a tool to manage using git as a deployment management tool. Also see: + +https://github.com/Git-Tools/git-deploy + **Sartoris** -- To view, visit https://gerrit.wikimedia.org/r/92260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc3388aba8e0b1070e7074da62ee4937ebd33e36 Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk Gerrit-Reviewer: jenkins-bot Gerrit-Reviewer: preilly ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add - ref to Git-Tools. - change (sartoris)
Rfaulk has uploaded a new change for review. https://gerrit.wikimedia.org/r/92260 Change subject: add - ref to Git-Tools. .. add - ref to Git-Tools. Change-Id: Idc3388aba8e0b1070e7074da62ee4937ebd33e36 --- M README.rst 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/60/92260/1 diff --git a/README.rst b/README.rst index 0fe1bf6..98c9f8a 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,10 @@ Sartoris -This is the Sartoris project. -It is a tool to manage using git as a deployment management tool +This is the Sartoris project. It is a tool to manage using git as a deployment management tool. Also see: + +https://github.com/Git-Tools/git-deploy + **Sartoris** -- To view, visit https://gerrit.wikimedia.org/r/92260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc3388aba8e0b1070e7074da62ee4937ebd33e36 Gerrit-PatchSet: 1 Gerrit-Project: sartoris Gerrit-Branch: master Gerrit-Owner: Rfaulk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove EchoEvent::updateExtra, MWEchoBackend::updateEventExtra - change (mediawiki...Echo)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92259
Change subject: Remove EchoEvent::updateExtra, MWEchoBackend::updateEventExtra
..
Remove EchoEvent::updateExtra, MWEchoBackend::updateEventExtra
Unused function, makes implementing Redis backend difficult.
There is also no usecase for this, events shouldn't be altered
after creation except for bundling.
Change-Id: Id175c075d24263119f0455d99342263dd98f9410
---
M includes/DbEchoBackend.php
M includes/EchoBackend.php
M model/Event.php
3 files changed, 0 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/59/92259/1
diff --git a/includes/DbEchoBackend.php b/includes/DbEchoBackend.php
index d97eb85..d47a665 100644
--- a/includes/DbEchoBackend.php
+++ b/includes/DbEchoBackend.php
@@ -200,20 +200,6 @@
}
/**
-* @param $event EchoEvent
-*/
- public function updateEventExtra( $event ) {
- $dbw = MWEchoDbFactory::getDB( DB_MASTER );
-
- $dbw->update(
- 'echo_event',
- array( 'event_extra' => $event->serializeExtra() ),
- array( 'event_id' => $event->getId() ),
- __METHOD__
- );
- }
-
- /**
* @param $user User
* @param $eventIDs array
*/
diff --git a/includes/EchoBackend.php b/includes/EchoBackend.php
index 2386b60..b1ef708 100644
--- a/includes/EchoBackend.php
+++ b/includes/EchoBackend.php
@@ -97,12 +97,6 @@
abstract public function loadEvent( $id, $fromMaster );
/**
-* Update the extra data for an Echo event
-* @param $event EchoEvent
-*/
- abstract public function updateEventExtra( $event );
-
- /**
* Mark notifications as read for a user
* @param $user User
* @param $eventIDs array
diff --git a/model/Event.php b/model/Event.php
index 9f5a096..99629e3 100644
--- a/model/Event.php
+++ b/model/Event.php
@@ -262,18 +262,6 @@
}
/**
-* Update extra data
-*/
- public function updateExtra( $extra ) {
- global $wgEchoBackend;
-
- $this->extra = $extra;
- if ( $this->id && $this->extra ) {
- $wgEchoBackend->updateEventExtra( $this );
- }
- }
-
- /**
* Serialize the extra data for event
* @return string
*/
--
To view, visit https://gerrit.wikimedia.org/r/92259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id175c075d24263119f0455d99342263dd98f9410
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Remove redundant subdirectory level - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Remove redundant subdirectory level .. Remove redundant subdirectory level Change-Id: Iccf02603e0bd28ec494f9300b8faf1ca686130a4 --- R Wikipedia-iOS.xcodeproj/project.pbxproj R Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme R Wikipedia-iOS/AppDelegate.h R Wikipedia-iOS/AppDelegate.m R Wikipedia-iOS/Base.lproj/Main_iPad.storyboard R Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard R Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json R Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json R Wikipedia-iOS/ViewController.h R Wikipedia-iOS/ViewController.m R Wikipedia-iOS/Wikipedia-iOS-Info.plist R Wikipedia-iOS/Wikipedia-iOS-Prefix.pch R Wikipedia-iOS/en.lproj/InfoPlist.strings R Wikipedia-iOS/main.m R Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist R Wikipedia-iOSTests/Wikipedia_iOSTests.m R Wikipedia-iOSTests/en.lproj/InfoPlist.strings 17 files changed, 0 insertions(+), 0 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/Wikipedia-iOS/Wikipedia-iOS.xcodeproj/project.pbxproj b/Wikipedia-iOS.xcodeproj/project.pbxproj similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS.xcodeproj/project.pbxproj rename to Wikipedia-iOS.xcodeproj/project.pbxproj diff --git a/Wikipedia-iOS/Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme b/Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme rename to Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme diff --git a/Wikipedia-iOS/Wikipedia-iOS/AppDelegate.h b/Wikipedia-iOS/AppDelegate.h similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/AppDelegate.h rename to Wikipedia-iOS/AppDelegate.h diff --git a/Wikipedia-iOS/Wikipedia-iOS/AppDelegate.m b/Wikipedia-iOS/AppDelegate.m similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/AppDelegate.m rename to Wikipedia-iOS/AppDelegate.m diff --git a/Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPad.storyboard b/Wikipedia-iOS/Base.lproj/Main_iPad.storyboard similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPad.storyboard rename to Wikipedia-iOS/Base.lproj/Main_iPad.storyboard diff --git a/Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard b/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard rename to Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard diff --git a/Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json rename to Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json b/Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json rename to Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/Wikipedia-iOS/Wikipedia-iOS/ViewController.h b/Wikipedia-iOS/ViewController.h similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/ViewController.h rename to Wikipedia-iOS/ViewController.h diff --git a/Wikipedia-iOS/Wikipedia-iOS/ViewController.m b/Wikipedia-iOS/ViewController.m similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/ViewController.m rename to Wikipedia-iOS/ViewController.m diff --git a/Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Info.plist b/Wikipedia-iOS/Wikipedia-iOS-Info.plist similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Info.plist rename to Wikipedia-iOS/Wikipedia-iOS-Info.plist diff --git a/Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Prefix.pch b/Wikipedia-iOS/Wikipedia-iOS-Prefix.pch similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Prefix.pch rename to Wikipedia-iOS/Wikipedia-iOS-Prefix.pch diff --git a/Wikipedia-iOS/Wikipedia-iOS/en.lproj/InfoPlist.strings b/Wikipedia-iOS/en.lproj/InfoPlist.strings similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/en.lproj/InfoPlist.strings rename to Wikipedia-iOS/en.lproj/InfoPlist.strings diff --git a/Wikipedia-iOS/Wikipedia-iOS/main.m b/Wikipedia-iOS/main.m similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/main.m rename to Wikipedia-iOS/main.m diff --git a/Wikipedia-iOS/Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist b/Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist rename
[MediaWiki-commits] [Gerrit] Remove redundant subdirectory level - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/92258 Change subject: Remove redundant subdirectory level .. Remove redundant subdirectory level Change-Id: Iccf02603e0bd28ec494f9300b8faf1ca686130a4 --- R Wikipedia-iOS.xcodeproj/project.pbxproj R Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme R Wikipedia-iOS/AppDelegate.h R Wikipedia-iOS/AppDelegate.m R Wikipedia-iOS/Base.lproj/Main_iPad.storyboard R Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard R Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json R Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json R Wikipedia-iOS/ViewController.h R Wikipedia-iOS/ViewController.m R Wikipedia-iOS/Wikipedia-iOS-Info.plist R Wikipedia-iOS/Wikipedia-iOS-Prefix.pch R Wikipedia-iOS/en.lproj/InfoPlist.strings R Wikipedia-iOS/main.m R Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist R Wikipedia-iOSTests/Wikipedia_iOSTests.m R Wikipedia-iOSTests/en.lproj/InfoPlist.strings 17 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/58/92258/1 diff --git a/Wikipedia-iOS/Wikipedia-iOS.xcodeproj/project.pbxproj b/Wikipedia-iOS.xcodeproj/project.pbxproj similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS.xcodeproj/project.pbxproj rename to Wikipedia-iOS.xcodeproj/project.pbxproj diff --git a/Wikipedia-iOS/Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme b/Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme rename to Wikipedia-iOS.xcodeproj/xcshareddata/xcschemes/Wikipedia-iOS.xcscheme diff --git a/Wikipedia-iOS/Wikipedia-iOS/AppDelegate.h b/Wikipedia-iOS/AppDelegate.h similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/AppDelegate.h rename to Wikipedia-iOS/AppDelegate.h diff --git a/Wikipedia-iOS/Wikipedia-iOS/AppDelegate.m b/Wikipedia-iOS/AppDelegate.m similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/AppDelegate.m rename to Wikipedia-iOS/AppDelegate.m diff --git a/Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPad.storyboard b/Wikipedia-iOS/Base.lproj/Main_iPad.storyboard similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPad.storyboard rename to Wikipedia-iOS/Base.lproj/Main_iPad.storyboard diff --git a/Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard b/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard rename to Wikipedia-iOS/Base.lproj/Main_iPhone.storyboard diff --git a/Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json rename to Wikipedia-iOS/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json b/Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json rename to Wikipedia-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/Wikipedia-iOS/Wikipedia-iOS/ViewController.h b/Wikipedia-iOS/ViewController.h similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/ViewController.h rename to Wikipedia-iOS/ViewController.h diff --git a/Wikipedia-iOS/Wikipedia-iOS/ViewController.m b/Wikipedia-iOS/ViewController.m similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/ViewController.m rename to Wikipedia-iOS/ViewController.m diff --git a/Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Info.plist b/Wikipedia-iOS/Wikipedia-iOS-Info.plist similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Info.plist rename to Wikipedia-iOS/Wikipedia-iOS-Info.plist diff --git a/Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Prefix.pch b/Wikipedia-iOS/Wikipedia-iOS-Prefix.pch similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/Wikipedia-iOS-Prefix.pch rename to Wikipedia-iOS/Wikipedia-iOS-Prefix.pch diff --git a/Wikipedia-iOS/Wikipedia-iOS/en.lproj/InfoPlist.strings b/Wikipedia-iOS/en.lproj/InfoPlist.strings similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/en.lproj/InfoPlist.strings rename to Wikipedia-iOS/en.lproj/InfoPlist.strings diff --git a/Wikipedia-iOS/Wikipedia-iOS/main.m b/Wikipedia-iOS/main.m similarity index 100% rename from Wikipedia-iOS/Wikipedia-iOS/main.m rename to Wikipedia-iOS/main.m diff --git a/Wikipedia-iOS/Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist b/Wikipedia-iOSTests/Wikipedia-iOSTests-Info.plist similarity index 100% rename from Wikipedia-iOS/
[MediaWiki-commits] [Gerrit] Display parent block target in autoblock errors - change (mediawiki/core)
saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92257
Change subject: Display parent block target in autoblock errors
..
Display parent block target in autoblock errors
If the reason to block is autoblock, display original block
target username and not an IP address of the current user.
Bug: 56227
Change-Id: I7fad56d6537dcec3cb36aeba40e01daf215515bd
---
M includes/Block.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/92257/1
diff --git a/includes/Block.php b/includes/Block.php
index 34b89e7..f008939 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1417,7 +1417,12 @@
/* $ip returns who *is* being blocked, $intended contains who
was meant to be blocked.
* This could be a username, an IP range, or a single IP. */
- $intended = $this->getTarget();
+ if ( $this->mAuto ) {
+ $parent = $this->mParentBlockId;
+ $intended = self::newFromId( $parent
)->getRedactedName();
+ } else {
+ $intended = $this->getRedactedName();
+ }
$lang = $context->getLanguage();
return array(
--
To view, visit https://gerrit.wikimedia.org/r/92257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fad56d6537dcec3cb36aeba40e01daf215515bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: saper
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [NOT2Merge!] Example for Selective Chrome bug in Inspectors - change (mediawiki...VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92256
Change subject: [NOT2Merge!] Example for Selective Chrome bug in Inspectors
..
[NOT2Merge!] Example for Selective Chrome bug in Inspectors
I've created this as a testing ground for a bug in the way inspectors
load in Chrome.
The code given is an empty new inspector, completely inherited without
any special behavior at all from SurfaceInspector.
In theory, this should open an empty inspector popup with only the
title, icon and 'back' button. In reality, this works as expected
in Firefox but in Chrome the inspector fails to appear.
It only appears if you first open another surface inspector
(like Link or Language) and then open the test inspector.
Change-Id: Ib9cd1022ef395b96168fc349d28d3f436a1654de
---
M VisualEditor.i18n.php
M VisualEditor.php
A modules/ve/ui/inspectors/ve.ui.TestInspector.js
M modules/ve/ui/tools/ve.ui.InspectorTool.js
4 files changed, 74 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/56/92256/1
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index b2cc671..f72fa09 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -193,6 +193,8 @@
'visualeditor-savedialog-warning-dirty' => 'Your edit may have been
corrupted – please review before saving.',
'visualeditor-saveerror' => 'Error saving data to server: $1.',
'visualeditor-serializeerror' => 'Error loading data from server: $1.',
+ 'visualeditor-testinspector-button-tooltip' => 'Test inspector',
+ 'visualeditor-testinspector-title' => 'Test inspector',
'visualeditor-toolbar-cancel' => 'Cancel',
'visualeditor-toolbar-more' => 'More',
'visualeditor-toolbar-savedialog' => 'Save page',
@@ -619,6 +621,8 @@
Parameters:
* $1 is an error message, in English.',
+ 'visualeditor-testinspector-button-tooltip' => 'Tool tip for the test
inspector',
+ 'visualeditor-testinspector-title' => 'Title for the test inspector',
'visualeditor-toolbar-cancel' => 'Label text for button to exit from
VisualEditor.
{{Identical|Cancel}}',
'visualeditor-toolbar-more' => 'Label for the toolbar group that
contains a list of all other available tools.
diff --git a/VisualEditor.php b/VisualEditor.php
index faf826c..37ea549 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -536,6 +536,7 @@
've/ui/inspectors/ve.ui.LinkInspector.js',
've-mw/ui/inspectors/ve.ui.MWLinkInspector.js',
've-mw/ui/inspectors/ve.ui.MWExtensionInspector.js',
+ 've/ui/inspectors/ve.ui.TestInspector.js',
),
'styles' => array(
// ce
@@ -698,6 +699,8 @@
'visualeditor-savedialog-warning-dirty',
'visualeditor-saveerror',
'visualeditor-serializeerror',
+ 'visualeditor-testinspector-button-tooltip',
+ 'visualeditor-testinspector-title',
'visualeditor-toolbar-cancel',
'visualeditor-toolbar-more',
'visualeditor-toolbar-savedialog',
diff --git a/modules/ve/ui/inspectors/ve.ui.TestInspector.js
b/modules/ve/ui/inspectors/ve.ui.TestInspector.js
new file mode 100644
index 000..748a81a
--- /dev/null
+++ b/modules/ve/ui/inspectors/ve.ui.TestInspector.js
@@ -0,0 +1,47 @@
+/*!
+ * VisualEditor UserInterface TestInspector class.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * Test inspector.
+ *
+ * @class
+ * @extends ve.ui.SurfaceInspector
+ *
+ * @constructor
+ * @param {ve.ui.SurfaceWindowSet} windowSet Window set this inspector is part
of
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.TestInspector = function VeUiTestInspector( windowSet, config ) {
+ // Parent constructor
+ ve.ui.SurfaceInspector.call( this, windowSet, config );
+
+ // Properties
+ this.initialAnnotation = null;
+ this.initialAnnotationHash = null;
+ this.initialText = null;
+ this.isNewAnnotation = false;
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.TestInspector, ve.ui.SurfaceInspector );
+
+/* Static properties */
+
+ve.ui.TestInspector.static.name = 'testinspector';
+
+ve.ui.TestInspector.static.icon = 'link'; // Just so we can see something here
+
+ve.ui.TestInspector.static.titleMessage = 'visualeditor-testinspector-title';
+
+ve.ui.TestInspector.static.removeable = false;
+
+/* Methods */
+
+/* Registration */
+
+ve.ui.inspectorFactory.register( ve.ui.TestInspector );
diff --git a/modules/ve/ui/tools/ve.ui.InspectorTool.js
b/modules/ve/ui/tools/ve.ui.InspectorTool.js
index 17c15a4..cb4ee8c
[MediaWiki-commits] [Gerrit] Correcting timestamp request in loading deleted revisions - change (pywikibot/core)
Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/92255 Change subject: Correcting timestamp request in loading deleted revisions .. Correcting timestamp request in loading deleted revisions I checked it and it worked correctly, you can test it by adding "print self._deletedRevs" before line 1325 Bug: 54546 Change-Id: I054097840cc6d69da107425868f92357cf12ce50 --- M pywikibot/page.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/55/92255/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index cb06350..78ce1d0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1324,8 +1324,8 @@ if hasattr(self, "_deletedRevs"): if timestamp in self._deletedRevs and ( (not retrieveText) -or "content" in self._deletedRevs["timestamp"]): -return self._deletedRevs["timestamp"] +or "content" in self._deletedRevs[timestamp]): +return self._deletedRevs[timestamp] for item in self.site.deletedrevs(self, start=timestamp, get_text=retrieveText, total=1): # should only be one item with one revision -- To view, visit https://gerrit.wikimedia.org/r/92255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I054097840cc6d69da107425868f92357cf12ce50 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't expose blocked IP address in error message - change (mediawiki/core)
saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92254
Change subject: Don't expose blocked IP address in error message
..
Don't expose blocked IP address in error message
Experimental patch to remove $3 parameter of
blockedtext and autoblockedtext
Bug: 53008
Change-Id: I4ad917075149616809f65726072f15cc3a5a7a70
---
M includes/Block.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/92254/1
diff --git a/includes/Block.php b/includes/Block.php
index 34b89e7..05eb509 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1424,7 +1424,7 @@
$this->mAuto ? 'autoblockedtext' : 'blockedtext',
$link,
$reason,
- $context->getRequest()->getIP(),
+ "",
$this->getByName(),
$this->getId(),
$lang->formatExpiry( $this->mExpiry ),
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 0c1b560..4a58312 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1402,7 +1402,7 @@
You can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]]
to discuss the block.
You cannot use the \"email this user\" feature unless a valid email address is
specified in your [[Special:Preferences|account preferences]] and you have not
been blocked from using it.
-Your current IP address is $3, and the block ID is #$5.
+Block ID is #$5.
Please include all above details in any queries you make.",
'autoblockedtext' => "Your IP address has been automatically
blocked because it was used by another user, who was blocked by $1.
The reason given is:
@@ -1417,7 +1417,7 @@
Note that you may not use the \"email this user\" feature unless you have a
valid email address registered in your [[Special:Preferences|user preferences]]
and you have not been blocked from using it.
-Your current IP address is $3, and the block ID is #$5.
+Block ID is #$5.
Please include all above details in any queries you make.",
'blockednoreason' => 'no reason given',
'whitelistedittext'=> 'You have to $1 to edit pages.',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index a8b66b2..f7535ff 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1816,7 +1816,7 @@
Parameters:
* $1 - the blocking sysop (with a link to his/her userpage)
* $2 - the reason for the block
-* $3 - the current IP address of the blocked user
+* $3 - empty, do not use
* $4 - (Unused) the blocking sysop\'s username (plain text, without the link)
* $5 - the unique numeric identifier of the applied autoblock
* $6 - the expiry of the block
@@ -1832,7 +1832,7 @@
Parameters:
* $1 - the blocking sysop (with a link to his/her userpage)
* $2 - the reason for the block (in case of autoblocks: {{msg-mw|autoblocker}})
-* $3 - the current IP address of the blocked user
+* $3 - empty, do not use
* $4 - (Unused) the blocking sysop\'s username (plain text, without the link).
Use it for GENDER.
* $5 - the unique numeric identifier of the applied autoblock
* $6 - the expiry of the block
--
To view, visit https://gerrit.wikimedia.org/r/92254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ad917075149616809f65726072f15cc3a5a7a70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: saper
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Parser::mPreprocessor->parser reference when Parser i... - change (mediawiki/core)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92253
Change subject: Update Parser::mPreprocessor->parser reference when Parser is
cloned
..
Update Parser::mPreprocessor->parser reference when Parser is cloned
If the first time someone is trying to transform a message is
during the parsing of something else, Parser will get cloned
well in a parsing state. However, Parser::mPreprocessor is
not updated or cloned. Thus it will point to the wrong
instance of Parser. If a strip item gets inserted, it could
get inserted with the wrong uniq prefix, which causes an
exception to be thrown. (This actually does happen in certain
rare ases when the translate extension is being used).
There's some code in Parser::clearState that looks like its
meant to work around this issue, but isn't sufficient.
I don't think its needed anymore, but left it there just to
be safe.
Bug: 56226
Change-Id: I8284b59de2d9c776c3439b966614717e680345d1
---
M includes/parser/Parser.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/92253/1
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1f14223..1f5d9ed 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -254,6 +254,9 @@
* Allow extensions to clean up when the parser is cloned
*/
function __clone() {
+ if ( isset( $this->mPreprocessor ) ) {
+ $this->mPreprocessor->parser = $this;
+ }
wfRunHooks( 'ParserCloned', array( $this ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/92253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8284b59de2d9c776c3439b966614717e680345d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove unused local variable 'old_text' - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: remove unused local variable 'old_text'
..
remove unused local variable 'old_text'
Change-Id: Ie06abada378ebfbdd869106e6aede71f63dee564
---
M maintenance/wikimedia_sites.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/wikimedia_sites.py b/maintenance/wikimedia_sites.py
index 439108f..8d11ded 100644
--- a/maintenance/wikimedia_sites.py
+++ b/maintenance/wikimedia_sites.py
@@ -91,7 +91,7 @@
pywikibot.output(text)
family_file_name = '../families/%s_family.py' % family
family_file = codecs.open(family_file_name, 'r', 'utf8')
-old_text = family_text = family_file.read()
+family_text = family_file.read()
old = re.findall(ur'(?msu)^ {8}self.languages_by_size.+?\]',
family_text)[0]
family_text = family_text.replace(old, text)
--
To view, visit https://gerrit.wikimedia.org/r/91411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie06abada378ebfbdd869106e6aede71f63dee564
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce AbuseFilterUser - change (mediawiki...AbuseFilter)
saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92252
Change subject: Introduce AbuseFilterUser
..
Introduce AbuseFilterUser
Modify behaviour of Abuse Filter special
user by extra
Experimental, see:
http://thread.gmane.org/gmane.science.linguistics.wikipedia.technical/73503
Bug: 42345
Change-Id: I0c1e34e95bfd41a8f7ace8b51937035bf574edf1
---
M AbuseFilter.class.php
M AbuseFilter.hooks.php
M AbuseFilter.php
A AbuseFilterUser.class.php
4 files changed, 185 insertions(+), 64 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/52/92252/1
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 61939ce..6673c75 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -1225,7 +1225,7 @@
case 'block':
global $wgUser, $wgAbuseFilterBlockDuration,
$wgAbuseFilterAnonBlockDuration;
- $filterUser = AbuseFilter::getFilterUser();
+ $filterUser = AbuseFilterUser::getInstance();
// Create a block.
$block = new Block;
@@ -1264,7 +1264,7 @@
$log->addEntry( 'block',
Title::makeTitle( NS_USER,
$wgUser->getName() ),
wfMessage( 'abusefilter-blockreason',
$rule_desc )->inContentLanguage()->text(),
- $logParams, self::getFilterUser()
+ $logParams,
AbuseFilterUser::getInstance()
);
$message = array(
@@ -1273,7 +1273,7 @@
);
break;
case 'rangeblock':
- $filterUser = AbuseFilter::getFilterUser();
+ $filterUser = AbuseFilterUser::getInstance();
$range = IP::sanitizeRange( $wgRequest->getIP()
. '/16' );
@@ -1301,7 +1301,7 @@
$log = new LogPage( 'block' );
$log->addEntry( 'block', Title::makeTitle(
NS_USER, $range ),
wfMessage( 'abusefilter-blockreason',
$rule_desc )->inContentLanguage()->text(),
- $logParams, self::getFilterUser()
+ $logParams,
AbuseFilterUser::getInstance()
);
$message = array(
@@ -1339,7 +1339,7 @@
implode( ', ', $groups
),
''
),
- self::getFilterUser()
+ AbuseFilterUser::getInstance()
);
}
@@ -1642,38 +1642,6 @@
*/
public static function filterMatchesKey( $filter = null ) {
return wfMemcKey( 'abusefilter', 'stats', 'matches', $filter );
- }
-
- /**
-* @return User
-*/
- public static function getFilterUser() {
- $user = User::newFromName( wfMessage( 'abusefilter-blocker'
)->inContentLanguage()->text() );
- $user->load();
- if ( $user->getId() && $user->mPassword == '' ) {
- // Already set up.
- return $user;
- }
-
- // Not set up. Create it.
- if ( !$user->getId() ) {
- print 'Trying to create account -- user id is ' .
$user->getId();
- $user->addToDatabase();
- $user->saveSettings();
- // Increment site_stats.ss_users
- $ssu = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
- $ssu->doUpdate();
- } else {
- // Take over the account
- $user->setPassword( null );
- $user->setEmail( null );
- $user->saveSettings();
- }
-
- // Promote user so it doesn't look too crazy.
- $user->addGroup( 'sysop' );
-
- return $user;
}
/**
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index 42c362d..ab5cd27 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -500,35 +500,9 @@
$updater->addExtensionUpdate( array( 'addPgExtIndex',
'abuse_filter_log', 'abuse_filter_log_wiki', "(afl_wiki)" ) );
}
- $updater->addExtension
[MediaWiki-commits] [Gerrit] remove index.php from url in passwordremindertext and create... - change (mediawiki/core)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92251
Change subject: remove index.php from url in passwordremindertext and
createaccount-text
..
remove index.php from url in passwordremindertext and createaccount-text
$wgScript (index.php) appended to the site url
(e.g. https://en.wikipedia.org/w/index.php) seems pointless
in the context of these email messages.
Change-Id: I1ae1ef164aa2db66e9370640e1e7dbddbed811c2
---
M includes/specials/SpecialUserlogin.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/92251/1
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index 5ac3e65..8d54ded 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -865,7 +865,7 @@
* @return Status object
*/
function mailPasswordInternal( $u, $throttle = true, $emailTitle =
'passwordremindertitle', $emailText = 'passwordremindertext' ) {
- global $wgCanonicalServer, $wgScript, $wgNewPasswordExpiry;
+ global $wgCanonicalServer, $wgNewPasswordExpiry;
if ( $u->getEmail() == '' ) {
return Status::newFatal( 'noemail', $u->getName() );
@@ -882,7 +882,7 @@
$u->setNewpassword( $np, $throttle );
$u->saveSettings();
$userLanguage = $u->getOption( 'language' );
- $m = $this->msg( $emailText, $ip, $u->getName(), $np, '<' .
$wgCanonicalServer . $wgScript . '>',
+ $m = $this->msg( $emailText, $ip, $u->getName(), $np, '<' .
$wgCanonicalServer . '>',
round( $wgNewPasswordExpiry / 86400 ) )->inLanguage(
$userLanguage )->text();
$result = $u->sendMail( $this->msg( $emailTitle )->inLanguage(
$userLanguage )->text(), $m );
--
To view, visit https://gerrit.wikimedia.org/r/92251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ae1ef164aa2db66e9370640e1e7dbddbed811c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added geocoder.us geocoding service - change (mediawiki...Maps)
tosfos has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92250
Change subject: Added geocoder.us geocoding service
..
Added geocoder.us geocoding service
Change-Id: I22926c7b66046146e5723e583b0698ea4059f750
---
M Maps.classes.php
M Maps.php
M Maps_Settings.php
A includes/geocoders/Maps_GeocoderusGeocoder.php
4 files changed, 68 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Maps
refs/changes/50/92250/1
diff --git a/Maps.classes.php b/Maps.classes.php
index 248e640..1ddb325 100644
--- a/Maps.classes.php
+++ b/Maps.classes.php
@@ -49,6 +49,7 @@
$classes['MapsGeonamesGeocoder'] = __DIR__ .
'/includes/geocoders/Maps_GeonamesGeocoder.php';
$classes['MapsGoogleGeocoder'] = __DIR__ .
'/includes/geocoders/Maps_GoogleGeocoder.php';
+$classes['MapsGeocoderusGeocoder'] = __DIR__ .
'/includes/geocoders/Maps_GeocoderusGeocoder.php';
$classes['SpecialMapEditor'] = __DIR__ .
'/includes/specials/SpecialMapEditor.php';
diff --git a/Maps.php b/Maps.php
index 1c48a53..404f494 100644
--- a/Maps.php
+++ b/Maps.php
@@ -32,7 +32,7 @@
return;
}
-define( 'Maps_VERSION' , '3.0 alpha' );
+define( 'Maps_VERSION' , '3.0.1 alpha' );
// Include the composer autoloader if it is present.
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
@@ -210,6 +210,9 @@
// Registration of the Google Geocoding (v2) service geocoder.
$wgHooks['GeocoderFirstCallInit'][] = 'MapsGoogleGeocoder::register';
+ // Registration of the geocoder.us service geocoder.
+ $wgHooks['GeocoderFirstCallInit'][] =
'MapsGeocoderusGeocoder::register';
+
// Layers
// Registration of the image layer type.
diff --git a/Maps_Settings.php b/Maps_Settings.php
index 3543ff8..bc69a91 100644
--- a/Maps_Settings.php
+++ b/Maps_Settings.php
@@ -62,6 +62,7 @@
$egMapsAvailableGeoServices = array(
'geonames',
'google',
+ 'geocoderus',
);
// String. The default geocoding service, which will be used when no
service is
diff --git a/includes/geocoders/Maps_GeocoderusGeocoder.php
b/includes/geocoders/Maps_GeocoderusGeocoder.php
new file mode 100644
index 000..9f14433
--- /dev/null
+++ b/includes/geocoders/Maps_GeocoderusGeocoder.php
@@ -0,0 +1,62 @@
+=5.3 becomes acceptable.
+*
+* @since 3.0.1
+*/
+ public static function register() {
+ \Maps\Geocoders::registerGeocoder( 'geocoderus', __CLASS__ );
+ return true;
+ }
+
+ /**
+* @see \Maps\Geocoder::getRequestUrl
+*
+* @since 3.0.1
+*
+* @param string $address
+*
+* @return string
+*/
+ protected function getRequestUrl( $address ) {
+ return 'http://geocoder.us/service/rest/?address=' . urlencode(
$address );
+ }
+
+ /**
+* @see \Maps\Geocoder::parseResponse
+*
+* @since 3.0.1
+*
+* @param string $address
+*
+* @return array
+*/
+ protected function parseResponse( $response ) {
+ $lon = self::getXmlElementValue( $response, 'geo:long' );
+ $lat = self::getXmlElementValue( $response, 'geo:lat' );
+
+ // In case one of the values is not found, return false.
+ if ( !$lon || !$lat ) return false;
+
+ return array(
+ 'lat' => (float)$lat,
+ 'lon' => (float)$lon
+ );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/92250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22926c7b66046146e5723e583b0698ea4059f750
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Maps
Gerrit-Branch: master
Gerrit-Owner: tosfos
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve wording of eauthentsent message for email confirmation - change (mediawiki/core)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92249
Change subject: Improve wording of eauthentsent message for email confirmation
..
Improve wording of eauthentsent message for email confirmation
eauthentsent message is used on Special:ChangeEmail confirmation page.
Change-Id: I34455b1452b670f5d1dcf58982d52326731c519d
---
M languages/messages/MessagesEn.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/49/92249/1
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 0c1b560..6d68d36 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1211,7 +1211,7 @@
'passwordsent'=> 'A new password has been sent to the
email address registered for "$1".
Please log in again after you receive it.',
'blocked-mailpassword'=> 'Your IP address is blocked from editing,
and so is not allowed to use the password recovery function to prevent abuse.',
-'eauthentsent'=> 'A confirmation email has been sent to
the nominated email address.
+'eauthentsent'=> 'A confirmation email has been sent to
the specified email address.
Before any other email is sent to the account, you will have to follow the
instructions in the email, to confirm that the account is actually yours.',
'throttled-mailpassword' => 'A password reset email has already been
sent, within the last {{PLURAL:$1|hour|$1 hours}}.
To prevent abuse, only one password reset email will be sent per
{{PLURAL:$1|hour|$1 hours}}.',
--
To view, visit https://gerrit.wikimedia.org/r/92249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34455b1452b670f5d1dcf58982d52326731c519d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add Redis backend - change (mediawiki...Echo)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92248
Change subject: [WIP] Add Redis backend
..
[WIP] Add Redis backend
Still at proof of concept stage
TODO:
* Don't use $wgMemc, use our own BagOfStuff class
* Implement bundling because I don't know how that works
* Make suck less
Change-Id: I3ee409be59cf31fe2e3e88221394cc05999eb8d3
---
M Echo.php
A includes/RedisEchoBackend.php
2 files changed, 267 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/48/92248/1
diff --git a/Echo.php b/Echo.php
index f5f3e61..4d317bc 100644
--- a/Echo.php
+++ b/Echo.php
@@ -101,6 +101,7 @@
// Backend support
$wgAutoloadClasses['MWEchoBackend'] = $dir . 'includes/EchoBackend.php';
$wgAutoloadClasses['MWDbEchoBackend'] = $dir . 'includes/DbEchoBackend.php';
+$wgAutoloadClasses['MWRedisEchoBackend'] = $dir .
'includes/RedisEchoBackend.php';
$wgAutoloadClasses['MWEchoDbFactory'] = $dir . 'includes/EchoDbFactory.php';
$wgAutoloadClasses['MWEchoNotifUser'] = $dir . 'includes/NotifUser.php';
diff --git a/includes/RedisEchoBackend.php b/includes/RedisEchoBackend.php
new file mode 100644
index 000..74ff9f9
--- /dev/null
+++ b/includes/RedisEchoBackend.php
@@ -0,0 +1,266 @@
+get( $eventKey );
+ $type = $event['event_type'];
+ $row['event_type'] = $type;
+
+ $id = MWCryptRand::generateHex( 16 );
+ $key = wfMemcKey( 'echo-notification', $id );
+ $wgMemc->set( $key, $row );
+ // Note that this won't work for IPs...
+ $userKey = self::getUserCacheKey( $row['notification_user'] );
+ $userData = $wgMemc->get( $userKey );
+ if ( $userData === false ) {
+ $new = array( 'notifs' => array( $id ) );
+ } else {
+ $new = $userData;
+ $new['notifs'][] = $id;
+ }
+ $wgMemc->set( $userKey, $new );
+
+ // @todo this isn't backend specific, move it somewhere else
+ $user = User::newFromId( $row['notification_user'] );
+ MWEchoNotifUser::newFromUser( $user )->resetNotificationCount(
DB_MASTER );
+ }
+
+ /**
+* Gets the cache key for a user id or user object
+* @param User|int $user
+* @return String
+*/
+ private static function getUserCacheKey( $user ) {
+ if ( $user instanceof User ) {
+ $user = $user->getId();
+ }
+ return wfMemcKey( 'echo-notifs-user', $user );
+ }
+
+ /**
+* Load some notifications
+* @param User $user
+* @param int $limit
+* @param string $continue
+* @param string $outputFormat
+* @return array
+*
+* @fixme implement $continue
+*/
+ public function loadNotifications( $user, $limit, $continue,
$outputFormat = 'web' ) {
+ global $wgMemc;
+
+ // @todo this isn't backend specific, move it somewhere else
+ $eventTypesToLoad =
EchoNotificationController::getUserEnabledEvents( $user, $outputFormat );
+ if ( !$eventTypesToLoad ) {
+ return array();
+ }
+
+ // @todo this code is duplicated in multiple places
+ $key = self::getUserCacheKey( $user );
+ $index = $wgMemc->get( $key );
+ if ( $index === false ) {
+ return array(); // No notifications
+ }
+ $notifs = array();
+ foreach( $index['notifs'] as $id ) {
+ $key = wfMemcKey( 'echo-notification', $id );
+ $row = $wgMemc->get( $key );
+ if ( $row !== false && in_array( $row['event_type'],
$eventTypesToLoad ) ) {
+ $eventKey = wfMemcKey( 'echo-event',
$row['notification_event'] );
+ $event = $wgMemc->get( $eventKey );
+ $notifs[] = (object)array_merge( $row, $event );
+ $limit--;
+ if ( $limit == 0 ) {
+ break;
+ }
+ }
+
+ }
+
+ return $notifs;
+ }
+
+ /**
+* @param User $user
+* @param string $bundleHash
+* @param string $type
+* @param string $order
+* @param int $limit
+* @return bool|ResultWrapper
+*/
+ public function getRawBundleData( $user, $bundleHash, $type = 'web',
$order = 'DESC', $limit = 250 ) {
+ // @fixme implement this
+ }
+
+ /**
+* @param User $user
+* @param str
[MediaWiki-commits] [Gerrit] Set relevant User on Special:Unblock - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Set relevant User on Special:Unblock
..
Set relevant User on Special:Unblock
Special:Block sets the relevant user to get links in the sidebar,
do this also on unblock
Change-Id: I3715ce63aae5ff7eb4aca9ef479020747fdc8ce8
---
M includes/specials/SpecialUnblock.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUnblock.php
b/includes/specials/SpecialUnblock.php
index ca93b6d..fbc8e91 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -42,6 +42,11 @@
list( $this->target, $this->type ) =
SpecialBlock::getTargetAndType( $par, $this->getRequest() );
$this->block = Block::newFromTarget( $this->target );
+ if ( $this->target instanceof User ) {
+ # Set the 'relevant user' in the skin, so it displays
links like Contributions,
+ # User logs, UserRights, etc.
+ $this->getSkin()->setRelevantUser( $this->target );
+ }
$this->setHeaders();
$this->outputHeader();
--
To view, visit https://gerrit.wikimedia.org/r/88785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3715ce63aae5ff7eb4aca9ef479020747fdc8ce8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Throw an error if calling parser recursively - change (mediawiki/core)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92247
Change subject: Throw an error if calling parser recursively
..
Throw an error if calling parser recursively
People accidentally (or sometimes intentionally) calling the
parser recursively has been a major source of bugs over the
years. I think its much better to fail suddenly, instead
of having unclear signs like UNIQ's all over the place.
Change-Id: I0e42aa69835c15a5df7aecb0dc5c3dec946bdf6a
---
M RELEASE-NOTES-1.23
M includes/parser/Parser.php
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/92247/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index ec7b898..bd46057 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -17,6 +17,7 @@
changes and watchlist) and the talk page message indicator are now correctly
updated when the user is viewing old revisions of pages, instead of always
acting as if the latest revision was being viewed.
+* Parser dies early if called recursively
=== API changes in 1.23 ===
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1f14223..3f9f626 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -212,6 +212,11 @@
var $mLangLinkLanguages;
/**
+* @var boolean Recursive call protection.
+*/
+ private $mInParse = false;
+
+ /**
* Constructor
*
* @param $conf array
@@ -360,10 +365,15 @@
*/
global $wgUseTidy, $wgAlwaysUseTidy, $wgShowHostnames;
+ if ( $this->mInParse ) {
+ throw new MWException( "Parser::Parse is not allowed to
be called recursively" );
+ }
+
$fname = __METHOD__ . '-' . wfGetCaller();
wfProfileIn( __METHOD__ );
wfProfileIn( $fname );
+ $this->mInParse = true;
$this->startParse( $title, $options, self::OT_HTML, $clearState
);
$this->mInputSize = strlen( $text );
@@ -578,6 +588,7 @@
$this->mRevisionUser = $oldRevisionUser;
$this->mRevisionSize = $oldRevisionSize;
$this->mInputSize = false;
+ $this->mInParse = false;
wfProfileOut( $fname );
wfProfileOut( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/92247
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e42aa69835c15a5df7aecb0dc5c3dec946bdf6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Remove leading/trailing spaces from error and descripti... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Remove leading/trailing spaces from error and description
text
..
API: Remove leading/trailing spaces from error and description text
Change-Id: Id866c7258a297fe965a64d52e3458d53e140aa4c
---
M includes/api/ApiLogin.php
M includes/api/ApiQueryRandom.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index b51d441..13e58b8 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -254,9 +254,9 @@
public function getDescription() {
return array(
- 'Log in and get the authentication tokens. ',
+ 'Log in and get the authentication tokens.',
'In the event of a successful log-in, a cookie will be
attached',
- 'to your session. In the event of a failed log-in, you
will not ',
+ 'to your session. In the event of a failed log-in, you
will not',
'be able to attempt another log-in through this method
for 5 seconds.',
'This is to prevent password guessing by automated
password crackers'
);
@@ -267,10 +267,10 @@
array( 'code' => 'NeedToken', 'info' => 'You need to
resubmit your login with the specified token. See
https://bugzilla.wikimedia.org/show_bug.cgi?id=23076' ),
array( 'code' => 'WrongToken', 'info' => 'You specified
an invalid token' ),
array( 'code' => 'NoName', 'info' => 'You didn\'t set
the lgname parameter' ),
- array( 'code' => 'Illegal', 'info' => ' You provided an
illegal username' ),
- array( 'code' => 'NotExists', 'info' => ' The username
you provided doesn\'t exist' ),
- array( 'code' => 'EmptyPass', 'info' => ' You didn\'t
set the lgpassword parameter or you left it empty' ),
- array( 'code' => 'WrongPass', 'info' => ' The password
you provided is incorrect' ),
+ array( 'code' => 'Illegal', 'info' => 'You provided an
illegal username' ),
+ array( 'code' => 'NotExists', 'info' => 'The username
you provided doesn\'t exist' ),
+ array( 'code' => 'EmptyPass', 'info' => 'You didn\'t
set the lgpassword parameter or you left it empty' ),
+ array( 'code' => 'WrongPass', 'info' => 'The password
you provided is incorrect' ),
array( 'code' => 'WrongPluginPass', 'info' => 'Same as
"WrongPass", returned when an authentication plugin rather than MediaWiki
itself rejected the password' ),
array( 'code' => 'CreateBlocked', 'info' => 'The wiki
tried to automatically create a new account for you, but your IP address has
been blocked from account creation' ),
array( 'code' => 'Throttled', 'info' => 'You\'ve logged
in too many times in a short time' ),
diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php
index 2754bda..fae3377 100644
--- a/includes/api/ApiQueryRandom.php
+++ b/includes/api/ApiQueryRandom.php
@@ -176,7 +176,7 @@
public function getDescription() {
return array(
'Get a set of random pages',
- 'NOTE: Pages are listed in a fixed sequence, only the
starting point is random. This means that if, for example, "Main Page" is the
first ',
+ 'NOTE: Pages are listed in a fixed sequence, only the
starting point is random. This means that if, for example, "Main Page" is the
first',
' random page on your list, "List of fictional
monkeys" will *always* be second, "List of people on stamps of Vanuatu" third,
etc',
'NOTE: If the number of pages in the namespace is lower
than rnlimit, you will get fewer pages. You will not get the same page twice'
);
--
To view, visit https://gerrit.wikimedia.org/r/92190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id866c7258a297fe965a64d52e3458d53e140aa4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from http://translatewiki.net. - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Localisation updates from http://translatewiki.net.
..
Localisation updates from http://translatewiki.net.
Change-Id: I7cf3010cef91413e4a3b704b86b45c83879f05b1
---
M VisualEditor.i18n.php
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
L10n-bot: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index 412987a..777e0fa 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -3092,6 +3092,7 @@
* @author Juandev
* @author Koo6
* @author Littledogboy
+ * @author Michaelbrabec
* @author Mormegil
* @author Polda18
* @author ශ්වෙත
@@ -3231,9 +3232,9 @@
'visualeditor-mwalienextensioninspector-title' => 'Rozšíření MediaWiki',
'visualeditor-mwhieroinspector-title' => 'Hieroglyfy',
'visualeditor-mwmathinspector-title' => 'LaTeX',
- 'visualeditor-notification-created' => 'Stránka „$1“ byla založena.',
+ 'visualeditor-notification-created' => 'Stránka „$1“ byla vytvořena.',
'visualeditor-notification-restored' => 'Stránka „$1“ byla obnovena.',
- 'visualeditor-notification-saved' => 'Vaše změny ve stránce „$1“ byly
uloženy.',
+ 'visualeditor-notification-saved' => 'Vaše změny na stránce „$1“ byly
uloženy.',
'visualeditor-outline-control-move-down' => 'Přesunout položku dolů',
'visualeditor-outline-control-move-up' => 'Přesunout položku nahoru',
'visualeditor-parameter-input-placeholder' => 'Jméno parametru',
@@ -8227,7 +8228,7 @@
'visualeditor-dialog-action-close' => '閉じる',
'visualeditor-dialog-action-goback' => '戻る',
'visualeditor-dialog-beta-welcome-action-continue' => '続行',
- 'visualeditor-dialog-beta-welcome-content' =>
'これは私たちの新しい、今までより簡単な編集方法です。これはまだ「ベータ版」であるため、ページの一部に編集できない部分が見つかるかもしれませんし、修正が必要な問題に遭遇するかもしれません。あなたが加えた変更内容を確認（review）することをお勧めします、またビジュアルエディター使用中に発生したどんな問題でも報告してくださることを歓迎します。(フィードバックするには\'{{int:visualeditor-beta-label}}\'ボタンをクリックしてください)。"$1"タブをクリックすると、従来通りのウィキテキストエディターに切り替えることもできます（ただし未保存の編集内容は失われます）。',
+ 'visualeditor-dialog-beta-welcome-content' =>
'これは私たちの新しい、今までより簡単な編集方法です。これはまだベータ版であるため、ページの一部に編集できない部分が見つかるかもしれませんし、修正が必要な問題に遭遇するかもしれません。あなたが加えた変更内容を確認することをお勧めします、またビジュアルエディター使用中に発生したどんな問題でも報告してくださることを歓迎します。(フィードバックするには「{{int:visualeditor-beta-label}}」ボタンをクリックしてください)。「$1」タブをクリックすると、従来通りのウィキテキスト
エディターに切り替えることもできます (ただし未保存の編集内容は失われます)。',
'visualeditor-dialog-beta-welcome-title' =>
'ビジュアルエディターへ{{GENDER:$1|ようこそ}}',
'visualeditor-dialog-media-content-section' => 'キャプション',
'visualeditor-dialog-media-insert-button' => 'メディアを挿入',
@@ -8358,7 +8359,7 @@
'visualeditor-savedialog-label-save' => 'ページを保存',
'visualeditor-savedialog-label-warning' => '警告',
'visualeditor-savedialog-title-conflict' => '競合',
- 'visualeditor-savedialog-title-nochanges' => 'レビューすべき変更点なし',
+ 'visualeditor-savedialog-title-nochanges' => '確認すべき変更点なし',
'visualeditor-savedialog-title-review' => '変更内容の確認',
'visualeditor-savedialog-title-save' => '変更内容の保存',
'visualeditor-savedialog-warning-dirty' => '編集内容が競合しているそれがあります -
保存する前に確認してください。',
--
To view, visit https://gerrit.wikimedia.org/r/92241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cf3010cef91413e4a3b704b86b45c83879f05b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: L10n-bot
Gerrit-Reviewer: L10n-bot
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Capitalize "Lightbox" - change (mediawiki...SectionDisqus)
Siebrand has submitted this change and it was merged. Change subject: Capitalize "Lightbox" .. Capitalize "Lightbox" Change-Id: Id3d6b95e01f209f5c753eb92039094561e5a3020 --- M SectionDisqus.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/SectionDisqus.i18n.php b/SectionDisqus.i18n.php index d798a58..8b5ec0a 100644 --- a/SectionDisqus.i18n.php +++ b/SectionDisqus.i18n.php @@ -12,7 +12,7 @@ * @author Luis Felipe Schenone */ $messages['en'] = array( - 'sectiondisqus-desc' => 'Adds a "Discuss" button next to the "Edit" button of every section, that when clicked, opens a Disqus lightbox for that section', + 'sectiondisqus-desc' => 'Adds a "Discuss" button next to the "Edit" button of every section, that when clicked, opens a Disqus Lightbox for that section', ); /** Message documentation (Message documentation) -- To view, visit https://gerrit.wikimedia.org/r/92046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3d6b95e01f209f5c753eb92039094561e5a3020 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SectionDisqus Gerrit-Branch: master Gerrit-Owner: Shirayuki Gerrit-Reviewer: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] vector: Restore gray search input placeholder - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92201
Change subject: vector: Restore gray search input placeholder
..
vector: Restore gray search input placeholder
Broken in I1d9657a5.
Bug: 54069
Change-Id: I2d86d75dd023eda349fc9fe69416e9682201eeb3
---
M skins/vector/screen.less
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/01/92201/1
diff --git a/skins/vector/screen.less b/skins/vector/screen.less
index f5cf5e5..30aaa0b 100644
--- a/skins/vector/screen.less
+++ b/skins/vector/screen.less
@@ -378,16 +378,16 @@
div#simpleSearch input:focus {
outline: none;
}
-div#simpleSearch input.placeholder {
+div#simpleSearch input#searchInput.placeholder {
color: #999;
}
-div#simpleSearch input::-webkit-input-placeholder {
+div#simpleSearch input#searchInput::-webkit-input-placeholder {
color: #999;
}
-div#simpleSearch input:-moz-placeholder {
+div#simpleSearch input#searchInput:-moz-placeholder {
color: #999;
}
-div#simpleSearch input:-ms-input-placeholder {
+div#simpleSearch input#searchInput:-ms-input-placeholder {
color: #999;
}
div#simpleSearch input#searchInput {
--
To view, visit https://gerrit.wikimedia.org/r/92201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d86d75dd023eda349fc9fe69416e9682201eeb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add API help url - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged.
Change subject: Add API help url
..
Add API help url
Change-Id: I9886163ad2492a5030059d45853b15964279362a
---
M ApiThank.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiThank.php b/ApiThank.php
index 7febee5..8449c25 100644
--- a/ApiThank.php
+++ b/ApiThank.php
@@ -119,6 +119,12 @@
return '';
}
+ public function getHelpUrls() {
+ return array(
+
'https://www.mediawiki.org/wiki/Extension:Thanks#API_Documentation',
+ );
+ }
+
public function getVersion() {
return __CLASS__ . '-1.0';
}
--
To view, visit https://gerrit.wikimedia.org/r/92166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9886163ad2492a5030059d45853b15964279362a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] awstats fixes - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: awstats fixes
..
awstats fixes
Change-Id: I91c6fb6ddc1896c7b34330c9ea10d1e799434178
---
M puppet/modules/awstats/files/stats.translatewiki.net
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/awstats/files/stats.translatewiki.net
b/puppet/modules/awstats/files/stats.translatewiki.net
index d31f484..0f0d7ac 100644
--- a/puppet/modules/awstats/files/stats.translatewiki.net
+++ b/puppet/modules/awstats/files/stats.translatewiki.net
@@ -8,9 +8,10 @@
server_name stats.translatewiki.net;
root /www/stats.translatewiki.net;
+ auth_basic"Restricted";
+ auth_basic_user_file /etc/webauth;
+
location / {
- auth_basic"Restricted";
- auth_basic_user_file /etc/webauth;
rewrite ^ /awstats.pl;
}
@@ -22,7 +23,7 @@
fastcgi_pass unix:/var/run/fcgiwrap.socket;
}
- location ~ ^/awstats-icon/(.*)$ {
+ location ~ ^/awstatsicons/(.*)$ {
alias /usr/share/awstats/icon/$1;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/92199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91c6fb6ddc1896c7b34330c9ea10d1e799434178
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
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] Fix some mailman issues - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix some mailman issues
..
Fix some mailman issues
Change-Id: Iefcd82ac44844993993f678896c73034fd37aa90
---
M puppet/modules/mailman-conf/manifests/init.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mailman-conf/manifests/init.pp
b/puppet/modules/mailman-conf/manifests/init.pp
index f2dc58e..bad920f 100644
--- a/puppet/modules/mailman-conf/manifests/init.pp
+++ b/puppet/modules/mailman-conf/manifests/init.pp
@@ -42,9 +42,7 @@
'POSTFIX_STYLE_VIRTUAL_DOMAINS' => "'False'",
'DEFAULT_SUBJECT_PREFIX' => "''",
'DEFAULT_REPLY_GOES_TO_LIST' => '1',
-'MAILMAN_UID' => "pwd.getpwnam('list')[2]",
-'MAILMAN_GID' => "grp.getgrnam('list')[2]",
-'SMTPHOST' => 'translatewiki.net',
+'SMTPHOST' => "'translatewiki.net'",
},
}
}
--
To view, visit https://gerrit.wikimedia.org/r/92200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefcd82ac44844993993f678896c73034fd37aa90
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
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] Fix some mailman issues - change (translatewiki)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92200
Change subject: Fix some mailman issues
..
Fix some mailman issues
Change-Id: Iefcd82ac44844993993f678896c73034fd37aa90
---
M puppet/modules/mailman-conf/manifests/init.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/00/92200/1
diff --git a/puppet/modules/mailman-conf/manifests/init.pp
b/puppet/modules/mailman-conf/manifests/init.pp
index f2dc58e..bad920f 100644
--- a/puppet/modules/mailman-conf/manifests/init.pp
+++ b/puppet/modules/mailman-conf/manifests/init.pp
@@ -42,9 +42,7 @@
'POSTFIX_STYLE_VIRTUAL_DOMAINS' => "'False'",
'DEFAULT_SUBJECT_PREFIX' => "''",
'DEFAULT_REPLY_GOES_TO_LIST' => '1',
-'MAILMAN_UID' => "pwd.getpwnam('list')[2]",
-'MAILMAN_GID' => "grp.getgrnam('list')[2]",
-'SMTPHOST' => 'translatewiki.net',
+'SMTPHOST' => "'translatewiki.net'",
},
}
}
--
To view, visit https://gerrit.wikimedia.org/r/92200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefcd82ac44844993993f678896c73034fd37aa90
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] awstats fixes - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92199
Change subject: awstats fixes
..
awstats fixes
Change-Id: I91c6fb6ddc1896c7b34330c9ea10d1e799434178
---
M puppet/modules/awstats/files/stats.translatewiki.net
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/99/92199/1
diff --git a/puppet/modules/awstats/files/stats.translatewiki.net
b/puppet/modules/awstats/files/stats.translatewiki.net
index d31f484..0f0d7ac 100644
--- a/puppet/modules/awstats/files/stats.translatewiki.net
+++ b/puppet/modules/awstats/files/stats.translatewiki.net
@@ -8,9 +8,10 @@
server_name stats.translatewiki.net;
root /www/stats.translatewiki.net;
+ auth_basic"Restricted";
+ auth_basic_user_file /etc/webauth;
+
location / {
- auth_basic"Restricted";
- auth_basic_user_file /etc/webauth;
rewrite ^ /awstats.pl;
}
@@ -22,7 +23,7 @@
fastcgi_pass unix:/var/run/fcgiwrap.socket;
}
- location ~ ^/awstats-icon/(.*)$ {
+ location ~ ^/awstatsicons/(.*)$ {
alias /usr/share/awstats/icon/$1;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/92199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91c6fb6ddc1896c7b34330c9ea10d1e799434178
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ssh module - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add ssh module
..
Add ssh module
Change-Id: Ib1dd64e59290529cd741eb18fe17c054f099e7cd
---
M .gitmodules
A puppet/modules/ssh
A puppet/modules/ssh-conf/manifests/init.pp
M puppet/site.pp
4 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitmodules b/.gitmodules
index 1b800a7..16fed08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
[submodule "puppet/modules/mailman"]
path = puppet/modules/mailman
url = https://github.com/cjsoftuk/puppet-mailman.git
+[submodule "puppet/modules/ssh"]
+ path = puppet/modules/ssh
+ url = https://github.com/attachmentgenie/puppet-module-ssh.git
diff --git a/puppet/modules/ssh b/puppet/modules/ssh
new file mode 16
index 000..9b5f31d
--- /dev/null
+++ b/puppet/modules/ssh
+Subproject commit 9b5f31de23c8c8b4dcda31d5ae25c3a0ec14f9f5
diff --git a/puppet/modules/ssh-conf/manifests/init.pp
b/puppet/modules/ssh-conf/manifests/init.pp
new file mode 100644
index 000..285dd19
--- /dev/null
+++ b/puppet/modules/ssh-conf/manifests/init.pp
@@ -0,0 +1,9 @@
+class ssh-conf {
+ include ssh::client
+
+ # @todo Remove root login after migrating
+ class { "ssh::server":
+port => 22,
+permit_root_login => 'yes'
+ }
+}
diff --git a/puppet/site.pp b/puppet/site.pp
index 6868228..13fc7db 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -14,6 +14,7 @@
include nginx
include php
include puppet
+ include ssh-conf
include sudo
include users
--
To view, visit https://gerrit.wikimedia.org/r/92196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1dd64e59290529cd741eb18fe17c054f099e7cd
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
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] Add ssh module - change (translatewiki)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92196
Change subject: Add ssh module
..
Add ssh module
Change-Id: Ib1dd64e59290529cd741eb18fe17c054f099e7cd
---
M .gitmodules
A puppet/modules/ssh
A puppet/modules/ssh-conf/manifests/init.pp
M puppet/site.pp
4 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/96/92196/1
diff --git a/.gitmodules b/.gitmodules
index 1b800a7..16fed08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
[submodule "puppet/modules/mailman"]
path = puppet/modules/mailman
url = https://github.com/cjsoftuk/puppet-mailman.git
+[submodule "puppet/modules/ssh"]
+ path = puppet/modules/ssh
+ url = https://github.com/attachmentgenie/puppet-module-ssh.git
diff --git a/puppet/modules/ssh b/puppet/modules/ssh
new file mode 16
index 000..9b5f31d
--- /dev/null
+++ b/puppet/modules/ssh
+Subproject commit 9b5f31de23c8c8b4dcda31d5ae25c3a0ec14f9f5
diff --git a/puppet/modules/ssh-conf/manifests/init.pp
b/puppet/modules/ssh-conf/manifests/init.pp
new file mode 100644
index 000..d3b10fa
--- /dev/null
+++ b/puppet/modules/ssh-conf/manifests/init.pp
@@ -0,0 +1,4 @@
+class ssh-conf {
+ class { 'ssh':
+ }
+}
diff --git a/puppet/site.pp b/puppet/site.pp
index 6868228..13fc7db 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -14,6 +14,7 @@
include nginx
include php
include puppet
+ include ssh-conf
include sudo
include users
--
To view, visit https://gerrit.wikimedia.org/r/92196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1dd64e59290529cd741eb18fe17c054f099e7cd
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correctly update wl_notificationtimestamp when viewing old r... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Correctly update wl_notificationtimestamp when viewing old revisions .. Correctly update wl_notificationtimestamp when viewing old revisions == Prelude == wl_notificationtimestamp controls sending the user e-mail notifications about changes to pages, as well as showing the "updated since last visit" markers on history pages, recent changes and watchlist. == The bug == Previously, on every view of a page, the notification timestamp was cleared, regardless of whether the user as actually viewing the latest revision. When viewing a diff, however, the timestamp was cleared only if one of the revisions being compared was the latest one of its page. The same behavior applied to talk page message indicators (which are actually stored sepately to cater to anonymous users). This was inconsistent and surprising when one was attempting to, say, go through the 50 new posts to a discussion page in a peacemeal fashion. == The fix == If the revision being viewed is the latest (or can't be determined), the timestamp is cleared as previously, as this is necessary to reenable e-mail notifications for given user and page. If the revision isn't the latest, the timestamp is updated to revision's timestamp plus one second. This uses up to two simple (selectField) indexed queries per page view, only fired when we do not already know we're looking at the latest version. Talk page indicator is updated to point at the next revision after the one being viewed, or cleared if viewing the latest revision. The UserClearNewTalkNotification hook gained $oldid as the second argument (a backwards-compatible change). In Skin, we no longer ignore the indicator being present if we're viewing the talk page, as it might still be valid. == The bonus == Comments and formatting was updated in a few places, including tables.sql and Wiki.php. The following functions gained a second, optional $oldid parameter (holy indirection, Batman!): * WikiPage#doViewUpdates() * User#clearNotification() * WatchedItem#resetNotificationTimestamp() DifferenceEngine gained a public method mapDiffPrevNext() used to parse the ids from URL parameters like oldid=12345&diff=prev, factored out of loadRevisionIds(). A bug where the NewDifferenceEngine hook would not be called in some cases, dating back to its introduction in r45518, was fixed in the process. Bug: 41759 Change-Id: I4144ba1987b8d7a7e8b24f4f067eedac2ae44459 --- M RELEASE-NOTES-1.23 M docs/hooks.txt M includes/Article.php M includes/ImagePage.php M includes/Skin.php M includes/User.php M includes/WatchedItem.php M includes/Wiki.php M includes/WikiPage.php M includes/diff/DifferenceEngine.php M maintenance/tables.sql 11 files changed, 173 insertions(+), 100 deletions(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 372170a..ec7b898 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -13,6 +13,10 @@ === New features in 1.23 === === Bug fixes in 1.23 === +* (bug 41759) The "updated since last visit" markers (on history pages, recent + changes and watchlist) and the talk page message indicator are now correctly + updated when the user is viewing old revisions of pages, instead of always + acting as if the latest revision was being viewed. === API changes in 1.23 === diff --git a/docs/hooks.txt b/docs/hooks.txt index 5aaf596..2671dd8 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2579,6 +2579,7 @@ 'UserClearNewTalkNotification': Called when clearing the "You have new messages!" message, return false to not delete it. $user: User (object) that will clear the message +$oldid: ID of the talk page revision being viewed (0 means the most recent one) 'UserComparePasswords': Called when checking passwords, return false to override the default password checks. diff --git a/includes/Article.php b/includes/Article.php index 0b18221..928fda0 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -586,7 +586,7 @@ wfDebug( __METHOD__ . ": done file cache\n" ); # tell wgOut that output is taken care of $outputPage->disable(); - $this->mPage->doViewUpdates( $user ); + $this->mPage->doViewUpdates( $user, $oldid ); wfProfileOut( __METHOD__ ); return; @@ -765,7 +765,7 @@ $outputPage->setFollowPolicy( $policy['follow'] ); $this->showViewFooter(); - $this->mPage->doViewUpdates( $user ); + $this->mPage->doViewUpdates( $user, $oldid ); $outputPage->addModules( 'mediawiki.action.view.postEdit' ); @@ -815,10 +815,10 @@ $this->mRevIdFetched
[MediaWiki-commits] [Gerrit] Capitalize "Lightbox" - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Capitalize "Lightbox" .. Capitalize "Lightbox" Change-Id: Iac7e33ac9b15e68b5d302f2321a1126622b55631 --- M MultimediaViewer.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php index bb2bd8d..2c235d3 100644 --- a/MultimediaViewer.i18n.php +++ b/MultimediaViewer.i18n.php @@ -26,9 +26,9 @@ * @author Mark Holmquist */ $messages['en'] = array( - 'multimediaviewer-desc' => 'Expand thumbnails in a larger size in a lightbox.', + 'multimediaviewer-desc' => 'Expand thumbnails in a larger size in a Lightbox.', 'multimediaviewer-pref' => 'Media Viewer', - 'multimediaviewer-pref-desc' => 'Improve your multimedia viewing experience with this new tool. It displays images in larger size on pages that have thumbnails. Images are shown in a nicer lightbox overlay, and can also be viewed in full-size.', + 'multimediaviewer-pref-desc' => 'Improve your multimedia viewing experience with this new tool. It displays images in larger size on pages that have thumbnails. Images are shown in a nicer Lightbox overlay, and can also be viewed in full-size.', 'multimediaviewer-file-page' => 'Go to corresponding file page', 'multimediaviewer-repository' => 'Learn more on $1', 'multimediaviewer-datetime-created' => 'Created on $1', -- To view, visit https://gerrit.wikimedia.org/r/92040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac7e33ac9b15e68b5d302f2321a1126622b55631 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Shirayuki 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] Add/remove full-stop - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Add/remove full-stop
..
Add/remove full-stop
For consistency
Change-Id: I033def7ebd5c8728af88e611639c30d5026f24ae
---
M Flow.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.i18n.php b/Flow.i18n.php
index 8acc149..9904e1c 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -115,7 +115,7 @@
'flow-notification-edit-bundle' => '$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|edited}} a [$4 post] in $2 on "$3".',
'flow-notification-newtopic' => '$1 {{GENDER:$1|created}} a [$5 new
topic] on [[$2|$3]]: $4.',
'flow-notification-rename' => '$1 {{GENDER:$1|changed}} the title of
[$2 $3] to "$4" on [[$5|$6]].',
- 'flow-notification-mention' => '$1 {{GENDER:$1|mentioned}} you in their
[$2 post] in "$3" on "$4"',
+ 'flow-notification-mention' => '$1 {{GENDER:$1|mentioned}} you in their
[$2 post] in "$3" on "$4".',
// Notification primary links and secondary links
'flow-notification-link-text-view-post' => 'View post',
@@ -149,7 +149,7 @@
'flow-moderation-title-censor' => 'Censor post',
'flow-moderation-title-delete' => 'Delete post',
'flow-moderation-title-hide' => 'Hide post',
- 'flow-moderation-title-restore'=> 'Restore post.',
+ 'flow-moderation-title-restore'=> 'Restore post',
'flow-moderation-intro-censor' => 'Please confirm that you wish to
censor the post by {{GENDER:$1|$1}} in the thread "$2", and provide a reason
for your action.',
'flow-moderation-intro-delete' => 'Please confirm that you wish to
delete the post by {{GENDER:$1|$1}} in the thread "$2", and provide a reason
for your action.',
'flow-moderation-intro-hide' => 'Please confirm that you wish to hide
the post by {{GENDER:$1|$1}} in the thread "$2", and provide a reason for your
action.',
--
To view, visit https://gerrit.wikimedia.org/r/92049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I033def7ebd5c8728af88e611639c30d5026f24ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Shirayuki
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] Remove full stop from 'echo-new-messages' message - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove full stop from 'echo-new-messages' message
..
Remove full stop from 'echo-new-messages' message
It should not have a full stop – it's used in the personal menu
(top-right corner of pages), which additionally some skins like
Monobook display in all lowercase.
Updated qqq.
Change-Id: I224a9fc0226ac769eb878cc5d3a7e6d8ebfa7548
(cherry picked from commit 0d39b70b4546d92d1c85764516e3bfa12463be2f)
---
M Echo.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 109b099..9e8b654 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -33,7 +33,7 @@
'echo-learn-more' => 'Learn more',
// Alert interface
- 'echo-new-messages' => 'You have new messages.',
+ 'echo-new-messages' => 'You have new messages',
// Category titles
'echo-category-title-edit-user-talk' => 'Talk page
{{PLURAL:$1|message|messages}}',
@@ -212,7 +212,7 @@
'echo-pref-new-message-indicator' => 'Label for a preference which
enables the new talk page message alert',
'echo-learn-more' => 'Text for link to more information about a topic.
{{Identical|Learn more}}',
- 'echo-new-messages' => 'Message to let the user know that they have new
talk page messages. Keep this message short.',
+ 'echo-new-messages' => 'Message to let the user know that they have new
talk page messages, displayed in the personal menu (top-right corner on Vector
and Monobook). Keep this message short. It \'\'\'should not\'\'\' end in a full
stop.',
'echo-category-title-edit-user-talk' => 'This is a short title for
notification category.
Used in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}}
in Special:Preferences. As far as I can see this always needs to be a plural
for an unspecified number.
--
To view, visit https://gerrit.wikimedia.org/r/92192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I224a9fc0226ac769eb878cc5d3a7e6d8ebfa7548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: REL1_22
Gerrit-Owner: Bartosz Dziewoński
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] Pin the MariaDB repo to prevent update issues - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Pin the MariaDB repo to prevent update issues
..
Pin the MariaDB repo to prevent update issues
Change-Id: I9e0a35fac8baea9b7743dbe8c15697334bcf399d
---
M puppet/modules/mailman
M puppet/modules/mariadb/manifests/init.pp
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mailman b/puppet/modules/mailman
index 2d55046..d4f880f 16
--- a/puppet/modules/mailman
+++ b/puppet/modules/mailman
-Subproject commit 2d55046435236772a5e255735ede44a51581117f
+Subproject commit d4f880fee47376e0eb8df8e6cfd432f547c7b7bb
diff --git a/puppet/modules/mariadb/manifests/init.pp
b/puppet/modules/mariadb/manifests/init.pp
index d72f78a..c3f9d8e 100644
--- a/puppet/modules/mariadb/manifests/init.pp
+++ b/puppet/modules/mariadb/manifests/init.pp
@@ -7,6 +7,12 @@
key_server => 'keyserver.ubuntu.com',
}
+ # Per https://mariadb.com/kb/en/installing-mariadb-deb-files/
+ apt::pin { 'mariadb':
+priority => 1000,
+origin => 'mirror3.layerjet.com'
+ }
+
class { '::mysql::server':
package_name => 'mariadb-server',
require => Apt::Source['mariadb'],
--
To view, visit https://gerrit.wikimedia.org/r/92194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e0a35fac8baea9b7743dbe8c15697334bcf399d
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
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] Install php-apc while we are using php 5.4 - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Install php-apc while we are using php 5.4 .. Install php-apc while we are using php 5.4 Change-Id: I22a097814e7a86ff3dec90e6363d5ec7c915d15e --- M puppet/modules/php/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/php/manifests/init.pp b/puppet/modules/php/manifests/init.pp index 2d424a2..2ade6a8 100644 --- a/puppet/modules/php/manifests/init.pp +++ b/puppet/modules/php/manifests/init.pp @@ -11,6 +11,7 @@ 'php5-gd', 'php5-intl', 'php5-mysql', +'php-apc', 'php-pear', ]: ensure => present, -- To view, visit https://gerrit.wikimedia.org/r/92195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22a097814e7a86ff3dec90e6363d5ec7c915d15e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit 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] Install php-apc while we are using php 5.4 - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/92195 Change subject: Install php-apc while we are using php 5.4 .. Install php-apc while we are using php 5.4 Change-Id: I22a097814e7a86ff3dec90e6363d5ec7c915d15e --- M puppet/modules/php/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/95/92195/1 diff --git a/puppet/modules/php/manifests/init.pp b/puppet/modules/php/manifests/init.pp index 2d424a2..2ade6a8 100644 --- a/puppet/modules/php/manifests/init.pp +++ b/puppet/modules/php/manifests/init.pp @@ -11,6 +11,7 @@ 'php5-gd', 'php5-intl', 'php5-mysql', +'php-apc', 'php-pear', ]: ensure => present, -- To view, visit https://gerrit.wikimedia.org/r/92195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22a097814e7a86ff3dec90e6363d5ec7c915d15e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pin the MariaDB repo to prevent update issues - change (translatewiki)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92194
Change subject: Pin the MariaDB repo to prevent update issues
..
Pin the MariaDB repo to prevent update issues
Change-Id: I9e0a35fac8baea9b7743dbe8c15697334bcf399d
---
M puppet/modules/mailman
M puppet/modules/mariadb/manifests/init.pp
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/94/92194/1
diff --git a/puppet/modules/mailman b/puppet/modules/mailman
index 2d55046..d4f880f 16
--- a/puppet/modules/mailman
+++ b/puppet/modules/mailman
-Subproject commit 2d55046435236772a5e255735ede44a51581117f
+Subproject commit d4f880fee47376e0eb8df8e6cfd432f547c7b7bb
diff --git a/puppet/modules/mariadb/manifests/init.pp
b/puppet/modules/mariadb/manifests/init.pp
index d72f78a..01dc151 100644
--- a/puppet/modules/mariadb/manifests/init.pp
+++ b/puppet/modules/mariadb/manifests/init.pp
@@ -7,6 +7,12 @@
key_server => 'keyserver.ubuntu.com',
}
+ // Per https://mariadb.com/kb/en/installing-mariadb-deb-files/
+ apt::pin { 'mariadb':
+priority => 1000,
+origin => 'mirror3.layerjet.com'
+ }
+
class { '::mysql::server':
package_name => 'mariadb-server',
require => Apt::Source['mariadb'],
--
To view, visit https://gerrit.wikimedia.org/r/92194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e0a35fac8baea9b7743dbe8c15697334bcf399d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] .svnprops file for importing to tortoiseSVN - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: .svnprops file for importing to tortoiseSVN .. .svnprops file for importing to tortoiseSVN Change-Id: I1b8c8fa548bc0ada986bddc9bf8ac9405be22857 --- A .svnprops 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.svnprops b/.svnprops new file mode 100644 index 000..d927a64 --- /dev/null +++ b/.svnprops Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/92188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b8c8fa548bc0ada986bddc9bf8ac9405be22857 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Fix possible errors to avoid Unknown error - change (mediawiki...CheckUser)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92193
Change subject: API: Fix possible errors to avoid Unknown error
..
API: Fix possible errors to avoid Unknown error
Add a missing one.
The error text must be repeated in the possible error list.
Change-Id: Id6ab454012bb0aacab323ece96336b768ca1d4f9
---
M api/ApiQueryCheckUser.php
M api/ApiQueryCheckUserLog.php
2 files changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser
refs/changes/93/92193/1
diff --git a/api/ApiQueryCheckUser.php b/api/ApiQueryCheckUser.php
index 99ea444..966bcc4 100644
--- a/api/ApiQueryCheckUser.php
+++ b/api/ApiQueryCheckUser.php
@@ -264,11 +264,12 @@
public function getPossibleErrors() {
return array_merge( parent::getPossibleErrors(),
array(
- array( 'nosuchuser' ),
- array( 'invalidip' ),
- array( 'permissionerror' ),
- array( 'invalidmode' ),
- array( 'missingdata' ),
+ array( 'code' => 'nosuchuser', 'info' =>
'Target user does not exist' ),
+ array( 'code' => 'invalidip', 'info' => 'IP or
range is invalid' ),
+ array( 'code' => 'permissionerror', 'info' =>
'You need the checkuser right' ),
+ array( 'code' => 'invalidmode', 'info' =>
'Invalid request mode' ),
+ array( 'code' => 'missingdata', 'info' => 'You
must define reason for check' ),
+ array( 'code' => 'invalidtime', 'info' => 'You
need use correct time limit (like "2 weeks")' ),
)
);
}
diff --git a/api/ApiQueryCheckUserLog.php b/api/ApiQueryCheckUserLog.php
index 84e5c7d..c143328 100644
--- a/api/ApiQueryCheckUserLog.php
+++ b/api/ApiQueryCheckUserLog.php
@@ -135,7 +135,7 @@
public function getPossibleErrors() {
return array_merge( parent::getPossibleErrors(),
array(
- array( 'permissionerror' ),
+ array( 'code' => 'permissionerror', 'info' =>
'You need the checkuser-log right' ),
)
);
}
--
To view, visit https://gerrit.wikimedia.org/r/92193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6ab454012bb0aacab323ece96336b768ca1d4f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Add text for Unknown error: "permissiondenied" - change (mediawiki...AbuseFilter)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92191
Change subject: API: Add text for Unknown error: "permissiondenied"
..
API: Add text for Unknown error: "permissiondenied"
The api does not known a generic "permissiondenied" message.
Change-Id: I65822c9f58ce323352db759d46bf11d4ddab14bd
---
M api/ApiAbuseFilterCheckMatch.php
M api/ApiAbuseFilterCheckSyntax.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/91/92191/1
diff --git a/api/ApiAbuseFilterCheckMatch.php b/api/ApiAbuseFilterCheckMatch.php
index 5490cc9..7f62792 100644
--- a/api/ApiAbuseFilterCheckMatch.php
+++ b/api/ApiAbuseFilterCheckMatch.php
@@ -7,7 +7,7 @@
// "Anti-DoS"
if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
- $this->dieUsageMsg( 'permissiondenied' );
+ $this->dieUsage( 'You don\'t have permission to test
abuse filters', 'permissiondenied' );
}
if ( $params['vars'] ) {
@@ -93,7 +93,7 @@
return array_merge( parent::getPossibleErrors(),
$this->getRequireOnlyOneParameterErrorMessages( array(
'vars', 'rcid', 'logid' ) ),
array(
- array( 'permissiondenied' ),
+ array( 'code' => 'permissiondenied', 'info' =>
'You don\'t have permission to test abuse filters' ),
array( 'nosuchrcid' ),
array( 'code' => 'nosuchlogid', 'info' =>
'There is no abuselog entry with the id given' ),
array( 'code' => 'badsyntax', 'info' => 'The
filter has invalid syntax' ),
diff --git a/api/ApiAbuseFilterCheckSyntax.php
b/api/ApiAbuseFilterCheckSyntax.php
index 379253e..5b89eeb 100644
--- a/api/ApiAbuseFilterCheckSyntax.php
+++ b/api/ApiAbuseFilterCheckSyntax.php
@@ -5,7 +5,7 @@
public function execute() {
// "Anti-DoS"
if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
- $this->dieUsageMsg( 'permissiondenied' );
+ $this->dieUsage( 'You don\'t have permission to check
syntax of abuse filters', 'permissiondenied' );
}
$params = $this->extractRequestParams();
@@ -48,7 +48,7 @@
public function getPossibleErrors() {
return array_merge( parent::getPossibleErrors(), array(
- array( 'permissiondenied' ),
+ array( 'code' => 'permissiondenied', 'info' => 'You
don\'t have permission to check syntax of abuse filters' ),
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/92191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65822c9f58ce323352db759d46bf11d4ddab14bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove full stop from 'echo-new-messages' message - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove full stop from 'echo-new-messages' message
..
Remove full stop from 'echo-new-messages' message
It should not have a full stop – it's used in the personal menu
(top-right corner of pages), which additionally some skins like
Monobook display in all lowercase.
Updated qqq.
Change-Id: I224a9fc0226ac769eb878cc5d3a7e6d8ebfa7548
---
M Echo.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 9e59611..83900d9 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -33,7 +33,7 @@
'echo-learn-more' => 'Learn more',
// Alert interface
- 'echo-new-messages' => 'You have new messages.',
+ 'echo-new-messages' => 'You have new messages',
// Category titles
'echo-category-title-edit-user-talk' => 'Talk page
{{PLURAL:$1|message|messages}}',
@@ -212,7 +212,7 @@
'echo-pref-new-message-indicator' => 'Label for a preference which
enables the new talk page message alert',
'echo-learn-more' => 'Text for link to more information about a topic.
{{Identical|Learn more}}',
- 'echo-new-messages' => 'Message to let the user know that they have new
talk page messages. Keep this message short.',
+ 'echo-new-messages' => 'Message to let the user know that they have new
talk page messages, displayed in the personal menu (top-right corner on Vector
and Monobook). Keep this message short. It \'\'\'should not\'\'\' end in a full
stop.',
'echo-category-title-edit-user-talk' => 'This is a short title for
notification category.
Used in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}}
in Special:Preferences. As far as I can see this always needs to be a plural
for an unspecified number.
--
To view, visit https://gerrit.wikimedia.org/r/92183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I224a9fc0226ac769eb878cc5d3a7e6d8ebfa7548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Shirayuki
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] .svnprops file for importing to tortoiseSVN - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: .svnprops file for importing to tortoiseSVN .. .svnprops file for importing to tortoiseSVN Change-Id: I18fdefb0ca3acce25d8c37fd676839a543e54bf5 --- A .svnprops 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/.svnprops b/.svnprops new file mode 100644 index 000..e5fa0ed --- /dev/null +++ b/.svnprops Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/92187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18fdefb0ca3acce25d8c37fd676839a543e54bf5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Remove leading/trailing spaces from error and descripti... - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92190
Change subject: API: Remove leading/trailing spaces from error and description
text
..
API: Remove leading/trailing spaces from error and description text
Change-Id: Id866c7258a297fe965a64d52e3458d53e140aa4c
---
M includes/api/ApiLogin.php
M includes/api/ApiQueryRandom.php
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/92190/1
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index b51d441..13e58b8 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -254,9 +254,9 @@
public function getDescription() {
return array(
- 'Log in and get the authentication tokens. ',
+ 'Log in and get the authentication tokens.',
'In the event of a successful log-in, a cookie will be
attached',
- 'to your session. In the event of a failed log-in, you
will not ',
+ 'to your session. In the event of a failed log-in, you
will not',
'be able to attempt another log-in through this method
for 5 seconds.',
'This is to prevent password guessing by automated
password crackers'
);
@@ -267,10 +267,10 @@
array( 'code' => 'NeedToken', 'info' => 'You need to
resubmit your login with the specified token. See
https://bugzilla.wikimedia.org/show_bug.cgi?id=23076' ),
array( 'code' => 'WrongToken', 'info' => 'You specified
an invalid token' ),
array( 'code' => 'NoName', 'info' => 'You didn\'t set
the lgname parameter' ),
- array( 'code' => 'Illegal', 'info' => ' You provided an
illegal username' ),
- array( 'code' => 'NotExists', 'info' => ' The username
you provided doesn\'t exist' ),
- array( 'code' => 'EmptyPass', 'info' => ' You didn\'t
set the lgpassword parameter or you left it empty' ),
- array( 'code' => 'WrongPass', 'info' => ' The password
you provided is incorrect' ),
+ array( 'code' => 'Illegal', 'info' => 'You provided an
illegal username' ),
+ array( 'code' => 'NotExists', 'info' => 'The username
you provided doesn\'t exist' ),
+ array( 'code' => 'EmptyPass', 'info' => 'You didn\'t
set the lgpassword parameter or you left it empty' ),
+ array( 'code' => 'WrongPass', 'info' => 'The password
you provided is incorrect' ),
array( 'code' => 'WrongPluginPass', 'info' => 'Same as
"WrongPass", returned when an authentication plugin rather than MediaWiki
itself rejected the password' ),
array( 'code' => 'CreateBlocked', 'info' => 'The wiki
tried to automatically create a new account for you, but your IP address has
been blocked from account creation' ),
array( 'code' => 'Throttled', 'info' => 'You\'ve logged
in too many times in a short time' ),
diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php
index 2754bda..fae3377 100644
--- a/includes/api/ApiQueryRandom.php
+++ b/includes/api/ApiQueryRandom.php
@@ -176,7 +176,7 @@
public function getDescription() {
return array(
'Get a set of random pages',
- 'NOTE: Pages are listed in a fixed sequence, only the
starting point is random. This means that if, for example, "Main Page" is the
first ',
+ 'NOTE: Pages are listed in a fixed sequence, only the
starting point is random. This means that if, for example, "Main Page" is the
first',
' random page on your list, "List of fictional
monkeys" will *always* be second, "List of people on stamps of Vanuatu" third,
etc',
'NOTE: If the number of pages in the namespace is lower
than rnlimit, you will get fewer pages. You will not get the same page twice'
);
--
To view, visit https://gerrit.wikimedia.org/r/92190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id866c7258a297fe965a64d52e3458d53e140aa4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Document some steps which are not yet automated - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/92189 Change subject: Document some steps which are not yet automated .. Document some steps which are not yet automated Change-Id: Ic19ea11ecd5a45cb20251ad60ee7872b23c53c7b --- A puppet/README 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/89/92189/1 diff --git a/puppet/README b/puppet/README new file mode 100644 index 000..6ba2f08 --- /dev/null +++ b/puppet/README @@ -0,0 +1,13 @@ +== Manual steps == + +Create /etc/webauth + +-- + +Install syck_load + +Follow instructions at https://github.com/example42/puppet-php +Create /etc/php5/conf.d/20-syck.ini: + extension=syck.so + +And restart php5-fpm -- To view, visit https://gerrit.wikimedia.org/r/92189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic19ea11ecd5a45cb20251ad60ee7872b23c53c7b Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] .svnprops file for importing to tortoiseSVN - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/92188 Change subject: .svnprops file for importing to tortoiseSVN .. .svnprops file for importing to tortoiseSVN Change-Id: I1b8c8fa548bc0ada986bddc9bf8ac9405be22857 --- A .svnprops 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/88/92188/1 diff --git a/.svnprops b/.svnprops new file mode 100644 index 000..d927a64 --- /dev/null +++ b/.svnprops Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/92188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b8c8fa548bc0ada986bddc9bf8ac9405be22857 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] .svnprops file for importing to tortoiseSVN - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/92187 Change subject: .svnprops file for importing to tortoiseSVN .. .svnprops file for importing to tortoiseSVN Change-Id: I18fdefb0ca3acce25d8c37fd676839a543e54bf5 --- A .svnprops 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/87/92187/1 diff --git a/.svnprops b/.svnprops new file mode 100644 index 000..e5fa0ed --- /dev/null +++ b/.svnprops Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/92187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18fdefb0ca3acce25d8c37fd676839a543e54bf5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add login data to .gitignore - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: Add login data to .gitignore .. Add login data to .gitignore Change-Id: I346a32b93c56abc604fc9620f3f08a14e2da3463 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 945c8e2..f394fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ user-config.py user-fixes.py throttle.ctrl +login-data/*login.data -- To view, visit https://gerrit.wikimedia.org/r/92186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I346a32b93c56abc604fc9620f3f08a14e2da3463 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Siebrand 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] Update namespace names and version - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: Update namespace names and version
..
Update namespace names and version
Change-Id: Iec2ca866b2dfe6ccd6b68c2d6c51f98555bf3ddb
---
M families/i18n_family.py
1 file changed, 23 insertions(+), 8 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/families/i18n_family.py b/families/i18n_family.py
index e4ca8eb..e8514db 100644
--- a/families/i18n_family.py
+++ b/families/i18n_family.py
@@ -196,16 +196,16 @@
'_default': [u'Europeana talk'],
}
self.namespaces[1238] = {
-'_default': [u'Pywikipedia'],
+'_default': [u'Pywikibot'],
}
self.namespaces[1239] = {
-'_default': [u'Pywikipedia talk'],
+'_default': [u'Pywikibot talk'],
}
self.namespaces[1240] = {
-'_default': [u'Toolserver'],
+'_default': [u'Intuition'],
}
self.namespaces[1241] = {
-'_default': [u'Toolserver talk'],
+'_default': [u'Intuition talk'],
}
self.namespaces[1242] = {
'_default': [u'EOL'],
@@ -225,9 +225,6 @@
self.namespaces[1247] = {
'_default': [u'Mozilla talk'],
}
-self.namespaces[1248] = {
-'_default': [u'FrontlineSMS'],
-}
self.namespaces[1249] = {
'_default': [u'FrontlineSMS talk'],
}
@@ -243,6 +240,24 @@
self.namespaces[1253] = {
'_default': [u'Vicuna talk'],
}
+self.namespaces[1254] = {
+'_default': [u'FUEL'],
+}
+self.namespaces[1255] = {
+'_default': [u'FUEL talk'],
+}
+self.namespaces[1256] = {
+'_default': [u'Blockly'],
+}
+self.namespaces[1257] = {
+'_default': [u'Blockly talk'],
+}
+self.namespaces[1258] = {
+'_default': [u'MathJax'],
+}
+self.namespaces[1259] = {
+'_default': [u'MathJax talk'],
+}
def version(self, code):
-return "1.21alpha"
+return "1.23alpha"
--
To view, visit https://gerrit.wikimedia.org/r/92185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec2ca866b2dfe6ccd6b68c2d6c51f98555bf3ddb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Siebrand
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] Add login data to .gitignore - change (pywikibot/compat)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/92186 Change subject: Add login data to .gitignore .. Add login data to .gitignore Change-Id: I346a32b93c56abc604fc9620f3f08a14e2da3463 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/86/92186/1 diff --git a/.gitignore b/.gitignore index 945c8e2..f394fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ user-config.py user-fixes.py throttle.ctrl +login-data/*login.data -- To view, visit https://gerrit.wikimedia.org/r/92186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I346a32b93c56abc604fc9620f3f08a14e2da3463 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update namespace names and version - change (pywikibot/compat)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92185
Change subject: Update namespace names and version
..
Update namespace names and version
Change-Id: Iec2ca866b2dfe6ccd6b68c2d6c51f98555bf3ddb
---
M families/i18n_family.py
1 file changed, 23 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/85/92185/1
diff --git a/families/i18n_family.py b/families/i18n_family.py
index e4ca8eb..e8514db 100644
--- a/families/i18n_family.py
+++ b/families/i18n_family.py
@@ -196,16 +196,16 @@
'_default': [u'Europeana talk'],
}
self.namespaces[1238] = {
-'_default': [u'Pywikipedia'],
+'_default': [u'Pywikibot'],
}
self.namespaces[1239] = {
-'_default': [u'Pywikipedia talk'],
+'_default': [u'Pywikibot talk'],
}
self.namespaces[1240] = {
-'_default': [u'Toolserver'],
+'_default': [u'Intuition'],
}
self.namespaces[1241] = {
-'_default': [u'Toolserver talk'],
+'_default': [u'Intuition talk'],
}
self.namespaces[1242] = {
'_default': [u'EOL'],
@@ -225,9 +225,6 @@
self.namespaces[1247] = {
'_default': [u'Mozilla talk'],
}
-self.namespaces[1248] = {
-'_default': [u'FrontlineSMS'],
-}
self.namespaces[1249] = {
'_default': [u'FrontlineSMS talk'],
}
@@ -243,6 +240,24 @@
self.namespaces[1253] = {
'_default': [u'Vicuna talk'],
}
+self.namespaces[1254] = {
+'_default': [u'FUEL'],
+}
+self.namespaces[1255] = {
+'_default': [u'FUEL talk'],
+}
+self.namespaces[1256] = {
+'_default': [u'Blockly'],
+}
+self.namespaces[1257] = {
+'_default': [u'Blockly talk'],
+}
+self.namespaces[1258] = {
+'_default': [u'MathJax'],
+}
+self.namespaces[1259] = {
+'_default': [u'MathJax talk'],
+}
def version(self, code):
-return "1.21alpha"
+return "1.23alpha"
--
To view, visit https://gerrit.wikimedia.org/r/92185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec2ca866b2dfe6ccd6b68c2d6c51f98555bf3ddb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove full stop from 'echo-new-messages' message - change (mediawiki...Echo)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92183
Change subject: Remove full stop from 'echo-new-messages' message
..
Remove full stop from 'echo-new-messages' message
It should not have a full stop – it's used in the personal menu
(top-right corner of pages), which additionally some skins like
Monobook display in all lowercase.
Updated qqq.
Change-Id: I224a9fc0226ac769eb878cc5d3a7e6d8ebfa7548
---
M Echo.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/83/92183/1
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 9e59611..83900d9 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -33,7 +33,7 @@
'echo-learn-more' => 'Learn more',
// Alert interface
- 'echo-new-messages' => 'You have new messages.',
+ 'echo-new-messages' => 'You have new messages',
// Category titles
'echo-category-title-edit-user-talk' => 'Talk page
{{PLURAL:$1|message|messages}}',
@@ -212,7 +212,7 @@
'echo-pref-new-message-indicator' => 'Label for a preference which
enables the new talk page message alert',
'echo-learn-more' => 'Text for link to more information about a topic.
{{Identical|Learn more}}',
- 'echo-new-messages' => 'Message to let the user know that they have new
talk page messages. Keep this message short.',
+ 'echo-new-messages' => 'Message to let the user know that they have new
talk page messages, displayed in the personal menu (top-right corner on Vector
and Monobook). Keep this message short. It \'\'\'should not\'\'\' end in a full
stop.',
'echo-category-title-edit-user-talk' => 'This is a short title for
notification category.
Used in a list of options under the heading {{msg-mw|Prefs-echosubscriptions}}
in Special:Preferences. As far as I can see this always needs to be a plural
for an unspecified number.
--
To view, visit https://gerrit.wikimedia.org/r/92183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I224a9fc0226ac769eb878cc5d3a7e6d8ebfa7548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ext.echo.alert: Restore orange background on Monobook - change (mediawiki...Echo)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92181
Change subject: ext.echo.alert: Restore orange background on Monobook
..
ext.echo.alert: Restore orange background on Monobook
Core styles for Monobook include high-specificity background: transparent;
rule for #p-personal li a, we need to match it to set our background.
Also change hover behavior: switch to a deeper orange instead of
default white, similarly to how the badge already behaves.
Partially reverts I682182fe.
Bug: 56214
Change-Id: I9f343264c395ecf09c1e34e03d208ec2119fb622
---
M Echo.php
M modules/alert/ext.echo.alert.css
M modules/alert/ext.echo.alert.modern.css
A modules/alert/ext.echo.alert.monobook.css
4 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/81/92181/1
diff --git a/Echo.php b/Echo.php
index f5f3e61..99e389c 100644
--- a/Echo.php
+++ b/Echo.php
@@ -209,6 +209,7 @@
'styles' => 'alert/ext.echo.alert.css',
'skinStyles' => array(
'modern' => 'alert/ext.echo.alert.modern.css',
+ 'monobook' => 'alert/ext.echo.alert.monobook.css',
),
'messages' => array(
'echo-new-messages',
diff --git a/modules/alert/ext.echo.alert.css b/modules/alert/ext.echo.alert.css
index a1fb628..15745c6 100644
--- a/modules/alert/ext.echo.alert.css
+++ b/modules/alert/ext.echo.alert.css
@@ -2,7 +2,7 @@
white-space: nowrap;
}
-.mw-echo-alert {
+#pt-mytalk a.mw-echo-alert {
border-radius: 2px;
background-color: #F9C557;
padding: 0.25em 0.8em 0.2em 0.8em;
diff --git a/modules/alert/ext.echo.alert.modern.css
b/modules/alert/ext.echo.alert.modern.css
index 1a3786e..66e440b 100644
--- a/modules/alert/ext.echo.alert.modern.css
+++ b/modules/alert/ext.echo.alert.modern.css
@@ -1,4 +1,4 @@
-/* No rounded corners for modern skin */
-.mw-echo-alert {
+/* No rounded corners for Modern skin */
+#pt-mytalk a.mw-echo-alert {
border-radius: 0;
}
diff --git a/modules/alert/ext.echo.alert.monobook.css
b/modules/alert/ext.echo.alert.monobook.css
new file mode 100644
index 000..97ee676
--- /dev/null
+++ b/modules/alert/ext.echo.alert.monobook.css
@@ -0,0 +1,4 @@
+/* Different background color on hover for consistency with Monobook skin */
+#pt-mytalk a.mw-echo-alert:hover {
+ background-color: #FAB951;
+}
--
To view, visit https://gerrit.wikimedia.org/r/92181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f343264c395ecf09c1e34e03d208ec2119fb622
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sort alphabetically - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Sort alphabetically
..
Sort alphabetically
Change-Id: I72d987c77e6e0cb4b489d1092810bc7f1a40b218
---
M puppet/site.pp
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/site.pp b/puppet/site.pp
index 60b54e4..af0c990 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -4,17 +4,17 @@
}
node default {
- include users
include base
+ include exim-conf
+ include logrotate
+ include mailman-conf
+ include mariadb
+ include memcached
include nginx
include php
include puppet
include sudo
- include memcached
- include mariadb
- include exim-conf
- include logrotate
- include mailman-conf
+ include users
class { 'backup':
databases => ['mediawiki'],
--
To view, visit https://gerrit.wikimedia.org/r/92180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72d987c77e6e0cb4b489d1092810bc7f1a40b218
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sort alphabetically - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92180
Change subject: Sort alphabetically
..
Sort alphabetically
Change-Id: I72d987c77e6e0cb4b489d1092810bc7f1a40b218
---
M puppet/site.pp
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/80/92180/1
diff --git a/puppet/site.pp b/puppet/site.pp
index 60b54e4..af0c990 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -4,17 +4,17 @@
}
node default {
- include users
include base
+ include exim-conf
+ include logrotate
+ include mailman-conf
+ include mariadb
+ include memcached
include nginx
include php
include puppet
include sudo
- include memcached
- include mariadb
- include exim-conf
- include logrotate
- include mailman-conf
+ include users
class { 'backup':
databases => ['mediawiki'],
--
To view, visit https://gerrit.wikimedia.org/r/92180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72d987c77e6e0cb4b489d1092810bc7f1a40b218
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow robotic Users to determine their IP address - change (mediawiki/core)
saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92179
Change subject: Allow robotic Users to determine their IP address
..
Allow robotic Users to determine their IP address
If some robotic user is making a change (for
example, AbuseFilter user), it is not always
correct to use IP address coming from the request.
Allow instances of User class to provide their
own way to determine IP address for the recent
changes logging.
Bug: 42345
Change-Id: I272db0c07808cd20e07f4d017220817f6d878209
---
M includes/User.php
M includes/changes/RecentChange.php
2 files changed, 31 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/92179/1
diff --git a/includes/User.php b/includes/User.php
index 12912e1..818d9e8 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1297,7 +1297,7 @@
# user is not immune to autoblocks/hardblocks, and they are the
current user so we
# know which IP address they're actually coming from
if ( !$this->isAllowed( 'ipblock-exempt' ) && $this->getID() ==
$wgUser->getID() ) {
- $ip = $this->getRequest()->getIP();
+ $ip = $this->getUserIP();
} else {
$ip = null;
}
@@ -1472,7 +1472,7 @@
*/
public function isPingLimitable() {
global $wgRateLimitsExcludedIPs;
- if ( in_array( $this->getRequest()->getIP(),
$wgRateLimitsExcludedIPs ) ) {
+ if ( in_array( $this->getUserIP(), $wgRateLimitsExcludedIPs ) )
{
// No other good way currently to disable rate limits
// for specific IPs. :P
// But this is a crappy hack and should die.
@@ -1529,11 +1529,11 @@
$keys[wfMemcKey( 'limiter', $action, 'user',
$id )] = $limits['newbie'];
}
if ( isset( $limits['ip'] ) ) {
- $ip = $this->getRequest()->getIP();
+ $ip = $this->getUserIP();
$keys["mediawiki:limiter:$action:ip:$ip"] =
$limits['ip'];
}
if ( isset( $limits['subnet'] ) ) {
- $ip = $this->getRequest()->getIP();
+ $ip = $this->getUserIP();
$matches = array();
$subnet = false;
if ( IP::isIPv6( $ip ) ) {
@@ -1687,7 +1687,7 @@
if ( IP::isIPAddress( $this->getName() ) ) {
$ip = $this->getName();
} elseif ( !$ip ) {
- $ip = $this->getRequest()->getIP();
+ $ip = $this->getUserIP();
}
$blocked = false;
wfRunHooks( 'UserIsBlockedGlobally', array( &$this, $ip,
&$blocked ) );
@@ -1766,7 +1766,7 @@
$this->load();
if ( $this->mName === false ) {
// Clean up IPs
- $this->mName = IP::sanitizeIP(
$this->getRequest()->getIP() );
+ $this->mName = IP::sanitizeIP(
$this->getUserIP() );
}
return $this->mName;
}
@@ -2620,7 +2620,7 @@
$https = $this->getBoolOption( 'prefershttps' );
wfRunHooks( 'UserRequiresHTTPS', array( $this, &$https
) );
if ( $https ) {
- $https = wfCanIPUseHTTPS(
$this->getRequest()->getIP() );
+ $https = wfCanIPUseHTTPS( $this->getUserIP() );
}
return $https;
}
@@ -3491,7 +3491,7 @@
return false;
}
- return (bool)$userblock->doAutoblock(
$this->getRequest()->getIP() );
+ return (bool)$userblock->doAutoblock( $this->getUserIP() );
}
/**
@@ -3558,7 +3558,7 @@
# blocked with createaccount disabled, prevent new account
creation there even
# when the user is logged in
if ( $this->mBlockedFromCreateAccount === false &&
!$this->isAllowed( 'ipblock-exempt' ) ) {
- $this->mBlockedFromCreateAccount =
Block::newFromTarget( null, $this->getRequest()->getIP() );
+ $this->mBlockedFromCreateAccount =
Block::newFromTarget( null, $this->getUserIP() );
}
return $this->mBlockedFromCreateAccount instanceof Block &&
$this->mBlockedFromCreateAccount->prevents( 'createaccount' )
? $this->mBlockedF
[MediaWiki-commits] [Gerrit] Add mailman config - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add mailman config
..
Add mailman config
Todo:
* Get the service running. Need hexmode's help for that.
* Confirm that we have the correct nginx configuration.
Change-Id: Iee263e70b1c2ab82173195d1ce321a9b2df2d469
---
A puppet/modules/mailman-conf/files/exim4/conf.d/main/04_mailman_options
A puppet/modules/mailman-conf/files/exim4/conf.d/router/450_mailman_aliases
A puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
A puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
A puppet/modules/mailman-conf/manifests/init.pp
D puppet/modules/nginx/files/sites/lists.translatewiki.net
M puppet/modules/nginx/manifests/init.pp
M puppet/site.pp
8 files changed, 124 insertions(+), 24 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/main/04_mailman_options
b/puppet/modules/mailman-conf/files/exim4/conf.d/main/04_mailman_options
new file mode 100644
index 000..b015dd0
--- /dev/null
+++ b/puppet/modules/mailman-conf/files/exim4/conf.d/main/04_mailman_options
@@ -0,0 +1,21 @@
+# file managed by puppet
+# Mailman macro definitions
+
+# Home dir for the Mailman installation
+MM_HOME=/var/lib/mailman
+
+# User and group for Mailman
+MM_UID=list
+MM_GID=list
+
+#
+# Domains that your lists are in - colon separated list
+# you may wish to add these into local_domains as well
+domainlist mm_domains=lists.translatewiki.net
+
+# The path of the Mailman mail wrapper script
+MM_WRAP=MM_HOME/mail/mailman
+#
+# The path of the list config file (used as a required file when
+# verifying list addresses)
+MM_LISTCHK=MM_HOME/lists/${lc::$local_part}/config.pck
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/router/450_mailman_aliases
b/puppet/modules/mailman-conf/files/exim4/conf.d/router/450_mailman_aliases
new file mode 100644
index 000..18e4277
--- /dev/null
+++ b/puppet/modules/mailman-conf/files/exim4/conf.d/router/450_mailman_aliases
@@ -0,0 +1,13 @@
+# file managed by puppet
+mailman_router:
+ driver = accept
+ domains = +mm_domains
+ require_files = MM_LISTCHK
+ local_part_suffix_optional
+ local_part_suffix = -admin : \
+-bounces : -bounces+* : \
+-confirm : -confirm+* : \
+-join : -leave : \
+-owner : -request: \
+-subscribe : -unsubscribe
+ transport = mailman_transport
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
b/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
new file mode 100644
index 000..962018f
--- /dev/null
+++ b/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
@@ -0,0 +1,13 @@
+# file managed by puppet
+mailman_transport:
+ driver = pipe
+ command = MM_WRAP \
+'${if def:local_part_suffix \
+{${sg{$local_part_suffix}{-(\\w+)(\\+.*)?}{\$1}}} \
+{post}}' \
+$local_part
+ current_directory = MM_HOME
+ home_directory = MM_HOME
+ user = MM_UID
+ group = MM_GID
+
diff --git a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
new file mode 100644
index 000..d72ce4c
--- /dev/null
+++ b/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
@@ -0,0 +1,26 @@
+# file managed by puppet
+
+# Per http://wiki.nginx.org/Mailman and
+# http://people.adams.edu/~cdmiller/posts/Ubuntu-Mailman-Nginx-Fcgipass/
+
+server {
+ listen 443 ssl;
+ server_name lists.translatewiki.net;
+
+ ssl_certificate /etc/ssl/private/translatewiki.net.pem;
+ ssl_certificate_key /etc/ssl/private/translatewiki.net.key;
+
+ root /usr/lib/cgi-bin;
+
+ location = / {
+ rewrite ^ /mailman/listinfo permanent;
+ }
+
+ location = /mailman {
+ fastcgi_split_path_info (^/mailman/[^/]*)(.*)$;
+ fastcgi_param SCRIPT_FILENAME
$document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ include /etc/nginx/fastcgi_params;
+ fastcgi_pass unix:/var/run/fcgiwrap.socket;
+ }
+}
diff --git a/puppet/modules/mailman-conf/manifests/init.pp
b/puppet/modules/mailman-conf/manifests/init.pp
new file mode 100644
index 000..f2dc58e
--- /dev/null
+++ b/puppet/modules/mailman-conf/manifests/init.pp
@@ -0,0 +1,50 @@
+class mailman-conf {
+ # Would prefer to just use "list" but the module does not support this, so
make an alias
+ user {
+ 'mailman':
+ensure => present,
+uid=> 38,
+allowdupe => true,
+gid=> 38,
+shell => '/bin/sh',
+password => '',
+home => '/var/list',
+comment=> 'Mailing List Manager'
+ }
+
+
[MediaWiki-commits] [Gerrit] Add backup module - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add backup module
..
Add backup module
Change-Id: I59fab3f631b2bf70ca67296aa719fe85a3f647c7
---
A puppet/modules/backup/files/backup.sh
A puppet/modules/backup/files/duplicity.conf
R puppet/modules/backup/files/logrotate
A puppet/modules/backup/manifests/init.pp
A puppet/modules/backup/templates/backup.erb
A puppet/modules/backup/templates/dump-databases.sh.erb
M puppet/modules/base/manifests/init.pp
M puppet/modules/logrotate/manifests/init.pp
M puppet/modules/wiki/manifests/init.pp
D puppet/modules/wiki/templates/wikibackup.erb
M puppet/site.pp
11 files changed, 113 insertions(+), 15 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/backup/files/backup.sh
b/puppet/modules/backup/files/backup.sh
new file mode 100644
index 000..bc88cd3
--- /dev/null
+++ b/puppet/modules/backup/files/backup.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# file managed by puppet
+
+# uncomment for debug
+#set -x
+
+source /root/.duplicity.conf
+
+# duplicity command
+SSHOPTS="--ssh-options \"-oIdentityFile=/root/.ssh/id_dsa_duplicity_backup\""
+
+DUPEXEC="--encrypt-key $ENCRKEY --sign-key $SIGNKEY $SSHOPTS $DUPOPTS $*"
+# loop on directories
+echo -n " Incremental backup of $HOSTNAME "; date
+for i in $BACKDIRS
+do
+ echo "Starting backup of directory /$i"
+ # create dirs and then backup
+ $MKDIR $LPATH/$i && duplicity $DUPEXEC /$i $RPATH/$i
+ # clean up
+ duplicity remove-older-than 2M --force $DUPEXEC $RPATH/$i
+ duplicity clean --force $DUPEXEC $RPATH/$i
+ echo
+done
+# if local, fix permissions
+if [ -z $HOST ]; then chown -R $NAME.$NAME $LPATH; fi
+echo -n " Finished backup on $HOSTNAME "; date
+echo
+echo
diff --git a/puppet/modules/backup/files/duplicity.conf
b/puppet/modules/backup/files/duplicity.conf
new file mode 100644
index 000..8a11e93
--- /dev/null
+++ b/puppet/modules/backup/files/duplicity.conf
@@ -0,0 +1,31 @@
+# file managed by puppet
+
+# path to backup to
+LPATH=/work/users/nike/backups/twn
+
+# remote settings
+HOST=lakka.kapsi.fi
+NAME=nike
+RPATH=scp://$NAME@$HOST/$LPATH
+SSHID="/root/.ssh/id_dsa_duplicity_backup"
+
+# complete with root gpg signature and encryption key
+SIGNKEY=D4D02B43
+ENCRKEY=$SIGNKEY
+export PASSPHRASE=$( present,
+ }
+
+ file { "/etc/cron.d/backup":
+# Enable when new server is primary
+ensure => absent,
+content => template("backup/backup.erb"),
+ }
+
+ file { "/root/backup.sh":
+source => 'puppet:///modules/backup/backup.sh',
+ }
+
+ file { "/root/.duplicity.conf":
+source => 'puppet:///modules/backup/duplicity.conf',
+ }
+
+ file { "/root/dump-databases.sh":
+content => template("backup/dump-databases.sh.erb"),
+ }
+
+ file { '/etc/logrotate.d/twn-database-backup':
+source => 'puppet:///modules/backup/logrotate'
+ }
+}
diff --git a/puppet/modules/backup/templates/backup.erb
b/puppet/modules/backup/templates/backup.erb
new file mode 100644
index 000..840fa96
--- /dev/null
+++ b/puppet/modules/backup/templates/backup.erb
@@ -0,0 +1,3 @@
+# file managed by puppet
+00 02 * * * root /root/dump-databases.sh
+00 03 * * * root /root/backup.sh
diff --git a/puppet/modules/backup/templates/dump-databases.sh.erb
b/puppet/modules/backup/templates/dump-databases.sh.erb
new file mode 100644
index 000..7fc3842
--- /dev/null
+++ b/puppet/modules/backup/templates/dump-databases.sh.erb
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+<% @databases.each do |db| -%>
+nice mysqldump --opt --single-transaction \
+ --user=root --password="" <%= db %> \
+ > /root/db-backup-<%= db %>.sql
+<% end -%>
diff --git a/puppet/modules/base/manifests/init.pp
b/puppet/modules/base/manifests/init.pp
index 8539219..152a782 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -4,7 +4,6 @@
'ack-grep',
'bash-completion',
'doxygen',
-'duplicity',
'fontconfig',
'htop',
'iotop', # IO view
diff --git a/puppet/modules/logrotate/manifests/init.pp
b/puppet/modules/logrotate/manifests/init.pp
index f2afee6..2cd019b 100644
--- a/puppet/modules/logrotate/manifests/init.pp
+++ b/puppet/modules/logrotate/manifests/init.pp
@@ -2,9 +2,4 @@
file { '/etc/logrotate.d/twn':
source => 'puppet:///modules/logrotate/twn'
}
-
- # @todo Should eventually end up in a backup module
- file { '/etc/logrotate.d/twn-database-backup':
-source => 'puppet:///modules/logrotate/twn-database-backup'
- }
}
diff --git a/puppet/modules/wiki/manifests/init.pp
b/puppet/modules/wiki/manifests/init.pp
index d6f3abc..fae5295 100644
--- a/puppet/modules/wiki/manifests/init.pp
+++ b/puppet/modules/wiki/manifests/init.pp
@@ -17,10 +17,6 @@
# }
#
class wiki ($config, $user) {
- file { "/etc/cron.d/wikibackup":
-content => template("wiki/w
[MediaWiki-commits] [Gerrit] Added import source for 'wikidata' - change (operations/mediawiki-config)
Vogone has uploaded a new change for review. https://gerrit.wikimedia.org/r/92178 Change subject: Added import source for 'wikidata' .. Added import source for 'wikidata' 'testwikidata' was added as an import source for 'wikidata' in this change. Bug: 56215 Change-Id: Ic06fd060585806b47b8e28e4d635aa86030dbd6f --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/78/92178/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 45da7b4..51c068f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8892,8 +8892,8 @@ 'viwikisource' => array( 'w', 'wikt', 'b', 'q' ), 'viwikiquote' => array( 'w', 'wikt', 'b', 's' ), - 'wikidata' => array( 'meta', 'commons', 'en', 'de', 'fr', 'es' ), - '+testwikidatawiki' => array( 'd' ), + 'wikidata' => array( 'meta', 'commons', 'en', 'de', 'fr', 'es', 'testwikidata' ), + 'testwikidatawiki' => array( 'd', 'meta', 'commons', 'en', 'de', 'fr', 'es' ), 'wikimania2012wiki' => array( 'en', 'meta', 'wm2011' ), 'wikimania2013wiki' => array( 'en', 'meta', 'wm2011', 'wm2012' ), 'wikimania2014wiki' => array( 'en', 'meta', 'wm2011', 'wm2012', 'wm2013' ), -- To view, visit https://gerrit.wikimedia.org/r/92178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic06fd060585806b47b8e28e4d635aa86030dbd6f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Vogone ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add fcgiwrap module - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add fcgiwrap module
..
Add fcgiwrap module
Change-Id: I5f1c609d617a02194f992a9a79ed5ccac7bb360b
---
A puppet/modules/fcgiwrap/manifests/init.pp
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/fcgiwrap/manifests/init.pp
b/puppet/modules/fcgiwrap/manifests/init.pp
new file mode 100644
index 000..c9a1c3b
--- /dev/null
+++ b/puppet/modules/fcgiwrap/manifests/init.pp
@@ -0,0 +1,13 @@
+class fcgiwrap {
+ package { 'fcgiwrap':
+ensure => present,
+ }
+
+ service { 'fcgiwrap':
+ensure => running,
+enable => true,
+hasstatus => true,
+hasrestart => true,
+require=> Package['fcgiwrap'],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/92177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f1c609d617a02194f992a9a79ed5ccac7bb360b
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Nikerabbit
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] Add fcgiwrap module - change (translatewiki)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92177
Change subject: Add fcgiwrap module
..
Add fcgiwrap module
Change-Id: I5f1c609d617a02194f992a9a79ed5ccac7bb360b
---
A puppet/modules/fcgiwrap/manifests/init.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/77/92177/1
diff --git a/puppet/modules/fcgiwrap/manifests/init.pp
b/puppet/modules/fcgiwrap/manifests/init.pp
new file mode 100644
index 000..b086f57
--- /dev/null
+++ b/puppet/modules/fcgiwrap/manifests/init.pp
@@ -0,0 +1,7 @@
+class fcgiwrap {
+ # @todo Install the service.
+ package { [
+ 'fcgiwrap'
+]: ensure => present,
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/92177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f1c609d617a02194f992a9a79ed5ccac7bb360b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add backup module - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92176
Change subject: Add backup module
..
Add backup module
Change-Id: I59fab3f631b2bf70ca67296aa719fe85a3f647c7
---
A puppet/modules/backup/files/backup.sh
A puppet/modules/backup/files/duplicity.conf
R puppet/modules/backup/files/logrotate
A puppet/modules/backup/manifests/init.pp
A puppet/modules/backup/templates/backup.erb
A puppet/modules/backup/templates/dump-databases.sh.erb
M puppet/modules/base/manifests/init.pp
M puppet/modules/logrotate/manifests/init.pp
M puppet/modules/wiki/manifests/init.pp
D puppet/modules/wiki/templates/wikibackup.erb
M puppet/site.pp
11 files changed, 113 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/76/92176/1
diff --git a/puppet/modules/backup/files/backup.sh
b/puppet/modules/backup/files/backup.sh
new file mode 100644
index 000..bc88cd3
--- /dev/null
+++ b/puppet/modules/backup/files/backup.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# file managed by puppet
+
+# uncomment for debug
+#set -x
+
+source /root/.duplicity.conf
+
+# duplicity command
+SSHOPTS="--ssh-options \"-oIdentityFile=/root/.ssh/id_dsa_duplicity_backup\""
+
+DUPEXEC="--encrypt-key $ENCRKEY --sign-key $SIGNKEY $SSHOPTS $DUPOPTS $*"
+# loop on directories
+echo -n " Incremental backup of $HOSTNAME "; date
+for i in $BACKDIRS
+do
+ echo "Starting backup of directory /$i"
+ # create dirs and then backup
+ $MKDIR $LPATH/$i && duplicity $DUPEXEC /$i $RPATH/$i
+ # clean up
+ duplicity remove-older-than 2M --force $DUPEXEC $RPATH/$i
+ duplicity clean --force $DUPEXEC $RPATH/$i
+ echo
+done
+# if local, fix permissions
+if [ -z $HOST ]; then chown -R $NAME.$NAME $LPATH; fi
+echo -n " Finished backup on $HOSTNAME "; date
+echo
+echo
diff --git a/puppet/modules/backup/files/duplicity.conf
b/puppet/modules/backup/files/duplicity.conf
new file mode 100644
index 000..8a11e93
--- /dev/null
+++ b/puppet/modules/backup/files/duplicity.conf
@@ -0,0 +1,31 @@
+# file managed by puppet
+
+# path to backup to
+LPATH=/work/users/nike/backups/twn
+
+# remote settings
+HOST=lakka.kapsi.fi
+NAME=nike
+RPATH=scp://$NAME@$HOST/$LPATH
+SSHID="/root/.ssh/id_dsa_duplicity_backup"
+
+# complete with root gpg signature and encryption key
+SIGNKEY=D4D02B43
+ENCRKEY=$SIGNKEY
+export PASSPHRASE=$( present,
+ }
+
+ file { "/etc/cron.d/backup":
+# Enable when new server is primary
+ensure => absent,
+content => template("backup/backup.erb"),
+ }
+
+ file { "/root/backup.sh":
+source => 'puppet:///modules/backup/backup.sh',
+ }
+
+ file { "/root/.duplicity.conf":
+source => 'puppet:///modules/backup/duplicity.conf',
+ }
+
+ file { "/root/dump-databases.sh":
+content => template("backup/dump-databases.sh.erb"),
+ }
+
+ file { '/etc/logrotate.d/twn-database-backup':
+source => 'puppet:///modules/backup/lograte'
+ }
+}
diff --git a/puppet/modules/backup/templates/backup.erb
b/puppet/modules/backup/templates/backup.erb
new file mode 100644
index 000..840fa96
--- /dev/null
+++ b/puppet/modules/backup/templates/backup.erb
@@ -0,0 +1,3 @@
+# file managed by puppet
+00 02 * * * root /root/dump-databases.sh
+00 03 * * * root /root/backup.sh
diff --git a/puppet/modules/backup/templates/dump-databases.sh.erb
b/puppet/modules/backup/templates/dump-databases.sh.erb
new file mode 100644
index 000..b77b4af
--- /dev/null
+++ b/puppet/modules/backup/templates/dump-databases.sh.erb
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+<% @databases.each do |db| -%>
+nice mysqldump --opt --single-transaction \
+ --user=root --password="" <%= db %> \
+ > /root/db-backup-<%= db =%>.sql
+<% end -%>
diff --git a/puppet/modules/base/manifests/init.pp
b/puppet/modules/base/manifests/init.pp
index 8539219..152a782 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -4,7 +4,6 @@
'ack-grep',
'bash-completion',
'doxygen',
-'duplicity',
'fontconfig',
'htop',
'iotop', # IO view
diff --git a/puppet/modules/logrotate/manifests/init.pp
b/puppet/modules/logrotate/manifests/init.pp
index f2afee6..2cd019b 100644
--- a/puppet/modules/logrotate/manifests/init.pp
+++ b/puppet/modules/logrotate/manifests/init.pp
@@ -2,9 +2,4 @@
file { '/etc/logrotate.d/twn':
source => 'puppet:///modules/logrotate/twn'
}
-
- # @todo Should eventually end up in a backup module
- file { '/etc/logrotate.d/twn-database-backup':
-source => 'puppet:///modules/logrotate/twn-database-backup'
- }
}
diff --git a/puppet/modules/wiki/manifests/init.pp
b/puppet/modules/wiki/manifests/init.pp
index d6f3abc..fae5295 100644
--- a/puppet/modules/wiki/manifests/init.pp
+++ b/puppet/modules/wiki/manifests/init.pp
@@ -17,10 +17,6 @@
# }
#
class wiki ($config, $user) {
- file { "/etc/cron.d/wikiback
[MediaWiki-commits] [Gerrit] Add betawiki cronjobs to puppet - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add betawiki cronjobs to puppet
..
Add betawiki cronjobs to puppet
Change-Id: I6cd2b9c77452aa95e825ef2b1df025440ed0f970
---
A puppet/modules/wiki/manifests/init.pp
A puppet/modules/wiki/templates/wikibackup.erb
A puppet/modules/wiki/templates/wikimaintenance.erb
A puppet/modules/wiki/templates/wikiservices.erb
A puppet/modules/wiki/templates/wikistats.erb
M puppet/site.pp
6 files changed, 74 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/puppet/modules/wiki/manifests/init.pp
b/puppet/modules/wiki/manifests/init.pp
new file mode 100644
index 000..d6f3abc
--- /dev/null
+++ b/puppet/modules/wiki/manifests/init.pp
@@ -0,0 +1,35 @@
+# = Class: wiki
+#
+# Configures various wiki stuff. Now mostly crontabs.
+#
+# == Parameters:
+#
+# $config:: Where the wiki config is stored.
+#
+# $user:: What user owns the wiki stuff.
+#
+#
+# == Sample Usage:
+#
+# class { 'wiki':
+# config => '/home/betawiki/config',
+# user => 'betawiki',
+# }
+#
+class wiki ($config, $user) {
+ file { "/etc/cron.d/wikibackup":
+content => template("wiki/wikibackup.erb"),
+ }
+
+ file { "/etc/cron.d/wikimaintenance":
+content => template("wiki/wikimaintenance.erb"),
+ }
+
+ file { "/etc/cron.d/wikiservices":
+content => template("wiki/wikiservices.erb"),
+ }
+
+ file { "/etc/cron.d/wikistats":
+content => template("wiki/wikistats.erb"),
+ }
+}
diff --git a/puppet/modules/wiki/templates/wikibackup.erb
b/puppet/modules/wiki/templates/wikibackup.erb
new file mode 100644
index 000..4852ee5
--- /dev/null
+++ b/puppet/modules/wiki/templates/wikibackup.erb
@@ -0,0 +1,2 @@
+# file managed by puppet
+@daily <%= @user %> /home/betawiki/backup.sh
diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb
b/puppet/modules/wiki/templates/wikimaintenance.erb
new file mode 100644
index 000..47d2211
--- /dev/null
+++ b/puppet/modules/wiki/templates/wikimaintenance.erb
@@ -0,0 +1,3 @@
+# file managed by puppet
+* * * * * <%= @user %> nice php
/www/translatewiki.net/w/maintenance/runJobs.php --exclusive --maxtime=50
--procs=1 --memory-limit=250M >> /www/translatewiki.net/w/logs/jobqueue 2>
/dev/null
+*/5 * * * * <%= @user %> nice php
/www/sandbox.translatewiki.net/w/maintenance/runJobs.php --exclusive
--maxtime=50 --procs=1 --memory-limit=250M >>
/www/sandbox.translatewiki.net/w/logs/jobqueue 2> /dev/null
diff --git a/puppet/modules/wiki/templates/wikiservices.erb
b/puppet/modules/wiki/templates/wikiservices.erb
new file mode 100644
index 000..73a153c
--- /dev/null
+++ b/puppet/modules/wiki/templates/wikiservices.erb
@@ -0,0 +1,3 @@
+# file managed by puppet
+@reboot <%= @user %> <%= @config %>/irc-relay/screen-init.sh
+@reboot <%= @user %> <%= @config %>/bin/solr-init
diff --git a/puppet/modules/wiki/templates/wikistats.erb
b/puppet/modules/wiki/templates/wikistats.erb
new file mode 100644
index 000..83ee6e2
--- /dev/null
+++ b/puppet/modules/wiki/templates/wikistats.erb
@@ -0,0 +1,26 @@
+# file managed by puppet
+45 21 * * * <%= @user %> <%= @config %>/bin/stats-mediawiki >> /dev/null 2>&1
+31 22 * * * <%= @user %> <%= @config %>/bin/stats-eol >> /dev/null 2>&1
+32 22 * * * <%= @user %> <%= @config %>/bin/stats-freecol >> /dev/null 2>&1
+33 22 * * * <%= @user %> <%= @config %>/bin/stats-fudforum >> /dev/null 2>&1
+34 22 * * * <%= @user %> <%= @config %>/bin/stats-ihris >> /dev/null 2>&1
+35 22 * * * <%= @user %> <%= @config %>/bin/stats-kiwix >> /dev/null 2>&1
+36 22 * * * <%= @user %> <%= @config %>/bin/stats-mantis >> /dev/null 2>&1
+37 22 * * * <%= @user %> <%= @config %>/bin/stats-mifos >> /dev/null 2>&1
+38 22 * * * <%= @user %> <%= @config %>/bin/stats-mwlibrl >> /dev/null 2>&1
+40 22 * * * <%= @user %> <%= @config %>/bin/stats-okawix >> /dev/null 2>&1
+41 22 * * * <%= @user %> <%= @config %>/bin/stats-openimages >> /dev/null 2>&1
+43 22 * * * <%= @user %> <%= @config %>/bin/stats-osm >> /dev/null 2>&1
+44 22 * * * <%= @user %> <%= @config %>/bin/stats-pywikibot >> /dev/null 2>&1
+45 22 * * * <%= @user %> <%= @config %>/bin/stats-shapado >> /dev/null 2>&1
+47 22 * * * <%= @user %> <%= @config %>/bin/stats-intuition >> /dev/null 2>&1
+48 22 * * * <%= @user %> <%= @config %>/bin/stats-wikia >> /dev/null 2>&1
+49 22 * * * <%= @user %> <%= @config %>/bin/stats-wikiblame >> /dev/null 2>&1
+50 22 * * * <%= @user %> <%= @config %>/bin/stats-wikireader >> /dev/null 2>&1
+
+53 23 * * * <%= @user %> <%= @config %>/bin/50-wikimedia >> /dev/null 2>&1
+54 23 * * * <%= @user %> <%= @config %>/bin/stats-translatewiki >> /dev/null
2>&1
+55 23 * * * <%= @user %> <%= @config %>/bin/stats-someextensions >> /dev/null
2>&1
+
+# Creation of https://translatewiki.net/static/stats/wmf.csv
+34 4 * * 4 <%= @user %> <%= @config
[MediaWiki-commits] [Gerrit] Update version - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update version .. Update version Change-Id: Iddd3af67908ffe97ed461dbf7280799fcca388ea --- M puppet/modules/mailman 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/mailman b/puppet/modules/mailman index d4f880f..2d55046 16 --- a/puppet/modules/mailman +++ b/puppet/modules/mailman -Subproject commit d4f880fee47376e0eb8df8e6cfd432f547c7b7bb +Subproject commit 2d55046435236772a5e255735ede44a51581117f -- To view, visit https://gerrit.wikimedia.org/r/92175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddd3af67908ffe97ed461dbf7280799fcca388ea Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand 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] Update version - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/92175 Change subject: Update version .. Update version Change-Id: Iddd3af67908ffe97ed461dbf7280799fcca388ea --- M puppet/modules/mailman 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/75/92175/1 diff --git a/puppet/modules/mailman b/puppet/modules/mailman index d4f880f..2d55046 16 --- a/puppet/modules/mailman +++ b/puppet/modules/mailman -Subproject commit d4f880fee47376e0eb8df8e6cfd432f547c7b7bb +Subproject commit 2d55046435236772a5e255735ede44a51581117f -- To view, visit https://gerrit.wikimedia.org/r/92175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iddd3af67908ffe97ed461dbf7280799fcca388ea Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change mailman submodule - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Change mailman submodule .. Change mailman submodule This one's been adapted for Ubuntu. Change-Id: Ie061880ef5477ac46af7da9abba535ffecdfe35c --- M .gitmodules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules index fd5033c..1b800a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,4 +18,4 @@ url = https://github.com/example42/puppet-exim.git [submodule "puppet/modules/mailman"] path = puppet/modules/mailman - url = https://github.com/thias/puppet-mailman.git + url = https://github.com/cjsoftuk/puppet-mailman.git -- To view, visit https://gerrit.wikimedia.org/r/92174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie061880ef5477ac46af7da9abba535ffecdfe35c Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand 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] Change mailman submodule - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/92174 Change subject: Change mailman submodule .. Change mailman submodule This one's been adapted for Ubuntu. Change-Id: Ie061880ef5477ac46af7da9abba535ffecdfe35c --- M .gitmodules 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/74/92174/1 diff --git a/.gitmodules b/.gitmodules index fd5033c..1b800a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,4 +18,4 @@ url = https://github.com/example42/puppet-exim.git [submodule "puppet/modules/mailman"] path = puppet/modules/mailman - url = https://github.com/thias/puppet-mailman.git + url = https://github.com/cjsoftuk/puppet-mailman.git -- To view, visit https://gerrit.wikimedia.org/r/92174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie061880ef5477ac46af7da9abba535ffecdfe35c Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Partially merge branch 'python3': - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92173
Change subject: Partially merge branch 'python3':
..
Partially merge branch 'python3':
family.py
Use key function instead of comparator for sorting interwikis
https://gerrit.wikimedia.org/r/#/c/90753/
api.py
Change Request from DictMixin to MutableMapping
https://gerrit.wikimedia.org/r/#/c/90752/
Change-Id: Ia0039c7989cb31fbcff59b9cc1e5fb07c505c231
---
M .gitreview
M pywikibot/comms/http.py
M pywikibot/page.py
M setup.py
4 files changed, 15 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/73/92173/1
diff --git a/.gitreview b/.gitreview
index bd3baf7..9c70b97 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
host=gerrit.wikimedia.org
port=29418
project=pywikibot/core.git
-defaultbranch=python3
+defaultbranch=master
defaultrebase=0
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index 49e57ac..1dee9ec 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -27,10 +27,7 @@
import logging
import atexit
-try:
-from httplib2 import SSLHandshakeError
-except ImportError:
-from ssl import SSLError as SSLHandshakeError
+from httplib2 import SSLHandshakeError
from pywikibot import config
from pywikibot.exceptions import FatalServerError, Server504Error
import pywikibot
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 2888f5e..cb06350 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -21,10 +21,7 @@
import re
import threading
import unicodedata
-try:
-from urllib.parse import quote_from_bytes, unquote_to_bytes
-except ImportError:
-from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes
+import urllib
import collections
logger = logging.getLogger("pywiki.wiki.page")
@@ -169,7 +166,7 @@
title = title.replace(u' ', u'_')
if asUrl:
encodedTitle = title.encode(self.site.encoding())
-title = quote_from_bytes(encodedTitle)
+title = urllib.quote(encodedTitle)
if as_filename:
# Replace characters that are not possible in file names on some
# systems.
@@ -3458,7 +3455,7 @@
for enc in encList:
try:
t = title.encode(enc)
-t = unquote_to_bytes(t)
+t = urllib.unquote(t)
return unicode(t, enc)
except UnicodeError, ex:
if not firstException:
diff --git a/setup.py b/setup.py
index 717771c..b022d2f 100644
--- a/setup.py
+++ b/setup.py
@@ -18,14 +18,16 @@
from setuptools.command import install
test_deps = []
-testcollector = "tests"
-if sys.version_info[0] == 2:
-if sys.version_info[1] < 6:
-raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6
or higher")
-elif sys.version_info[1] == 6:
-test_deps = ['unittest2']
-testcollector = "tests.utils.collector"
+if sys.version_info[0] != 2:
+raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2")
+elif sys.version_info[1] < 6:
+raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or
higher")
+elif sys.version_info[1] == 6:
+test_deps = ['unittest2']
+testcollector = "tests.utils.collector"
+else:
+testcollector = "tests"
class pwb_install(install.install):
@@ -65,6 +67,5 @@
],
cmdclass={
'install': pwb_install
-},
-use_2to3=True
+}
)
--
To view, visit https://gerrit.wikimedia.org/r/92173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0039c7989cb31fbcff59b9cc1e5fb07c505c231
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: TranslationAid tests - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92172
Change subject: WIP: TranslationAid tests
..
WIP: TranslationAid tests
Started with Niklas in SF. Committing as WIP.
Change-Id: I20decb8398f3b65ad38f05eea246b46af7550280
---
A tests/TranslationAidTest.php
1 file changed, 75 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/72/92172/1
diff --git a/tests/TranslationAidTest.php b/tests/TranslationAidTest.php
new file mode 100644
index 000..2d8a0c4
--- /dev/null
+++ b/tests/TranslationAidTest.php
@@ -0,0 +1,75 @@
+setMwGlobals( array(
+ 'wgHooks' => $wgHooks,
+ 'wgTranslateCC' => array(),
+ 'wgTranslateMessageIndex' => array(
'DatabaseMessageIndex' ),
+ 'wgTranslateWorkflowStates' => false,
+ 'wgTranslateGroupFiles' => array(),
+ 'wgTranslateTranslationServices' => array(),
+ ) );
+ $wgHooks['TranslatePostInitGroups'] = array( array( $this,
'getTestGroups' ) );
+ MessageGroups::clearCache();
+ MessageIndexRebuildJob::newJob()->run();
+ }
+
+ public function getTestGroups( &$list ) {
+ $messages = array( 'ugakey' => '$1 of $2', );
+ $list['test-group'] = new MockWikiMessageGroup( 'test-group',
$messages );
+
+ return false;
+ }
+
+ public function testParsing() {
+ $title = Title::newFromText( 'MediaWiki:Ugakey/nl' );
+ $page = WikiPage::factory( $title );
+ $status = $page->doEdit( '$1 van $2', __METHOD__ );
+ $value = $status->getValue();
+ /**
+* @var Revision $rev
+*/
+ $rev = $value['revision'];
+ $revision = $rev->getId();
+
+ $dbw = wfGetDB( DB_MASTER );
+ $conds = array(
+ 'rt_page' => $title->getArticleID(),
+ 'rt_type' => RevTag::getType( 'fuzzy' ),
+ 'rt_revision' => $revision
+ );
+
+ $index = array_keys( $conds );
+ $dbw->replace( 'revtag', array( $index ), $conds, __METHOD__ );
+
+ $handle = new MessageHandle( $title );
+ $this->assertTrue( $handle->isValid(), 'Message is known' );
+ $this->assertTrue( $handle->isFuzzy(), 'Message is fuzzy after
database fuzzying' );
+ // Update the translation without the fuzzy string
+ $page->doEdit( '$1 van $2', __METHOD__ );
+ $this->assertFalse( $handle->isFuzzy(), 'Message is unfuzzy
after edit' );
+
+ $page->doEdit( '!!FUZZY!!$1 van $2', __METHOD__ );
+ $this->assertTrue( $handle->isFuzzy(), 'Message is fuzzy after
manual fuzzying' );
+
+ // Update the translation without the fuzzy string
+ $page->doEdit( '$1 van $2', __METHOD__ );
+ $this->assertFalse( $handle->isFuzzy(), 'Message is unfuzzy
after edit' );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/92172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20decb8398f3b65ad38f05eea246b46af7550280
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix phpdoc - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged. Change subject: Fix phpdoc .. Fix phpdoc See https://www.mediawiki.org/wiki/Manual:Hooks/DiffViewHeader Change-Id: I551c5b5a4f98503dad01c763032c5b1b86daba6f --- M Thanks.hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Thanks.hooks.php b/Thanks.hooks.php index 3542be2..77a5dda 100644 --- a/Thanks.hooks.php +++ b/Thanks.hooks.php @@ -96,7 +96,7 @@ /** * Handler for DiffViewHeader hook. * @see http://www.mediawiki.org/wiki/Manual:Hooks/DiffViewHeader -* @param $diff WikiPage|Article|ImagePage|CategoryPage|Page The page that the history is loading for. +* @param $diff DifferenceEngine * @param $oldRev Revision object of the "old" revision (may be null/invalid) * @param $newRev Revision object of the "new" revision * @return bool true in all cases -- To view, visit https://gerrit.wikimedia.org/r/91557 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I551c5b5a4f98503dad01c763032c5b1b86daba6f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove outdated comment - change (mediawiki...Thanks)
jenkins-bot has submitted this change and it was merged. Change subject: Remove outdated comment .. Remove outdated comment Preference was removed in 4c88b5973acdbef6ca3085d10647d2b486a330c8. Change-Id: Ibaa277b5468eda29a0c6b11eeed9c9985ed15580 --- M Thanks.hooks.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Bsitu: Looks good to me, approved jenkins-bot: Verified diff --git a/Thanks.hooks.php b/Thanks.hooks.php index 63b13b5..3542be2 100644 --- a/Thanks.hooks.php +++ b/Thanks.hooks.php @@ -19,7 +19,6 @@ // Make sure Echo is turned on. // Exclude anonymous users. // Don't let users thank themselves. - // Exclude users who don't want to participate in feature experiments. // Exclude users who are blocked. if ( class_exists( 'EchoNotifier' ) && !$wgUser->isAnon() -- To view, visit https://gerrit.wikimedia.org/r/91556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibaa277b5468eda29a0c6b11eeed9c9985ed15580 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Bsitu Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialGWTooset clean-up - change (mediawiki...GWToolset)
Dan-nl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92171
Change subject: SpecialGWTooset clean-up
..
SpecialGWTooset clean-up
* removed extra $this->setHeaders();
* added missing $this->outputHeader();
Change-Id: If571b9be56a2670616fe5d03642e6d5b621b7dbb
---
M includes/Specials/SpecialGWToolset.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/71/92171/1
diff --git a/includes/Specials/SpecialGWToolset.php
b/includes/Specials/SpecialGWToolset.php
index 93aa3a4..2df4588 100644
--- a/includes/Specials/SpecialGWToolset.php
+++ b/includes/Specials/SpecialGWToolset.php
@@ -62,6 +62,7 @@
*/
public function execute( $par ) {
$this->setHeaders();
+ $this->outputHeader();
set_error_handler( '\GWToolset\handleError' );
if ( $this->wikiChecks() ) {
@@ -158,7 +159,6 @@
}
}
- $this->setHeaders();
$this->getOutput()->addModules( 'ext.GWToolset' );
$this->getOutput()->addHtml(
wfMessage( 'gwtoolset-menu' )->rawParams(
--
To view, visit https://gerrit.wikimedia.org/r/92171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If571b9be56a2670616fe5d03642e6d5b621b7dbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Dan-nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
