Siebrand [Sat, 1 Sep 2012 22:44:48 +0000 (22:44 +0000)]
Merge "Make functions match definitions in Preprocessor interface"
Translation updater bot [Sat, 1 Sep 2012 20:50:14 +0000 (20:50 +0000)]
Merge "Localisation updates from translatewiki.net."
Translation updater bot [Sat, 1 Sep 2012 20:43:45 +0000 (20:43 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Ifae56bd20a5d2868c54751f5d0a04439d35c89c2
Siebrand [Sat, 1 Sep 2012 20:41:55 +0000 (20:41 +0000)]
Merge "Added missing GPLv2 headers in new files."
Alexandre Emsenhuber [Sat, 1 Sep 2012 19:56:38 +0000 (21:56 +0200)]
Added missing GPLv2 headers in new files.
Also improved file documentation.
Change-Id: Ia5a383110769cf51603305dc639616d904ebbab2
MatmaRex [Sat, 1 Sep 2012 14:20:16 +0000 (16:20 +0200)]
LivePreview: properly use jquery.form (as dependency)
... instead of just using two outdated functions copied from there god knows when.
Change-Id: Ifcc7e7c51cf20b3b93e4b16bd9ba55dfe45b445c
Siebrand [Sat, 1 Sep 2012 12:33:07 +0000 (12:33 +0000)]
Merge "Follow-up I0b781c11 (
2a55449): use User::getAutomaticGroups()."
Catrope [Sat, 1 Sep 2012 00:11:19 +0000 (00:11 +0000)]
Merge "[FileRepo] Added option to shorten long file names."
Aaron Schulz [Sat, 1 Sep 2012 00:03:47 +0000 (00:03 +0000)]
Merge "Allow array condition for HAVING in database interface"
Kaldari [Fri, 31 Aug 2012 23:53:21 +0000 (23:53 +0000)]
Merge "(bug 25830) fix JS preview causing the page to "jump""
Aaron [Fri, 31 Aug 2012 21:21:39 +0000 (14:21 -0700)]
[FileRepo] Added option to shorten long file names.
Change-Id: Id36e787192b32b72d3b49e2afbe41335b81ae732
Aaron [Fri, 31 Aug 2012 23:24:19 +0000 (16:24 -0700)]
Cleaned up some whitespace from
45b9073b61d3aa569adb8cff46531a5b06b8bb7a
Change-Id: I42e376d80d6cc483b96e815d63b19aee78fe1127
Trevor Parscal [Fri, 31 Aug 2012 23:20:55 +0000 (23:20 +0000)]
Merge "Adjust margin of wpSummary elements per move of summary box."
Catrope [Fri, 31 Aug 2012 23:20:18 +0000 (23:20 +0000)]
Merge "[FileBackend] Added Content-Disposition support to Swift."
MatmaRex [Thu, 9 Aug 2012 13:51:28 +0000 (15:51 +0200)]
(bug 25830) fix JS preview causing the page to "jump"
Originally a patch by DieBuche <diebuche@gmail.com>, fixed to apply on
master (only whitespace changes were needed), with multiple new tweaks and
fixes.
The patch introduces fadeTo(..., 0.4) instead of fadeIn/fadeOut, causing
the preview not to be removed, but only faded out slightly. The reason
for this change is twofold:
* We do not want to completely remove the elements, which is what the old
version did. This causes the edit field to jump up and then back down
when the preview is reinserted.
* We do not want to display a huge blank white space where the preview
used to be before it disappeared.
Instead of scrolling to the top, we scroll straight to the preview. This
works when the preview is set to appear below edit field and possibly with
non-default skins. (And also is much neater.) Thanks to Jdlrobson for
noticing this issue.
We also separately handle first preview and all the following ones to
further reduce jumping. Thanks to MarkTraceur and Kaldari for noticing the
problem and to Kaldari for a patch.
Change-Id: I743ed45e039445242a99a23cad719a75731c5562
Siebrand [Fri, 31 Aug 2012 23:05:39 +0000 (23:05 +0000)]
Merge "Fix return doc and update whitespace in SpecialBlock.php"
Rob Moen [Wed, 29 Aug 2012 22:31:04 +0000 (15:31 -0700)]
Adjust margin of wpSummary elements per move of summary box.
See change: https://gerrit.wikimedia.org/r/#/c/21852
Rational:
http://www.mediawiki.org/wiki/Micro_Design_Improvements
Change-Id: Ib0e7a5a8c1e0076d44bd1a244e97c79e5e72de41
Aaron [Fri, 31 Aug 2012 22:35:39 +0000 (15:35 -0700)]
[FileBackend] Added Content-Disposition support to Swift.
* Renamed $handle => $op to avoid line breaks in a few spots.
Change-Id: I4598e685cc27552425a47f9d97eaeddaaf1a64a1
robin [Wed, 29 Aug 2012 02:34:00 +0000 (04:34 +0200)]
Fix return doc and update whitespace in SpecialBlock.php
Fix return documentation for blockLogFlags() in SpecialBlock.php.
Make whitespace of if() and foreach() consistent per coding standards in SpecialBlock.php
Change-Id: I87ea271e71c45dcc3f7cdd0960eb8f60a13cfec6
csteipp [Fri, 31 Aug 2012 22:05:04 +0000 (22:05 +0000)]
Merge "(bug 39700) Add htmlspecialchars encoding to label"
csteipp [Fri, 31 Aug 2012 03:40:19 +0000 (20:40 -0700)]
(bug 39700) Add htmlspecialchars encoding to label
Adds htmlspecialchars encoding to the link label, passed
into Linker::makeBrokenImageLinkObj.
This fixes a stored XSS (HTML injection) vulnerability.
* Released as part of 1.20wmf10, 1.19.2, 1.18.5
Change-Id: I0e5f9eeb1f3561b1354aecced74f68ae2fa20dfa
csteipp [Fri, 31 Aug 2012 03:38:05 +0000 (20:38 -0700)]
(bug 39184) LDAP password leakage
Allow AuthPlugin to determine if user passwords should be stored
locally.
* Released as part of 1.20wmf10, 1.19.2, 1.18.5
Change-Id: Ie41bed7ecf5390f8815128c227bae371880a6058
Translation updater bot [Fri, 31 Aug 2012 19:44:24 +0000 (19:44 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I9b073c9cdd5556abb26f675ce9a96a4481bb393a
Siebrand [Fri, 31 Aug 2012 19:25:17 +0000 (19:25 +0000)]
Merge "Add @since to new variables, fix variable name"
Siebrand [Fri, 31 Aug 2012 19:23:13 +0000 (19:23 +0000)]
Merge "Fix zhtable's Makefile.py"
Siebrand [Fri, 31 Aug 2012 19:22:36 +0000 (19:22 +0000)]
Merge "Better conversion for 线/綫/線"
Liangent [Fri, 31 Aug 2012 18:31:53 +0000 (02:31 +0800)]
Fix zhtable's Makefile.py
* Add the trailing \n to ZhConversion.php
* Switch to dfn.dl.sourceforge.net because cdnetworks-kr-2
seems down (tested on both my PC and Toolserver)
Change-Id: I9843d9ff190a6e909d2fa699af8880a7025778ab
Liangent [Fri, 31 Aug 2012 18:27:02 +0000 (02:27 +0800)]
Better conversion for 线/綫/線
Change-Id: Ib32fe67cc812dd42cd1aae5682e44872e4b9f01f
umherirrender [Fri, 31 Aug 2012 18:12:19 +0000 (20:12 +0200)]
Allow array condition for HAVING in database interface
Current no use in core.
Change-Id: I8ed86c8238146285dd1caed4d8586c877cbecf44
robin [Fri, 31 Aug 2012 17:23:38 +0000 (19:23 +0200)]
Add @since to new variables, fix variable name
Add @since 1.20 to new configuration variables and fix variable name wgLocalTimezone -> wgLocaltimezone
(New variables per https://www.mediawiki.org/wiki/Category:MediaWiki_configuration_settings_1.20.0 )
Change-Id: I97f373e9760f5b4966ae064965ec6cfd8dff2498
Reedy [Sat, 21 Jul 2012 21:37:59 +0000 (22:37 +0100)]
(bug 38451) remove $wgAllowPageInfo
InfoAction needs a bit of work, so this might want to wait a little
while. The patch removes $wgAllowPageInfo which was used to enable the
action=info action (which was disabled by default).
https://gerrit.wikimedia.org/r/#/c/15847 is needed to disable the
counter query.
Change-Id: I467e688090919b627bf1fb124ef712821c2257f6
Liangent [Wed, 6 Jun 2012 13:50:59 +0000 (21:50 +0800)]
test: unwanted search namespace should not be there
When Special:Search uses User preferences for search, make sure that no
unwanted namespaces have been used.
Change-Id: Ibcb23c812bf1e02a398ffbf3a276afc1b1f367cf
Demon [Fri, 31 Aug 2012 14:47:28 +0000 (14:47 +0000)]
Merge "(bug 39180) Set x-frame-options='DENY' for api"
Demon [Fri, 31 Aug 2012 14:46:48 +0000 (14:46 +0000)]
Merge "(bug 35839) Check permisions for revdel blocks"
Demon [Fri, 31 Aug 2012 13:42:09 +0000 (13:42 +0000)]
Merge "[FileRepo] Made temp zone files use doQuickOperations."
Demon [Fri, 31 Aug 2012 13:40:17 +0000 (13:40 +0000)]
Merge "[FileBackend] Reduced CDN purging when CDN is enabled."
Demon [Fri, 31 Aug 2012 13:38:59 +0000 (13:38 +0000)]
Merge "Added PHP complement for mw.Time."
IAlex [Fri, 31 Aug 2012 13:15:45 +0000 (13:15 +0000)]
Merge "Replace deprecated wfMsg* calls with Message class calls."
Tyler Anthony Romeo [Tue, 31 Jul 2012 19:37:01 +0000 (15:37 -0400)]
Added PHP complement for mw.Time.
Figured since a JS Timestamp class was being implemented
it might be appropriate to create a complementary PHP
Timestamp class. Much of code is taken from wfTimestamp().
Note: Another change (I53dcf547) is attempting a related
issue. Not sure how much of scope overlap there is.
Change-Id: I68eb9f27eebe80df757187f634392e1bcba5551f
Signed-off-by: Tyler Romeo <tylerromeo@gmail.com>
Kaldari [Fri, 31 Aug 2012 00:06:33 +0000 (00:06 +0000)]
Merge "Revert "Setting up a way to have uploading by URL, but not on Special:Upload""
Kaldari [Thu, 30 Aug 2012 23:59:52 +0000 (23:59 +0000)]
Revert "Setting up a way to have uploading by URL, but not on Special:Upload"
This reverts commit
8c6c29b3fc5db93c46bdd73b48f1ff5b4edad25c
I erroneously assumed there was a practical reason why
wgAllowCopyUploads was turned off on Commons, i.e. it was
too easy to abuse, causing too many copyvios, etc. I didn't
realize that the reason it was turned off was purely
technical (since the apaches on the cluster have no
external internet access). So there's no reason we need a
separate config.
Change-Id: I293a59d756335909898fd647edd6eddb68f06e17
Aaron [Thu, 30 Aug 2012 23:03:36 +0000 (16:03 -0700)]
[FileRepo] Made temp zone files use doQuickOperations.
* This avoids stat and journaling overhead.
Change-Id: I817e95fa15096bb02ab7505055949acd56164442
Daniel Friesen [Sun, 12 Aug 2012 09:23:50 +0000 (02:23 -0700)]
Fix up the preferred way to specify mw.util.$content
- Setting a .mw-body class is the preferred way for $content to be defined
- You can set an extra .mw-body-primary if you use multiple .mw-body classes or for some legacy reasons .mw-body is at a different depth than the content area
- No extensions appear to be using util.$content in a way that would imply they want the body text rather than the overall content area
- Anyone that actually needs the body text can use #mw-content-text.
Change-Id: Ic7b756f139047e4100fcab8f63a968d45ca2b2fe
Aaron [Thu, 30 Aug 2012 21:23:41 +0000 (14:23 -0700)]
[FileBackend] Reduced CDN purging when CDN is enabled.
Change-Id: I63fc9271ca997b19dad957b544503e9ec3b54fa1
Catrope [Thu, 30 Aug 2012 21:09:43 +0000 (21:09 +0000)]
Merge "Add and update some missing release notes for rl modules."
Aaron Schulz [Thu, 30 Aug 2012 21:06:14 +0000 (21:06 +0000)]
Merge "Make LinksUpdate run without a db transaction."
Reedy [Thu, 30 Aug 2012 21:03:19 +0000 (22:03 +0100)]
Make functions match definitions in Preprocessor interface
Change-Id: I0bc1f5540bb7aabcd7e54edc180439446af979f4
Demon [Thu, 30 Aug 2012 20:58:07 +0000 (20:58 +0000)]
Merge "[FileBackend] Improved stat caching by reducing cache salting."
Krinkle [Thu, 30 Aug 2012 20:51:56 +0000 (20:51 +0000)]
Merge "Addressing problems with jquery.badge mentioned at I0f5e7541"
Timo Tijhof [Thu, 30 Aug 2012 20:51:39 +0000 (22:51 +0200)]
Add and update some missing release notes for rl modules.
* QUnit v1.9.0
* jQuery UI 1.8.23
* New: jquery.badge
Change-Id: I6b3de9b0e02ea7c4931ebf3f3a3b85bf76407f02
Aaron [Thu, 30 Aug 2012 19:47:19 +0000 (12:47 -0700)]
[FileBackend] Improved stat caching by reducing cache salting.
Change-Id: Ieec6515fcf1c2f147b52eceec1f6c55a681115c5
Kaldari [Thu, 16 Aug 2012 21:22:45 +0000 (14:22 -0700)]
Addressing problems with jquery.badge mentioned at I0f5e7541
Making sure variable types are consistant, fixing global vars,
various style fixes, etc.
Change-Id: I2f30fe07078aa3cadd730b0d6f199d037f2a4612
Demon [Thu, 30 Aug 2012 20:20:59 +0000 (20:20 +0000)]
Merge "Update migrateUserGroup to deal with primary key issue"
Translation updater bot [Thu, 30 Aug 2012 19:44:22 +0000 (19:44 +0000)]
Merge "Localisation updates from translatewiki.net."
Krinkle [Thu, 30 Aug 2012 19:36:15 +0000 (19:36 +0000)]
Merge "(bug 36329) Fix accesskey tooltip for Firefox 14 on Mac"
Minh Nguyễn [Sat, 28 Apr 2012 22:30:22 +0000 (22:30 +0000)]
(bug 36329) Fix accesskey tooltip for Firefox 14 on Mac
Should use "ctrl-option-" prefix
Change-Id: I87463fc6043fb17cab70956f65fd9da3cdd7477d
Translation updater bot [Thu, 30 Aug 2012 19:33:15 +0000 (19:33 +0000)]
Localisation updates from translatewiki.net.
Change-Id: Ia32bb1239b6b88c757b04a748bc3d9f69cc6be36
Demon [Thu, 30 Aug 2012 19:26:03 +0000 (19:26 +0000)]
Merge "[FileBackend] Improved getLocalCopy() performance for Swift."
Aaron [Thu, 30 Aug 2012 19:17:28 +0000 (12:17 -0700)]
[FileBackend] Improved getLocalCopy() performance for Swift.
* This eliminates HEAD requests to speed up concatenate() operations (by ~9 seconds for 300 chunks for wmf).
Change-Id: I43456bd59eeb7943e66cae9c1e42dc410c2a8daf
Catrope [Thu, 30 Aug 2012 18:57:34 +0000 (18:57 +0000)]
Merge "(bug 39273) add diff support to LivePreview"
Catrope [Thu, 30 Aug 2012 18:13:47 +0000 (18:13 +0000)]
Merge "[FileBackend] Made TempFSFile use wfRandomString() and be more random."
Aaron [Thu, 30 Aug 2012 18:05:52 +0000 (11:05 -0700)]
[FileBackend] Made TempFSFile use wfRandomString() and be more random.
Change-Id: I5bfff8cfb9d1c786490f7539a6cdb47e36d88cc1
Catrope [Thu, 30 Aug 2012 17:50:55 +0000 (17:50 +0000)]
Merge "[FileBackend] Reduce backend sync errors a bit by aborting operations more."
Aaron Schulz [Thu, 30 Aug 2012 17:16:33 +0000 (17:16 +0000)]
Merge "clear magicword cache before testing cleanSig"
Aaron [Thu, 30 Aug 2012 17:10:50 +0000 (10:10 -0700)]
[FileBackend] Reduce backend sync errors a bit by aborting operations more.
Change-Id: Iedb8d7e1f95c971dbb9f9baed67de047753ab40d
Siebrand [Thu, 30 Aug 2012 15:07:26 +0000 (15:07 +0000)]
Merge "Fix the incorrect nesting"
Daniel Kinzler [Thu, 30 Aug 2012 10:37:41 +0000 (10:37 +0000)]
Merge "Added default implmentation of instanceProvider to GenericArrayObjectTest"
Antoine Musso [Thu, 30 Aug 2012 09:56:21 +0000 (11:56 +0200)]
tests: Wraper to set/disable $wgHTML5 in HtmlTest
Would let us easily set $wgHtml5 in our tests.
Change-Id: Iacf38c2961cbbb9cc58cd45bba34f10ee5688605
Nikerabbit [Thu, 30 Aug 2012 07:54:27 +0000 (07:54 +0000)]
Merge "Add cache/ to .gitignore"
Catrope [Thu, 30 Aug 2012 05:21:32 +0000 (05:21 +0000)]
Merge "Added explicit DB flags for Revision loading calls."
Catrope [Thu, 30 Aug 2012 05:18:55 +0000 (05:18 +0000)]
Merge "[FileBackend] Made getLocalCopy() handle long file names better."
Aaron Schulz [Thu, 30 Aug 2012 05:06:16 +0000 (22:06 -0700)]
[FileBackend] Made getLocalCopy() handle long file names better.
Change-Id: I54d7c610dba8cb3e7bc0ef4d4bfbb2327e63db07
Aaron Schulz [Thu, 30 Aug 2012 03:04:30 +0000 (20:04 -0700)]
Added explicit DB flags for Revision loading calls.
Change-Id: Ie90d4197ad7a16009c96273eeae1a658678a8200
Vitaliy Filippov [Fri, 25 May 2012 10:41:53 +0000 (14:41 +0400)]
Bug 20595 - Fixed incr()/decr() functions for some caches.
* Preserve TTL in objectcache incr() method for APC, XCache and DBA.
Do not serialize numeric values, since it breaks the counters.
* Also gave some DBABagOStuff functions explicit visibility.
Change-Id: I13856832f418c843afc8e42a6d77686331f6cb41
Timo Tijhof [Wed, 29 Aug 2012 22:23:47 +0000 (00:23 +0200)]
Add cache/ to .gitignore
On fenari we've always got:
> Untracked files:
> (use "git add <file>..." to include in what will be committed)
>
> cache/l10n/
> cache/message-timestamp
And on my localhost also several files and stuff extensions have
put in there. Might as well ignore cache entirely instead of
just .cdb files.
Change-Id: I3c594a0f746341687c2a35eed5dc2c2b91e68265
Kaldari [Wed, 29 Aug 2012 22:00:52 +0000 (22:00 +0000)]
Merge "(Bug 38606) Set log_page on uploads to the page_id of its description page"
Platonides [Wed, 29 Aug 2012 21:23:27 +0000 (23:23 +0200)]
(Bug 38606) Set log_page on uploads to the page_id of its description page
This change updates the log_page in a second step after performing
the edit, which is not terribly elegant, but is very robust.
Change-Id: I9015230df772d049b2879fb34914c68183f1da05
Rob Moen [Wed, 29 Aug 2012 21:20:02 +0000 (14:20 -0700)]
Move cancel link out of editHelp span and wrap in 'cancelLink' span.
Change-Id: I203a3eaf2f171bba81e11806e3632c2bc012458c
Krinkle [Wed, 29 Aug 2012 20:56:54 +0000 (20:56 +0000)]
Merge "Revert "Revert "Update jQuery UI to 1.8.23"""
Krinkle [Wed, 29 Aug 2012 20:56:43 +0000 (20:56 +0000)]
Revert "Revert "Update jQuery UI to 1.8.23""
Problems solved.
This reverts commit
731219d5d1c82eb199eb9808948740555d2ebe14
Catrope [Wed, 29 Aug 2012 20:53:04 +0000 (20:53 +0000)]
Merge "Added post-commit callback support to DB classes."
Siebrand [Wed, 29 Aug 2012 20:40:28 +0000 (20:40 +0000)]
Merge "(bug 39771) Regression in Ie349afa5 broke plurals in JavaScript"
Aaron Schulz [Wed, 29 Aug 2012 20:39:18 +0000 (20:39 +0000)]
Merge "Rewrite the ThumbnailImage constructor to take parameter array"
Niklas Laxström [Wed, 29 Aug 2012 20:30:15 +0000 (20:30 +0000)]
(bug 39771) Regression in Ie349afa5 broke plurals in JavaScript
Change-Id: Iee4e3bdca0e72292d6d431703f0f589653f68f64
jarry1250 [Wed, 29 Aug 2012 20:09:36 +0000 (21:09 +0100)]
Rewrite the ThumbnailImage constructor to take parameter array
This is required for a full resolution of bug #32987. Per Brion's
commentary on that bug, for the long-term preservation of
sanity we can't just keep adding arguments to the constructor
whenever a new feature is added.
Instead, we can have an array of optional parameters. At the moment,
this situation is a bit iffy for width and height: we should really
specify either a default height / width or error if one is not found.
I'm open to ideas on that, but it's not a big deal since nothing
uses the new syntax yet. When that is agreed, I'll convert all usage
in core and maybe some extensions too.
Change-Id: I116f71aeb90ef7c786f0874b150c7bcca527e106
Aaron [Wed, 29 Aug 2012 19:32:47 +0000 (12:32 -0700)]
Added post-commit callback support to DB classes.
* This can allow for autocommit job queue insertion without
breaking existing transactions (which currently happens since
job queue insert does begin/commit).
Change-Id: I021d4a73635168c05bbc1068912c2c6dbdf9cdc4
Alexandre Emsenhuber [Wed, 29 Aug 2012 19:36:37 +0000 (21:36 +0200)]
Fix wfGetCaller() and wfFormatStackFrame() documentation
These two functions cannot return a boolean.
Also simplified wfGetCaller() to not use the $caller local
variable which is totally useless in that case.
Change-Id: I81707a8292afc1829921b58cdaae81b3147ee3cb
Catrope [Wed, 29 Aug 2012 19:30:17 +0000 (19:30 +0000)]
Merge "Move copyright warning to directly above buttons."
Translation updater bot [Wed, 29 Aug 2012 19:25:50 +0000 (19:25 +0000)]
Merge "Localisation updates from translatewiki.net."
Catrope [Wed, 29 Aug 2012 19:25:13 +0000 (19:25 +0000)]
Merge "Setting up a way to have uploading by URL, but not on Special:Upload"
Translation updater bot [Wed, 29 Aug 2012 19:19:12 +0000 (19:19 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I0596ce4ee5480cce947a1c8c89e2acc46c182dcd
MatmaRex [Thu, 23 Aug 2012 22:56:50 +0000 (00:56 +0200)]
(bug 39273) add diff support to LivePreview
Now both "Show preview" and "Show changes" result in an AJAX call;
previously, "Show changes" would just reload the form as usual, and
LivePreview wouldn't handle the #wikiDiff element at all, which resulted
in both the new preview and stale diff being shown.
We load the diff styles using mw.loader.load if necessary (which will
probably be basically always).
Change-Id: Iaf9edf947e019ec7fa949d664b46b88161235b41
jeroendedauw [Wed, 29 Aug 2012 17:52:13 +0000 (19:52 +0200)]
Added default implmentation of instanceProvider to GenericArrayObjectTest
Change-Id: I8d77c03b90ddca226c4bff18e42c53980bf9a861
Siebrand [Wed, 29 Aug 2012 17:48:44 +0000 (17:48 +0000)]
Merge "Revert "Revert "jQuery 1.8"""
awjrichards [Wed, 29 Aug 2012 16:54:18 +0000 (16:54 +0000)]
Merge "New hook ApiMain::onException"
Max Semenik [Fri, 24 Aug 2012 23:57:54 +0000 (03:57 +0400)]
New hook ApiMain::onException
Allows custom logging of API errors
Change-Id: If8841c33998dff96448a7eb8dbe95d68119e068f
Siebrand [Wed, 29 Aug 2012 16:16:57 +0000 (16:16 +0000)]
Merge "Fixed fallback behaviour for plural rules"
Siebrand [Wed, 29 Aug 2012 15:12:59 +0000 (15:12 +0000)]
Merge "(bug 38556) Add header and footer messages to MediaWiki's info action"
madman [Mon, 27 Aug 2012 15:39:03 +0000 (15:39 +0000)]
(bug 38556) Add header and footer messages to MediaWiki's info action
Change-Id: I5d23d83dabc1f642d2b96a17aabd6b6fc9ece399
Antoine Musso [Wed, 29 Aug 2012 15:01:02 +0000 (17:01 +0200)]
raise filerepo tests timeout to 10sec
'@group medium' instructs PHPUnit to wait up to 10 seconds for the test
to complete. That would save us from false positive caused by high disk
I/O on the continuous integration server.
Change-Id: Id11c3ed1879705f806d262dc8090ef2fb432ed36