[MediaWiki-commits] [Gerrit] MobileApp depends upon MobileFrontend - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: MobileApp depends upon MobileFrontend
..
MobileApp depends upon MobileFrontend
Bug: 65954
Change-Id: I34a753366f0815eb852f6217ff22ddc2c7ad55c7
---
M mediawiki-extensions.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 9e79715..59a925b 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1064,6 +1064,10 @@
dependencies: 'EventLogging'
- '{name}-{ext-name}-testextensions-{mwbranch}':
name: mwext
+ext-name: MobileApp
+dependencies: 'MobileFrontend,Mantle'
+ - '{name}-{ext-name}-testextensions-{mwbranch}':
+name: mwext
ext-name: MobileFrontend
dependencies: 'Mantle'
- '{name}-{ext-name}-testextensions-{mwbranch}':
--
To view, visit https://gerrit.wikimedia.org/r/149784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34a753366f0815eb852f6217ff22ddc2c7ad55c7
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...MobileApp)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/149803 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I672574386c11979398da6c52baac0dabf4064e89 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp refs/changes/03/149803/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/149803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I672574386c11979398da6c52baac0dabf4064e89 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileApp Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make MobileApp tests voting - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Make MobileApp tests voting .. Make MobileApp tests voting They were missing dependencies (MobileFrontend and Mantle). Bug: 65954 Change-Id: I854140be425b48cb46c21b7dd26bcc1b5148ab88 --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index eec00b2..70df0f4 100644 --- a/layout.yaml +++ b/layout.yaml @@ -758,8 +758,6 @@ voting: false - name: ^mwext-OpenID-testextensions.* # no sqlite support voting: false - - name: ^mwext-MobileApp-testextensions.* # bug 65954 -voting: false - name: ^mwext-NaturalLanguageList-testextensions.* # bug 49881 voting: false - name: ^mwext-OAI-testextensions.* # bug 65895 -- To view, visit https://gerrit.wikimedia.org/r/149804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I854140be425b48cb46c21b7dd26bcc1b5148ab88 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make MobileApp tests voting - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/149804 Change subject: Make MobileApp tests voting .. Make MobileApp tests voting They were missing dependencies (MobileFrontend and Mantle). Bug: 65954 Change-Id: I854140be425b48cb46c21b7dd26bcc1b5148ab88 --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/04/149804/1 diff --git a/layout.yaml b/layout.yaml index eec00b2..70df0f4 100644 --- a/layout.yaml +++ b/layout.yaml @@ -758,8 +758,6 @@ voting: false - name: ^mwext-OpenID-testextensions.* # no sqlite support voting: false - - name: ^mwext-MobileApp-testextensions.* # bug 65954 -voting: false - name: ^mwext-NaturalLanguageList-testextensions.* # bug 49881 voting: false - name: ^mwext-OAI-testextensions.* # bug 65895 -- To view, visit https://gerrit.wikimedia.org/r/149804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I854140be425b48cb46c21b7dd26bcc1b5148ab88 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: plural support for securepoll-create-layout-election_d... - change (mediawiki...SecurePoll)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149805
Change subject: i18n: plural support for securepoll-create-layout-election_dates
..
i18n: plural support for securepoll-create-layout-election_dates
- $2 is HTML code and cannot be used for PLURAL
Spotted by Robby
https://translatewiki.net/wiki/Thread:Support/About:MediaWiki:Securepoll-create-layout-election_dates/en
Change-Id: I56ae7f6b2bebef2a10153454aa7188525246a0f5
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/05/149805/1
diff --git a/i18n/en.json b/i18n/en.json
index 78e09c2..c170fe7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -145,7 +145,7 @@
securepoll-create-option-wiki-other_wiki: Other specific wiki,
securepoll-create-label-election_primaryLang: Primary Language:,
securepoll-create-label-election_dates: Election Dates:,
- securepoll-create-layout-election_dates: Start on $1 (at 00:00 UTC)
and run for $2 days,
+ securepoll-create-layout-election_dates: Start on $1 (at 00:00 UTC)
and run for $2 day(s),
securepoll-create-label-election_disallow-change: Prevent voters
from changing their votes,
securepoll-create-label-election_return-url: Return-to URL:,
securepoll-create-label-election_type: Poll type:,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a5ac500..6fbefd2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -122,7 +122,7 @@
securepoll-create-option-wiki-other_wiki: Label for form option on
Special:SecurePoll/create.,
securepoll-create-label-election_primaryLang: Label for form field
on Special:SecurePoll/create.\n{{Identical|Primary language}},
securepoll-create-label-election_dates: Label for form field on
Special:SecurePoll/create.,
- securepoll-create-layout-election_dates: Layout message for the date
range input on Special:SecurePoll/create. See
{{msg-mw|securepoll-htmlform-daterange-layout}}. Parameters:\n* $1 - HTML for
the starting date control\n* $2 - HTML for the number-of-days control,
+ securepoll-create-layout-election_dates: Layout message for the date
range input on Special:SecurePoll/create. See
{{msg-mw|securepoll-htmlform-daterange-layout}}. Parameters:\n* $1 - HTML for
the starting date control\n* $2 - HTML for the number-of-days control, cannot
be used for PLURAL,
securepoll-create-label-election_disallow-change: Label for form
field on Special:SecurePoll/create.,
securepoll-create-label-election_return-url: Label for form field on
Special:SecurePoll/create.,
securepoll-create-label-election_type: Label for form field on
Special:SecurePoll/create.,
--
To view, visit https://gerrit.wikimedia.org/r/149805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56ae7f6b2bebef2a10153454aa7188525246a0f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load user group modules in individual requests - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149806
Change subject: Load user group modules in individual requests
..
Load user group modules in individual requests
User modules have different cache versioning, and are currently
loaded in indvidiual requests. This logic is now also added
to OutputPage::makeResourceLoaderLink so the same special
treatment is also applied to modules loaded by extensions.
Bug: 68712
Change-Id: I0deb2de2ee85c6dd3431ffe1c766fc4c37b260f0
---
M includes/OutputPage.php
M tests/phpunit/includes/OutputPageTest.php
2 files changed, 99 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/06/149806/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6bea931..6515b1b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2670,6 +2670,66 @@
}
/**
+* @param array $modules Array of module names
+* @param string $source ResourceLoader source name
+* @param array $query Output from ResourceLoader::makeLoaderQuery
+* @param string $only ResourceLoaderModule TYPE_ class constant
+* @param bool $useESI Whether to use ESI-loading, caller should check
global
+* @param bool $loadCall Whether to load with an asynchronous
mw.loader.load() call
+* @param array $extraQuery
+* @return array An array with 'link' for the HTML output, and
'loading' for a
+* ist of module names that should have their state marked as loading
+*/
+ protected function getHTMLForModules( array $modules, $source, array
$query,
+ $only, $useESI, $loadCall, array $extraQuery
+ ) {
+ $query['modules'] = ResourceLoader::makePackedModulesString(
$modules );
+ $moduleContext = new ResourceLoaderContext(
+ $this-getResourceLoader(),
+ new FauxRequest( $query )
+ );
+ $url = $this-getResourceLoader()-createLoaderURL(
+ $source,
+ $moduleContext,
+ $extraQuery
+ );
+
+ $loading = array();
+ if ( $useESI ) {
+ $esi = Xml::element( 'esi:include', array( 'src' =
$url ) );
+ if ( $only == ResourceLoaderModule::TYPE_STYLES ) {
+ $link = Html::inlineStyle( $esi );
+ } else {
+ $link = Html::inlineScript( $esi );
+ }
+ } else {
+ // Automatically select style/script elements
+ if ( $only === ResourceLoaderModule::TYPE_STYLES ) {
+ $link = Html::linkedStyle( $url );
+ } elseif ( $loadCall ) {
+ $link = Html::inlineScript(
+
ResourceLoader::makeLoaderConditionalScript(
+ Xml::encodeJsCall(
'mw.loader.load', array( $url, 'text/javascript', true ) )
+ )
+ );
+ } else {
+ $link = Html::linkedScript( $url );
+
+ // For modules requested directly in the html
via link or script,
+ // tell mw.loader they are being loading to
prevent duplicate requests.
+ // Don't output state=loading for the startup
module..
+ $loading = array_diff( $modules, array(
'startup' ) );
+ }
+ }
+
+ return array(
+ 'link' = $link,
+ 'loading' = $loading,
+ );
+
+ }
+
+ /**
* @todo Document
* @param array|string $modules One or more module names
* @param string $only ResourceLoaderModule TYPE_ class constant
@@ -2813,38 +2873,32 @@
$query['version'] = wfTimestamp(
TS_ISO_8601_BASIC, $timestamp );
}
- $query['modules'] =
ResourceLoader::makePackedModulesString( array_keys( $grpModules ) );
- $moduleContext = new ResourceLoaderContext(
$resourceLoader, new FauxRequest( $query ) );
- $url = $resourceLoader-createLoaderURL(
$source, $moduleContext, $extraQuery );
-
- if ( $useESI $wgResourceLoaderUseESI ) {
- $esi = Xml::element( 'esi:include',
array( 'src' = $url ) );
- if ( $only ==
ResourceLoaderModule::TYPE_STYLES ) {
-
[MediaWiki-commits] [Gerrit] Account for $wgWhitelistRead = false (default) - change (mediawiki...NSFileRepo)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149807
Change subject: Account for $wgWhitelistRead = false (default)
..
Account for $wgWhitelistRead = false (default)
Warning: in_array() expects parameter 2 to be array, boolean given in
/srv/vagrant/mediawiki/extensions/NSFileRepo/NSFileRepo.php on line 98
Change-Id: I89b8d0c31e00a80128c5282d421d668f0eef7f1a
---
M NSFileRepo.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NSFileRepo
refs/changes/07/149807/1
diff --git a/NSFileRepo.php b/NSFileRepo.php
index b9ed2eb..56e7f9c 100644
--- a/NSFileRepo.php
+++ b/NSFileRepo.php
@@ -95,7 +95,7 @@
*/
function NSFileRepolockdownUserCan( $title, $user, $action, $result) {
global $wgWhitelistRead;
- if ( in_array( $title-getPrefixedText(), $wgWhitelistRead ) ) {
+ if ( $wgWhitelistRead !== false in_array( $title-getPrefixedText(),
$wgWhitelistRead ) ) {
return true;
} elseif( function_exists( 'lockdownUserPermissionsErrors' ) ) {
if( $title-getNamespace() == NS_FILE ) {
--
To view, visit https://gerrit.wikimedia.org/r/149807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89b8d0c31e00a80128c5282d421d668f0eef7f1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wikimedia] Add patches by Tim - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149808
Change subject: [wikimedia] Add patches by Tim
..
[wikimedia] Add patches by Tim
Still pending merge,
https://github.com/facebook/hhvm/pulls/tstarling
---
A debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
A debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
A debian/patches/Support-stream-wrappers-in-XML-parser-extensions.patch
M debian/patches/series
4 files changed, 1,160 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm
refs/changes/08/149808/1
diff --git
a/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
b/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
new file mode 100644
index 000..10621c9
--- /dev/null
+++ b/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
@@ -0,0 +1,44 @@
+From 5a908e3f3b1e2f98e654c3933e9be7eff80b0b47 Mon Sep 17 00:00:00 2001
+From: Tim Starling tstarl...@wikimedia.org
+Date: Mon, 30 Jun 2014 12:42:22 +1000
+Subject: [PATCH] Allow MixedArray::MakeReserveLike to work on arrays with
+ virtual size
+
+Previously this would try to create an array with 2^32 elements, causing
+an assertion or crash. array_map.hhas calls NewLikeArrayL on arbitrary
+input, which in turn calls MixedArray::MakeReserveLike. So any array
+originating from EZC would crash when fed into array_map().
+
+Added test case which previously crashed.
+---
+ hphp/runtime/base/mixed-array.cpp| 2 +-
+ hphp/test/slow/ext_ezc_test/array_map-proxyarray.php | 2 ++
+ hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf | 5 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+ create mode 100644 hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
+ create mode 100644
hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
+
+--- a/hphp/runtime/base/mixed-array.cpp
b/hphp/runtime/base/mixed-array.cpp
+@@ -78,7 +78,7 @@ ArrayData* MixedArray::MakeReserveMixed(
+
+ ArrayData* MixedArray::MakeReserveLike(const ArrayData* other,
+uint32_t capacity) {
+- capacity = (capacity ? capacity : other-m_size);
++ capacity = (capacity ? capacity : other-size());
+
+ if (other-m_kind == kPackedKind) {
+ return MixedArray::MakeReserve(capacity);
+--- /dev/null
b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
+@@ -0,0 +1,2 @@
++?php
++var_dump(array_map('boolval', ezc_create_cloneable_in_array()));
+--- /dev/null
b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
+@@ -0,0 +1,5 @@
++EzcTestCloneable free_storage (clone 0)
++array(1) {
++ [0]=
++ bool(true)
++}
diff --git
a/debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
b/debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
new file mode 100644
index 000..f9793ac
--- /dev/null
+++ b/debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
@@ -0,0 +1,697 @@
+From 662cc520f203aad04418d0c27698a7565aaf4f4a Mon Sep 17 00:00:00 2001
+From: Tim Starling tstarl...@wikimedia.org
+Date: Thu, 19 Jun 2014 14:16:31 +1000
+Subject: [PATCH] Fix boundary cases of strspn, strcspn and substr_replace
+
+I'm all for refactoring, but a precondition for refactoring is that the
+original copies of the code in some way resemble each other. While the
+bounds checks for strspn, substr_replace and substr might look
+superficially similar, in fact they can't be merged with a single
+simple if(strict) to take care of the divergence. The main problem is
+that multi-pass normalization of the inputs gives you some interesting
+and arguably broken behaviour when there are multiple issues that need
+to be simultaneously fixed.
+
+So, unrefactor (expand?) string_substr_check() into its three
+consistutent parts, with code in the two new parts based closely on the
+Zend source in the current git master. Remove the strict parameter,
+now implicitly true.
+
+Added a test case which previously failed in multiple ways. In
+particular, strspn('','x') returned the wrong thing, which broke the
+MediaWiki parser quite badly. The expect file was generated by PHP 5.5
+and is identical to the one generated by PHP 5.3.
+
+Submitted on behalf of a third-party: The PHP Group
+Source: PHP 5.6.0-dev
+License: version 3.01 of the PHP license
+---
+ hphp/runtime/base/zend-string.cpp| 33 +-
+ hphp/runtime/base/zend-string.h | 5 +-
+ hphp/runtime/ext/ext_string.cpp | 28 +-
+ hphp/test/quick/string-bounds.php| 33 ++
+ hphp/test/quick/string-bounds.php.expect | 499 +++
+ 5 files changed, 588 insertions(+), 10 deletions(-)
+ create mode 100644 hphp/test/quick/string-bounds.php
+ create mode 100644 hphp/test/quick/string-bounds.php.expect
[MediaWiki-commits] [Gerrit] [wikimedia] update changelog - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149809 Change subject: [wikimedia] update changelog .. [wikimedia] update changelog --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/09/149809/1 diff --git a/debian/changelog b/debian/changelog index f74c6ea..097fd88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hhvm (3.1+20140630-1) UNRELEASED; urgency=low +hhvm (3.1+20140630-1+wm1) trusty-wikimedia; urgency=low [ David Martínez Moreno ] * Initial release (closes: #727085). @@ -23,4 +23,4 @@ - public_headers_system: add header files from hphp/system/ too as at least systemlib.h is needed to build an extension. - -- Faidon Liambotis parav...@debian.org Mon, 30 Jun 2014 17:22:40 + + -- Faidon Liambotis fai...@wikimedia.org Tue, 01 Jul 2014 23:56:23 + -- To view, visit https://gerrit.wikimedia.org/r/149809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2452bc5d83afc931998f4452ceb9cd897bcf0d27 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wikimedia] Remove merged patches - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149813 Change subject: [wikimedia] Remove merged patches .. [wikimedia] Remove merged patches Upstream has merged/improved most of the patches to the build system; now CMake will search for the system libraries and will use the third-party ones only if those are not present. Given our Build-depends includes said libraries, we will obtain the correct result. --- M debian/patches/fix_freetype_include R debian/patches/public_headers_system.stale M debian/patches/series R debian/patches/use_system_double_conversion.stale R debian/patches/use_system_libsqlite3.stale R debian/patches/use_system_libzip.stale R debian/patches/use_system_lz4.stale 7 files changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/13/149813/1 diff --git a/debian/patches/fix_freetype_include b/debian/patches/fix_freetype_include index d8d463a..872d91d 100644 --- a/debian/patches/fix_freetype_include +++ b/debian/patches/fix_freetype_include @@ -7,12 +7,12 @@ --- a/hphp/runtime/ext/gd/libgd/gdft.cpp +++ b/hphp/runtime/ext/gd/libgd/gdft.cpp -@@ -62,7 +62,7 @@ gdImageStringFT (gdImage * im, int *brec - +@@ -63,7 +63,7 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist, #include gdcache.h --#include freetype/config/ftheader.h -+#include config/ftheader.h - - #include FT_FREETYPE_H - #include FT_GLYPH_H + #ifndef HAVE_FT2BUILD +-# include freetype/config/ftheader.h ++# include config/ftheader.h + #else + # include ft2build.h + #endif diff --git a/debian/patches/public_headers_system b/debian/patches/public_headers_system.stale similarity index 100% rename from debian/patches/public_headers_system rename to debian/patches/public_headers_system.stale diff --git a/debian/patches/series b/debian/patches/series index cc74034..128e00c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,6 @@ -use_system_libzip -use_system_libsqlite3 -use_system_lz4 -use_system_double_conversion -remove_libpam fix_freetype_include +remove_libpam typos -public_headers_system # Wikimedia-specific patches Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch diff --git a/debian/patches/use_system_double_conversion b/debian/patches/use_system_double_conversion.stale similarity index 100% rename from debian/patches/use_system_double_conversion rename to debian/patches/use_system_double_conversion.stale diff --git a/debian/patches/use_system_libsqlite3 b/debian/patches/use_system_libsqlite3.stale similarity index 100% rename from debian/patches/use_system_libsqlite3 rename to debian/patches/use_system_libsqlite3.stale diff --git a/debian/patches/use_system_libzip b/debian/patches/use_system_libzip.stale similarity index 100% rename from debian/patches/use_system_libzip rename to debian/patches/use_system_libzip.stale diff --git a/debian/patches/use_system_lz4 b/debian/patches/use_system_lz4.stale similarity index 100% rename from debian/patches/use_system_lz4 rename to debian/patches/use_system_lz4.stale -- To view, visit https://gerrit.wikimedia.org/r/149813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c2cc73dc90b0037e768e31b75ab951b8b1d4f60 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wikimedia] Add init scripts, bump changelog - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149810 Change subject: [wikimedia] Add init scripts, bump changelog .. [wikimedia] Add init scripts, bump changelog --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/10/149810/1 diff --git a/debian/changelog b/debian/changelog index 097fd88..da082ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hhvm (3.1+20140723-1+wmf1) trusty-wikimedia; urgency=medium + + * Refreshed the sources to the latest git master + * Init/upstart scripts + * Refreshed the list of patches we apply + + -- Giuseppe Lavagetto glavage...@wikimedia.org Wed, 23 Jul 2014 08:30:18 + + hhvm (3.1+20140630-1+wm1) trusty-wikimedia; urgency=low [ David Martínez Moreno ] -- To view, visit https://gerrit.wikimedia.org/r/149810 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaca49268429573541aef7e52f1cc80333fba540d Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wikimedia] Remove patches integrated in the tree, add PR #3... - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149812
Change subject: [wikimedia] Remove patches integrated in the tree, add PR #3121
and PR #3249
..
[wikimedia] Remove patches integrated in the tree, add PR #3121 and
PR #3249
---
D debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
A
debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
D debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
A
debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch
D debian/patches/Support-stream-wrappers-in-XML-parser-extensions.patch
M debian/patches/series
6 files changed, 1,517 insertions(+), 1,158 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm
refs/changes/12/149812/1
diff --git
a/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
b/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
deleted file mode 100644
index 10621c9..000
--- a/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5a908e3f3b1e2f98e654c3933e9be7eff80b0b47 Mon Sep 17 00:00:00 2001
-From: Tim Starling tstarl...@wikimedia.org
-Date: Mon, 30 Jun 2014 12:42:22 +1000
-Subject: [PATCH] Allow MixedArray::MakeReserveLike to work on arrays with
- virtual size
-
-Previously this would try to create an array with 2^32 elements, causing
-an assertion or crash. array_map.hhas calls NewLikeArrayL on arbitrary
-input, which in turn calls MixedArray::MakeReserveLike. So any array
-originating from EZC would crash when fed into array_map().
-
-Added test case which previously crashed.
- hphp/runtime/base/mixed-array.cpp| 2 +-
- hphp/test/slow/ext_ezc_test/array_map-proxyarray.php | 2 ++
- hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf | 5 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
- create mode 100644 hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
- create mode 100644
hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
-
a/hphp/runtime/base/mixed-array.cpp
-+++ b/hphp/runtime/base/mixed-array.cpp
-@@ -78,7 +78,7 @@ ArrayData* MixedArray::MakeReserveMixed(
-
- ArrayData* MixedArray::MakeReserveLike(const ArrayData* other,
-uint32_t capacity) {
-- capacity = (capacity ? capacity : other-m_size);
-+ capacity = (capacity ? capacity : other-size());
-
- if (other-m_kind == kPackedKind) {
- return MixedArray::MakeReserve(capacity);
/dev/null
-+++ b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
-@@ -0,0 +1,2 @@
-+?php
-+var_dump(array_map('boolval', ezc_create_cloneable_in_array()));
/dev/null
-+++ b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
-@@ -0,0 +1,5 @@
-+EzcTestCloneable free_storage (clone 0)
-+array(1) {
-+ [0]=
-+ bool(true)
-+}
diff --git
a/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
b/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
new file mode 100644
index 000..d65b9e5
--- /dev/null
+++
b/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
@@ -0,0 +1,116 @@
+From 22f01359490d0290b06de9da6dc33dd68fc7ed3e Mon Sep 17 00:00:00 2001
+From: Tim Starling tstarl...@wikimedia.org
+Date: Mon, 7 Jul 2014 13:01:09 +1000
+Subject: [PATCH] EZC: fix crash due to EG(exception) being transmitted between
+ requests
+
+When an exception was thrown from EZC, EG(exception) was left holding a
+reference to the smart-allocated exception object, even after the end of
+the request. At the end of the request, the object storage was freed by
+resetAllocator(), then when zend_wrap_func() was entered in the next
+request, EG(exception) would be freed again, causing a crash.
+
+Fixed by installing request event handlers. The requestInit() handler is
+analogous to Zend's init_executor(). Defer
+ZendObjectStore::requestShutdown() until after EG(exception) is deleted,
+to avoid an assertion from ExecutionContext::registerRequestEventHandler
+due to duplicate registration.
+---
+ .../ext_zend_compat/hhvm/zend-object-store.h | 8 -
+ .../ext_zend_compat/php-src/Zend/zend_globals.cpp | 41 +++---
+ 2 files changed, 44 insertions(+), 5 deletions(-)
+
+diff --git a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
+index 9672a3f..86a6126 100644
+--- a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
+@@ -36,9 +36,15 @@ class ZendObjectStore final : public RequestEventHandler {
+ : m_free_list_head(0)
+ {}
+
+-virtual void requestInit() {};
++virtual void
[MediaWiki-commits] [Gerrit] [wikimedia] Add patches by Tim - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: [wikimedia] Add patches by Tim
..
[wikimedia] Add patches by Tim
Still pending merge,
https://github.com/facebook/hhvm/pulls/tstarling
---
A debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
A debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
A debian/patches/Support-stream-wrappers-in-XML-parser-extensions.patch
M debian/patches/series
4 files changed, 1,160 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git
a/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
b/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
new file mode 100644
index 000..10621c9
--- /dev/null
+++ b/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
@@ -0,0 +1,44 @@
+From 5a908e3f3b1e2f98e654c3933e9be7eff80b0b47 Mon Sep 17 00:00:00 2001
+From: Tim Starling tstarl...@wikimedia.org
+Date: Mon, 30 Jun 2014 12:42:22 +1000
+Subject: [PATCH] Allow MixedArray::MakeReserveLike to work on arrays with
+ virtual size
+
+Previously this would try to create an array with 2^32 elements, causing
+an assertion or crash. array_map.hhas calls NewLikeArrayL on arbitrary
+input, which in turn calls MixedArray::MakeReserveLike. So any array
+originating from EZC would crash when fed into array_map().
+
+Added test case which previously crashed.
+---
+ hphp/runtime/base/mixed-array.cpp| 2 +-
+ hphp/test/slow/ext_ezc_test/array_map-proxyarray.php | 2 ++
+ hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf | 5 +
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+ create mode 100644 hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
+ create mode 100644
hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
+
+--- a/hphp/runtime/base/mixed-array.cpp
b/hphp/runtime/base/mixed-array.cpp
+@@ -78,7 +78,7 @@ ArrayData* MixedArray::MakeReserveMixed(
+
+ ArrayData* MixedArray::MakeReserveLike(const ArrayData* other,
+uint32_t capacity) {
+- capacity = (capacity ? capacity : other-m_size);
++ capacity = (capacity ? capacity : other-size());
+
+ if (other-m_kind == kPackedKind) {
+ return MixedArray::MakeReserve(capacity);
+--- /dev/null
b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
+@@ -0,0 +1,2 @@
++?php
++var_dump(array_map('boolval', ezc_create_cloneable_in_array()));
+--- /dev/null
b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
+@@ -0,0 +1,5 @@
++EzcTestCloneable free_storage (clone 0)
++array(1) {
++ [0]=
++ bool(true)
++}
diff --git
a/debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
b/debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
new file mode 100644
index 000..f9793ac
--- /dev/null
+++ b/debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
@@ -0,0 +1,697 @@
+From 662cc520f203aad04418d0c27698a7565aaf4f4a Mon Sep 17 00:00:00 2001
+From: Tim Starling tstarl...@wikimedia.org
+Date: Thu, 19 Jun 2014 14:16:31 +1000
+Subject: [PATCH] Fix boundary cases of strspn, strcspn and substr_replace
+
+I'm all for refactoring, but a precondition for refactoring is that the
+original copies of the code in some way resemble each other. While the
+bounds checks for strspn, substr_replace and substr might look
+superficially similar, in fact they can't be merged with a single
+simple if(strict) to take care of the divergence. The main problem is
+that multi-pass normalization of the inputs gives you some interesting
+and arguably broken behaviour when there are multiple issues that need
+to be simultaneously fixed.
+
+So, unrefactor (expand?) string_substr_check() into its three
+consistutent parts, with code in the two new parts based closely on the
+Zend source in the current git master. Remove the strict parameter,
+now implicitly true.
+
+Added a test case which previously failed in multiple ways. In
+particular, strspn('','x') returned the wrong thing, which broke the
+MediaWiki parser quite badly. The expect file was generated by PHP 5.5
+and is identical to the one generated by PHP 5.3.
+
+Submitted on behalf of a third-party: The PHP Group
+Source: PHP 5.6.0-dev
+License: version 3.01 of the PHP license
+---
+ hphp/runtime/base/zend-string.cpp| 33 +-
+ hphp/runtime/base/zend-string.h | 5 +-
+ hphp/runtime/ext/ext_string.cpp | 28 +-
+ hphp/test/quick/string-bounds.php| 33 ++
+ hphp/test/quick/string-bounds.php.expect | 499 +++
+ 5 files changed, 588 insertions(+), 10 deletions(-)
+ create mode 100644 hphp/test/quick/string-bounds.php
+ create mode 100644 hphp/test/quick/string-bounds.php.expect
+
+--- a/hphp/runtime/base/zend-string.cpp
[MediaWiki-commits] [Gerrit] [wikimedia] update changelog - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: [wikimedia] update changelog .. [wikimedia] update changelog --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index f74c6ea..097fd88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hhvm (3.1+20140630-1) UNRELEASED; urgency=low +hhvm (3.1+20140630-1+wm1) trusty-wikimedia; urgency=low [ David Martínez Moreno ] * Initial release (closes: #727085). @@ -23,4 +23,4 @@ - public_headers_system: add header files from hphp/system/ too as at least systemlib.h is needed to build an extension. - -- Faidon Liambotis parav...@debian.org Mon, 30 Jun 2014 17:22:40 + + -- Faidon Liambotis fai...@wikimedia.org Tue, 01 Jul 2014 23:56:23 + -- To view, visit https://gerrit.wikimedia.org/r/149809 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2452bc5d83afc931998f4452ceb9cd897bcf0d27 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wikimedia] Add init scripts, bump changelog - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: [wikimedia] Add init scripts, bump changelog .. [wikimedia] Add init scripts, bump changelog --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 097fd88..da082ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hhvm (3.1+20140723-1+wmf1) trusty-wikimedia; urgency=medium + + * Refreshed the sources to the latest git master + * Init/upstart scripts + * Refreshed the list of patches we apply + + -- Giuseppe Lavagetto glavage...@wikimedia.org Wed, 23 Jul 2014 08:30:18 + + hhvm (3.1+20140630-1+wm1) trusty-wikimedia; urgency=low [ David Martínez Moreno ] -- To view, visit https://gerrit.wikimedia.org/r/149810 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaca49268429573541aef7e52f1cc80333fba540d Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wikimedia] Remove patches integrated in the tree, add PR #3... - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: [wikimedia] Remove patches integrated in the tree, add PR #3121
and PR #3249
..
[wikimedia] Remove patches integrated in the tree, add PR #3121 and
PR #3249
---
D debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
A
debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
D debian/patches/Fix-boundary-cases-of-strspn-strcspn-and-substr_repl.patch
A
debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch
D debian/patches/Support-stream-wrappers-in-XML-parser-extensions.patch
M debian/patches/series
6 files changed, 1,517 insertions(+), 1,158 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git
a/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
b/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
deleted file mode 100644
index 10621c9..000
--- a/debian/patches/Allow-MixedArray-MakeReserveLike-to-work-on-arrays-w.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5a908e3f3b1e2f98e654c3933e9be7eff80b0b47 Mon Sep 17 00:00:00 2001
-From: Tim Starling tstarl...@wikimedia.org
-Date: Mon, 30 Jun 2014 12:42:22 +1000
-Subject: [PATCH] Allow MixedArray::MakeReserveLike to work on arrays with
- virtual size
-
-Previously this would try to create an array with 2^32 elements, causing
-an assertion or crash. array_map.hhas calls NewLikeArrayL on arbitrary
-input, which in turn calls MixedArray::MakeReserveLike. So any array
-originating from EZC would crash when fed into array_map().
-
-Added test case which previously crashed.
- hphp/runtime/base/mixed-array.cpp| 2 +-
- hphp/test/slow/ext_ezc_test/array_map-proxyarray.php | 2 ++
- hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf | 5 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
- create mode 100644 hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
- create mode 100644
hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
-
a/hphp/runtime/base/mixed-array.cpp
-+++ b/hphp/runtime/base/mixed-array.cpp
-@@ -78,7 +78,7 @@ ArrayData* MixedArray::MakeReserveMixed(
-
- ArrayData* MixedArray::MakeReserveLike(const ArrayData* other,
-uint32_t capacity) {
-- capacity = (capacity ? capacity : other-m_size);
-+ capacity = (capacity ? capacity : other-size());
-
- if (other-m_kind == kPackedKind) {
- return MixedArray::MakeReserve(capacity);
/dev/null
-+++ b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php
-@@ -0,0 +1,2 @@
-+?php
-+var_dump(array_map('boolval', ezc_create_cloneable_in_array()));
/dev/null
-+++ b/hphp/test/slow/ext_ezc_test/array_map-proxyarray.php.expectf
-@@ -0,0 +1,5 @@
-+EzcTestCloneable free_storage (clone 0)
-+array(1) {
-+ [0]=
-+ bool(true)
-+}
diff --git
a/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
b/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
new file mode 100644
index 000..d65b9e5
--- /dev/null
+++
b/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
@@ -0,0 +1,116 @@
+From 22f01359490d0290b06de9da6dc33dd68fc7ed3e Mon Sep 17 00:00:00 2001
+From: Tim Starling tstarl...@wikimedia.org
+Date: Mon, 7 Jul 2014 13:01:09 +1000
+Subject: [PATCH] EZC: fix crash due to EG(exception) being transmitted between
+ requests
+
+When an exception was thrown from EZC, EG(exception) was left holding a
+reference to the smart-allocated exception object, even after the end of
+the request. At the end of the request, the object storage was freed by
+resetAllocator(), then when zend_wrap_func() was entered in the next
+request, EG(exception) would be freed again, causing a crash.
+
+Fixed by installing request event handlers. The requestInit() handler is
+analogous to Zend's init_executor(). Defer
+ZendObjectStore::requestShutdown() until after EG(exception) is deleted,
+to avoid an assertion from ExecutionContext::registerRequestEventHandler
+due to duplicate registration.
+---
+ .../ext_zend_compat/hhvm/zend-object-store.h | 8 -
+ .../ext_zend_compat/php-src/Zend/zend_globals.cpp | 41 +++---
+ 2 files changed, 44 insertions(+), 5 deletions(-)
+
+diff --git a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
+index 9672a3f..86a6126 100644
+--- a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
+@@ -36,9 +36,15 @@ class ZendObjectStore final : public RequestEventHandler {
+ : m_free_list_head(0)
+ {}
+
+-virtual void requestInit() {};
++virtual void requestInit() {}
+ virtual void requestShutdown();
+
++
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Moved to Json i18n files
Change-Id: I7c8319ca7ebf8add3b717a347f0f134dea1adf19
---
M RSSFeeder/RSSFeeder.class.php
M RSSFeeder/RSSFeeder.setup.php
M RSSFeeder/i18n/de-formal.json
M RSSFeeder/i18n/de.json
M RSSFeeder/i18n/en.json
M RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
8 files changed, 35 insertions(+), 35 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
Objections:
Siebrand: There's a problem with this change, please improve
diff --git a/RSSFeeder/RSSFeeder.class.php b/RSSFeeder/RSSFeeder.class.php
index 5803e0f..cf5b19f 100644
--- a/RSSFeeder/RSSFeeder.class.php
+++ b/RSSFeeder/RSSFeeder.class.php
@@ -90,14 +90,14 @@
*/
public function onBSDashboardsAdminDashboardPortalPortlets( $aPortlets
) {
$aPortlets[] = array(
- 'type' =
'BS.RSSFeeder.RSSPortlet',
- 'config' = array(
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'height' = 660,
- 'rssurl' =
'http://blog.blue-spice.org/feed/'
- ),
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'description' = wfMessage(
'bs-dashboards-rss-desc' )-plain()
+ 'type' = 'BS.RSSFeeder.RSSPortlet',
+ 'config' = array(
+ 'title' = wfMessage( 'bs-rssfeeder-rss'
)-plain(),
+ 'height' = 660,
+ 'rssurl' = 'http://blog.blue-spice.org/feed/'
+ ),
+ 'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+ 'description' = wfMessage( 'bs-rssfeeder-rss-desc'
)-plain()
);
return true;
@@ -132,14 +132,14 @@
*/
public function onBSDashboardsUserDashboardPortalPortlets( $aPortlets
) {
$aPortlets[] = array(
- 'type' =
'BS.RSSFeeder.RSSPortlet',
- 'config' = array(
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'height' = 610,
- 'rssurl' =
'http://blog.blue-spice.org/feed/'
- ),
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'description' = wfMessage(
'bs-dashboards-rss-desc' )-plain()
+ 'type' = 'BS.RSSFeeder.RSSPortlet',
+ 'config' = array(
+ 'title' = wfMessage( 'bs-rssfeeder-rss'
)-plain(),
+ 'height' = 610,
+ 'rssurl' = 'http://blog.blue-spice.org/feed/'
+ ),
+ 'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+ 'description' = wfMessage( 'bs-rssfeeder-rss-desc'
)-plain()
);
return true;
diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index eac09a5..25c4bdc 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -4,11 +4,11 @@
$wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ .
'/languages/RSSFeeder.i18n.php';
+$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ .
'/languages/RSSFeeder.i18n.php';
$wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ .
'/languages/SpecialRSSFeeder.alias.php';
$wgAutoloadClasses['SpecialRSSFeeder'] = __DIR__ .
'/includes/specials/SpecialRSSFeeder.class.php';
-$wgAutoloadClasses['RSSCreator'] = __DIR__ .
'/includes/RSSCreator.class.php';
+$wgAutoloadClasses['RSSCreator'] = __DIR__ . '/includes/RSSCreator.class.php';
$wgSpecialPageGroups['RSSFeeder'] = 'bluespice';
$wgSpecialPages['RSSFeeder'] = 'SpecialRSSFeeder';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
index 81b033f..efe675e 100644
--- a/RSSFeeder/i18n/de-formal.json
+++ b/RSSFeeder/i18n/de-formal.json
@@ -4,5 +4,5 @@
Stephan Muggli mug...@hallowelt.biz
]
},
- bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen RSS-Feed
+
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Moved to Json i18n files
Change-Id: Id4831bf2d5fe3e71f5a28644317ac07eb1c386bd
---
M RSSFeeder/RSSFeeder.setup.php
A RSSFeeder/i18n/de-formal.json
A RSSFeeder/i18n/de.json
A RSSFeeder/i18n/en.json
A RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
7 files changed, 87 insertions(+), 68 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index 1216fd8..eac09a5 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -1,6 +1,8 @@
?php
-BsExtensionManager::registerExtension('RSSFeeder',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'RSSFeeder',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
+
+$wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ .
'/languages/RSSFeeder.i18n.php';
$wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ .
'/languages/SpecialRSSFeeder.alias.php';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
new file mode 100644
index 000..81b033f
--- /dev/null
+++ b/RSSFeeder/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen RSS-Feed
+}
diff --git a/RSSFeeder/i18n/de.json b/RSSFeeder/i18n/de.json
new file mode 100644
index 000..f907bd6
--- /dev/null
+++ b/RSSFeeder/i18n/de.json
@@ -0,0 +1,16 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-rssfeeder-desc: Fügt RSS Funktionalität hinzu,
+ rssfeeder: RSS Feeder,
+ bs-rssfeeder-pagetext: Folgende RSS-Feeds stehen zur Verfügung,
+ bs-rssfeeder-recent-changes: Letzte Änderungen,
+ bs-rssfeeder-pages: Seite,
+ bs-rssfeeder-submit: Anzeigen,
+ bs-rssfeeder-rss: RSS-Feed,
+ bs-dashboards-rss-desc: Erstelle deinen eigenen RSS-Feed,
+ bs-extjs-rssfeeder-rss-title: RSS-URL
+}
diff --git a/RSSFeeder/i18n/en.json b/RSSFeeder/i18n/en.json
new file mode 100644
index 000..0ad5368
--- /dev/null
+++ b/RSSFeeder/i18n/en.json
@@ -0,0 +1,16 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-rssfeeder-desc: Adds RSS functionality,
+ rssfeeder: RSS feeder,
+ bs-rssfeeder-pagetext: You can subscribe to the following RSS feeds,
+ bs-rssfeeder-recent-changes: Recent changes,
+ bs-rssfeeder-pages: Page,
+ bs-rssfeeder-submit: Show,
+ bs-rssfeeder-rss: RSS feed,
+ bs-dashboards-rss-desc: Create your own RSS feed,
+ bs-extjs-rssfeeder-rss-title: RSS URL
+}
diff --git a/RSSFeeder/i18n/qqq.json b/RSSFeeder/i18n/qqq.json
new file mode 100644
index 000..fe46181
--- /dev/null
+++ b/RSSFeeder/i18n/qqq.json
@@ -0,0 +1,16 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-rssfeeder-desc: Used in
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}}
Special:WikiAdmin?mode=ExtensionInfo], description of rss feeder extension,
+ rssfeeder: {{doc-special|RSS feeder}},
+ bs-rssfeeder-pagetext: Headline on special page for all available
RSS feeds,
+ bs-rssfeeder-recent-changes: Headline for recent
changes\\n{{Identical|Recent changes}},
+ bs-rssfeeder-pages: Headline for page\\n{{Identical|Page}},
+ bs-rssfeeder-submit: Button label for show\\n{{Identical|Show}},
+ bs-rssfeeder-rss: Used in [[Special:AdminDashboard]] and
[[Special:UserDashboard]], headline for rss feed portlet\\n{{Identical|RSS
feed}}},
+ bs-dashboards-rss-desc: Used in [[Special:AdminDashboard]] and
[[Special:UserDashboard]], description of rss feed portlet,
+ bs-extjs-rssfeeder-rss-title: Used in [[Special:AdminDashboard]] and
[[Special:UserDashboard]], label for rss url\\n{{Identical|RSS URL}}}
+}
diff --git a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
index 7d009e5..2d1b4e6 100644
--- a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
+++ b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
@@ -35,7 +35,6 @@
return;
}
- $this-getOutput()-setPageTitle('RSS');
$this-getOutput()-addModuleStyles( 'ext.bluespice.rssFeeder'
);
$form = new ViewBaseForm();
@@ -44,7 +43,7 @@
[MediaWiki-commits] [Gerrit] [wikimedia] Remove merged patches - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: [wikimedia] Remove merged patches .. [wikimedia] Remove merged patches Upstream has merged/improved most of the patches to the build system; now CMake will search for the system libraries and will use the third-party ones only if those are not present. Given our Build-depends includes said libraries, we will obtain the correct result. --- M debian/patches/fix_freetype_include R debian/patches/public_headers_system.stale M debian/patches/series R debian/patches/use_system_double_conversion.stale R debian/patches/use_system_libsqlite3.stale R debian/patches/use_system_libzip.stale R debian/patches/use_system_lz4.stale 7 files changed, 8 insertions(+), 13 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/patches/fix_freetype_include b/debian/patches/fix_freetype_include index d8d463a..872d91d 100644 --- a/debian/patches/fix_freetype_include +++ b/debian/patches/fix_freetype_include @@ -7,12 +7,12 @@ --- a/hphp/runtime/ext/gd/libgd/gdft.cpp +++ b/hphp/runtime/ext/gd/libgd/gdft.cpp -@@ -62,7 +62,7 @@ gdImageStringFT (gdImage * im, int *brec - +@@ -63,7 +63,7 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist, #include gdcache.h --#include freetype/config/ftheader.h -+#include config/ftheader.h - - #include FT_FREETYPE_H - #include FT_GLYPH_H + #ifndef HAVE_FT2BUILD +-# include freetype/config/ftheader.h ++# include config/ftheader.h + #else + # include ft2build.h + #endif diff --git a/debian/patches/public_headers_system b/debian/patches/public_headers_system.stale similarity index 100% rename from debian/patches/public_headers_system rename to debian/patches/public_headers_system.stale diff --git a/debian/patches/series b/debian/patches/series index cc74034..128e00c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,6 @@ -use_system_libzip -use_system_libsqlite3 -use_system_lz4 -use_system_double_conversion -remove_libpam fix_freetype_include +remove_libpam typos -public_headers_system # Wikimedia-specific patches Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch diff --git a/debian/patches/use_system_double_conversion b/debian/patches/use_system_double_conversion.stale similarity index 100% rename from debian/patches/use_system_double_conversion rename to debian/patches/use_system_double_conversion.stale diff --git a/debian/patches/use_system_libsqlite3 b/debian/patches/use_system_libsqlite3.stale similarity index 100% rename from debian/patches/use_system_libsqlite3 rename to debian/patches/use_system_libsqlite3.stale diff --git a/debian/patches/use_system_libzip b/debian/patches/use_system_libzip.stale similarity index 100% rename from debian/patches/use_system_libzip rename to debian/patches/use_system_libzip.stale diff --git a/debian/patches/use_system_lz4 b/debian/patches/use_system_lz4.stale similarity index 100% rename from debian/patches/use_system_lz4 rename to debian/patches/use_system_lz4.stale -- To view, visit https://gerrit.wikimedia.org/r/149813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c2cc73dc90b0037e768e31b75ab951b8b1d4f60 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove api.py - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149814
Change subject: Remove api.py
..
Remove api.py
Since we're no longer going to have production talk to labs,
this API is no longer needed.
Change-Id: I406bcdf44b126cf90b027702c402ab4bc727c153
---
D api.py
D extdist.wsgi
2 files changed, 0 insertions(+), 90 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/14/149814/1
diff --git a/api.py b/api.py
deleted file mode 100644
index ac8d6b8..000
--- a/api.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-
-api.py - Webserver
-
-This webserver is designed to mimic Github's
-tarball API. It exposes two entry points:
-
-* / - accepts version and ext parameters,
- API entry point
-
-* /dist - serves generated tarballs to users
-
-import json
-import os
-from flask import Flask, redirect, request, send_from_directory
-
-import conf
-import nightly
-
-app = Flask(__name__, static_url_path='')
-app.debug = True
-
-
-def get_link(ext, version):
-
-Get the /dist/ link to a tarball, given
-extension name and version.
-Returns a dictionary if tarball doesn't
-exist.
-
-files = os.listdir(conf.DIST_PATH)
-f = False
-for f in files:
-# VisualEditor-REL1_23-9883566.tar.gz
-if f.startswith('%s-%s' % (ext, version)):
-break
-
-if f is False:
-return {'error': 'notfound'}
-else:
-return conf.URL_ENDPOINT % f
-
-@app.route('/dist/path:path')
-def serve_files(path):
-
-Serves tarballs. flask will only allow files in
-conf.DIST_PATH to be accessed.
-
-if path.endswith('.tar.gz'):
-# Err, do some more secure file checking
-return send_from_directory(conf.DIST_PATH, path, as_attachment=True)
-else:
-return out({'error': 'invalidfile'})
-
-
-def out(j):
-
-Wrapper for error message formatter
-In the future we might want to make
-this look pretty or something.
-
-return json.dumps(j)
-
-@app.route('/')
-def entry_point():
-ext = request.args.get('ext')
-version = request.args.get('version')
-if not ext and not version:
-# Our home page is a redirect to mw.o
-return
redirect('https://www.mediawiki.org/wiki/Special:ExtensionDistributor',
code=302)
-if not version in nightly.get_supported_branches():
-# Check version is a supported one
-return out({'error': 'badversion'})
-if not ext in nightly.get_all_extensions():
-# Check extension name is a valid one
-return out({'error': 'badext'})
-
-info = get_link(ext, version)
-if type(info) == dict:
-# Error message
-return out(info)
-
-# Redirect to the tarball
-return redirect(info, code=302)
-
-if __name__ == '__main__':
-app.run(debug=True)
diff --git a/extdist.wsgi b/extdist.wsgi
deleted file mode 100644
index 050bc46..000
--- a/extdist.wsgi
+++ /dev/null
@@ -1,3 +0,0 @@
-import sys
-sys.path.append('/var/www/extdist/')
-from api import app as application
--
To view, visit https://gerrit.wikimedia.org/r/149814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I406bcdf44b126cf90b027702c402ab4bc727c153
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove api.py - change (labs...extdist)
Yuvipanda has submitted this change and it was merged.
Change subject: Remove api.py
..
Remove api.py
Since we're no longer going to have production talk to labs,
this API is no longer needed.
Change-Id: I406bcdf44b126cf90b027702c402ab4bc727c153
---
D api.py
D extdist.wsgi
2 files changed, 0 insertions(+), 90 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/api.py b/api.py
deleted file mode 100644
index ac8d6b8..000
--- a/api.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-
-api.py - Webserver
-
-This webserver is designed to mimic Github's
-tarball API. It exposes two entry points:
-
-* / - accepts version and ext parameters,
- API entry point
-
-* /dist - serves generated tarballs to users
-
-import json
-import os
-from flask import Flask, redirect, request, send_from_directory
-
-import conf
-import nightly
-
-app = Flask(__name__, static_url_path='')
-app.debug = True
-
-
-def get_link(ext, version):
-
-Get the /dist/ link to a tarball, given
-extension name and version.
-Returns a dictionary if tarball doesn't
-exist.
-
-files = os.listdir(conf.DIST_PATH)
-f = False
-for f in files:
-# VisualEditor-REL1_23-9883566.tar.gz
-if f.startswith('%s-%s' % (ext, version)):
-break
-
-if f is False:
-return {'error': 'notfound'}
-else:
-return conf.URL_ENDPOINT % f
-
-@app.route('/dist/path:path')
-def serve_files(path):
-
-Serves tarballs. flask will only allow files in
-conf.DIST_PATH to be accessed.
-
-if path.endswith('.tar.gz'):
-# Err, do some more secure file checking
-return send_from_directory(conf.DIST_PATH, path, as_attachment=True)
-else:
-return out({'error': 'invalidfile'})
-
-
-def out(j):
-
-Wrapper for error message formatter
-In the future we might want to make
-this look pretty or something.
-
-return json.dumps(j)
-
-@app.route('/')
-def entry_point():
-ext = request.args.get('ext')
-version = request.args.get('version')
-if not ext and not version:
-# Our home page is a redirect to mw.o
-return
redirect('https://www.mediawiki.org/wiki/Special:ExtensionDistributor',
code=302)
-if not version in nightly.get_supported_branches():
-# Check version is a supported one
-return out({'error': 'badversion'})
-if not ext in nightly.get_all_extensions():
-# Check extension name is a valid one
-return out({'error': 'badext'})
-
-info = get_link(ext, version)
-if type(info) == dict:
-# Error message
-return out(info)
-
-# Redirect to the tarball
-return redirect(info, code=302)
-
-if __name__ == '__main__':
-app.run(debug=True)
diff --git a/extdist.wsgi b/extdist.wsgi
deleted file mode 100644
index 050bc46..000
--- a/extdist.wsgi
+++ /dev/null
@@ -1,3 +0,0 @@
-import sys
-sys.path.append('/var/www/extdist/')
-from api import app as application
--
To view, visit https://gerrit.wikimedia.org/r/149814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I406bcdf44b126cf90b027702c402ab4bc727c153
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jobs for labs/tools/extdist - change (integration/jenkins-job-builder-config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149815
Change subject: Add jobs for labs/tools/extdist
..
Add jobs for labs/tools/extdist
Change-Id: I3646c6df3b1320245c598ceb22c433bbcca3867b
---
M labs.yaml
1 file changed, 5 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/15/149815/1
diff --git a/labs.yaml b/labs.yaml
index abdfe8f..8b97cc5 100644
--- a/labs.yaml
+++ b/labs.yaml
@@ -21,6 +21,11 @@
- '{name}-debian-glue'
- project:
+name: 'labs-tools-extdist'
+jobs:
+ - python-jobs
+
+- project:
name: 'labs-tools-grrrit'
jobs:
- '{name}-jslint'
--
To view, visit https://gerrit.wikimedia.org/r/149815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3646c6df3b1320245c598ceb22c433bbcca3867b
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add zuul config for labs/tools/extdist - change (integration/zuul-config)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/149816 Change subject: Add zuul config for labs/tools/extdist .. Add zuul config for labs/tools/extdist Change-Id: I52b8eeff3f617f99d903e25bac174a8a2a760e66 --- M layout.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/16/149816/1 diff --git a/layout.yaml b/layout.yaml index 70df0f4..91ed5fd 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1150,6 +1150,11 @@ test: - labs-toollabs-debian-glue + - name: labs/tools/extdist +template: + - name: 'python-lint' + prefix: 'labs-tools-extdist' + - name: labs/tools/grrrit check-voter: - labs-tools-grrrit-jslint -- To view, visit https://gerrit.wikimedia.org/r/149816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52b8eeff3f617f99d903e25bac174a8a2a760e66 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct RL module class for templates - change (mediawiki...ZeroBanner)
jenkins-bot has submitted this change and it was merged. Change subject: Use correct RL module class for templates .. Use correct RL module class for templates This is now in Extension:Mantle Change-Id: I88dc29c2ed79ed02de6116ef0d12b5edc9ed204e --- M ZeroBanner.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Yurik: Looks good to me, approved jenkins-bot: Verified diff --git a/ZeroBanner.php b/ZeroBanner.php index 8918b13..42aa53e 100644 --- a/ZeroBanner.php +++ b/ZeroBanner.php @@ -74,7 +74,8 @@ 'remoteExtPath' = $remoteExtPath, 'localTemplateBasePath' = $localBasePath . '/templates', 'templates' = array( 'interstitial', 'zeroinfo' ), - 'class' = 'MFResourceLoaderModule', + // Use Mantle Resource Loader module + 'class' = 'ResourceLoaderTemplateModule', 'targets' = array( 'mobile' ), 'scripts' = array( 'modules/ZeroOverlay.js', 'modules/banner.js', 'modules/ZeroInfo.js', 'modules/interstitial.js' ), 'messages' = array( -- To view, visit https://gerrit.wikimedia.org/r/149452 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88dc29c2ed79ed02de6116ef0d12b5edc9ed204e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ZeroBanner Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: Yurik yu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move configuration into a JSON file - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149817
Change subject: Move configuration into a JSON file
..
Move configuration into a JSON file
Change-Id: I7856032b89f42bcf597ec1585f4423cbed1301fd
---
A conf.json
D conf.py
M nightly.py
3 files changed, 29 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/17/149817/1
diff --git a/conf.json b/conf.json
new file mode 100644
index 000..a6a9390
--- /dev/null
+++ b/conf.json
@@ -0,0 +1,10 @@
+{
+API_URL: https://www.mediawiki.org/w/api.php;,
+DIST_PATH: /srv/dist,
+EXT_LIST: null,
+GIT_URL: https://github.com/wikimedia/mediawiki-extensions-%s;,
+SRC_PATH: /srv/src/extensions,
+SUPPORTED_VERSIONS: null,
+URL_ENDPOINT: https://extdist.wmflabs.org/dist/%s;
+}
+
diff --git a/conf.py b/conf.py
deleted file mode 100644
index 4027615..000
--- a/conf.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-SRC_PATH = '/srv/src/extensions'
-#SRC_PATH = '/Users/km/projects/extdist/src/extensions'
-DIST_PATH = '/srv/dist'
-#DIST_PATH = '/Users/km/projects/extdist/dist'
-GIT_URL = 'https://github.com/wikimedia/mediawiki-extensions-%s'
-SUPPORTED_VERSIONS = None # lazy-init
-EXT_LIST = None # lazy-init
-URL_ENDPOINT = 'https://extdist.wmflabs.org/dist/%s'
-API_URL = 'https://www.mediawiki.org/w/api.php'
diff --git a/nightly.py b/nightly.py
index e1a55ba..b9bfe33 100644
--- a/nightly.py
+++ b/nightly.py
@@ -22,7 +22,25 @@
import sys
import urllib
-import conf
+# Load our config from JSON
+if os.path.exists('/etc/extdist.conf'):
+with open('/etc/extdist.conf', 'r') as f:
+conf = json.load(f)
+elif os.path.exists(os.path.join(os.path.dirname(__file__), 'conf.json')):
+with open(os.path.join(os.path.dirname(__file__), 'conf.json'), 'r') as f:
+conf = json.load(f)
+else:
+print 'extdist is not configured properly.'
+quit()
+
+
+class AttrDict(dict):
+def __init__(self, *args, **kwargs):
+super(AttrDict, self).__init__(*args, **kwargs)
+self.__dict__ = self
+
+# Allow accessing settings as attributes
+conf = AttrDict(conf)
def fetch_all_extensions():
--
To view, visit https://gerrit.wikimedia.org/r/149817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7856032b89f42bcf597ec1585f4423cbed1301fd
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move configuration into a JSON file - change (labs...extdist)
Yuvipanda has submitted this change and it was merged.
Change subject: Move configuration into a JSON file
..
Move configuration into a JSON file
Change-Id: I7856032b89f42bcf597ec1585f4423cbed1301fd
---
A conf.json
D conf.py
M nightly.py
3 files changed, 28 insertions(+), 12 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/conf.json b/conf.json
new file mode 100644
index 000..1eeec44
--- /dev/null
+++ b/conf.json
@@ -0,0 +1,9 @@
+{
+API_URL: https://www.mediawiki.org/w/api.php;,
+DIST_PATH: /srv/dist,
+EXT_LIST: null,
+GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
+SRC_PATH: /srv/src/extensions,
+SUPPORTED_VERSIONS: null
+}
+
diff --git a/conf.py b/conf.py
deleted file mode 100644
index 4027615..000
--- a/conf.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-SRC_PATH = '/srv/src/extensions'
-#SRC_PATH = '/Users/km/projects/extdist/src/extensions'
-DIST_PATH = '/srv/dist'
-#DIST_PATH = '/Users/km/projects/extdist/dist'
-GIT_URL = 'https://github.com/wikimedia/mediawiki-extensions-%s'
-SUPPORTED_VERSIONS = None # lazy-init
-EXT_LIST = None # lazy-init
-URL_ENDPOINT = 'https://extdist.wmflabs.org/dist/%s'
-API_URL = 'https://www.mediawiki.org/w/api.php'
diff --git a/nightly.py b/nightly.py
index e1a55ba..b9bfe33 100644
--- a/nightly.py
+++ b/nightly.py
@@ -22,7 +22,25 @@
import sys
import urllib
-import conf
+# Load our config from JSON
+if os.path.exists('/etc/extdist.conf'):
+with open('/etc/extdist.conf', 'r') as f:
+conf = json.load(f)
+elif os.path.exists(os.path.join(os.path.dirname(__file__), 'conf.json')):
+with open(os.path.join(os.path.dirname(__file__), 'conf.json'), 'r') as f:
+conf = json.load(f)
+else:
+print 'extdist is not configured properly.'
+quit()
+
+
+class AttrDict(dict):
+def __init__(self, *args, **kwargs):
+super(AttrDict, self).__init__(*args, **kwargs)
+self.__dict__ = self
+
+# Allow accessing settings as attributes
+conf = AttrDict(conf)
def fetch_all_extensions():
--
To view, visit https://gerrit.wikimedia.org/r/149817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7856032b89f42bcf597ec1585f4423cbed1301fd
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setup logging to conf.LOG_FILE - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149818
Change subject: Setup logging to conf.LOG_FILE
..
Setup logging to conf.LOG_FILE
Change-Id: I94b7d69e37bc5164305aba0e5e7a77425901acf6
---
M conf.json
M nightly.py
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/18/149818/1
diff --git a/conf.json b/conf.json
index 1eeec44..b6758c0 100644
--- a/conf.json
+++ b/conf.json
@@ -3,6 +3,7 @@
DIST_PATH: /srv/dist,
EXT_LIST: null,
GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
+LOG_FILE: extdist.log,
SRC_PATH: /srv/src/extensions,
SUPPORTED_VERSIONS: null
}
diff --git a/nightly.py b/nightly.py
index b9bfe33..d28e8f9 100644
--- a/nightly.py
+++ b/nightly.py
@@ -42,6 +42,13 @@
# Allow accessing settings as attributes
conf = AttrDict(conf)
+# Set up logging
+logging.basicConfig(
+filename=conf.LOG_FILE,
+level=logging.DEBUG,
+format='%(asctime)s %(levelname)s:%(message)s'
+)
+
def fetch_all_extensions():
@@ -151,7 +158,8 @@
# Checkout the branch
shell_exec(['git', 'checkout', 'origin/%s' % branch])
except subprocess.CalledProcessError:
-logging.error('could not checkout origin/%s' % branch)
+# Just a warning because this is expected for some extensions
+logging.warning('could not checkout origin/%s' % branch)
continue
# Sync submodules in case their urls have changed
shell_exec(['git', 'submodule', 'sync'])
--
To view, visit https://gerrit.wikimedia.org/r/149818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94b7d69e37bc5164305aba0e5e7a77425901acf6
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setup logging to conf.LOG_FILE - change (labs...extdist)
Yuvipanda has submitted this change and it was merged.
Change subject: Setup logging to conf.LOG_FILE
..
Setup logging to conf.LOG_FILE
Change-Id: I94b7d69e37bc5164305aba0e5e7a77425901acf6
---
M conf.json
M nightly.py
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/conf.json b/conf.json
index 1eeec44..b6758c0 100644
--- a/conf.json
+++ b/conf.json
@@ -3,6 +3,7 @@
DIST_PATH: /srv/dist,
EXT_LIST: null,
GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
+LOG_FILE: extdist.log,
SRC_PATH: /srv/src/extensions,
SUPPORTED_VERSIONS: null
}
diff --git a/nightly.py b/nightly.py
index b9bfe33..d28e8f9 100644
--- a/nightly.py
+++ b/nightly.py
@@ -42,6 +42,13 @@
# Allow accessing settings as attributes
conf = AttrDict(conf)
+# Set up logging
+logging.basicConfig(
+filename=conf.LOG_FILE,
+level=logging.DEBUG,
+format='%(asctime)s %(levelname)s:%(message)s'
+)
+
def fetch_all_extensions():
@@ -151,7 +158,8 @@
# Checkout the branch
shell_exec(['git', 'checkout', 'origin/%s' % branch])
except subprocess.CalledProcessError:
-logging.error('could not checkout origin/%s' % branch)
+# Just a warning because this is expected for some extensions
+logging.warning('could not checkout origin/%s' % branch)
continue
# Sync submodules in case their urls have changed
shell_exec(['git', 'submodule', 'sync'])
--
To view, visit https://gerrit.wikimedia.org/r/149818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94b7d69e37bc5164305aba0e5e7a77425901acf6
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove conf.SUPPORTED_VERSIONS and conf.EXT_LIST - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149819
Change subject: Remove conf.SUPPORTED_VERSIONS and conf.EXT_LIST
..
Remove conf.SUPPORTED_VERSIONS and conf.EXT_LIST
Just lazy-init in Python
Change-Id: Iacb85cc6f2f898c9770c67165046384a7b0c04ae
---
M conf.json
M nightly.py
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/19/149819/1
diff --git a/conf.json b/conf.json
index b6758c0..38ddf45 100644
--- a/conf.json
+++ b/conf.json
@@ -1,10 +1,8 @@
{
API_URL: https://www.mediawiki.org/w/api.php;,
DIST_PATH: /srv/dist,
-EXT_LIST: null,
GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
LOG_FILE: extdist.log,
-SRC_PATH: /srv/src/extensions,
-SUPPORTED_VERSIONS: null
+SRC_PATH: /srv/src/extensions
}
diff --git a/nightly.py b/nightly.py
index d28e8f9..fd51cf4 100644
--- a/nightly.py
+++ b/nightly.py
@@ -41,6 +41,8 @@
# Allow accessing settings as attributes
conf = AttrDict(conf)
+conf.EXT_LIST = None
+conf.SUPPORTED_VERSIONS = None
# Set up logging
logging.basicConfig(
--
To view, visit https://gerrit.wikimedia.org/r/149819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacb85cc6f2f898c9770c67165046384a7b0c04ae
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add and use conf.EXT_PATH, conf.SRC_PATH no longer implies /... - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149820
Change subject: Add and use conf.EXT_PATH, conf.SRC_PATH no longer implies
/extensions
..
Add and use conf.EXT_PATH, conf.SRC_PATH no longer implies /extensions
Change-Id: Ib1cdada3efb7ba3f1450304cc7e206255ce290e2
---
M conf.json
M nightly.py
2 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/20/149820/1
diff --git a/conf.json b/conf.json
index 38ddf45..871f653 100644
--- a/conf.json
+++ b/conf.json
@@ -3,6 +3,6 @@
DIST_PATH: /srv/dist,
GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
LOG_FILE: extdist.log,
-SRC_PATH: /srv/src/extensions
+SRC_PATH: /srv/src
}
diff --git a/nightly.py b/nightly.py
index fd51cf4..a34c142 100644
--- a/nightly.py
+++ b/nightly.py
@@ -43,6 +43,7 @@
conf = AttrDict(conf)
conf.EXT_LIST = None
conf.SUPPORTED_VERSIONS = None
+conf.EXT_PATH = os.path.join(conf.SRC_PATH, 'extensions')
# Set up logging
logging.basicConfig(
@@ -69,7 +70,7 @@
Returns a list of all extension names,
possibly using a cached list locally
-fname = os.path.join(conf.SRC_PATH, 'extension-list')
+fname = os.path.join(conf.EXT_PATH, 'extension-list')
if update or not os.path.exists(fname):
with open(fname, 'w') as f:
exts = fetch_all_extensions()
@@ -110,7 +111,7 @@
def get_extension_config(update=False):
-fname = os.path.join(conf.SRC_PATH, 'mw-conf.json')
+fname = os.path.join(conf.EXT_PATH, 'mw-conf.json')
if update or not os.path.exists(fname):
with open(fname, 'w') as f:
e_config = fetch_extension_config()
@@ -142,10 +143,10 @@
Fetch an extension's updates, and
create new tarballs if needed
-full_path = os.path.join(conf.SRC_PATH, ext)
+full_path = os.path.join(conf.EXT_PATH, ext)
logging.info('Starting update for %s' % ext)
if not os.path.exists(full_path):
-os.chdir(conf.SRC_PATH)
+os.chdir(conf.EXT_PATH)
logging.debug('Cloning %s' % ext)
shell_exec(['git', 'clone', conf.GIT_URL % ext, ext])
pass
@@ -183,11 +184,11 @@
for old in old_tarballs:
# FIXME: Race condition, we should probably do this later on...
os.unlink(old)
-os.chdir(conf.SRC_PATH)
+os.chdir(conf.EXT_PATH)
# Finally, create the new tarball
shell_exec(['tar', 'czPf', tarball_fname, ext])
logging.debug('Moving new tarballs into dist/')
-tarballs = glob.glob(os.path.join(conf.SRC_PATH, '*.tar.gz'))
+tarballs = glob.glob(os.path.join(conf.EXT_PATH, '*.tar.gz'))
for tar in tarballs:
fname = tar.split('/')[-1]
os.rename(tar, os.path.join(conf.DIST_PATH, fname))
@@ -206,8 +207,8 @@
# Init
-if not os.path.isdir(conf.SRC_PATH):
-shell_exec(['mkdir', '-p', conf.SRC_PATH])
+if not os.path.isdir(conf.EXT_PATH):
+shell_exec(['mkdir', '-p', conf.EXT_PATH])
if not os.path.isdir(conf.DIST_PATH):
shell_exec(['mkdir', '-p', conf.DIST_PATH])
--
To view, visit https://gerrit.wikimedia.org/r/149820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1cdada3efb7ba3f1450304cc7e206255ce290e2
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 28/07/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149821
Change subject: New Wikidata Build - 28/07/2014 10:00
..
New Wikidata Build - 28/07/2014 10:00
Change-Id: I5f73dc9982b9c0b45a56e3bf718dd0a5c3dd5b74
---
M composer.lock
M extensions/Wikibase/.travis.yml
M extensions/Wikibase/client/i18n/cs.json
M extensions/Wikibase/client/i18n/hu.json
M extensions/Wikibase/client/i18n/nb.json
M extensions/Wikibase/client/i18n/sco.json
M extensions/Wikibase/client/i18n/sl.json
M extensions/Wikibase/client/i18n/zh-hant.json
M extensions/Wikibase/lib/i18n/nb.json
M extensions/Wikibase/lib/includes/Term.php
M extensions/Wikibase/lib/includes/serializers/EntitySerializer.php
M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilder.php
M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
M extensions/Wikibase/lib/resources/templates.php
M extensions/Wikibase/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
M extensions/Wikibase/repo/i18n/bn.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/lb.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/sco.json
M extensions/Wikibase/repo/i18n/zh-hans.json
M extensions/Wikibase/repo/i18n/zh-hant.json
M extensions/Wikibase/repo/includes/EntityView.php
M extensions/Wikibase/repo/includes/View/SectionEditLinkGenerator.php
M extensions/Wikibase/repo/includes/View/SiteLinksView.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M extensions/Wikibase/repo/includes/store/sql/EntityPerPageTable.php
M extensions/Wikibase/repo/tests/phpunit/includes/EntityViewTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/ItemMoveTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
33 files changed, 295 insertions(+), 205 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/21/149821/1
diff --git a/composer.lock b/composer.lock
index 9b4c25c..c9a5eec 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1124,7 +1124,7 @@
name: Jeroen De Dauw,
email: jeroended...@gmail.com,
homepage: http://jeroendedauw.com;,
-role: Core developer
+role: Developer
},
{
name: Daniel Werner,
@@ -1152,12 +1152,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 0d45dc9d5d12915d5108fb4993ba0ffd0dd67601
+reference: 4ed4832b30db867321f374344ec71906bc536551
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0d45dc9d5d12915d5108fb4993ba0ffd0dd67601;,
-reference: 0d45dc9d5d12915d5108fb4993ba0ffd0dd67601,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4ed4832b30db867321f374344ec71906bc536551;,
+reference: 4ed4832b30db867321f374344ec71906bc536551,
shasum:
},
require: {
@@ -1226,7 +1226,7 @@
wikibaserepo,
wikidata
],
-time: 2014-07-25 21:08:05
+time: 2014-07-27 20:26:21
}
],
packages-dev: [
diff --git a/extensions/Wikibase/.travis.yml b/extensions/Wikibase/.travis.yml
index 15756f9..2370e97 100644
--- a/extensions/Wikibase/.travis.yml
+++ b/extensions/Wikibase/.travis.yml
@@ -4,6 +4,7 @@
- THENEEDFORTHIS=FAIL
matrix:
+ fast_finish: true
include:
- env: DBTYPE=mysql LANG=de; MW=master WB=client
php: 5.3
diff --git a/extensions/Wikibase/client/i18n/cs.json
b/extensions/Wikibase/client/i18n/cs.json
index ca83599..e5932e4 100644
--- a/extensions/Wikibase/client/i18n/cs.json
+++ b/extensions/Wikibase/client/i18n/cs.json
@@ -22,7 +22,7 @@
wikibase-comment-sitelink-change: Mezijazykový odkaz změněn z $1 na
$2,
wikibase-comment-sitelink-remove: Odstraněn mezijazykový odkaz: $1,
wikibase-comment-multi: $1 {{PLURAL:$1|změna|změny|změn}},
- wikibase-dataitem: Položka na {{grammar:6sg|{{WBREPONAME,
+ wikibase-dataitem: Položka {{grammar:2sg|{{WBREPONAME,
wikibase-editlinks: Upravit odkazy,
wikibase-editlinkstitle: Editovat mezijazykové odkazy,
wikibase-linkitem-addlinks: Přidat odkazy,
diff --git a/extensions/Wikibase/client/i18n/hu.json
b/extensions/Wikibase/client/i18n/hu.json
index 49c9b8d..1055c64 100644
--- a/extensions/Wikibase/client/i18n/hu.json
+++ b/extensions/Wikibase/client/i18n/hu.json
@@ -26,8 +26,12 @@
wikibase-editlinks: szerkesztés,
[MediaWiki-commits] [Gerrit] Don't die if conf.SUPPORTED_VERSIONS and conf.EXT_LIST aren'... - change (labs...extdist)
Yuvipanda has submitted this change and it was merged.
Change subject: Don't die if conf.SUPPORTED_VERSIONS and conf.EXT_LIST aren't
set
..
Don't die if conf.SUPPORTED_VERSIONS and conf.EXT_LIST aren't set
Change-Id: Iacb85cc6f2f898c9770c67165046384a7b0c04ae
---
M nightly.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/nightly.py b/nightly.py
index d28e8f9..c26bc76 100644
--- a/nightly.py
+++ b/nightly.py
@@ -80,13 +80,13 @@
def get_supported_branches():
-if conf.SUPPORTED_VERSIONS is None:
+if conf.get('SUPPORTED_VERSIONS') is None:
conf.SUPPORTED_VERSIONS = get_extension_config()['versions']
return conf.SUPPORTED_VERSIONS
def get_extension_list():
-if conf.EXT_LIST is None:
+if conf.get('EXT_LIST') is None:
conf.EXT_LIST = get_extension_config()['extension-list']
return conf.EXT_LIST
--
To view, visit https://gerrit.wikimedia.org/r/149819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacb85cc6f2f898c9770c67165046384a7b0c04ae
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TopMenuBarCustomizer: Refactoring - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: TopMenuBarCustomizer: Refactoring
..
TopMenuBarCustomizer: Refactoring
* Moved NavigationSites handling to extension TopMenuBarCustomizer pt2
* Total Makeover for extension TopMenuBarCustomizer
* NavigationSites also support MW messages now
* Made some doc an cc
Change-Id: Id6cf25fd83d883170c727574d5858595befdf84d
---
M Blog/Blog.class.php
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
M TopMenuBarCustomizer/TopMenuBarCustomizer.setup.php
M TopMenuBarCustomizer/doc/Hooks.txt
A TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php
M TopMenuBarCustomizer/resources/bluespice.TopMenuBarCustomizer.js
M TopMenuBarCustomizer/views/view.TopMenuItem.php
D TopMenuBarCustomizer/views/view.TopMenuItemMain.php
8 files changed, 458 insertions(+), 410 deletions(-)
Approvals:
Robert Vogel: Checked; Looks good to me, but someone else must approve
Smuggli: Verified; Looks good to me, approved
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 7490852..bbb877a 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -77,7 +77,7 @@
$this-setHook( 'BSNamespaceManagerBeforeSetUsernamespaces',
'onBSNamespaceManagerBeforeSetUsernamespaces');
$this-setHook( 'BSRSSFeederGetRegisteredFeeds' );
$this-setHook( 'BeforePageDisplay' );
- $this-setHook( 'SkinTemplateOutputPageBeforeExec' );
+ $this-setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites'
);
// Trackback is not fully functional in MW and thus disabled.
BsConfig::registerVar( 'MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL );
@@ -109,23 +109,22 @@
}
/**
-* Adds entry to bs_navigation_topbar
-* @param SkinTemplate $sktemplate
-* @param BaseTemplate $tpl
-* @return boolean Always true to keep hook running
+* Adds entry to navigation sites
+* @global string $wgScriptPath
+* @param array $aNavigationSites
+* @return boolean - always true
*/
- public function onSkinTemplateOutputPageBeforeExec( $sktemplate, $tpl
){
+ public function onBSTopMenuBarCustomizerRegisterNavigationSites(
$aNavigationSites ) {
global $wgScriptPath;
- $tpl-data['bs_navigation_sites'][20] = array(
+
+ $aNavigationSites[] = array(
'id' = 'nt-blog',
'href' = wfAppendQuery( $wgScriptPath.'/index.php',
array(
'action' = 'blog'
)),
- 'text' = wfMessage('bs-blog-blog')-plain()
+ 'active' = BsExtensionManager::isContextActive(
'MW::Blog::ShowBlog' ),
+ 'text' = wfMessage('bs-blog-blog')-plain(),
);
- if( BsExtensionManager::isContextActive( 'MW::Blog::ShowBlog' )
) {
- $tpl-data['bs_navigation_sites_active'] = 'nt-blog';
- }
return true;
}
diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 0e7fce4..aefa6ad 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -22,8 +22,7 @@
* For further information visit http://www.blue-spice.org
*
* @author Patric Wirth wi...@hallowelt.biz
-* @version2.22.0
-
+* @version2.23.0
* @packageBluespice_Extensions
* @subpackage TopMenuBarCustomizer
* @copyright Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
@@ -34,11 +33,30 @@
/**
* v1.20.0
* - MediaWiki I18N
+ * v2.23.0
+ * - Complete makeover
*/
class TopMenuBarCustomizer extends BsExtensionMW {
- private $aOldApps = array();
- private $aApps = array();
+ /**
+*
+* @var array
+*/
+ public static $aNavigationSiteTemplate = array(
+ 'id' = '',
+ 'href' = '',
+ 'text' = '',
+ 'active' = false,
+ 'level' = 1,
+ 'containsactive' = false,
+ 'external' = false,
+ );
+
+ /**
+*
+* @var array
+*/
+ private static $aNavigationSites = null;
/**
* Constructor of TopMenuBarCustomizer class
@@ -55,7 +73,7 @@
EXTINFO::STATUS = 'default',
EXTINFO::PACKAGE = 'default',
EXTINFO::URL = 'http://www.hallowelt.biz',
- EXTINFO::DEPS= array( 'bluespice' = '2.22.0' )
+ EXTINFO::DEPS= array( 'bluespice' = '2.23.0' )
);
$this-mExtensionKey =
[MediaWiki-commits] [Gerrit] Add and use conf.EXT_PATH, conf.SRC_PATH no longer implies /... - change (labs...extdist)
Yuvipanda has submitted this change and it was merged.
Change subject: Add and use conf.EXT_PATH, conf.SRC_PATH no longer implies
/extensions
..
Add and use conf.EXT_PATH, conf.SRC_PATH no longer implies /extensions
Change-Id: Ib1cdada3efb7ba3f1450304cc7e206255ce290e2
---
M conf.json
M nightly.py
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/conf.json b/conf.json
index b6758c0..3e3d0af 100644
--- a/conf.json
+++ b/conf.json
@@ -4,7 +4,7 @@
EXT_LIST: null,
GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
LOG_FILE: extdist.log,
-SRC_PATH: /srv/src/extensions,
+SRC_PATH: /srv/src,
SUPPORTED_VERSIONS: null
}
diff --git a/nightly.py b/nightly.py
index c26bc76..beb66c7 100644
--- a/nightly.py
+++ b/nightly.py
@@ -41,6 +41,7 @@
# Allow accessing settings as attributes
conf = AttrDict(conf)
+conf.EXT_PATH = os.path.join(conf.SRC_PATH, 'extensions')
# Set up logging
logging.basicConfig(
@@ -67,7 +68,7 @@
Returns a list of all extension names,
possibly using a cached list locally
-fname = os.path.join(conf.SRC_PATH, 'extension-list')
+fname = os.path.join(conf.EXT_PATH, 'extension-list')
if update or not os.path.exists(fname):
with open(fname, 'w') as f:
exts = fetch_all_extensions()
@@ -108,7 +109,7 @@
def get_extension_config(update=False):
-fname = os.path.join(conf.SRC_PATH, 'mw-conf.json')
+fname = os.path.join(conf.EXT_PATH, 'mw-conf.json')
if update or not os.path.exists(fname):
with open(fname, 'w') as f:
e_config = fetch_extension_config()
@@ -140,10 +141,10 @@
Fetch an extension's updates, and
create new tarballs if needed
-full_path = os.path.join(conf.SRC_PATH, ext)
+full_path = os.path.join(conf.EXT_PATH, ext)
logging.info('Starting update for %s' % ext)
if not os.path.exists(full_path):
-os.chdir(conf.SRC_PATH)
+os.chdir(conf.EXT_PATH)
logging.debug('Cloning %s' % ext)
shell_exec(['git', 'clone', conf.GIT_URL % ext, ext])
pass
@@ -181,11 +182,11 @@
for old in old_tarballs:
# FIXME: Race condition, we should probably do this later on...
os.unlink(old)
-os.chdir(conf.SRC_PATH)
+os.chdir(conf.EXT_PATH)
# Finally, create the new tarball
shell_exec(['tar', 'czPf', tarball_fname, ext])
logging.debug('Moving new tarballs into dist/')
-tarballs = glob.glob(os.path.join(conf.SRC_PATH, '*.tar.gz'))
+tarballs = glob.glob(os.path.join(conf.EXT_PATH, '*.tar.gz'))
for tar in tarballs:
fname = tar.split('/')[-1]
os.rename(tar, os.path.join(conf.DIST_PATH, fname))
@@ -204,8 +205,8 @@
# Init
-if not os.path.isdir(conf.SRC_PATH):
-shell_exec(['mkdir', '-p', conf.SRC_PATH])
+if not os.path.isdir(conf.EXT_PATH):
+shell_exec(['mkdir', '-p', conf.EXT_PATH])
if not os.path.isdir(conf.DIST_PATH):
shell_exec(['mkdir', '-p', conf.DIST_PATH])
--
To view, visit https://gerrit.wikimedia.org/r/149820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1cdada3efb7ba3f1450304cc7e206255ce290e2
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tox entry point to run flake8 - change (labs...extdist)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/149822 Change subject: Tox entry point to run flake8 .. Tox entry point to run flake8 Tox is a thin wrapper around python virtualenv. It lets one define entry points that run whatever commands the devs want, Jenkins just invoke a list of known entry point. That makes it easier for developers to adjust what Jenkins is going to run. Change-Id: I16c92cb7e40cefb5b87e0e3522fa72f67cc3ca79 --- A .gitignore A tox.ini 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist refs/changes/22/149822/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..5f4d761 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.tox diff --git a/tox.ini b/tox.ini new file mode 100644 index 000..b376392 --- /dev/null +++ b/tox.ini @@ -0,0 +1,17 @@ +[tox] + +# Ensure 1.6+ is used to support 'skipsdist' +minversion = 1.6 + +# Do not run install command +skipsdist = True + +# Environements to execute when invoking 'tox' +envlist = flake8 + +[testenv:flake8] +commands = flake8 +deps = flake8 + +[flake8] +exclude = .tox -- To view, visit https://gerrit.wikimedia.org/r/149822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16c92cb7e40cefb5b87e0e3522fa72f67cc3ca79 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/extdist Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for numeric months in MwTimeIsoFormatter - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149823
Change subject: Add support for numeric months in MwTimeIsoFormatter
..
Add support for numeric months in MwTimeIsoFormatter
n and m are numeric months (without/with leading zero).
But xj... and xm... are extended formats and need to be
excluded here. These are currently not used in the dmy ...
formats, that's why I currently can't add more tests.
Change-Id: Iba32128e8de716562e29abe5b374fb19786d25ba
---
M lib/includes/formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/23/149823/1
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php
b/lib/includes/formatters/MwTimeIsoFormatter.php
index 1ebf18b..46be1e1 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -137,7 +137,7 @@
* @return string A date format for the day that roundtrips the
Wikibase TimeParsers.
*/
private function getDayFormat( $dateFormat ) {
- if ( preg_match( '/[dj][.,]?/', $dateFormat, $matches ) ) {
+ if ( preg_match( '/(?:d|(?!x)j)[.,]?/', $dateFormat, $matches
) ) {
return $matches[0];
}
@@ -152,7 +152,7 @@
* @return string A date format for the month that roundtrips the
Wikibase TimeParsers.
*/
private function getMonthFormat( $dateFormat ) {
- if ( preg_match( '/(?:[FM]|xg)[.,]?/', $dateFormat, $matches )
) {
+ if ( preg_match( '/(?:[FMn]|(?!x)m|xg)[.,]?/', $dateFormat,
$matches ) ) {
return $matches[0];
}
diff --git a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
index 996bbce..ac807ac 100644
--- a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
@@ -297,6 +297,12 @@
true,
'pt'
),
+ array(
+ '+2013-08-16T00:00:00Z',
TimeValue::PRECISION_DAY,
+ '16 8月 2013',
+ true,
+ 'yue'
+ ),
// Valid values with day, month and/or year zero
array(
--
To view, visit https://gerrit.wikimedia.org/r/149823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba32128e8de716562e29abe5b374fb19786d25ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tox entry point to run flake8 - change (labs...extdist)
Legoktm has submitted this change and it was merged. Change subject: Tox entry point to run flake8 .. Tox entry point to run flake8 Tox is a thin wrapper around python virtualenv. It lets one define entry points that run whatever commands the devs want, Jenkins just invoke a list of known entry point. That makes it easier for developers to adjust what Jenkins is going to run. Change-Id: I16c92cb7e40cefb5b87e0e3522fa72f67cc3ca79 --- A .gitignore A tox.ini 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..5f4d761 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.tox diff --git a/tox.ini b/tox.ini new file mode 100644 index 000..b376392 --- /dev/null +++ b/tox.ini @@ -0,0 +1,17 @@ +[tox] + +# Ensure 1.6+ is used to support 'skipsdist' +minversion = 1.6 + +# Do not run install command +skipsdist = True + +# Environements to execute when invoking 'tox' +envlist = flake8 + +[testenv:flake8] +commands = flake8 +deps = flake8 + +[flake8] +exclude = .tox -- To view, visit https://gerrit.wikimedia.org/r/149822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16c92cb7e40cefb5b87e0e3522fa72f67cc3ca79 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/extdist Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix flake8 whitespace errors - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149824
Change subject: Fix flake8 whitespace errors
..
Fix flake8 whitespace errors
Also set max_line_length to 120 because I have a wide screen
Change-Id: Iebc98fb45e5f6d06009440b864bcfaff198dea42
---
M nightly.py
M tox.ini
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/24/149824/1
diff --git a/nightly.py b/nightly.py
index beb66c7..ace8b65 100644
--- a/nightly.py
+++ b/nightly.py
@@ -150,7 +150,7 @@
pass
for branch in get_supported_branches():
os.chdir(full_path)
-logging.info('Creating %s for %s' %(branch, ext))
+logging.info('Creating %s for %s' % (branch, ext))
# Update remotes
shell_exec(['git', 'fetch'])
try:
@@ -174,10 +174,10 @@
continue
# Create a 'version' file with basic info about the tarball
with open('version', 'w') as f:
-f.write('%s: %s\n' %(ext, branch))
+f.write('%s: %s\n' % (ext, branch))
f.write(shell_exec(['date', '+%Y-%m-%dT%H:%M:%S']) + '\n') #
TODO: Do this in python
f.write(rev + '\n')
-old_tarballs = glob.glob(os.path.join(conf.DIST_PATH, '%s-%s-*.tar.gz'
%(ext, branch)))
+old_tarballs = glob.glob(os.path.join(conf.DIST_PATH, '%s-%s-*.tar.gz'
% (ext, branch)))
logging.debug('Deleting old tarballs...')
for old in old_tarballs:
# FIXME: Race condition, we should probably do this later on...
diff --git a/tox.ini b/tox.ini
index b376392..f05cb65 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,3 +15,4 @@
[flake8]
exclude = .tox
+max_line_length = 120
--
To view, visit https://gerrit.wikimedia.org/r/149824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc98fb45e5f6d06009440b864bcfaff198dea42
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Simpified MonthNameUnlocalizer - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149386
Change subject: Simpified MonthNameUnlocalizer
..
Simpified MonthNameUnlocalizer
This changes the behavior for some edge cases, but should not affect
any valid dates. The intention is to reduce the code complexity, and
make the behavior more predictable.
Change-Id: I09d71b29db3c733fcc3abe809ab5db82782f34b6
---
M lib/includes/parsers/MonthNameUnlocalizer.php
M lib/tests/phpunit/parsers/MonthNameUnlocalizerTest.php
2 files changed, 55 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/149386/2
diff --git a/lib/includes/parsers/MonthNameUnlocalizer.php
b/lib/includes/parsers/MonthNameUnlocalizer.php
index 990dd0a..8d8b93f 100644
--- a/lib/includes/parsers/MonthNameUnlocalizer.php
+++ b/lib/includes/parsers/MonthNameUnlocalizer.php
@@ -27,10 +27,6 @@
* @return string
*/
public function unlocalize( $date, $languageCode, ParserOptions
$options ) {
- if ( $languageCode === 'en' ) {
- return $date;
- }
-
$language = Language::factory( $languageCode );
$en = Language::factory( 'en' );
@@ -41,7 +37,6 @@
/**
* Unlocalizes the longest month name in a date string that could be
found first.
-* Tries to avoid doing multiple replacements and returns the localized
original if in doubt.
* Takes full month names, genitive names and abbreviations into
account.
*
* @param Language $from
@@ -51,6 +46,24 @@
* @return string
*/
private function unlocalizeMonthName( Language $from, Language $to,
$date ) {
+ // Replace month names in the $from language with the canonical
name in the $to language.
+ // Also replace all forms already in the target language with
the canonical form.
+ $replacements = array_merge(
+ $this-getMonthNameMappings( $from, $to ),
+ $this-getMonthNameMappings( $to, $to )
+ );
+
+ // Order search strings from longest to shortest
+ uksort( $replacements, function( $a, $b ) {
+ return strlen( $b ) - strlen( $a );
+ } );
+
+ // Try replacing each mapping, longest first
+ $date = $this-replaceFirst( $replacements, $date );
+ return $date;
+ }
+
+ private function getMonthNameMappings( Language $from, Language $to ) {
$replacements = array();
for ( $i = 1; $i = 12; $i++ ) {
@@ -61,34 +74,32 @@
$replacements[$from-getMonthAbbreviation( $i )] =
$replace;
}
- // Order search strings from longest to shortest
- uksort( $replacements, function( $a, $b ) {
- return strlen( $b ) - strlen( $a );
- } );
-
- foreach ( $replacements as $search = $replace ) {
- $unlocalized = str_replace( $search, $replace, $date,
$count );
-
- // Nothing happened, try the next.
- if ( $count = 0 ) {
- continue;
- }
-
- // Do not mess with strings that are clearly not a
valid date.
- if ( $count 1 ) {
- break;
- }
-
- // Do not mess with already unlocalized month names,
e.g. Juli should not become
- // Julyi when replacing Jul with July. But
shortening Julyus to July is ok.
- if ( strpos( $date, $replace ) !== false strlen(
$replace ) = strlen( $search ) ) {
- break;
- }
-
- return $unlocalized;
- }
-
- return $date;
+ return $replacements;
}
-}
+ /**
+* Replaces the first key from $replacements found in $text
+* with the corresponding value. If the key is found multiple
+* times in $text, all occurrences are replaced.
+*
+* @param array $replacements An associative array representing the
desired replacements.
+* @param string $text
+*
+* @return string
+*/
+ private function replaceFirst( array $replacements, $text ) {
+
+ // Try each mapping, in order
+ foreach ( $replacements as $search = $replace ) {
+ $mangled = str_replace( $search, $replace, $text,
$count );
+
+ // Found a match, done
+ if ( $count 0 ) {
+ return $mangled;
+
[MediaWiki-commits] [Gerrit] swift: qualify var - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: swift: qualify var .. swift: qualify var Change-Id: Ib020babe08f6187e6bfce5a09719b8f51685d050 --- M templates/swift/swift-ganglia-report-global-stats.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/swift/swift-ganglia-report-global-stats.conf.erb b/templates/swift/swift-ganglia-report-global-stats.conf.erb index 514d044..3d69720 100644 --- a/templates/swift/swift-ganglia-report-global-stats.conf.erb +++ b/templates/swift/swift-ganglia-report-global-stats.conf.erb @@ -1,3 +1,3 @@ # This file is managed by Puppet! -password = %= password % +password = %= @password % -- To view, visit https://gerrit.wikimedia.org/r/149003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib020babe08f6187e6bfce5a09719b8f51685d050 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated File::getPropsFromPath call - change (mediawiki...SemanticPageMaker)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149825
Change subject: Replace deprecated File::getPropsFromPath call
..
Replace deprecated File::getPropsFromPath call
Change-Id: I91c860396686ca307a1fab21e5439aa3b8ce1512
---
M specials/WidgetAssembler/SPM_UploadWindow.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticPageMaker
refs/changes/25/149825/1
diff --git a/specials/WidgetAssembler/SPM_UploadWindow.php
b/specials/WidgetAssembler/SPM_UploadWindow.php
index 08a4688..f8f1746 100644
--- a/specials/WidgetAssembler/SPM_UploadWindow.php
+++ b/specials/WidgetAssembler/SPM_UploadWindow.php
@@ -401,7 +401,7 @@
* probably not accept it.
*/
if ( !$this-mStashed ) {
- $this-mFileProps = File::getPropsFromPath(
$this-mTempPath, $finalExt );
+ $this-mFileProps = FSFile::getPropsFromPath(
$this-mTempPath, $finalExt );
$this-checkMacBinary();
$veri = $this-verify( $this-mTempPath, $finalExt );
--
To view, visit https://gerrit.wikimedia.org/r/149825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91c860396686ca307a1fab21e5439aa3b8ce1512
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Imported Upstream version 3.3-dev+20140728 - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149826 Change subject: Imported Upstream version 3.3-dev+20140728 .. Imported Upstream version 3.3-dev+20140728 --- M .gitignore M CMake/FindLibDwarf.cmake M CMake/FollySetup.cmake M CMake/HPHPCompiler.cmake M CMake/HPHPFunctions.cmake M CMake/HPHPSetup.cmake M CMake/Options.cmake M hphp/compiler/analysis/emitter.cpp M hphp/compiler/compiler.cpp A hphp/hack/editor-plugins/emacs/hack-mode.el M hphp/hack/hhi/classes.hhi M hphp/hack/hhi/stdlib/builtins_apache.idl.hhi M hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi M hphp/hack/hhi/stdlib/builtins_json.idl.hhi M hphp/hack/hhi/stdlib/builtins_server.idl.hhi M hphp/hack/hhi/stdlib/builtins_string.idl.hhi M hphp/hack/hhi/stdlib/builtins_url.idl.hhi A hphp/hack/hhi/stdlib/bultins_filter.hhi M hphp/hack/src/client/Makefile M hphp/hack/src/client/clientArgs.ml A hphp/hack/src/client/clientArgumentInfo.ml M hphp/hack/src/client/clientBuild.ml M hphp/hack/src/client/clientCheck.ml M hphp/hack/src/client/clientEnv.ml M hphp/hack/src/globals/autocomplete.ml M hphp/hack/src/heap/sharedMem.ml M hphp/hack/src/js/hh_ide.ml M hphp/hack/src/naming/nast.ml M hphp/hack/src/parsing/parser_hack.ml M hphp/hack/src/server/Makefile A hphp/hack/src/server/argumentInfoService.ml M hphp/hack/src/server/hackProgram.ml A hphp/hack/src/server/serverArgumentInfo.ml M hphp/hack/src/server/serverMsg.ml M hphp/hack/src/typing/typing.ml M hphp/hack/src/typing/typing_compare.ml M hphp/hack/src/typing/typing_decl.ml M hphp/hack/src/typing/typing_enum.ml M hphp/hack/src/typing/typing_env.ml M hphp/hack/src/typing/typing_reason.ml M hphp/hack/src/typing/typing_utils.ml M hphp/hack/src/utils/errors.ml M hphp/hack/src/utils/errors.mli A hphp/hack/test/typecheck/async_function_untyped1.php A hphp/hack/test/typecheck/async_function_untyped1.php.exp A hphp/hack/test/typecheck/async_function_untyped2.php A hphp/hack/test/typecheck/async_function_untyped2.php.exp A hphp/hack/test/typecheck/async_function_untyped3.php A hphp/hack/test/typecheck/async_function_untyped3.php.exp A hphp/hack/test/typecheck/async_function_untyped4.php A hphp/hack/test/typecheck/async_function_untyped4.php.exp A hphp/hack/test/typecheck/async_function_untyped5.php A hphp/hack/test/typecheck/async_function_untyped5.php.exp A hphp/hack/test/typecheck/async_function_untyped6.php A hphp/hack/test/typecheck/async_function_untyped6.php.exp M hphp/hack/test/typecheck/enum_7.php M hphp/hack/test/typecheck/enum_7.php.exp A hphp/hack/test/typecheck/shapes_cc_10.php A hphp/hack/test/typecheck/shapes_cc_10.php.exp M hphp/hack/test/typecheck/shapes_cc_7.php.exp A hphp/hack/test/typecheck/shapes_cc_8.php A hphp/hack/test/typecheck/shapes_cc_8.php.exp A hphp/hack/test/typecheck/shapes_cc_9.php A hphp/hack/test/typecheck/shapes_cc_9.php.exp A hphp/hack/test/typecheck/yield_send1.php A hphp/hack/test/typecheck/yield_send1.php.exp A hphp/hack/test/typecheck/yield_send2.php A hphp/hack/test/typecheck/yield_send2.php.exp A hphp/hack/test/typecheck/yield_send3.php A hphp/hack/test/typecheck/yield_send3.php.exp A hphp/hack/test/typecheck/yield_send4.php A hphp/hack/test/typecheck/yield_send4.php.exp A hphp/hack/test/typecheck/yield_send5.php A hphp/hack/test/typecheck/yield_send5.php.exp M hphp/hhbbc/emit.cpp M hphp/hhbbc/index.cpp M hphp/hhbbc/parse.cpp M hphp/hhvm/CMakeLists.txt M hphp/parser/hphp.tab.cpp M hphp/parser/hphp.y M hphp/runtime/base/http-client.cpp M hphp/runtime/base/http-stream-wrapper.cpp M hphp/runtime/base/mixed-array.cpp M hphp/runtime/base/mixed-array.h M hphp/runtime/base/object-data.cpp M hphp/runtime/base/program-functions.cpp M hphp/runtime/base/proxy-array.h M hphp/runtime/base/request-event-handler.h M hphp/runtime/base/request-injection-data.cpp M hphp/runtime/base/request-injection-data.h M hphp/runtime/base/runtime-option.h M hphp/runtime/base/smart-containers.h M hphp/runtime/base/variable-serializer.cpp M hphp/runtime/base/variable-unserializer.h M hphp/runtime/ext/asio/asio_blockable.cpp M hphp/runtime/ext/asio/asio_session.cpp M hphp/runtime/ext/asio/asio_session.h A hphp/runtime/ext/asio/await_all_wait_handle.cpp A hphp/runtime/ext/asio/await_all_wait_handle.h M hphp/runtime/ext/asio/wait_handle.h M hphp/runtime/ext/asio/waitable_wait_handle.cpp M hphp/runtime/ext/ext_asio.h M hphp/runtime/ext/ext_collections.h M hphp/runtime/ext/ext_hotprofiler.cpp M hphp/runtime/ext/ext_hotprofiler.h M hphp/runtime/ext/ext_posix.cpp M hphp/runtime/ext/icu/ext_icu_date_fmt.cpp M hphp/runtime/ext/icu/icu.cpp M hphp/runtime/ext/json/JSON_parser.cpp M hphp/runtime/ext/json/ext_json.cpp M hphp/runtime/ext/json/ext_json.h M hphp/runtime/ext/json/ext_json.php A hphp/runtime/ext/mysql/ext_mysql-async.php M hphp/runtime/ext/mysql/ext_mysql.cpp M hphp/runtime/ext/mysql/ext_mysql.h A hphp/runtime/ext/mysql/ext_mysql.php M hphp/runtime/ext/mysql/mysql_common.cpp M hphp/runtime/ext
[MediaWiki-commits] [Gerrit] Fix flake8 whitespace errors - change (labs...extdist)
Yuvipanda has submitted this change and it was merged.
Change subject: Fix flake8 whitespace errors
..
Fix flake8 whitespace errors
Also set max_line_length to 120 because I have a wide screen
Change-Id: Iebc98fb45e5f6d06009440b864bcfaff198dea42
---
M nightly.py
M tox.ini
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/nightly.py b/nightly.py
index beb66c7..ace8b65 100644
--- a/nightly.py
+++ b/nightly.py
@@ -150,7 +150,7 @@
pass
for branch in get_supported_branches():
os.chdir(full_path)
-logging.info('Creating %s for %s' %(branch, ext))
+logging.info('Creating %s for %s' % (branch, ext))
# Update remotes
shell_exec(['git', 'fetch'])
try:
@@ -174,10 +174,10 @@
continue
# Create a 'version' file with basic info about the tarball
with open('version', 'w') as f:
-f.write('%s: %s\n' %(ext, branch))
+f.write('%s: %s\n' % (ext, branch))
f.write(shell_exec(['date', '+%Y-%m-%dT%H:%M:%S']) + '\n') #
TODO: Do this in python
f.write(rev + '\n')
-old_tarballs = glob.glob(os.path.join(conf.DIST_PATH, '%s-%s-*.tar.gz'
%(ext, branch)))
+old_tarballs = glob.glob(os.path.join(conf.DIST_PATH, '%s-%s-*.tar.gz'
% (ext, branch)))
logging.debug('Deleting old tarballs...')
for old in old_tarballs:
# FIXME: Race condition, we should probably do this later on...
diff --git a/tox.ini b/tox.ini
index b376392..f05cb65 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,3 +15,4 @@
[flake8]
exclude = .tox
+max_line_length = 120
--
To view, visit https://gerrit.wikimedia.org/r/149824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc98fb45e5f6d06009440b864bcfaff198dea42
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove File::getPropsFromPath() (deprecated since 1.19) - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149827
Change subject: Remove File::getPropsFromPath() (deprecated since 1.19)
..
Remove File::getPropsFromPath() (deprecated since 1.19)
Change-Id: I11b6c582b9ce60cba03e55d55afb7cd02d218049
---
M RELEASE-NOTES-1.24
M includes/filerepo/file/File.php
2 files changed, 1 insertion(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/27/149827/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 119f1a2..d1e0f03 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -275,6 +275,7 @@
* Removed maintenance script importTextFile.php. Use edit.php script instead.
* A _from_namespace field has been added to the templatelinks, pagelinks,
and filelinks tables. Run update.php to apply this change to the schema.
+* Removed File::getPropsFromPath(). (deprecated since 1.19)
Renamed classes
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 32374cd..610bd2a 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -2073,25 +2073,6 @@
}
/**
-* Get an associative array containing information about a file in the
local filesystem.
-*
-* @param string $path Absolute local filesystem path
-* @param string|bool $ext The file extension, or true to extract it
from
-* the filename. Set it to false to ignore the extension.
-*
-* @return array
-* @deprecated since 1.19
-*/
- static function getPropsFromPath( $path, $ext = true ) {
- wfDebug( __METHOD__ . : Getting file info for $path\n );
- wfDeprecated( __METHOD__, '1.19' );
-
- $fsFile = new FSFile( $path );
-
- return $fsFile-getProps();
- }
-
- /**
* Get a SHA-1 hash of a file in the local filesystem, in base-36 lower
case
* encoding, zero padded to 31 digits.
*
--
To view, visit https://gerrit.wikimedia.org/r/149827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11b6c582b9ce60cba03e55d55afb7cd02d218049
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide the dictionary card till result received - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide the dictionary card till result received
..
Hide the dictionary card till result received
Avoids the flash of the card in the tools column
Bug: 68159
Change-Id: Ic5bd0aa5499899f50960c99f69290d4a3983b21a
---
M modules/tools/ext.cx.tools.dictionary.js
1 file changed, 26 insertions(+), 3 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.dictionary.js
b/modules/tools/ext.cx.tools.dictionary.js
index 171a968..4b50dd6 100644
--- a/modules/tools/ext.cx.tools.dictionary.js
+++ b/modules/tools/ext.cx.tools.dictionary.js
@@ -60,13 +60,17 @@
$expand = $( 'div' )
.addClass( 'card__expand' );
- return this.$card.append(
+ this.$card.append(
$titleRow,
$headword,
this.$definition,
this.$translationsBlock,
$expand
);
+
+ this.hide();
+
+ return this.$card;
};
/**
@@ -90,6 +94,8 @@
DictionaryCard.prototype.showResult = function ( response ) {
var i, $translation;
+ this.show();
+
if ( response.translations response.translations.length ) {
for ( i = 0; i response.translations.length; i++ ) {
$translation = $( 'div' )
@@ -104,7 +110,20 @@
this.stop();
}
}
+ };
+ /**
+* Hide the card.
+*/
+ DictionaryCard.prototype.hide = function () {
+ this.$card.hide();
+ };
+
+ /**
+* Show the card.
+*/
+ DictionaryCard.prototype.show = function () {
+ this.$card.show();
this.onShow();
};
@@ -115,11 +134,15 @@
return;
}
+
// Normalize the case to lowercase.
word = word.toLowerCase();
- // Show the source word and get a translation,
- // and don't appear if getting the translation fails
+
+ // Set the source word
this.$card.find( '.card__headword' ).text( word );
+
+ // Try to get a translation.
+ // Don't appear if getting the translation fails.
getTranslation( word, mw.cx.sourceLanguage,
mw.cx.targetLanguage )
.done( $.proxy( this.showResult, this ) )
.fail( $.proxy( this.stop, this ) );
--
To view, visit https://gerrit.wikimedia.org/r/149798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5bd0aa5499899f50960c99f69290d4a3983b21a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated File::sha1Base36 call - change (mediawiki...BlueSpiceFoundation)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149828
Change subject: Replace deprecated File::sha1Base36 call
..
Replace deprecated File::sha1Base36 call
Change-Id: I2ca237444b5ceb18d69cecfa20a44524eae5b2ea
---
M maintenance/importImagesRecursive.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/28/149828/1
diff --git a/maintenance/importImagesRecursive.php
b/maintenance/importImagesRecursive.php
index 491d670..0ca488c 100644
--- a/maintenance/importImagesRecursive.php
+++ b/maintenance/importImagesRecursive.php
@@ -161,7 +161,7 @@
} else {
if ( isset( $options['skip-dupes'] ) ) {
$repo = $image-getRepo();
- $sha1 = File::sha1Base36( $file ); # XXX: we
end up calculating this again when actually uploading. that sucks.
+ $sha1 = FSFile::getSha1Base36FromPath( $file );
# XXX: we end up calculating this again when actually uploading. that sucks.
$dupes = $repo-findBySha1( $sha1 );
--
To view, visit https://gerrit.wikimedia.org/r/149828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ca237444b5ceb18d69cecfa20a44524eae5b2ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dictionary, take language parameters so that we can show syn... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Dictionary, take language parameters so that we can show
synonyms
..
Dictionary, take language parameters so that we can show synonyms
We do not have synonyms data at server, but make sure dictionary
card can take optional language pairs other than default sourceLanguage-
targetLanguage pair
Change-Id: Ie78f53403109bfc7284b86c428b963ab687e0a0e
---
M modules/tools/ext.cx.tools.dictionary.js
M modules/translation/ext.cx.translation.js
2 files changed, 13 insertions(+), 3 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.dictionary.js
b/modules/tools/ext.cx.tools.dictionary.js
index 4b50dd6..fb17781 100644
--- a/modules/tools/ext.cx.tools.dictionary.js
+++ b/modules/tools/ext.cx.tools.dictionary.js
@@ -127,7 +127,14 @@
this.onShow();
};
- DictionaryCard.prototype.start = function ( word ) {
+ /**
+* @param {string} word
+* @param {string} [sourceLanguage]
+* @param {string} [targetLanguage]
+*/
+ DictionaryCard.prototype.start = function ( word, sourceLanguage,
targetLanguage ) {
+ sourceLanguage = sourceLanguage || mw.cx.sourceLanguage;
+ targetLanguage = targetLanguage || mw.cx.targetLanguage;
// Don't appear if there's nothing to translate
if ( word === '' ) {
this.stop();
@@ -143,7 +150,7 @@
// Try to get a translation.
// Don't appear if getting the translation fails.
- getTranslation( word, mw.cx.sourceLanguage,
mw.cx.targetLanguage )
+ getTranslation( word, sourceLanguage, targetLanguage )
.done( $.proxy( this.showResult, this ) )
.fail( $.proxy( this.stop, this ) );
};
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index 9f217ff..fc7bd44 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -148,6 +148,7 @@
$section.find( 'img' ).adaptImage( mw.cx.targetLanguage );
// Adapt references
$sourceSection = $( '#' + $section.data( 'source' ) );
+
if ( $.fn.adaptReferences ) { // This is an experimental feature
$section.find( '[typeof=mw:Extension/ref]'
).adaptReferences();
}
@@ -172,7 +173,9 @@
var selection = window.getSelection().toString();
if ( selection ) {
- mw.hook( 'mw.cx.select.word' ).fire( selection
);
+ // In this case, user is interested in
targetLanguage-targetLanguage
+ // dictionary lookup. Or synonyms.
+ mw.hook( 'mw.cx.select.word' ).fire( selection,
mw.cx.targetLanguage, mw.cx.targetLanguage );
}
} ) );
--
To view, visit https://gerrit.wikimedia.org/r/149801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie78f53403109bfc7284b86c428b963ab687e0a0e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
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 File::sha1Base36() (deprecated since 1.19) - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149829
Change subject: Remove File::sha1Base36() (deprecated since 1.19)
..
Remove File::sha1Base36() (deprecated since 1.19)
Change-Id: I551a3c7451307e1a4fba3ea9b22320cc4ca72215
---
M RELEASE-NOTES-1.24
M includes/filerepo/file/File.php
2 files changed, 1 insertion(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/149829/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 119f1a2..ecb59eb 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -275,6 +275,7 @@
* Removed maintenance script importTextFile.php. Use edit.php script instead.
* A _from_namespace field has been added to the templatelinks, pagelinks,
and filelinks tables. Run update.php to apply this change to the schema.
+* Removed File::sha1Base36(). (deprecated since 1.19)
Renamed classes
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 32374cd..17207d4 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -2092,25 +2092,6 @@
}
/**
-* Get a SHA-1 hash of a file in the local filesystem, in base-36 lower
case
-* encoding, zero padded to 31 digits.
-*
-* 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in
base 36
-* fairly neatly.
-*
-* @param string $path
-* @return bool|string False on failure
-* @deprecated since 1.19
-*/
- static function sha1Base36( $path ) {
- wfDeprecated( __METHOD__, '1.19' );
-
- $fsFile = new FSFile( $path );
-
- return $fsFile-getSha1Base36();
- }
-
- /**
* @return array HTTP header name/value map to use for HEAD/GET request
responses
*/
function getStreamHeaders() {
--
To view, visit https://gerrit.wikimedia.org/r/149829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I551a3c7451307e1a4fba3ea9b22320cc4ca72215
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually load SMW_QueryProcessor.php, from correct path - change (mediawiki...SemanticTasks)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/149830 Change subject: Actually load SMW_QueryProcessor.php, from correct path .. Actually load SMW_QueryProcessor.php, from correct path While running phpunit I got thousands of Warning: include_once( /srv/vagrant/mediawiki/extensions/SemanticMediaWiki//includes/SMW_QueryProcessor.php ): failed to open stream: No such file or directory in /srv/vagrant/mediawiki/extensions/SemanticTasks/SemanticTasks.classes.php on line 321 As far as I can see $smwgIP is usually assumed to include trailing slash by other semantic extensions. Change-Id: I0e623ac2dff3d4c76cc4a5f00dd423922a4be12a --- M SemanticTasks.classes.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTasks refs/changes/30/149830/1 diff --git a/SemanticTasks.classes.php b/SemanticTasks.classes.php index cebab45..75031ef 100644 --- a/SemanticTasks.classes.php +++ b/SemanticTasks.classes.php @@ -318,7 +318,7 @@ // $smwgIP is defined by Semantic MediaWiki, and we don't allow // this file to be sourced unless Semantic MediaWiki is included. global $smwgIP; - include_once( $smwgIP . /includes/SMW_QueryProcessor.php ); + include_once( $smwgIP . includes/SMW_QueryProcessor.php ); $params = array(); $inline = true; -- To view, visit https://gerrit.wikimedia.org/r/149830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e623ac2dff3d4c76cc4a5f00dd423922a4be12a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticTasks Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] After translation is filled up, unbind click handler to sour... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: After translation is filled up, unbind click handler to source
section
..
After translation is filled up, unbind click handler to source section
This dangling click handler was triggering duplicate word select events
and causing duplicate API requests.
Change-Id: I37bc796ca85d788751e60d5902ddf29fdc1d8aeb
---
M modules/translation/ext.cx.translation.js
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index fc7bd44..a51b7e8 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -140,15 +140,16 @@
* @param {jQuery} $section
*/
ContentTranslationEditor.prototype.postProcessMT = function ( $section
) {
- var $sourceSection;
+ var $sourceSection = $( '#' + $section.data( 'source' ) );
+
+ // Translation filled up. Unbind click handler for the source
section.
+ $sourceSection.unbind( 'click', sourceSectionClickHandler );
// Adapt links
$section.adaptLinks( mw.cx.targetLanguage );
// Adapt images
$section.find( 'img' ).adaptImage( mw.cx.targetLanguage );
// Adapt references
- $sourceSection = $( '#' + $section.data( 'source' ) );
-
if ( $.fn.adaptReferences ) { // This is an experimental feature
$section.find( '[typeof=mw:Extension/ref]'
).adaptReferences();
}
--
To view, visit https://gerrit.wikimedia.org/r/149802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37bc796ca85d788751e60d5902ddf29fdc1d8aeb
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
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 a pid file to check if nightly.py is already running - change (labs...extdist)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149831
Change subject: Add a pid file to check if nightly.py is already running
..
Add a pid file to check if nightly.py is already running
Change-Id: I33c1858af84b41de716f5f7584ab42ce21aea006
---
M conf.json
M nightly.py
2 files changed, 39 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist
refs/changes/31/149831/1
diff --git a/conf.json b/conf.json
index 3e3d0af..49b4300 100644
--- a/conf.json
+++ b/conf.json
@@ -5,6 +5,7 @@
GIT_URL: https://gerrit.wikimedia.org/r/mediawiki/extensions/%s;,
LOG_FILE: extdist.log,
SRC_PATH: /srv/src,
+PID_FILE: extdist.pid,
SUPPORTED_VERSIONS: null
}
diff --git a/nightly.py b/nightly.py
index ace8b65..5683941 100644
--- a/nightly.py
+++ b/nightly.py
@@ -51,6 +51,44 @@
)
+def check_pid(pid):
+
+Checks whether the given pid is running
+
+try:
+# This doesn't actually kill it, just checks if it is running
+os.kill(pid, 0)
+except OSError:
+# Not running
+return False
+else:
+# So it must be running
+return True
+
+
+def create_pid_file():
+
+Creates a pid file with the current pid
+
+with open(conf.PID_FILE, 'w') as f:
+f.write(str(os.getpid()))
+logging.info('Creating pid file')
+
+# Check to make sure nightly.py isn't already running
+pid = os.getpid()
+if os.path.exists(conf.PID_FILE):
+with open(conf.PID_FILE, 'r') as f:
+old_pid = f.read()
+
+if check_pid(int(old_pid)):
+logging.warning('Another process of nightly.py is still running,
quitting this one')
+quit()
+else:
+create_pid_file()
+else:
+create_pid_file()
+
+
def fetch_all_extensions():
Returns raw text of extension list,
--
To view, visit https://gerrit.wikimedia.org/r/149831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33c1858af84b41de716f5f7584ab42ce21aea006
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/extdist
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure $rights is defined - change (mediawiki...AccessControl)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149832
Change subject: Ensure $rights is defined
..
Ensure $rights is defined
I got in phpunit: Notice: Undefined variable: rights in
mediawiki/extensions/AccessControl/AccessControl.php on line 226
Change-Id: I9c19e9ed007726ffdd38a96ce79e8d1a26a947d0
---
M AccessControl.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AccessControl
refs/changes/32/149832/1
diff --git a/AccessControl.php b/AccessControl.php
index ae577d7..a2a3136 100644
--- a/AccessControl.php
+++ b/AccessControl.php
@@ -222,6 +222,7 @@
}
} else {
// echo The end of work with code of article;
+ $rights = null;
}
if ( is_array( $rights ) ) {
if ( $wgUser-mId === 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/149832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c19e9ed007726ffdd38a96ce79e8d1a26a947d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AccessControl
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make MonthNameUnlocalizer aware of genitive month names - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make MonthNameUnlocalizer aware of genitive month names
..
Make MonthNameUnlocalizer aware of genitive month names
See Ic7a5797.
This includes a major rewrite of the method. Now it tries to
unlocalize longer strings first. This should avoid all possible
conflicts.
Change-Id: I232fd3b5433f04396c53eecf3ad49d025a84ee64
---
M lib/includes/parsers/MonthNameUnlocalizer.php
M lib/tests/phpunit/parsers/MonthNameUnlocalizerTest.php
2 files changed, 118 insertions(+), 50 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/parsers/MonthNameUnlocalizer.php
b/lib/includes/parsers/MonthNameUnlocalizer.php
index ef6fd9e..990dd0a 100644
--- a/lib/includes/parsers/MonthNameUnlocalizer.php
+++ b/lib/includes/parsers/MonthNameUnlocalizer.php
@@ -6,7 +6,7 @@
use ValueParsers\ParserOptions;
/**
- * Class to unlocalise month names using Mediawiki's Language object
+ * Class to unlocalize a month name in a date string using MediaWiki's
Language object.
*
* @since 0.5
*
@@ -18,51 +18,77 @@
class MonthNameUnlocalizer {
/**
-* @see Unlocalizer::unlocalize()
+* @see NumberUnlocalizer::unlocalizeNumber
*
-* @param string $string string to process
-* @param string $langCode
+* @param string $date Localized date string.
+* @param string $languageCode
* @param ParserOptions $options
-*
-* @return string unlocalized string
-*/
- public function unlocalize( $string, $langCode, ParserOptions $options
) {
- if( $langCode === 'en' ) {
- return $string;
- }
-
- $lang = Language::factory( $langCode );
- $en = Language::factory( 'en' );
-
- $string = $this-unlocalizeMonthNames( $lang, $en, $string );
-
- return $string;
- }
-
- /**
-* Unlocalizes month names in a string, checking both full month names
and abbreviations
-* @param Language $from
-* @param Language $to
-* @param string $string
*
* @return string
*/
- private function unlocalizeMonthNames( Language $from, Language $to,
$string ) {
- $initialString = $string;
-
- for ( $i = 1; $i = 12; $i++ ) {
- $string = str_replace( $from-getMonthName( $i ),
$to-getMonthName( $i ), $string );
+ public function unlocalize( $date, $languageCode, ParserOptions
$options ) {
+ if ( $languageCode === 'en' ) {
+ return $date;
}
- if( $string !== $initialString ) {
- return $string;
- }
+ $language = Language::factory( $languageCode );
+ $en = Language::factory( 'en' );
- for ( $i = 1; $i = 12; $i++ ) {
- $string = str_replace( $from-getMonthAbbreviation( $i
), $to-getMonthName( $i ), $string );
- }
+ $date = $this-unlocalizeMonthName( $language, $en, $date );
- return $string;
+ return $date;
}
-}
\ No newline at end of file
+ /**
+* Unlocalizes the longest month name in a date string that could be
found first.
+* Tries to avoid doing multiple replacements and returns the localized
original if in doubt.
+* Takes full month names, genitive names and abbreviations into
account.
+*
+* @param Language $from
+* @param Language $to
+* @param string $date Localized date string.
+*
+* @return string
+*/
+ private function unlocalizeMonthName( Language $from, Language $to,
$date ) {
+ $replacements = array();
+
+ for ( $i = 1; $i = 12; $i++ ) {
+ $replace = $to-getMonthName( $i );
+
+ $replacements[$from-getMonthName( $i )] = $replace;
+ $replacements[$from-getMonthNameGen( $i )] = $replace;
+ $replacements[$from-getMonthAbbreviation( $i )] =
$replace;
+ }
+
+ // Order search strings from longest to shortest
+ uksort( $replacements, function( $a, $b ) {
+ return strlen( $b ) - strlen( $a );
+ } );
+
+ foreach ( $replacements as $search = $replace ) {
+ $unlocalized = str_replace( $search, $replace, $date,
$count );
+
+ // Nothing happened, try the next.
+ if ( $count = 0 ) {
+ continue;
+ }
+
+ // Do not mess with strings that are clearly not a
valid date.
+
[MediaWiki-commits] [Gerrit] Replace deprecated Xml::namespaceSelector call - change (mediawiki...Push)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/149833 Change subject: Replace deprecated Xml::namespaceSelector call .. Replace deprecated Xml::namespaceSelector call Change-Id: If2465b7e83c9032928afd27d5c6ca354ea1ef550 --- M specials/Push_Body.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Push refs/changes/33/149833/1 diff --git a/specials/Push_Body.php b/specials/Push_Body.php index 640856c..ba37c50 100644 --- a/specials/Push_Body.php +++ b/specials/Push_Body.php @@ -208,7 +208,15 @@ $form .= Xml::inputLabel( wfMsg( 'export-addcattext' ), 'catname', 'catname', 40 ) . '#160;'; $form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' = 'addcat' ) ) . 'br /'; - $form .= Xml::namespaceSelector( $req-getText( 'nsindex', '' ), null, 'nsindex', wfMsg( 'export-addnstext' ) ) . '#160;'; + $form .= Html::namespaceSelector( array( + 'selected' = $req-getText( 'nsindex', '' ), + 'all' = null, + 'label' = wfMsg( 'export-addnstext' ), + ), array( + 'name' = 'nsindex', + 'id' = 'namespace', + 'class' = 'namespaceselector', + ) ) . '#160;'; $form .= Xml::submitButton( wfMsg( 'export-addns' ), array( 'name' = 'addns' ) ) . 'br /'; $form .= Xml::element( 'textarea', array( 'name' = 'pages', 'cols' = 40, 'rows' = 10 ), $pages, false ); -- To view, visit https://gerrit.wikimedia.org/r/149833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2465b7e83c9032928afd27d5c6ca354ea1ef550 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Push Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated Xml::namespaceSelector call - change (mediawiki...NewestPages)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/149834 Change subject: Replace deprecated Xml::namespaceSelector call .. Replace deprecated Xml::namespaceSelector call Change-Id: I68b513e70ab30febc755a8e6e1942a3d5b6c1118 --- M NewestPages.page.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewestPages refs/changes/34/149834/1 diff --git a/NewestPages.page.php b/NewestPages.page.php index e8fc000..306d4f4 100644 --- a/NewestPages.page.php +++ b/NewestPages.page.php @@ -172,7 +172,15 @@ $self = $this-getTitle(); $form = Xml::openElement( 'form', array( 'method' = 'post', 'action' = $self-getLocalUrl() ) ); $form .= Xml::label( wfMsg( 'newestpages-namespace' ), 'namespace' ) . '#160;'; - $form .= Xml::namespaceSelector( $this-namespace, 'all' ); + $form .= Html::namespaceSelector( array( + 'selected' = $this-namespace, + 'all' = 'all', + 'label' = null, + ), array( + 'name' = 'namespace', + 'id' = 'namespace', + 'class' = 'namespaceselector', + ) ); $form .= Html::Hidden( 'limit', $this-limit ); $form .= Html::Hidden( 'redirects', $this-redirects ); $form .= Xml::submitButton( wfMsg( 'newestpages-submit' ) ) . '/form'; -- To view, visit https://gerrit.wikimedia.org/r/149834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68b513e70ab30febc755a8e6e1942a3d5b6c1118 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NewestPages Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove Xml::namespaceSelector() (deprecated since 1.19) - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149836
Change subject: Remove Xml::namespaceSelector() (deprecated since 1.19)
..
Remove Xml::namespaceSelector() (deprecated since 1.19)
Change-Id: If4eaadda2f2533cdcebc692f90c43bdddab3d82b
---
M RELEASE-NOTES-1.24
M includes/Xml.php
2 files changed, 1 insertion(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/149836/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 119f1a2..b17d611 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -275,6 +275,7 @@
* Removed maintenance script importTextFile.php. Use edit.php script instead.
* A _from_namespace field has been added to the templatelinks, pagelinks,
and filelinks tables. Run update.php to apply this change to the schema.
+* Removed Xml::namespaceSelector(). (deprecated since 1.19)
Renamed classes
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/Xml.php b/includes/Xml.php
index 7761ecc..05f5394 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -135,31 +135,6 @@
}
/**
-* Build a drop-down box for selecting a namespace
-*
-* @param string $selected Namespace which should be pre-selected
-* @param string|null $all Value of an item denoting all namespaces, or
null to omit
-* @param string $element_name Value of the name attribute of the
select tag
-* @param string $label Optional label to add to the field
-* @return string
-* @deprecated since 1.19
-*/
- public static function namespaceSelector( $selected = '', $all = null,
- $element_name = 'namespace', $label = null
- ) {
- wfDeprecated( __METHOD__, '1.19' );
- return Html::namespaceSelector( array(
- 'selected' = $selected,
- 'all' = $all,
- 'label' = $label,
- ), array(
- 'name' = $element_name,
- 'id' = 'namespace',
- 'class' = 'namespaceselector',
- ) );
- }
-
- /**
* Create a date selector
*
* @param string $selected The month which should be selected, default
''.
--
To view, visit https://gerrit.wikimedia.org/r/149836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4eaadda2f2533cdcebc692f90c43bdddab3d82b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make function mailNotification() static - change (mediawiki...SemanticTasks)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149835
Change subject: Make function mailNotification() static
..
Make function mailNotification() static
When running phpunit I got hundreds of Strict standards: Non-static
method SemanticTasksMailer::mailNotification() should not be called
statically in SemanticTasks/SemanticTasks.classes.php on line 85
Change-Id: Iac64617a8c77a7f637087165f946e9f3c0d1fd4f
---
M SemanticTasks.classes.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTasks
refs/changes/35/149835/1
diff --git a/SemanticTasks.classes.php b/SemanticTasks.classes.php
index cebab45..f057e59 100644
--- a/SemanticTasks.classes.php
+++ b/SemanticTasks.classes.php
@@ -245,7 +245,7 @@
/**
* Sends mail notifications
*/
- function mailNotification( $assignees, $text, $title, $user, $status ) {
+ static function mailNotification( $assignees, $text, $title, $user,
$status ) {
global $wgSitename;
if ( !empty( $assignees ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/149835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac64617a8c77a7f637087165f946e9f3c0d1fd4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticTasks
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Imported Upstream version 3.3-dev+20140728 - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149837 Change subject: Imported Upstream version 3.3-dev+20140728 .. Imported Upstream version 3.3-dev+20140728 --- M .gitignore M CMake/FindLibDwarf.cmake M CMake/FollySetup.cmake M CMake/HPHPCompiler.cmake M CMake/HPHPFunctions.cmake M CMake/HPHPSetup.cmake M CMake/Options.cmake M hphp/compiler/analysis/emitter.cpp M hphp/compiler/compiler.cpp A hphp/hack/editor-plugins/emacs/hack-mode.el M hphp/hack/hhi/classes.hhi M hphp/hack/hhi/stdlib/builtins_apache.idl.hhi M hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi M hphp/hack/hhi/stdlib/builtins_json.idl.hhi M hphp/hack/hhi/stdlib/builtins_server.idl.hhi M hphp/hack/hhi/stdlib/builtins_string.idl.hhi M hphp/hack/hhi/stdlib/builtins_url.idl.hhi A hphp/hack/hhi/stdlib/bultins_filter.hhi M hphp/hack/src/client/Makefile M hphp/hack/src/client/clientArgs.ml A hphp/hack/src/client/clientArgumentInfo.ml M hphp/hack/src/client/clientBuild.ml M hphp/hack/src/client/clientCheck.ml M hphp/hack/src/client/clientEnv.ml M hphp/hack/src/globals/autocomplete.ml M hphp/hack/src/heap/sharedMem.ml M hphp/hack/src/js/hh_ide.ml M hphp/hack/src/naming/nast.ml M hphp/hack/src/parsing/parser_hack.ml M hphp/hack/src/server/Makefile A hphp/hack/src/server/argumentInfoService.ml M hphp/hack/src/server/hackProgram.ml A hphp/hack/src/server/serverArgumentInfo.ml M hphp/hack/src/server/serverMsg.ml M hphp/hack/src/typing/typing.ml M hphp/hack/src/typing/typing_compare.ml M hphp/hack/src/typing/typing_decl.ml M hphp/hack/src/typing/typing_enum.ml M hphp/hack/src/typing/typing_env.ml M hphp/hack/src/typing/typing_reason.ml M hphp/hack/src/typing/typing_utils.ml M hphp/hack/src/utils/errors.ml M hphp/hack/src/utils/errors.mli A hphp/hack/test/typecheck/async_function_untyped1.php A hphp/hack/test/typecheck/async_function_untyped1.php.exp A hphp/hack/test/typecheck/async_function_untyped2.php A hphp/hack/test/typecheck/async_function_untyped2.php.exp A hphp/hack/test/typecheck/async_function_untyped3.php A hphp/hack/test/typecheck/async_function_untyped3.php.exp A hphp/hack/test/typecheck/async_function_untyped4.php A hphp/hack/test/typecheck/async_function_untyped4.php.exp A hphp/hack/test/typecheck/async_function_untyped5.php A hphp/hack/test/typecheck/async_function_untyped5.php.exp A hphp/hack/test/typecheck/async_function_untyped6.php A hphp/hack/test/typecheck/async_function_untyped6.php.exp M hphp/hack/test/typecheck/enum_7.php M hphp/hack/test/typecheck/enum_7.php.exp A hphp/hack/test/typecheck/shapes_cc_10.php A hphp/hack/test/typecheck/shapes_cc_10.php.exp M hphp/hack/test/typecheck/shapes_cc_7.php.exp A hphp/hack/test/typecheck/shapes_cc_8.php A hphp/hack/test/typecheck/shapes_cc_8.php.exp A hphp/hack/test/typecheck/shapes_cc_9.php A hphp/hack/test/typecheck/shapes_cc_9.php.exp A hphp/hack/test/typecheck/yield_send1.php A hphp/hack/test/typecheck/yield_send1.php.exp A hphp/hack/test/typecheck/yield_send2.php A hphp/hack/test/typecheck/yield_send2.php.exp A hphp/hack/test/typecheck/yield_send3.php A hphp/hack/test/typecheck/yield_send3.php.exp A hphp/hack/test/typecheck/yield_send4.php A hphp/hack/test/typecheck/yield_send4.php.exp A hphp/hack/test/typecheck/yield_send5.php A hphp/hack/test/typecheck/yield_send5.php.exp M hphp/hhbbc/emit.cpp M hphp/hhbbc/index.cpp M hphp/hhbbc/parse.cpp M hphp/hhvm/CMakeLists.txt M hphp/parser/hphp.tab.cpp M hphp/parser/hphp.y M hphp/runtime/base/http-client.cpp M hphp/runtime/base/http-stream-wrapper.cpp M hphp/runtime/base/mixed-array.cpp M hphp/runtime/base/mixed-array.h M hphp/runtime/base/object-data.cpp M hphp/runtime/base/program-functions.cpp M hphp/runtime/base/proxy-array.h M hphp/runtime/base/request-event-handler.h M hphp/runtime/base/request-injection-data.cpp M hphp/runtime/base/request-injection-data.h M hphp/runtime/base/runtime-option.h M hphp/runtime/base/smart-containers.h M hphp/runtime/base/variable-serializer.cpp M hphp/runtime/base/variable-unserializer.h M hphp/runtime/ext/asio/asio_blockable.cpp M hphp/runtime/ext/asio/asio_session.cpp M hphp/runtime/ext/asio/asio_session.h A hphp/runtime/ext/asio/await_all_wait_handle.cpp A hphp/runtime/ext/asio/await_all_wait_handle.h M hphp/runtime/ext/asio/wait_handle.h M hphp/runtime/ext/asio/waitable_wait_handle.cpp M hphp/runtime/ext/ext_asio.h M hphp/runtime/ext/ext_collections.h M hphp/runtime/ext/ext_hotprofiler.cpp M hphp/runtime/ext/ext_hotprofiler.h M hphp/runtime/ext/ext_posix.cpp M hphp/runtime/ext/icu/ext_icu_date_fmt.cpp M hphp/runtime/ext/icu/icu.cpp M hphp/runtime/ext/json/JSON_parser.cpp M hphp/runtime/ext/json/ext_json.cpp M hphp/runtime/ext/json/ext_json.h M hphp/runtime/ext/json/ext_json.php A hphp/runtime/ext/mysql/ext_mysql-async.php M hphp/runtime/ext/mysql/ext_mysql.cpp M hphp/runtime/ext/mysql/ext_mysql.h A hphp/runtime/ext/mysql/ext_mysql.php M hphp/runtime/ext/mysql/mysql_common.cpp M hphp/runtime/ext
[MediaWiki-commits] [Gerrit] Replace deprecated File::sha1Base36 call - change (mediawiki...BlueSpiceFoundation)
Smuggli has submitted this change and it was merged.
Change subject: Replace deprecated File::sha1Base36 call
..
Replace deprecated File::sha1Base36 call
Change-Id: I2ca237444b5ceb18d69cecfa20a44524eae5b2ea
---
M maintenance/importImagesRecursive.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/maintenance/importImagesRecursive.php
b/maintenance/importImagesRecursive.php
index 491d670..0ca488c 100644
--- a/maintenance/importImagesRecursive.php
+++ b/maintenance/importImagesRecursive.php
@@ -161,7 +161,7 @@
} else {
if ( isset( $options['skip-dupes'] ) ) {
$repo = $image-getRepo();
- $sha1 = File::sha1Base36( $file ); # XXX: we
end up calculating this again when actually uploading. that sucks.
+ $sha1 = FSFile::getSha1Base36FromPath( $file );
# XXX: we end up calculating this again when actually uploading. that sucks.
$dupes = $repo-findBySha1( $sha1 );
--
To view, visit https://gerrit.wikimedia.org/r/149828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ca237444b5ceb18d69cecfa20a44524eae5b2ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cache support - change (mediawiki...BlueSpiceFoundation)
Swidmann has submitted this change and it was merged.
Change subject: Cache support
..
Cache support
Added CacheHelper class
Added LCStore_MC for memcached stuff
Added cache support for ArticleHelper
Added cache support for WidgetListHelper
Increased max cache time in Config class
Change-Id: I4b7f6830493a213e07440189656eb0a95f9f2c77
---
A BlueSpice.hooks.php
M BlueSpiceFoundation.php
M includes/AutoLoader.php
M includes/Config.class.php
A includes/cache/LCStore_MC.php
M includes/utility/ArticleHelper.class.php
A includes/utility/CacheHelper.class.php
M includes/utility/WidgetListHelper.class.php
M resources/bluespice.extjs/Ext.ux/form/ItemSelector.js
9 files changed, 314 insertions(+), 63 deletions(-)
Approvals:
Robert Vogel: Checked; Looks good to me, but someone else must approve
Swidmann: Verified; Looks good to me, approved
diff --git a/BlueSpice.hooks.php b/BlueSpice.hooks.php
new file mode 100644
index 000..fde8732
--- /dev/null
+++ b/BlueSpice.hooks.php
@@ -0,0 +1,27 @@
+?php
+$wgHooks['SetupAfterCache'][] = 'BsCoreHooks::onSetupAfterCache';
+$wgHooks['SoftwareInfo'][] = 'BsCoreHooks::onSoftwareInfo';
+$wgHooks['BeforePageDisplay'][] = 'BsCoreHooks::onBeforePageDisplay';
+$wgHooks['LinkEnd'][] = 'BsCoreHooks::LinkEnd';
+$wgHooks['MakeGlobalVariablesScript'][] =
'BsCoreHooks::onMakeGlobalVariablesScript';
+$wgHooks['LoadExtensionSchemaUpdates'][] =
'BsCoreHooks::onLoadExtensionSchemaUpdates';
+$wgHooks['ApiCheckCanExecute'][] = 'BsCoreHooks::onApiCheckCanExecute';
+$wgHooks['UserGetRights'][] = 'BsCoreHooks::onUserGetRights';
+$wgHooks['userCan'][] = 'BsCoreHooks::onUserCan';
+$wgHooks['UploadVerification'][] = 'BsCoreHooks::onUploadVerification';
+$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
'BsCoreHooks::onSkinTemplateOutputPageBeforeExec';
+
+$wgHooks['UserAddGroup'][] = 'BsGroupHelper::addTemporaryGroupToUserHelper';
+
+// START cache invalidation hooks
+$wgHooks['PageContentSaveComplete'][] =
'BsCacheHelper::onPageContentSaveComplete';
+$wgHooks['BsSettingsAfterSaveSettings'][] =
'BsCacheHelper::onBsSettingsAfterSaveSettings';
+// END cache invalidation hooks
+
+if ( !isset( $wgHooks['EditPage::showEditForm:initial'] ) ) {
+ $wgHooks['EditPage::showEditForm:initial'] = array();
+}
+
+if ( $wgDBtype == 'oracle' ) {
+ $wgHooks['ArticleDelete'][] = 'BSOracleHooks::onArticleDelete';
+}
diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php
index 7e2760c..e4f77fd 100644
--- a/BlueSpiceFoundation.php
+++ b/BlueSpiceFoundation.php
@@ -90,29 +90,10 @@
$wgSpecialPageGroups['SpecialCredits'] = 'bluespice';
$wgSpecialPages['SpecialCredits'] = 'SpecialCredits';
-$wgHooks['SetupAfterCache'][] = 'BsCoreHooks::onSetupAfterCache';
-$wgHooks['SoftwareInfo'][] = 'BsCoreHooks::onSoftwareInfo';
-$wgHooks['BeforePageDisplay'][] = 'BsCoreHooks::onBeforePageDisplay';
-$wgHooks['LinkEnd'][] = 'BsCoreHooks::LinkEnd';
-$wgHooks['MakeGlobalVariablesScript'][] =
'BsCoreHooks::onMakeGlobalVariablesScript';
-$wgHooks['LoadExtensionSchemaUpdates'][] =
'BsCoreHooks::onLoadExtensionSchemaUpdates';
-$wgHooks['ApiCheckCanExecute'][] = 'BsCoreHooks::onApiCheckCanExecute';
-$wgHooks['UserGetRights'][] = 'BsCoreHooks::onUserGetRights';
-$wgHooks['userCan'][] = 'BsCoreHooks::onUserCan';
-$wgHooks['UploadVerification'][] = 'BsCoreHooks::onUploadVerification';
-$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
'BsCoreHooks::onSkinTemplateOutputPageBeforeExec';
-
-$wgHooks['UserAddGroup'][] = 'BsGroupHelper::addTemporaryGroupToUserHelper';
-
-if ( !isset( $wgHooks['EditPage::showEditForm:initial'] ) ) {
- $wgHooks['EditPage::showEditForm:initial'] = array();
-}
-
-if ( $wgDBtype == 'oracle' ) {
- $wgHooks['ArticleDelete'][] = 'BSOracleHooks::onArticleDelete';
-}
-
+// Register hooks
+require_once( 'BlueSpice.hooks.php' );
//Setup
+
$wgExtensionFunctions[] = 'BsCoreHooks::setup';
// initalise BlueSpice as first extension in a fully initialised environment
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 84196fb..146301a 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -14,7 +14,8 @@
$GLOBALS['wgAutoloadClasses']['EXTTYPE'] = __DIR__./Common.php;
$GLOBALS['wgAutoloadClasses']['LCStore_BSDB'] =
__DIR__./cache/LCStore_BSDB.php;
-$GLOBALS['wgAutoloadClasses']['LCStore_SHM'] =
__DIR__./cache/LCStore_SHM.php;
+$GLOBALS['wgAutoloadClasses']['LCStore_SHM'] =
__DIR__./cache/LCStore_SHM.php;
+$GLOBALS['wgAutoloadClasses']['LCStore_MC'] = __DIR__./cache/LCStore_MC.php;
$GLOBALS['wgAutoloadClasses']['BsValidator'] =
__DIR__./validator/Validator.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorPlugin'] =
__DIR__./validator/Validator.class.php;
@@ -57,6 +58,7 @@
//utility
$GLOBALS['wgAutoloadClasses']['BsArticleHelper'] =
__DIR__./utility/ArticleHelper.class.php;
+$GLOBALS['wgAutoloadClasses']['BsCacheHelper'] =
__DIR__./utility/CacheHelper.class.php;
[MediaWiki-commits] [Gerrit] Imported Upstream version 3.3-dev+20140728 - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Imported Upstream version 3.3-dev+20140728 .. Imported Upstream version 3.3-dev+20140728 --- M .gitignore M CMake/FindLibDwarf.cmake M CMake/FollySetup.cmake M CMake/HPHPCompiler.cmake M CMake/HPHPFunctions.cmake M CMake/HPHPSetup.cmake M CMake/Options.cmake M hphp/compiler/analysis/emitter.cpp M hphp/compiler/compiler.cpp A hphp/hack/editor-plugins/emacs/hack-mode.el M hphp/hack/hhi/classes.hhi M hphp/hack/hhi/stdlib/builtins_apache.idl.hhi M hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi M hphp/hack/hhi/stdlib/builtins_json.idl.hhi M hphp/hack/hhi/stdlib/builtins_server.idl.hhi M hphp/hack/hhi/stdlib/builtins_string.idl.hhi M hphp/hack/hhi/stdlib/builtins_url.idl.hhi A hphp/hack/hhi/stdlib/bultins_filter.hhi M hphp/hack/src/client/Makefile M hphp/hack/src/client/clientArgs.ml A hphp/hack/src/client/clientArgumentInfo.ml M hphp/hack/src/client/clientBuild.ml M hphp/hack/src/client/clientCheck.ml M hphp/hack/src/client/clientEnv.ml M hphp/hack/src/globals/autocomplete.ml M hphp/hack/src/heap/sharedMem.ml M hphp/hack/src/js/hh_ide.ml M hphp/hack/src/naming/nast.ml M hphp/hack/src/parsing/parser_hack.ml M hphp/hack/src/server/Makefile A hphp/hack/src/server/argumentInfoService.ml M hphp/hack/src/server/hackProgram.ml A hphp/hack/src/server/serverArgumentInfo.ml M hphp/hack/src/server/serverMsg.ml M hphp/hack/src/typing/typing.ml M hphp/hack/src/typing/typing_compare.ml M hphp/hack/src/typing/typing_decl.ml M hphp/hack/src/typing/typing_enum.ml M hphp/hack/src/typing/typing_env.ml M hphp/hack/src/typing/typing_reason.ml M hphp/hack/src/typing/typing_utils.ml M hphp/hack/src/utils/errors.ml M hphp/hack/src/utils/errors.mli A hphp/hack/test/typecheck/async_function_untyped1.php A hphp/hack/test/typecheck/async_function_untyped1.php.exp A hphp/hack/test/typecheck/async_function_untyped2.php A hphp/hack/test/typecheck/async_function_untyped2.php.exp A hphp/hack/test/typecheck/async_function_untyped3.php A hphp/hack/test/typecheck/async_function_untyped3.php.exp A hphp/hack/test/typecheck/async_function_untyped4.php A hphp/hack/test/typecheck/async_function_untyped4.php.exp A hphp/hack/test/typecheck/async_function_untyped5.php A hphp/hack/test/typecheck/async_function_untyped5.php.exp A hphp/hack/test/typecheck/async_function_untyped6.php A hphp/hack/test/typecheck/async_function_untyped6.php.exp M hphp/hack/test/typecheck/enum_7.php M hphp/hack/test/typecheck/enum_7.php.exp A hphp/hack/test/typecheck/shapes_cc_10.php A hphp/hack/test/typecheck/shapes_cc_10.php.exp M hphp/hack/test/typecheck/shapes_cc_7.php.exp A hphp/hack/test/typecheck/shapes_cc_8.php A hphp/hack/test/typecheck/shapes_cc_8.php.exp A hphp/hack/test/typecheck/shapes_cc_9.php A hphp/hack/test/typecheck/shapes_cc_9.php.exp A hphp/hack/test/typecheck/yield_send1.php A hphp/hack/test/typecheck/yield_send1.php.exp A hphp/hack/test/typecheck/yield_send2.php A hphp/hack/test/typecheck/yield_send2.php.exp A hphp/hack/test/typecheck/yield_send3.php A hphp/hack/test/typecheck/yield_send3.php.exp A hphp/hack/test/typecheck/yield_send4.php A hphp/hack/test/typecheck/yield_send4.php.exp A hphp/hack/test/typecheck/yield_send5.php A hphp/hack/test/typecheck/yield_send5.php.exp M hphp/hhbbc/emit.cpp M hphp/hhbbc/index.cpp M hphp/hhbbc/parse.cpp M hphp/hhvm/CMakeLists.txt M hphp/parser/hphp.tab.cpp M hphp/parser/hphp.y M hphp/runtime/base/http-client.cpp M hphp/runtime/base/http-stream-wrapper.cpp M hphp/runtime/base/mixed-array.cpp M hphp/runtime/base/mixed-array.h M hphp/runtime/base/object-data.cpp M hphp/runtime/base/program-functions.cpp M hphp/runtime/base/proxy-array.h M hphp/runtime/base/request-event-handler.h M hphp/runtime/base/request-injection-data.cpp M hphp/runtime/base/request-injection-data.h M hphp/runtime/base/runtime-option.h M hphp/runtime/base/smart-containers.h M hphp/runtime/base/variable-serializer.cpp M hphp/runtime/base/variable-unserializer.h M hphp/runtime/ext/asio/asio_blockable.cpp M hphp/runtime/ext/asio/asio_session.cpp M hphp/runtime/ext/asio/asio_session.h A hphp/runtime/ext/asio/await_all_wait_handle.cpp A hphp/runtime/ext/asio/await_all_wait_handle.h M hphp/runtime/ext/asio/wait_handle.h M hphp/runtime/ext/asio/waitable_wait_handle.cpp M hphp/runtime/ext/ext_asio.h M hphp/runtime/ext/ext_collections.h M hphp/runtime/ext/ext_hotprofiler.cpp M hphp/runtime/ext/ext_hotprofiler.h M hphp/runtime/ext/ext_posix.cpp M hphp/runtime/ext/icu/ext_icu_date_fmt.cpp M hphp/runtime/ext/icu/icu.cpp M hphp/runtime/ext/json/JSON_parser.cpp M hphp/runtime/ext/json/ext_json.cpp M hphp/runtime/ext/json/ext_json.h M hphp/runtime/ext/json/ext_json.php A hphp/runtime/ext/mysql/ext_mysql-async.php M hphp/runtime/ext/mysql/ext_mysql.cpp M hphp/runtime/ext/mysql/ext_mysql.h A hphp/runtime/ext/mysql/ext_mysql.php M hphp/runtime/ext/mysql/mysql_common.cpp M hphp/runtime/ext/mysql/mysql_common.h M hphp
[MediaWiki-commits] [Gerrit] Make efFormatNumParserFunction_Setup static - change (mediawiki...FormatNum)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149838
Change subject: Make efFormatNumParserFunction_Setup static
..
Make efFormatNumParserFunction_Setup static
Running phpunit gives Strict standards: call_user_func_array()
expects parameter 1 to be a valid callback, non-static method
FormatNumHooks::efFormatNumParserFunction_Setup() should not
be called statically in mediawiki/includes/Hooks.php on line 207
Change-Id: I81cc113376689b775f6d00948e4a9244b105dadc
---
M FormatNum.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FormatNum
refs/changes/38/149838/1
diff --git a/FormatNum.hooks.php b/FormatNum.hooks.php
index ac4b5a7..3fc18fd 100644
--- a/FormatNum.hooks.php
+++ b/FormatNum.hooks.php
@@ -1,6 +1,6 @@
?php
class FormatNumHooks {
- public function efFormatNumParserFunction_Setup( $parser ) {
+ static function efFormatNumParserFunction_Setup( $parser ) {
# Set a function hook associating the example magic word with our
function
$parser-setFunctionHook( 'formatnum',
'FormatNumHooks::efFormatNumParserFunction_Render' );
return true;
--
To view, visit https://gerrit.wikimedia.org/r/149838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81cc113376689b775f6d00948e4a9244b105dadc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FormatNum
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added cache support for extensions - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Added cache support for extensions
..
Added cache support for extensions
Added db and memcache support for extension
this depends on https://gerrit.wikimedia.org/r/#/c/148354/
Change-Id: I0ad0b1b2399051db882eb9df3052abb9da1051af
---
M Authors/Authors.class.php
M Emoticons/Emoticons.class.php
M PageTemplates/PageTemplates.class.php
M PageTemplates/PageTemplatesAdmin.class.php
M ResponsibleEditors/ResponsibleEditors.class.php
M ResponsibleEditors/includes/ResponsibleEditor.class.php
M ResponsibleEditors/includes/specials/SpecialResponsibleEditors.class.php
M ResponsibleEditors/resources/BS.ResponsibleEditors/AssignmentPanel.js
M ShoutBox/ShoutBox.class.php
M ShoutBox/resources/bluespice.shoutBox.js
M UserSidebar/UserSidebar.class.php
M WantedArticle/WantedArticle.class.php
M WantedArticle/includes/ViewWantedArticleForm.php
13 files changed, 458 insertions(+), 289 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Swidmann: Checked; Looks good to me, but someone else must approve
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index 43285a6..26af819 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -91,6 +91,7 @@
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
$this-setHook( 'BS:UserPageSettings', 'onUserPageSettings' );
+ $this-setHook( 'PageContentSave' );
BsConfig::registerVar( 'MW::Authors::Blacklist', array(
'MediaWiki default' ), BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING );
BsConfig::registerVar( 'MW::Authors::ImageHeight', 40,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT,
'bs-authors-pref-imageheight', 'int' );
@@ -176,98 +177,108 @@
$sPrintable = $this-getRequest()-getVal( 'printable', 'no' );
$iArticleId = $oTitle-getArticleID();
- //HINT: Maybe we want to use MW interface
Article::getContributors() to have better caching
- //HINT2: Check if available in MW 1.17+
- $dbr = wfGetDB( DB_SLAVE );
- $res = $dbr-select(
- array( 'revision' ),
- array( 'rev_user_text', 'MAX(rev_timestamp) AS ts' ),
- array( 'rev_page' = $iArticleId ),
- __METHOD__,
- array(
- 'GROUP BY' = 'rev_user_text',
- 'ORDER BY' = 'ts DESC'
- )
- );
+ $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Authors',
$iArticleId );
+ $aData = BsCacheHelper::get( $sKey );
- if ( $res-numRows() == 0 ) {
- return true;
- }
+ if( $aData !== false ) {
+ wfDebugLog( 'BsMemcached', __CLASS__.': Fetched
AuthorsView from cache' );
+ $oAuthorsView = $aData;
+ } else {
+ wfDebugLog( 'BsMemcached', __CLASS__.': Fetching
AuthorsView from DB' );
+ //HINT: Maybe we want to use MW interface
Article::getContributors() to have better caching
+ //HINT2: Check if available in MW 1.17+
+ // SW: There is still no caching in
WikiPage::getContributors()! 17.07.2014
+ $dbr = wfGetDB( DB_SLAVE );
+ $res = $dbr-select(
+ array( 'revision' ),
+ array( 'rev_user_text', 'MAX(rev_timestamp) AS
ts' ),
+ array( 'rev_page' = $iArticleId ),
+ __METHOD__,
+ array(
+ 'GROUP BY' = 'rev_user_text',
+ 'ORDER BY' = 'ts DESC'
+ )
+ );
- $oAuthorsView = new ViewAuthors();
- if ( $sPrintable == 'yes' ) {
- $oAuthorsView-setOption( 'print', true );
- }
-
- $aUserNames = array();
- foreach ( $res as $row ) {
- $aUserNames[] = $row-rev_user_text;
- }
-
- $iCount = count( $aUserNames );
-
- $sOriginatorUserName =
$oTitle-getFirstRevision()-getUserText();
- $sOriginatorUserName = $this-checkOriginatorForBlacklist(
- $sOriginatorUserName, $oTitle-getFirstRevision(),
$aBlacklist
- );
-
- if ( $iCount 1 ) {
- array_unshift( $aUserNames, $sOriginatorUserName );
- $iCount++;
- }
-
-
[MediaWiki-commits] [Gerrit] Minor profiling fix - change (mediawiki...BlueSpiceFoundation)
Swidmann has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149839
Change subject: Minor profiling fix
..
Minor profiling fix
if wfProfileOut() is missing it increases memory peak while profiling
and profiling provides invalid results
Change-Id: I0612c21f40f1cc9f0396830a4ef5599a158d22fb
---
M includes/Core.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/39/149839/1
diff --git a/includes/Core.class.php b/includes/Core.class.php
index 4bba864..e6c66cb 100644
--- a/includes/Core.class.php
+++ b/includes/Core.class.php
@@ -315,7 +315,7 @@
public static function doInitialise() {
wfProfileIn('Performance: ' . __METHOD__ . ' - Initialize
Core');
self::$oInstance = new BsCore();
- wfProfileIn('Performance: ' . __METHOD__ . ' - Initialize
Core');
+ wfProfileOut('Performance: ' . __METHOD__ . ' - Initialize
Core');
wfProfileIn('Performance: ' . __METHOD__ . ' - Load Settings');
if ( !defined( 'DO_MAINTENANCE' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/149839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0612c21f40f1cc9f0396830a4ef5599a158d22fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Swidmann widm...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor profiling fix - change (mediawiki...BlueSpiceFoundation)
Smuggli has submitted this change and it was merged.
Change subject: Minor profiling fix
..
Minor profiling fix
if wfProfileOut() is missing it increases memory peak while profiling
and profiling provides invalid results
Change-Id: I0612c21f40f1cc9f0396830a4ef5599a158d22fb
---
M includes/Core.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/includes/Core.class.php b/includes/Core.class.php
index 4bba864..e6c66cb 100644
--- a/includes/Core.class.php
+++ b/includes/Core.class.php
@@ -315,7 +315,7 @@
public static function doInitialise() {
wfProfileIn('Performance: ' . __METHOD__ . ' - Initialize
Core');
self::$oInstance = new BsCore();
- wfProfileIn('Performance: ' . __METHOD__ . ' - Initialize
Core');
+ wfProfileOut('Performance: ' . __METHOD__ . ' - Initialize
Core');
wfProfileIn('Performance: ' . __METHOD__ . ' - Load Settings');
if ( !defined( 'DO_MAINTENANCE' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/149839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0612c21f40f1cc9f0396830a4ef5599a158d22fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Swidmann widm...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Language screenshot feature file runs only in language scree... - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Language screenshot feature file runs only in language
screenshot job
..
Language screenshot feature file runs only in language screenshot job
Bug: 68467
Change-Id: Ic05ff20661add53c4a867c1217efb6f36543a1f4
---
M macro.yaml
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index a760c0d..97000ea 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -79,10 +79,10 @@
$WORKSPACE/vendor/bin/bundle install --verbose
if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
-CUCUMBER_EXTRA_PARAMETERS=--tags @language_screenshot
+CUCUMBER_PARAMETER=@language_screenshot
export LANGUAGE_SCREENSHOT_PATH=$WORKSPACE/log
else
-CUCUMBER_EXTRA_PARAMETERS=''
+CUCUMBER_PARAMETER=@{mediawiki_url}
fi
# run tests
@@ -93,9 +93,8 @@
--format pretty \
--format Cucumber::Formatter::Sauce \
--out $WORKSPACE/log/junit \
---tags @{mediawiki_url} \
+--tags $CUCUMBER_PARAMETER \
--tags @$BROWSER_TAG \
-$CUCUMBER_EXTRA_PARAMETERS \
|| (echo -e \nJob has failed (exit code: $?).; false)
if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
--
To view, visit https://gerrit.wikimedia.org/r/149045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic05ff20661add53c4a867c1217efb6f36543a1f4
Gerrit-PatchSet: 9
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide the providers menu on clicking outside of it - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149840
Change subject: Hide the providers menu on clicking outside of it
..
Hide the providers menu on clicking outside of it
Change-Id: I1de9cf0c56cbcecb2502730ce0d223d6a7e9b855
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 7 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/40/149840/1
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 9b477f8..e137d8d 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -292,6 +292,13 @@
e.stopPropagation();
} )
.after( $providersMenu );
+
+ // Hide the dropdown on clicking outside of it
+ $( 'html' ).on( 'click', function ( e ) {
+ if ( !e.isDefaultPrevented() ) {
+ $providersMenu.addClass( 'hidden' );
+ }
+ } );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/149840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1de9cf0c56cbcecb2502730ce0d223d6a7e9b855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use undefined $_POST stuff, avoid isset - change (mediawiki...AdvancedMeta)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149841
Change subject: Don't use undefined $_POST stuff, avoid isset
..
Don't use undefined $_POST stuff, avoid isset
Change-Id: Ib594d9273078afaaf199b1d51322573953eea9ce
Notice: Undefined index: wpTitleAlias in
/srv/vagrant/mediawiki/extensions/AdvancedMeta/AdvancedMeta.php on line 159
Notice: Undefined index: wpKeywords in
/srv/vagrant/mediawiki/extensions/AdvancedMeta/AdvancedMeta.php on line 160
Notice: Undefined index: wpDescription in
/srv/vagrant/mediawiki/extensions/AdvancedMeta/AdvancedMeta.php on line 161
---
M AdvancedMeta.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedMeta
refs/changes/41/149841/1
diff --git a/AdvancedMeta.php b/AdvancedMeta.php
index ee78b20..53a0c92 100644
--- a/AdvancedMeta.php
+++ b/AdvancedMeta.php
@@ -237,11 +237,11 @@
// get meta from the posted forms
$metaData = array(
- 'rindex' = isset( $_POST['wpIndex'] ) ? '1' :
'0',
- 'rfollow' = isset( $_POST['wpFollow'] ) ? '1'
: '0',
- 'titlealias' = htmlspecialchars(
$_POST['wpTitleAlias'] ),
- 'keywords' = htmlspecialchars(
$_POST['wpKeywords'] ),
- 'description' = htmlspecialchars(
$_POST['wpDescription'] )
+ 'rindex' = $_POST['wpIndex'] === ? '1' :
'0',
+ 'rfollow' = $_POST['wpFollow'] === ? '1' :
'0',
+ 'titlealias' = $_POST['wpTitleAlias'] === ?
null : htmlspecialchars( $_POST['wpTitleAlias'] ),
+ 'keywords' = $_POST['wpKeywords'] === ?
null : htmlspecialchars( $_POST['wpKeywords'] ),
+ 'description' = $_POST['wpDescription'] ===
? null : htmlspecialchars( $_POST['wpDescription'] )
);
if ( $id == 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/149841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib594d9273078afaaf199b1d51322573953eea9ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedMeta
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache2: rename apache2_test_config = apache2_test_config_a... - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: apache2: rename apache2_test_config =
apache2_test_config_and_restart
..
apache2: rename apache2_test_config = apache2_test_config_and_restart
The current name is misleading, because it does not communicate the fact that a
successful config test will lead to an Apache 2 restart.
Change-Id: Idcce8723d83b2a0fc231c005d94c6a099ab484a2
---
M modules/apache/manifests/def.pp
M modules/apache/manifests/init.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apache/manifests/def.pp b/modules/apache/manifests/def.pp
index f9c711f..0f42771 100644
--- a/modules/apache/manifests/def.pp
+++ b/modules/apache/manifests/def.pp
@@ -23,6 +23,6 @@
ensure = $ensure,
path = '/etc/apache2/envvars',
line = export APACHE_ARGUMENTS=\\$APACHE_ARGUMENTS -D ${title}\,
-notify = Exec['apache2_test_config'],
+notify = Exec['apache2_test_config_and_restart'],
}
}
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index d593b22..c0da628 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -37,7 +37,7 @@
require= Package['apache2'],
}
-exec { 'apache2_test_config':
+exec { 'apache2_test_config_and_restart':
command = '/usr/sbin/apache2ctl configtest',
notify = Exec['apache2_hard_restart'],
require = Service['apache2'],
--
To view, visit https://gerrit.wikimedia.org/r/149344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcce8723d83b2a0fc231c005d94c6a099ab484a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BaseTemplate: TopMenuBarCustomizer - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: BaseTemplate: TopMenuBarCustomizer
..
BaseTemplate: TopMenuBarCustomizer
* Moved NavigationSites handling to extension TopMenuBarCustomizer pt1
Change-Id: I703ce7d8391c44cc9619d6b3d7a494cfe35cef0c
---
M includes/BsBaseTemplate.php
1 file changed, 4 insertions(+), 23 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index 968abec..18f717d 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -24,12 +24,7 @@
'content' = '' //Gets filled in execute
)
);
- $this-data['bs_navigation_sites'] = array(
- 10 = array(
- 'id' = 'nt-wiki',
- )
- );
- $this-data['bs_navigation_sites_active'] = 'nt-wiki';
+ $this-data['bs_navigation_sites'] = '';
}
/**
@@ -142,20 +137,6 @@
$this-data['bs_navigation_main']['navigation']['class'] =
'icon-menu2';
$this-sortDataArrayByPosition(
$this-data['bs_navigation_main'] );
- if( is_array($this-data['bs_navigation_sites'][10]) ) {
- $this-data['bs_navigation_sites'][10] += array(
- 'href' =
$this-data['nav_urls']['mainpage']['href'],
- 'text' = $this-data['sitename']
- );
- foreach( $this-data['bs_navigation_sites'] as $site )
{
- $site['active'] = false;
- if( $site['id'] ===
$this-data['bs_navigation_sites_active']) {
- $site['active'] = true;
- }
- }
- }
-
- ksort( $this-data['bs_navigation_sites'] );
ksort( $this-data['bs_personal_info'] );
}
@@ -588,9 +569,9 @@
protected function printNavigationSites() {
$aOut = array();
$aOut[] = 'div id=bs-apps';
- $aOut[] = ' ul';
- $aOut[] = $this-processData(
$this-data['bs_navigation_sites'], true );
- $aOut[] = ' /ul';
+ if($this-data['bs_navigation_sites']) {
+ $aOut[] = $this-data['bs_navigation_sites'];
+ }
$aOut[] = '/div';
echo implode(\n, $aOut);
}
--
To view, visit https://gerrit.wikimedia.org/r/148636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I703ce7d8391c44cc9619d6b3d7a494cfe35cef0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Comment used messages - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/149842 Change subject: Comment used messages .. Comment used messages Change-Id: I22594b11f06f349c43162d52646a5c647c6ad0a3 --- M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/42/149842/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index f9b3d91..6964152 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -140,6 +140,11 @@ this.setSize( 'medium' ); // Update the window title + // The following messages can be used here: + // visualeditor-savedialog-title-save + // visualeditor-savedialog-title-reviews + // visualeditor-savedialog-title-conflict + // visualeditor-savedialog-title-nochanges this.title.setLabel( ve.msg( 'visualeditor-savedialog-title-' + panel ) ); // Reset save button if we disabled it for e.g. unrecoverable spam error -- To view, visit https://gerrit.wikimedia.org/r/149842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22594b11f06f349c43162d52646a5c647c6ad0a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PHP Warning: Invalid argument supplied for foreach() in Lang... - change (mediawiki...LanguageTag)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149843
Change subject: PHP Warning: Invalid argument supplied for foreach() in
LanguageTag.body.php
..
PHP Warning: Invalid argument supplied for foreach() in LanguageTag.body.php
Bug: 68711
Change-Id: I09ac07f8c85594407975e5518a47ffa85b0c30e6
---
M LanguageTag.body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTag
refs/changes/43/149843/1
diff --git a/LanguageTag.body.php b/LanguageTag.body.php
index d0a5110..2676260 100644
--- a/LanguageTag.body.php
+++ b/LanguageTag.body.php
@@ -18,9 +18,9 @@
{
public static function LanguageTagParserInit( Parser $parser ) {
-
// at runtime TagLanguages is in the global scope
global $wgLanguageTagLanguages;
+if ( $wgLanguageTagLanguages === null ) return true; // Nothing to do
foreach ($wgLanguageTagLanguages as $Tag) $parser-setHook( $Tag,
'LanguageTag::LanguageTagRender_'.$Tag );
unset($Tag);
--
To view, visit https://gerrit.wikimedia.org/r/149843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09ac07f8c85594407975e5518a47ffa85b0c30e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTag
Gerrit-Branch: master
Gerrit-Owner: Nemo bis federicol...@tiscali.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Function name fix - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149844
Change subject: Function name fix
..
Function name fix
Change-Id: I831612dc467b463f52eed8434639204e645f6fc1
---
M modules/ve/ui/inspectors/ve.ui.FragmentInspector.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/44/149844/1
diff --git a/modules/ve/ui/inspectors/ve.ui.FragmentInspector.js
b/modules/ve/ui/inspectors/ve.ui.FragmentInspector.js
index a823741..3609eb8 100644
--- a/modules/ve/ui/inspectors/ve.ui.FragmentInspector.js
+++ b/modules/ve/ui/inspectors/ve.ui.FragmentInspector.js
@@ -15,7 +15,7 @@
* @param {OO.ui.WindowManager} manager Manager of window
* @param {Object} [config] Configuration options
*/
-ve.ui.FragmentInspector = function OoUiInspector( manager, config ) {
+ve.ui.FragmentInspector = function VeUiFragmentInspector( manager, config ) {
// Parent constructor
ve.ui.FragmentInspector.super.call( this, manager, config );
--
To view, visit https://gerrit.wikimedia.org/r/149844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I831612dc467b463f52eed8434639204e645f6fc1
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tox job for labs/tools/extdist - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Tox job for labs/tools/extdist
..
Tox job for labs/tools/extdist
Just flake8 for now.
Creates: labs-tools-extdist-tox-flake8
Change-Id: I3646c6df3b1320245c598ceb22c433bbcca3867b
---
M labs.yaml
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/labs.yaml b/labs.yaml
index abdfe8f..9e9331a 100644
--- a/labs.yaml
+++ b/labs.yaml
@@ -21,6 +21,13 @@
- '{name}-debian-glue'
- project:
+name: 'labs-tools-extdist'
+toxenv:
+ - flake8
+jobs:
+ - '{name}-tox-{toxenv}'
+
+- project:
name: 'labs-tools-grrrit'
jobs:
- '{name}-jslint'
--
To view, visit https://gerrit.wikimedia.org/r/149815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3646c6df3b1320245c598ceb22c433bbcca3867b
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add zuul config for labs/tools/extdist - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add zuul config for labs/tools/extdist .. Add zuul config for labs/tools/extdist Change-Id: I52b8eeff3f617f99d903e25bac174a8a2a760e66 --- M layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 70df0f4..c6c0ad9 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1150,6 +1150,12 @@ test: - labs-toollabs-debian-glue + - name: labs/tools/extdist +test: + - labs-tools-extdist-tox-flake8 +gate-and-submit: + - labs-tools-extdist-tox-flake8 + - name: labs/tools/grrrit check-voter: - labs-tools-grrrit-jslint -- To view, visit https://gerrit.wikimedia.org/r/149816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52b8eeff3f617f99d903e25bac174a8a2a760e66 Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] BS api base prototype - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149845
Change subject: [WIP] BS api base prototype
..
[WIP] BS api base prototype
* added BSApiBase as prototype for upcoming BlueSpiceExtensions apis
Change-Id: Ib0d5269555a7878384c3d23656d5b3668953b904
---
A includes/api/BSApiBase.php
1 file changed, 51 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/45/149845/1
diff --git a/includes/api/BSApiBase.php b/includes/api/BSApiBase.php
new file mode 100644
index 000..edc4265
--- /dev/null
+++ b/includes/api/BSApiBase.php
@@ -0,0 +1,51 @@
+?php
+if ( !defined( 'MEDIAWIKI' ) ) die( 'this is not a valid entry point');
+
+class BSApiBase extends ApiBase {
+
+ protected static $aTasks = array();
+
+ public function execute() {
+ $params = $this-extractRequestParams();
+ if( !isset($params['task']) ) return;
+
+ if( in_array($params['task'], self::$aTasks) ) {
+ $params = call_user_func(
+ array($this, $params['task']),
+ $params
+ );
+ }
+ $this-getResult()-addValue(null, 'bs', $params);
+ }
+
+ protected static function stdReturn() {
+ return $oReturn = (object) array(
+ 'result' = array(
+ 'data' = null,
+ 'success' = false,
+ 'message' = '',
+ 'errors' = array(),
+ 'data_count' = 0,
+ )
+ );
+ }
+
+ /**
+* Returns a string that identifies the version of the extending class.
+* Typically includes the class name, the svn revision, timestamp, and
+* last author. Usually done with SVN's Id keyword
+* @return string
+* @deprecated since 1.21, version string is no longer supported
+*/
+ public function getVersion() {
+ wfDeprecated( __METHOD__, '1.21' );
+
+ return '';
+ }
+
+ public function getAllowedParams() {
+ return array(
+ 'task'
+ );
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/149845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0d5269555a7878384c3d23656d5b3668953b904
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Guard against Illegal offset type in isset or empty - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149846
Change subject: Guard against Illegal offset type in isset or empty
..
Guard against Illegal offset type in isset or empty
Change-Id: Iddb2bc8bbc83cd0750dfd812db245f4f25a77354
---
M tests/phpunit/SpecialPagesTest.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/46/149846/1
diff --git a/tests/phpunit/SpecialPagesTest.php
b/tests/phpunit/SpecialPagesTest.php
index 1d2973a..af8ef71 100644
--- a/tests/phpunit/SpecialPagesTest.php
+++ b/tests/phpunit/SpecialPagesTest.php
@@ -31,7 +31,7 @@
$pages = array();
foreach ( $wgSpecialPages as $name = $class ) {
- if ( isset( $al[$class] ) ) {
+ if ( is_string( $class ) isset( $al[$class] ) ) {
$pages[] = array( $name );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/149846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddb2bc8bbc83cd0750dfd812db245f4f25a77354
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix socket errors: buffer Apertium stdout - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix socket errors: buffer Apertium stdout
..
Fix socket errors: buffer Apertium stdout
Change-Id: I53bbc76df0099e092b92fee5a186a370f2dbe744
---
M mt/Apertium.js
A mt/apertium.py
2 files changed, 17 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mt/Apertium.js b/mt/Apertium.js
index ced3afb..602e11a 100644
--- a/mt/Apertium.js
+++ b/mt/Apertium.js
@@ -90,7 +90,7 @@
deferred = Q.defer();
rangedSourceText = getRangedText( sourceText );
apertium = spawn(
- 'apertium', [ sourceLang + '-' + targetLang, '-u', '-f', 'html'
], {
+ 'python', [ 'mt/apertium.py', sourceLang + '-' + targetLang,
'-u', '-f', 'html' ], {
stdio: 'pipe',
env: {
PATH: process.env.PATH,
diff --git a/mt/apertium.py b/mt/apertium.py
new file mode 100644
index 000..bbc53cf
--- /dev/null
+++ b/mt/apertium.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+# Apertium 3.2 fails when spawned from nodejs, because it is a shell script
+# running a unix pipeline, and nodejs stdout is a socket rather than a pipe.
+# This wrapper script just provides an intermediate buffer around stdout.
+# It is written in python rather than shell as there are fewer security issues
+# and security restriction problems.
+
+import sys
+import subprocess
+
+args = ['apertium']
+args += sys.argv[1:]
+process = subprocess.Popen(args, stdin=sys.stdin, stdout=subprocess.PIPE)
+for line in process.stdout:
+sys.stdout.write(line)
--
To view, visit https://gerrit.wikimedia.org/r/148968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53bbc76df0099e092b92fee5a186a370f2dbe744
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Divec da...@sheetmusic.org.uk
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve comments - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/149847 Change subject: Improve comments .. Improve comments Change-Id: I6d7d1e2418a475d2ab1a41fd0863e3415ab86f7c --- M tests/phpunit/SpecialPagesTest.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/47/149847/1 diff --git a/tests/phpunit/SpecialPagesTest.php b/tests/phpunit/SpecialPagesTest.php index 1d2973a..ae2d047 100644 --- a/tests/phpunit/SpecialPagesTest.php +++ b/tests/phpunit/SpecialPagesTest.php @@ -1,15 +1,15 @@ ?php /** - * General unit tests for special pages. + * General integration test for special pages. * * @file * @author Niklas Laxström - * @copyright Copyright © 2012-2013, Niklas Laxström * @license GPL-2.0+ */ /** - * Unit tests for making sure special pages execute + * Integration tests for making sure special pages do not fail in unexpected ways when viewed + * without parameters as anonymous or logged in user. * @group Database * @group large */ -- To view, visit https://gerrit.wikimedia.org/r/149847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d7d1e2418a475d2ab1a41fd0863e3415ab86f7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add aliases file for Special:TwoFactorAuth - change (mediawiki...TwoFactorAuthentication)
MegaAlex has uploaded a new change for review. https://gerrit.wikimedia.org/r/149848 Change subject: Add aliases file for Special:TwoFactorAuth .. Add aliases file for Special:TwoFactorAuth Bug: 68698 Change-Id: I37eb96a6f5a74fcb72518a009f0a544edeb14647 --- A TwoFactorAuth.alias.php M TwoFactorAuth.php 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoFactorAuthentication refs/changes/48/149848/1 diff --git a/TwoFactorAuth.alias.php b/TwoFactorAuth.alias.php new file mode 100644 index 000..00ff14c --- /dev/null +++ b/TwoFactorAuth.alias.php @@ -0,0 +1,14 @@ +?php +/** + * Aliases for Special:TwoFactorAuth + * + * @file + * @ingroup Extensions + */ + +$specialPageAliases = array(); + +/** English (English) */ +$specialPageAliases[ 'en' ] = array( +'TwoFactorAuth' = array( 'TwoFactorAuth' ), +); diff --git a/TwoFactorAuth.php b/TwoFactorAuth.php index 779fc26..4b30c20 100644 --- a/TwoFactorAuth.php +++ b/TwoFactorAuth.php @@ -56,6 +56,7 @@ $wgMessagesDirs['TwoFactorAuth'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['TwoFactorAuth'] = __DIR__ . '/TwoFactorAuth.i18n.php'; +$wgExtensionMessagesFiles[ 'TwoFactorAuthAlias' ] = __DIR__ . '/TwoFactorAuth.alias.php'; $wgSpecialPages['TwoFactorAuth'] = 'SpecialTwoFactorAuth'; $wgResourceModules['ext.twofactorauth'] = array( -- To view, visit https://gerrit.wikimedia.org/r/149848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37eb96a6f5a74fcb72518a009f0a544edeb14647 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoFactorAuthentication Gerrit-Branch: master Gerrit-Owner: MegaAlex alexivano...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.ime from upstream - change (mediawiki...UniversalLanguageSelector)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149849
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
Changes:
* Update jquery.ime.js version.
* Updated Tibetian (bo) EWTS IME for handling brla and speed
improvement.
Change-Id: I6a3eb0d1674ea5fd96ef15d4096a5d9ce9f8
---
M lib/jquery.ime/jquery.ime.js
M lib/jquery.ime/rules/bo/bo-ewts.js
2 files changed, 24 insertions(+), 70 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/49/149849/1
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 00a1cf1..9606358 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20140723
+/*! jquery.ime - v0.1.0+20140728
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2014 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
diff --git a/lib/jquery.ime/rules/bo/bo-ewts.js
b/lib/jquery.ime/rules/bo/bo-ewts.js
index 2122bd7..49c81ec 100644
--- a/lib/jquery.ime/rules/bo/bo-ewts.js
+++ b/lib/jquery.ime/rules/bo/bo-ewts.js
@@ -1,64 +1,18 @@
-(function ( $ ) {
+( function ( $ ) {
'use strict';
var patterns = [
// ambiguous cases with b as prefix
['བྲk', 'r', 'བརྐ'],
['བྲg', 'r', 'བརྒ'],
+ ['བྲl', 'r', 'བརླ'],
['བྲj', 'r', 'བརྗ'],
['བྲt', 'r', 'བརྟ'],
['བྲd', 'r', 'བརྡ'],
['བྲn', 'r', 'བརྣ '],
- ['བྲb', 'r', 'བརྦ'],
- ['བྲm', 'r', 'བརྨ'],
- ['བླk', 'l', 'བལྐ'],
- ['བླg', 'l', 'བལྒ'],
- ['བླནg', 'n', 'བལྔ'],
- ['བླc', 'l', 'བལྕ'],
- ['བླj', 'l', 'བལྗ'],
['བླt', 'l', 'བལྟ'],
- ['བླd', 'l', 'བསྡ'],
- ['བླp', 'l', 'བལྤ'],
- ['བླb', 'l', 'བལྦ'],
- ['བླh', 'l', 'བལྷ'],
- // ambiguous cases with g as prefix
- ['གྲk', 'r', 'གརྐ'],
- ['གྲg', 'r', 'གརྒ'],
- ['གྲj', 'r', 'གརྗ'],
- ['གྲt', 'r', 'གརྟ'],
- ['གྲd', 'r', 'གརྡ'],
- ['གྲn', 'r', 'གརྣ '],
- ['གྲb', 'r', 'གརྦ'],
- ['གྲm', 'r', 'གརྨ'],
- ['གླk', 'l', 'གལྐ'],
- ['གླg', 'r', 'གལྒ'],
- ['གླg', 'n', 'གལྔ'],
- ['གླc', 'r', 'གལྕ'],
- ['གླj', 'r', 'གལྗ'],
- ['གླt', 'r', 'གལྟ'],
- ['གླd', 'r', 'གསྡ'],
- ['གླp', 'r', 'གལྤ'],
- ['གླb', 'r', 'གལྦ'],
- ['གླh', 'r', 'གལྷ'],
- // ambiguous cases with d as prefix
- ['དྲk', 'r', 'དརྐ'],
- ['དྲg', 'r', 'དརྒ'],
- ['དྲj', 'r', 'དརྗ'],
- ['དྲt', 'r', 'དརྟ'],
- ['དྲd', 'r', 'དརྡ'],
- ['དྲn', 'r', 'དརྣ '],
- ['དྲb', 'r', 'དརྦ'],
- ['དྲm', 'r', 'དརྨ'],
- // ambiguous cases with m as prefix
- ['མྲk', 'r', 'མརྐ'],
- ['མྲg', 'r', 'མརྒ'],
- ['མྲj', 'r', 'མརྗ'],
- ['མྲt', 'r', 'མརྟ'],
- ['མྲd', 'r', 'མརྡ'],
- ['མྲn', 'r', 'མརྣ '],
- ['མྲb', 'r', 'མརྦ'],
- ['མྲm', 'r', 'མརྨ'],
+ ['བླd', 'l', 'བལྡ'],
// Standard Tibetan Stacks listed at
http://www.thlib.org/reference/transliteration/tibstacks.php
- // some are handled magically and don't need to appear here.
+ // some are handled magically and don't need to appear here.
['རྐy', 'k', 'རྐྱ'],
['རྒy', 'g', 'རྒྱ'],
['རྨy', 'm', 'རྨྱ'],
@@ -185,12 +139,12 @@
['h', '\\+S', 'ྵ'],
['s', '\\+', 'ྶ'],
['h', '\\+', 'ྷ'],
- ['v', '\\+', ྦ༹],
- ['f', '\\+', ྥ༹],
- ['W', '\\+', ྺ],
- ['Y', '\\+', ྻ],
- ['R', '\\+', ྼ],
- ['Z', '\\+', ༹],
+ ['v', '\\+', 'ྦ༹'],
+ ['f', '\\+', 'ྥ༹'],
+ ['W', '\\+', 'ྺ'],
+ ['Y', '\\+', 'ྻ'],
+ ['R', '\\+', 'ྼ'],
+ ['Z', '\\+', '༹'],
// consonants
['k', 'ཀ'],
['ཀh', 'k', 'ཁ'],
@@ -242,7 +196,7 @@
['([ཀ-ྼ])i', '$1ི'],
['([ཀ-ྼ])u', '$1ུ'],
['([ཀ-ྼ])e', '$1ེ'],
- ['([ཀ-ྼ])o', $1ོ],
+ ['([ཀ-ྼ])o', '$1ོ'],
['([ཀ-ྼ])A', '$1ཱ'],
['([ཀ-ྼ])I', '$1ཱི'],
['([ཀ-ྼ])U', '$1ཱུ'],
@@ -269,11 +223,11 @@
['8', '༨'],
['9', '༩'],
// sanskrit marks
- ['H', ཿ],
- ['M', ཾ],
- ['~M', ྃ],
- ['~M`', ྂ],
- ['\\?', ྄],
+ ['H', 'ཿ'],
+ ['M', 'ཾ'],
+ ['~M', 'ྃ'],
+ ['~M`', 'ྂ'],
+ ['\\?', '྄'],
['', '྅'],
// punctuation
[' ', '་'],
@@ -294,20 +248,20 @@
['', '༻'],
['\\(', '༼'],
['\\)', '༽'],
- ['~X', ༵],
- ['X', ༷],
- ['\\^', ༹]
+ ['~X', '༵'],
+ ['X', '༷'],
+ ['\\^', '༹']
];
var boEWTS = {
id: 'bo-ewts',
name: 'Tibetan EWTS transliteration',
- description: 'Tibetan Extended Wylie Transliteration, based on
a href=http://www.thlib.org/reference/transliteration/#!essay=/thl/ewts;the
work of thdl/a.',
- date: '2014-07-02',
- URL: 'http://github.com/wikimedia/jquery.ime
[MediaWiki-commits] [Gerrit] Update jquery.ime from upstream - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
Changes:
* Update jquery.ime.js version.
* Updated Tibetian (bo) EWTS IME for handling brla and speed
improvement.
Change-Id: I6a3eb0d1674ea5fd96ef15d4096a5d9ce9f8
---
M lib/jquery.ime/jquery.ime.js
M lib/jquery.ime/rules/bo/bo-ewts.js
2 files changed, 24 insertions(+), 70 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 00a1cf1..9606358 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20140723
+/*! jquery.ime - v0.1.0+20140728
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2014 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
diff --git a/lib/jquery.ime/rules/bo/bo-ewts.js
b/lib/jquery.ime/rules/bo/bo-ewts.js
index 2122bd7..49c81ec 100644
--- a/lib/jquery.ime/rules/bo/bo-ewts.js
+++ b/lib/jquery.ime/rules/bo/bo-ewts.js
@@ -1,64 +1,18 @@
-(function ( $ ) {
+( function ( $ ) {
'use strict';
var patterns = [
// ambiguous cases with b as prefix
['བྲk', 'r', 'བརྐ'],
['བྲg', 'r', 'བརྒ'],
+ ['བྲl', 'r', 'བརླ'],
['བྲj', 'r', 'བརྗ'],
['བྲt', 'r', 'བརྟ'],
['བྲd', 'r', 'བརྡ'],
['བྲn', 'r', 'བརྣ '],
- ['བྲb', 'r', 'བརྦ'],
- ['བྲm', 'r', 'བརྨ'],
- ['བླk', 'l', 'བལྐ'],
- ['བླg', 'l', 'བལྒ'],
- ['བླནg', 'n', 'བལྔ'],
- ['བླc', 'l', 'བལྕ'],
- ['བླj', 'l', 'བལྗ'],
['བླt', 'l', 'བལྟ'],
- ['བླd', 'l', 'བསྡ'],
- ['བླp', 'l', 'བལྤ'],
- ['བླb', 'l', 'བལྦ'],
- ['བླh', 'l', 'བལྷ'],
- // ambiguous cases with g as prefix
- ['གྲk', 'r', 'གརྐ'],
- ['གྲg', 'r', 'གརྒ'],
- ['གྲj', 'r', 'གརྗ'],
- ['གྲt', 'r', 'གརྟ'],
- ['གྲd', 'r', 'གརྡ'],
- ['གྲn', 'r', 'གརྣ '],
- ['གྲb', 'r', 'གརྦ'],
- ['གྲm', 'r', 'གརྨ'],
- ['གླk', 'l', 'གལྐ'],
- ['གླg', 'r', 'གལྒ'],
- ['གླg', 'n', 'གལྔ'],
- ['གླc', 'r', 'གལྕ'],
- ['གླj', 'r', 'གལྗ'],
- ['གླt', 'r', 'གལྟ'],
- ['གླd', 'r', 'གསྡ'],
- ['གླp', 'r', 'གལྤ'],
- ['གླb', 'r', 'གལྦ'],
- ['གླh', 'r', 'གལྷ'],
- // ambiguous cases with d as prefix
- ['དྲk', 'r', 'དརྐ'],
- ['དྲg', 'r', 'དརྒ'],
- ['དྲj', 'r', 'དརྗ'],
- ['དྲt', 'r', 'དརྟ'],
- ['དྲd', 'r', 'དརྡ'],
- ['དྲn', 'r', 'དརྣ '],
- ['དྲb', 'r', 'དརྦ'],
- ['དྲm', 'r', 'དརྨ'],
- // ambiguous cases with m as prefix
- ['མྲk', 'r', 'མརྐ'],
- ['མྲg', 'r', 'མརྒ'],
- ['མྲj', 'r', 'མརྗ'],
- ['མྲt', 'r', 'མརྟ'],
- ['མྲd', 'r', 'མརྡ'],
- ['མྲn', 'r', 'མརྣ '],
- ['མྲb', 'r', 'མརྦ'],
- ['མྲm', 'r', 'མརྨ'],
+ ['བླd', 'l', 'བལྡ'],
// Standard Tibetan Stacks listed at
http://www.thlib.org/reference/transliteration/tibstacks.php
- // some are handled magically and don't need to appear here.
+ // some are handled magically and don't need to appear here.
['རྐy', 'k', 'རྐྱ'],
['རྒy', 'g', 'རྒྱ'],
['རྨy', 'm', 'རྨྱ'],
@@ -185,12 +139,12 @@
['h', '\\+S', 'ྵ'],
['s', '\\+', 'ྶ'],
['h', '\\+', 'ྷ'],
- ['v', '\\+', ྦ༹],
- ['f', '\\+', ྥ༹],
- ['W', '\\+', ྺ],
- ['Y', '\\+', ྻ],
- ['R', '\\+', ྼ],
- ['Z', '\\+', ༹],
+ ['v', '\\+', 'ྦ༹'],
+ ['f', '\\+', 'ྥ༹'],
+ ['W', '\\+', 'ྺ'],
+ ['Y', '\\+', 'ྻ'],
+ ['R', '\\+', 'ྼ'],
+ ['Z', '\\+', '༹'],
// consonants
['k', 'ཀ'],
['ཀh', 'k', 'ཁ'],
@@ -242,7 +196,7 @@
['([ཀ-ྼ])i', '$1ི'],
['([ཀ-ྼ])u', '$1ུ'],
['([ཀ-ྼ])e', '$1ེ'],
- ['([ཀ-ྼ])o', $1ོ],
+ ['([ཀ-ྼ])o', '$1ོ'],
['([ཀ-ྼ])A', '$1ཱ'],
['([ཀ-ྼ])I', '$1ཱི'],
['([ཀ-ྼ])U', '$1ཱུ'],
@@ -269,11 +223,11 @@
['8', '༨'],
['9', '༩'],
// sanskrit marks
- ['H', ཿ],
- ['M', ཾ],
- ['~M', ྃ],
- ['~M`', ྂ],
- ['\\?', ྄],
+ ['H', 'ཿ'],
+ ['M', 'ཾ'],
+ ['~M', 'ྃ'],
+ ['~M`', 'ྂ'],
+ ['\\?', '྄'],
['', '྅'],
// punctuation
[' ', '་'],
@@ -294,20 +248,20 @@
['', '༻'],
['\\(', '༼'],
['\\)', '༽'],
- ['~X', ༵],
- ['X', ༷],
- ['\\^', ༹]
+ ['~X', '༵'],
+ ['X', '༷'],
+ ['\\^', '༹']
];
var boEWTS = {
id: 'bo-ewts',
name: 'Tibetan EWTS transliteration',
- description: 'Tibetan Extended Wylie Transliteration, based on
a href=http://www.thlib.org/reference/transliteration/#!essay=/thl/ewts;the
work of thdl/a.',
- date: '2014-07-02',
- URL: 'http://github.com/wikimedia/jquery.ime',
+ description: 'Tibetan Extended Wylie Transliteration, based
[MediaWiki-commits] [Gerrit] Imported Upstream version 3.3-dev+20140728 - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149850 Change subject: Imported Upstream version 3.3-dev+20140728 .. Imported Upstream version 3.3-dev+20140728 --- M .gitignore M CMake/FindLibDwarf.cmake M CMake/FollySetup.cmake M CMake/HPHPCompiler.cmake M CMake/HPHPFunctions.cmake M CMake/HPHPSetup.cmake M CMake/Options.cmake M hphp/compiler/analysis/emitter.cpp M hphp/compiler/compiler.cpp A hphp/hack/editor-plugins/emacs/hack-mode.el M hphp/hack/hhi/classes.hhi M hphp/hack/hhi/stdlib/builtins_apache.idl.hhi M hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi M hphp/hack/hhi/stdlib/builtins_json.idl.hhi M hphp/hack/hhi/stdlib/builtins_server.idl.hhi M hphp/hack/hhi/stdlib/builtins_string.idl.hhi M hphp/hack/hhi/stdlib/builtins_url.idl.hhi A hphp/hack/hhi/stdlib/bultins_filter.hhi M hphp/hack/src/client/Makefile M hphp/hack/src/client/clientArgs.ml A hphp/hack/src/client/clientArgumentInfo.ml M hphp/hack/src/client/clientBuild.ml M hphp/hack/src/client/clientCheck.ml M hphp/hack/src/client/clientEnv.ml M hphp/hack/src/globals/autocomplete.ml M hphp/hack/src/heap/sharedMem.ml M hphp/hack/src/js/hh_ide.ml M hphp/hack/src/naming/nast.ml M hphp/hack/src/parsing/parser_hack.ml M hphp/hack/src/server/Makefile A hphp/hack/src/server/argumentInfoService.ml M hphp/hack/src/server/hackProgram.ml A hphp/hack/src/server/serverArgumentInfo.ml M hphp/hack/src/server/serverMsg.ml M hphp/hack/src/typing/typing.ml M hphp/hack/src/typing/typing_compare.ml M hphp/hack/src/typing/typing_decl.ml M hphp/hack/src/typing/typing_enum.ml M hphp/hack/src/typing/typing_env.ml M hphp/hack/src/typing/typing_reason.ml M hphp/hack/src/typing/typing_utils.ml M hphp/hack/src/utils/errors.ml M hphp/hack/src/utils/errors.mli A hphp/hack/test/typecheck/async_function_untyped1.php A hphp/hack/test/typecheck/async_function_untyped1.php.exp A hphp/hack/test/typecheck/async_function_untyped2.php A hphp/hack/test/typecheck/async_function_untyped2.php.exp A hphp/hack/test/typecheck/async_function_untyped3.php A hphp/hack/test/typecheck/async_function_untyped3.php.exp A hphp/hack/test/typecheck/async_function_untyped4.php A hphp/hack/test/typecheck/async_function_untyped4.php.exp A hphp/hack/test/typecheck/async_function_untyped5.php A hphp/hack/test/typecheck/async_function_untyped5.php.exp A hphp/hack/test/typecheck/async_function_untyped6.php A hphp/hack/test/typecheck/async_function_untyped6.php.exp M hphp/hack/test/typecheck/enum_7.php M hphp/hack/test/typecheck/enum_7.php.exp A hphp/hack/test/typecheck/shapes_cc_10.php A hphp/hack/test/typecheck/shapes_cc_10.php.exp M hphp/hack/test/typecheck/shapes_cc_7.php.exp A hphp/hack/test/typecheck/shapes_cc_8.php A hphp/hack/test/typecheck/shapes_cc_8.php.exp A hphp/hack/test/typecheck/shapes_cc_9.php A hphp/hack/test/typecheck/shapes_cc_9.php.exp A hphp/hack/test/typecheck/yield_send1.php A hphp/hack/test/typecheck/yield_send1.php.exp A hphp/hack/test/typecheck/yield_send2.php A hphp/hack/test/typecheck/yield_send2.php.exp A hphp/hack/test/typecheck/yield_send3.php A hphp/hack/test/typecheck/yield_send3.php.exp A hphp/hack/test/typecheck/yield_send4.php A hphp/hack/test/typecheck/yield_send4.php.exp A hphp/hack/test/typecheck/yield_send5.php A hphp/hack/test/typecheck/yield_send5.php.exp M hphp/hhbbc/emit.cpp M hphp/hhbbc/index.cpp M hphp/hhbbc/parse.cpp M hphp/hhvm/CMakeLists.txt M hphp/parser/hphp.tab.cpp M hphp/parser/hphp.y M hphp/runtime/base/http-client.cpp M hphp/runtime/base/http-stream-wrapper.cpp M hphp/runtime/base/mixed-array.cpp M hphp/runtime/base/mixed-array.h M hphp/runtime/base/object-data.cpp M hphp/runtime/base/program-functions.cpp M hphp/runtime/base/proxy-array.h M hphp/runtime/base/request-event-handler.h M hphp/runtime/base/request-injection-data.cpp M hphp/runtime/base/request-injection-data.h M hphp/runtime/base/runtime-option.h M hphp/runtime/base/smart-containers.h M hphp/runtime/base/variable-serializer.cpp M hphp/runtime/base/variable-unserializer.h M hphp/runtime/ext/asio/asio_blockable.cpp M hphp/runtime/ext/asio/asio_session.cpp M hphp/runtime/ext/asio/asio_session.h A hphp/runtime/ext/asio/await_all_wait_handle.cpp A hphp/runtime/ext/asio/await_all_wait_handle.h M hphp/runtime/ext/asio/wait_handle.h M hphp/runtime/ext/asio/waitable_wait_handle.cpp M hphp/runtime/ext/ext_asio.h M hphp/runtime/ext/ext_collections.h M hphp/runtime/ext/ext_hotprofiler.cpp M hphp/runtime/ext/ext_hotprofiler.h M hphp/runtime/ext/ext_posix.cpp M hphp/runtime/ext/icu/ext_icu_date_fmt.cpp M hphp/runtime/ext/icu/icu.cpp M hphp/runtime/ext/json/JSON_parser.cpp M hphp/runtime/ext/json/ext_json.cpp M hphp/runtime/ext/json/ext_json.h M hphp/runtime/ext/json/ext_json.php A hphp/runtime/ext/mysql/ext_mysql-async.php M hphp/runtime/ext/mysql/ext_mysql.cpp M hphp/runtime/ext/mysql/ext_mysql.h A hphp/runtime/ext/mysql/ext_mysql.php M hphp/runtime/ext/mysql/mysql_common.cpp M hphp/runtime/ext
[MediaWiki-commits] [Gerrit] Update the patchsets to apply cleanly - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149851
Change subject: Update the patchsets to apply cleanly
..
Update the patchsets to apply cleanly
- New rebased stream wrappers patch
- EZC fix has been merged upstream
- Removed the stale patches
---
D
debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
M
debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch
D debian/patches/public_headers_system.stale
M debian/patches/remove_libpam
M debian/patches/series
D debian/patches/use_system_double_conversion.stale
D debian/patches/use_system_libsqlite3.stale
D debian/patches/use_system_libzip.stale
D debian/patches/use_system_lz4.stale
9 files changed, 87 insertions(+), 480 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm
refs/changes/51/149851/1
diff --git
a/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
b/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
deleted file mode 100644
index d65b9e5..000
---
a/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 22f01359490d0290b06de9da6dc33dd68fc7ed3e Mon Sep 17 00:00:00 2001
-From: Tim Starling tstarl...@wikimedia.org
-Date: Mon, 7 Jul 2014 13:01:09 +1000
-Subject: [PATCH] EZC: fix crash due to EG(exception) being transmitted between
- requests
-
-When an exception was thrown from EZC, EG(exception) was left holding a
-reference to the smart-allocated exception object, even after the end of
-the request. At the end of the request, the object storage was freed by
-resetAllocator(), then when zend_wrap_func() was entered in the next
-request, EG(exception) would be freed again, causing a crash.
-
-Fixed by installing request event handlers. The requestInit() handler is
-analogous to Zend's init_executor(). Defer
-ZendObjectStore::requestShutdown() until after EG(exception) is deleted,
-to avoid an assertion from ExecutionContext::registerRequestEventHandler
-due to duplicate registration.
- .../ext_zend_compat/hhvm/zend-object-store.h | 8 -
- .../ext_zend_compat/php-src/Zend/zend_globals.cpp | 41 +++---
- 2 files changed, 44 insertions(+), 5 deletions(-)
-
-diff --git a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
-index 9672a3f..86a6126 100644
a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
-+++ b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
-@@ -36,9 +36,15 @@ class ZendObjectStore final : public RequestEventHandler {
- : m_free_list_head(0)
- {}
-
--virtual void requestInit() {};
-+virtual void requestInit() {}
- virtual void requestShutdown();
-
-+// Defer shutdown until after other requestShutdown hooks are done
-+// freeing their objects.
-+virtual int priority() const {
-+ return 10;
-+}
-+
- zend_object_handle insertObject(void *object,
- zend_objects_store_dtor_t dtor,
- zend_objects_free_object_storage_t free_storage,
-diff --git a/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
b/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
-index ba3a970..c87f07d 100644
a/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
-+++ b/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
-@@ -1,28 +1,61 @@
- #include zend.h
- #include zend_globals.h
-+#include zend_exceptions.h
-
- #include hphp/runtime/base/externals.h
- #include hphp/util/thread-local.h
- #include hphp/runtime/base/execution-context.h
- #include hphp/runtime/base/thread-info.h
- #include hphp/runtime/base/request-injection-data.h
-+#include hphp/runtime/base/request-local.h
-+#include hphp/runtime/base/request-event-handler.h
-
- ZEND_API zend_compiler_globals compiler_globals;
-
--static IMPLEMENT_THREAD_LOCAL(_zend_executor_globals,
s_zend_executor_globals);
-+namespace HPHP {
-+
-+class ZendExecutorGlobals : public RequestEventHandler {
-+ public:
-+virtual void requestInit() {
-+ m_data.exception = nullptr;
-+ m_data.prev_exception = nullptr;
-+}
-+
-+virtual void requestShutdown() {
-+ zval * tmp;
-+ if (m_data.exception) {
-+tmp = m_data.exception;
-+m_data.exception = nullptr;
-+zval_ptr_dtor(tmp);
-+ }
-+ if (m_data.prev_exception) {
-+tmp = m_data.prev_exception;
-+m_data.prev_exception = nullptr;
-+zval_ptr_dtor(tmp);
-+ }
-+}
-+
-+virtual ~ZendExecutorGlobals() {}
-+
-+_zend_executor_globals m_data;
-+};
-+
-+IMPLEMENT_STATIC_REQUEST_LOCAL(ZendExecutorGlobals, s_zend_executor_globals);
-+
-+} // namespace HPHP
-
- #define G(TYPE, MEMBER) \
-
[MediaWiki-commits] [Gerrit] version bump; add postrm hook - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/149852 Change subject: version bump; add postrm hook .. version bump; add postrm hook Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M debian/changelog A debian/hhvm.postrm 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm refs/changes/52/149852/1 diff --git a/debian/changelog b/debian/changelog index da082ef..ff2d932 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hhvm (3.3-dev+20140728) trusty-wikimedia; urgency=low + + * Refreshed the source from the git master + * Added postinst/postrm hooks for update-alternatives + * Refreshed the list of patches we apply + + -- Giuseppe Lavagetto glavage...@wikimedia.org Mon, 28 Jul 2014 13:23:42 +0200 + hhvm (3.1+20140723-1+wmf1) trusty-wikimedia; urgency=medium * Refreshed the sources to the latest git master diff --git a/debian/hhvm.postrm b/debian/hhvm.postrm new file mode 100755 index 000..489ec54 --- /dev/null +++ b/debian/hhvm.postrm @@ -0,0 +1,2 @@ +#!/bin/bash -e +/usr/bin/update-alternatives --remove php /usr/bin/hhvm -- To view, visit https://gerrit.wikimedia.org/r/149852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1717518ae1a509e5ba9761fb22e24bfae06588b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Imported Upstream version 3.3-dev+20140728 - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Imported Upstream version 3.3-dev+20140728 .. Imported Upstream version 3.3-dev+20140728 --- M .gitignore M CMake/FindLibDwarf.cmake M CMake/FollySetup.cmake M CMake/HPHPCompiler.cmake M CMake/HPHPFunctions.cmake M CMake/HPHPSetup.cmake M CMake/Options.cmake M hphp/compiler/analysis/emitter.cpp M hphp/compiler/compiler.cpp A hphp/hack/editor-plugins/emacs/hack-mode.el M hphp/hack/hhi/classes.hhi M hphp/hack/hhi/stdlib/builtins_apache.idl.hhi M hphp/hack/hhi/stdlib/builtins_datetime.idl.hhi M hphp/hack/hhi/stdlib/builtins_json.idl.hhi M hphp/hack/hhi/stdlib/builtins_server.idl.hhi M hphp/hack/hhi/stdlib/builtins_string.idl.hhi M hphp/hack/hhi/stdlib/builtins_url.idl.hhi A hphp/hack/hhi/stdlib/bultins_filter.hhi M hphp/hack/src/client/Makefile M hphp/hack/src/client/clientArgs.ml A hphp/hack/src/client/clientArgumentInfo.ml M hphp/hack/src/client/clientBuild.ml M hphp/hack/src/client/clientCheck.ml M hphp/hack/src/client/clientEnv.ml M hphp/hack/src/globals/autocomplete.ml M hphp/hack/src/heap/sharedMem.ml M hphp/hack/src/js/hh_ide.ml M hphp/hack/src/naming/nast.ml M hphp/hack/src/parsing/parser_hack.ml M hphp/hack/src/server/Makefile A hphp/hack/src/server/argumentInfoService.ml M hphp/hack/src/server/hackProgram.ml A hphp/hack/src/server/serverArgumentInfo.ml M hphp/hack/src/server/serverMsg.ml M hphp/hack/src/typing/typing.ml M hphp/hack/src/typing/typing_compare.ml M hphp/hack/src/typing/typing_decl.ml M hphp/hack/src/typing/typing_enum.ml M hphp/hack/src/typing/typing_env.ml M hphp/hack/src/typing/typing_reason.ml M hphp/hack/src/typing/typing_utils.ml M hphp/hack/src/utils/errors.ml M hphp/hack/src/utils/errors.mli A hphp/hack/test/typecheck/async_function_untyped1.php A hphp/hack/test/typecheck/async_function_untyped1.php.exp A hphp/hack/test/typecheck/async_function_untyped2.php A hphp/hack/test/typecheck/async_function_untyped2.php.exp A hphp/hack/test/typecheck/async_function_untyped3.php A hphp/hack/test/typecheck/async_function_untyped3.php.exp A hphp/hack/test/typecheck/async_function_untyped4.php A hphp/hack/test/typecheck/async_function_untyped4.php.exp A hphp/hack/test/typecheck/async_function_untyped5.php A hphp/hack/test/typecheck/async_function_untyped5.php.exp A hphp/hack/test/typecheck/async_function_untyped6.php A hphp/hack/test/typecheck/async_function_untyped6.php.exp M hphp/hack/test/typecheck/enum_7.php M hphp/hack/test/typecheck/enum_7.php.exp A hphp/hack/test/typecheck/shapes_cc_10.php A hphp/hack/test/typecheck/shapes_cc_10.php.exp M hphp/hack/test/typecheck/shapes_cc_7.php.exp A hphp/hack/test/typecheck/shapes_cc_8.php A hphp/hack/test/typecheck/shapes_cc_8.php.exp A hphp/hack/test/typecheck/shapes_cc_9.php A hphp/hack/test/typecheck/shapes_cc_9.php.exp A hphp/hack/test/typecheck/yield_send1.php A hphp/hack/test/typecheck/yield_send1.php.exp A hphp/hack/test/typecheck/yield_send2.php A hphp/hack/test/typecheck/yield_send2.php.exp A hphp/hack/test/typecheck/yield_send3.php A hphp/hack/test/typecheck/yield_send3.php.exp A hphp/hack/test/typecheck/yield_send4.php A hphp/hack/test/typecheck/yield_send4.php.exp A hphp/hack/test/typecheck/yield_send5.php A hphp/hack/test/typecheck/yield_send5.php.exp M hphp/hhbbc/emit.cpp M hphp/hhbbc/index.cpp M hphp/hhbbc/parse.cpp M hphp/hhvm/CMakeLists.txt M hphp/parser/hphp.tab.cpp M hphp/parser/hphp.y M hphp/runtime/base/http-client.cpp M hphp/runtime/base/http-stream-wrapper.cpp M hphp/runtime/base/mixed-array.cpp M hphp/runtime/base/mixed-array.h M hphp/runtime/base/object-data.cpp M hphp/runtime/base/program-functions.cpp M hphp/runtime/base/proxy-array.h M hphp/runtime/base/request-event-handler.h M hphp/runtime/base/request-injection-data.cpp M hphp/runtime/base/request-injection-data.h M hphp/runtime/base/runtime-option.h M hphp/runtime/base/smart-containers.h M hphp/runtime/base/variable-serializer.cpp M hphp/runtime/base/variable-unserializer.h M hphp/runtime/ext/asio/asio_blockable.cpp M hphp/runtime/ext/asio/asio_session.cpp M hphp/runtime/ext/asio/asio_session.h A hphp/runtime/ext/asio/await_all_wait_handle.cpp A hphp/runtime/ext/asio/await_all_wait_handle.h M hphp/runtime/ext/asio/wait_handle.h M hphp/runtime/ext/asio/waitable_wait_handle.cpp M hphp/runtime/ext/ext_asio.h M hphp/runtime/ext/ext_collections.h M hphp/runtime/ext/ext_hotprofiler.cpp M hphp/runtime/ext/ext_hotprofiler.h M hphp/runtime/ext/ext_posix.cpp M hphp/runtime/ext/icu/ext_icu_date_fmt.cpp M hphp/runtime/ext/icu/icu.cpp M hphp/runtime/ext/json/JSON_parser.cpp M hphp/runtime/ext/json/ext_json.cpp M hphp/runtime/ext/json/ext_json.h M hphp/runtime/ext/json/ext_json.php A hphp/runtime/ext/mysql/ext_mysql-async.php M hphp/runtime/ext/mysql/ext_mysql.cpp M hphp/runtime/ext/mysql/ext_mysql.h A hphp/runtime/ext/mysql/ext_mysql.php M hphp/runtime/ext/mysql/mysql_common.cpp M hphp/runtime/ext/mysql/mysql_common.h M hphp
[MediaWiki-commits] [Gerrit] Update the patchsets to apply cleanly - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Update the patchsets to apply cleanly
..
Update the patchsets to apply cleanly
- New rebased stream wrappers patch
- EZC fix has been merged upstream
- Removed the stale patches
---
D
debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
M
debian/patches/Support-stream-wrappers-in-XML-parser-extensions-add-external-entity-loader.patch
D debian/patches/public_headers_system.stale
M debian/patches/remove_libpam
M debian/patches/series
D debian/patches/use_system_double_conversion.stale
D debian/patches/use_system_libsqlite3.stale
D debian/patches/use_system_libzip.stale
D debian/patches/use_system_lz4.stale
9 files changed, 87 insertions(+), 480 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git
a/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
b/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
deleted file mode 100644
index d65b9e5..000
---
a/debian/patches/EZC-fix-crash-due-to-EG-being-transmitted-between-requests.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 22f01359490d0290b06de9da6dc33dd68fc7ed3e Mon Sep 17 00:00:00 2001
-From: Tim Starling tstarl...@wikimedia.org
-Date: Mon, 7 Jul 2014 13:01:09 +1000
-Subject: [PATCH] EZC: fix crash due to EG(exception) being transmitted between
- requests
-
-When an exception was thrown from EZC, EG(exception) was left holding a
-reference to the smart-allocated exception object, even after the end of
-the request. At the end of the request, the object storage was freed by
-resetAllocator(), then when zend_wrap_func() was entered in the next
-request, EG(exception) would be freed again, causing a crash.
-
-Fixed by installing request event handlers. The requestInit() handler is
-analogous to Zend's init_executor(). Defer
-ZendObjectStore::requestShutdown() until after EG(exception) is deleted,
-to avoid an assertion from ExecutionContext::registerRequestEventHandler
-due to duplicate registration.
- .../ext_zend_compat/hhvm/zend-object-store.h | 8 -
- .../ext_zend_compat/php-src/Zend/zend_globals.cpp | 41 +++---
- 2 files changed, 44 insertions(+), 5 deletions(-)
-
-diff --git a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
-index 9672a3f..86a6126 100644
a/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
-+++ b/hphp/runtime/ext_zend_compat/hhvm/zend-object-store.h
-@@ -36,9 +36,15 @@ class ZendObjectStore final : public RequestEventHandler {
- : m_free_list_head(0)
- {}
-
--virtual void requestInit() {};
-+virtual void requestInit() {}
- virtual void requestShutdown();
-
-+// Defer shutdown until after other requestShutdown hooks are done
-+// freeing their objects.
-+virtual int priority() const {
-+ return 10;
-+}
-+
- zend_object_handle insertObject(void *object,
- zend_objects_store_dtor_t dtor,
- zend_objects_free_object_storage_t free_storage,
-diff --git a/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
b/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
-index ba3a970..c87f07d 100644
a/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
-+++ b/hphp/runtime/ext_zend_compat/php-src/Zend/zend_globals.cpp
-@@ -1,28 +1,61 @@
- #include zend.h
- #include zend_globals.h
-+#include zend_exceptions.h
-
- #include hphp/runtime/base/externals.h
- #include hphp/util/thread-local.h
- #include hphp/runtime/base/execution-context.h
- #include hphp/runtime/base/thread-info.h
- #include hphp/runtime/base/request-injection-data.h
-+#include hphp/runtime/base/request-local.h
-+#include hphp/runtime/base/request-event-handler.h
-
- ZEND_API zend_compiler_globals compiler_globals;
-
--static IMPLEMENT_THREAD_LOCAL(_zend_executor_globals,
s_zend_executor_globals);
-+namespace HPHP {
-+
-+class ZendExecutorGlobals : public RequestEventHandler {
-+ public:
-+virtual void requestInit() {
-+ m_data.exception = nullptr;
-+ m_data.prev_exception = nullptr;
-+}
-+
-+virtual void requestShutdown() {
-+ zval * tmp;
-+ if (m_data.exception) {
-+tmp = m_data.exception;
-+m_data.exception = nullptr;
-+zval_ptr_dtor(tmp);
-+ }
-+ if (m_data.prev_exception) {
-+tmp = m_data.prev_exception;
-+m_data.prev_exception = nullptr;
-+zval_ptr_dtor(tmp);
-+ }
-+}
-+
-+virtual ~ZendExecutorGlobals() {}
-+
-+_zend_executor_globals m_data;
-+};
-+
-+IMPLEMENT_STATIC_REQUEST_LOCAL(ZendExecutorGlobals, s_zend_executor_globals);
-+
-+} // namespace HPHP
-
- #define G(TYPE, MEMBER) \
- std::add_lvalue_referenceTYPE::type EG_ ## MEMBER() { \
--return
[MediaWiki-commits] [Gerrit] version bump; add postrm hook - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: version bump; add postrm hook .. version bump; add postrm hook Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M debian/changelog A debian/hhvm.postrm 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index da082ef..ff2d932 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hhvm (3.3-dev+20140728) trusty-wikimedia; urgency=low + + * Refreshed the source from the git master + * Added postinst/postrm hooks for update-alternatives + * Refreshed the list of patches we apply + + -- Giuseppe Lavagetto glavage...@wikimedia.org Mon, 28 Jul 2014 13:23:42 +0200 + hhvm (3.1+20140723-1+wmf1) trusty-wikimedia; urgency=medium * Refreshed the sources to the latest git master diff --git a/debian/hhvm.postrm b/debian/hhvm.postrm new file mode 100755 index 000..489ec54 --- /dev/null +++ b/debian/hhvm.postrm @@ -0,0 +1,2 @@ +#!/bin/bash -e +/usr/bin/update-alternatives --remove php /usr/bin/hhvm -- To view, visit https://gerrit.wikimedia.org/r/149852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1717518ae1a509e5ba9761fb22e24bfae06588b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable hhvm hotprofiler - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Enable hhvm hotprofiler .. Enable hhvm hotprofiler I asked brett the other day about hotprofiler at lunch, and he indicated that having it compiled in is standard procedure. When hotprofiler is disabled xhprof_disable() always returns null, with it enabled we get full profiling data. Change-Id: Icaf42b2efcc0fac7e6b9faa99f8d81fa9c602229 --- M debian/rules 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Filippo Giunchedi: Looks good to me, but someone else must approve Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/debian/rules b/debian/rules index 354928e..511edf2 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ dh_auto_configure -- \ -DUSE_JSONC=ON \ -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2/ \ + -DHOTPROFILER=ON \ -DCMAKE_INSTALL_PREFIX=/usr ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -- To view, visit https://gerrit.wikimedia.org/r/148850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icaf42b2efcc0fac7e6b9faa99f8d81fa9c602229 Gerrit-PatchSet: 3 Gerrit-Project: operations/debs/hhvm Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New version: 0.6 - change (mediawiki...DataTransfer)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149853
Change subject: New version: 0.6
..
New version: 0.6
Change-Id: I97c8b9960c5ef9623e188827dc5ce39c0cdd5f72
---
M DataTransfer.php
M INSTALL
M README
3 files changed, 19 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataTransfer
refs/changes/53/149853/1
diff --git a/DataTransfer.php b/DataTransfer.php
index abe9b7d..1b4bffb 100644
--- a/DataTransfer.php
+++ b/DataTransfer.php
@@ -7,7 +7,7 @@
if ( !defined( 'MEDIAWIKI' ) ) die();
-define( 'DATA_TRANSFER_VERSION', '0.5' );
+define( 'DATA_TRANSFER_VERSION', '0.6' );
// constants for special properties
define( 'DT_SP_HAS_XML_GROUPING', 1 );
@@ -47,8 +47,8 @@
$wgHooks['AdminLinks'][] = 'dtfAddToAdminLinks';
$wgHooks['smwInitProperties'][] = 'dtfInitProperties';
-// only enable spreadsheet import if PHPExcel is installed
-if (class_exists( 'PHPExcel' )) {
+// Only enable spreadsheet import if PHPExcel is installed.
+if ( class_exists( 'PHPExcel' )) {
$wgSpecialPages['ImportSpreadsheet'] = 'DTImportSpreadsheet';
$wgAutoloadClasses['DTImportSpreadsheet'] = $dtgIP .
'/specials/DT_ImportSpreadsheet.php';
}
diff --git a/INSTALL b/INSTALL
index 1b0e794..5e39b1b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-[[Data Transfer 0.5]]
+[[Data Transfer 0.6]]
Contents:
* Disclaimer
diff --git a/README b/README
index 447f020..192b04e 100644
--- a/README
+++ b/README
@@ -1,12 +1,15 @@
== About ==
-Data Transfer is an extension to MediaWiki that both exports XML
-based on the current contents of pages in a wiki, and imports pages
-in both XML format (using the same structure as the XML export) and
-CSV format. Both the XML and CSV formats use template calls, and
-the fields within them, to define the data structure. Any text that
-is not within a template call gets placed into one or more free
-text fields.
+Data Transfer is an extension to MediaWiki that both exports data,
+based on the current contents of pages in a wiki; and imports pages.
+In both cases, it uses template calls, and the fields within them,
+to define the data structure.
+
+The export is done in XML format, while the import can be done in
+either XML, CSV or spreadsheet (.xls, .ods etc.) formats.
+
+For the export, any text that is not within a template call gets
+placed into one or more free text fields.
For more information on Data Transfer, see the extension
homepage at
@@ -16,7 +19,11 @@
== Credits ==
-Data Transfer was written by Yaron Koren.
+Data Transfer was mostly written by Yaron Koren. The spreadsheet import
+functionality was written by Stephan Gambke.
+
+The spreadsheet import functionality makes use of the PHPExcel
+library, if it is available.
== Contact ==
--
To view, visit https://gerrit.wikimedia.org/r/149853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97c8b9960c5ef9623e188827dc5ce39c0cdd5f72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Language of images should be in subcategory of... - change (mediawiki...VisualEditor)
Vikassy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149854
Change subject: [BrowserTest] Language of images should be in subcategory of
VisualEditor
..
[BrowserTest] Language of images should be in subcategory of VisualEditor
Change-Id: Ibf77dffbb3468446c3a5828fad053f8cac6861af
---
M modules/ve-mw/tests/browser/upload.rb
1 file changed, 3 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/54/149854/1
diff --git a/modules/ve-mw/tests/browser/upload.rb
b/modules/ve-mw/tests/browser/upload.rb
index 04b8638..a4930cc 100644
--- a/modules/ve-mw/tests/browser/upload.rb
+++ b/modules/ve-mw/tests/browser/upload.rb
@@ -1,20 +1,4 @@
-def language_string language_code
- language_hash = {
-en: English,
-de: German,
-he: Hebrew,
-cs: Czech,
-it: Italian,
-mk: Macedonian,
-ru: Russian,
-fa: Persian,
-fr: French,
-ia: Interlingua,
- }
- language_hash.fetch(language_code.to_sym)
-end
-
-def license(language, language_code, file_name)
+def license(language_code, file_name)
require date
date = Date.today.to_s
=={{int:filedesc}}==
@@ -31,15 +15,13 @@
=={{int:license-header}}==
{{Wikipedia-screenshot}}
-[[Category:VisualEditor]]
-[[Category:#{language}]]
+[[Category:VisualEditor-#{language_code}]]
end
def upload_image file_path
language_code = ENV['LANGUAGE_SCREENSHOT_CODE']
file_name = File.basename(file_path, )
- language = language_string language_code
- file_license = license(language, language_code, file_name)
+ file_license = license(language_code, file_name)
require 'mediawiki_api'
client = MediawikiApi::Client.new ENV[MEDIAWIKI_API_UPLOAD_URL]
--
To view, visit https://gerrit.wikimedia.org/r/149854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf77dffbb3468446c3a5828fad053f8cac6861af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New version: 0.6 - change (mediawiki...DataTransfer)
Yaron Koren has submitted this change and it was merged.
Change subject: New version: 0.6
..
New version: 0.6
Change-Id: I97c8b9960c5ef9623e188827dc5ce39c0cdd5f72
---
M DataTransfer.php
M INSTALL
M README
3 files changed, 19 insertions(+), 12 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/DataTransfer.php b/DataTransfer.php
index abe9b7d..1b4bffb 100644
--- a/DataTransfer.php
+++ b/DataTransfer.php
@@ -7,7 +7,7 @@
if ( !defined( 'MEDIAWIKI' ) ) die();
-define( 'DATA_TRANSFER_VERSION', '0.5' );
+define( 'DATA_TRANSFER_VERSION', '0.6' );
// constants for special properties
define( 'DT_SP_HAS_XML_GROUPING', 1 );
@@ -47,8 +47,8 @@
$wgHooks['AdminLinks'][] = 'dtfAddToAdminLinks';
$wgHooks['smwInitProperties'][] = 'dtfInitProperties';
-// only enable spreadsheet import if PHPExcel is installed
-if (class_exists( 'PHPExcel' )) {
+// Only enable spreadsheet import if PHPExcel is installed.
+if ( class_exists( 'PHPExcel' )) {
$wgSpecialPages['ImportSpreadsheet'] = 'DTImportSpreadsheet';
$wgAutoloadClasses['DTImportSpreadsheet'] = $dtgIP .
'/specials/DT_ImportSpreadsheet.php';
}
diff --git a/INSTALL b/INSTALL
index 1b0e794..5e39b1b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-[[Data Transfer 0.5]]
+[[Data Transfer 0.6]]
Contents:
* Disclaimer
diff --git a/README b/README
index 447f020..192b04e 100644
--- a/README
+++ b/README
@@ -1,12 +1,15 @@
== About ==
-Data Transfer is an extension to MediaWiki that both exports XML
-based on the current contents of pages in a wiki, and imports pages
-in both XML format (using the same structure as the XML export) and
-CSV format. Both the XML and CSV formats use template calls, and
-the fields within them, to define the data structure. Any text that
-is not within a template call gets placed into one or more free
-text fields.
+Data Transfer is an extension to MediaWiki that both exports data,
+based on the current contents of pages in a wiki; and imports pages.
+In both cases, it uses template calls, and the fields within them,
+to define the data structure.
+
+The export is done in XML format, while the import can be done in
+either XML, CSV or spreadsheet (.xls, .ods etc.) formats.
+
+For the export, any text that is not within a template call gets
+placed into one or more free text fields.
For more information on Data Transfer, see the extension
homepage at
@@ -16,7 +19,11 @@
== Credits ==
-Data Transfer was written by Yaron Koren.
+Data Transfer was mostly written by Yaron Koren. The spreadsheet import
+functionality was written by Stephan Gambke.
+
+The spreadsheet import functionality makes use of the PHPExcel
+library, if it is available.
== Contact ==
--
To view, visit https://gerrit.wikimedia.org/r/149853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97c8b9960c5ef9623e188827dc5ce39c0cdd5f72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old message - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/149855 Change subject: Remove old message .. Remove old message Change-Id: I0e8b9ea7957f8495dc9713ac5db811f42dfb19fe --- M VisualEditorDataModule.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/55/149855/1 diff --git a/VisualEditorDataModule.php b/VisualEditorDataModule.php index 5c36ef8..e089f0e 100644 --- a/VisualEditorDataModule.php +++ b/VisualEditorDataModule.php @@ -76,7 +76,6 @@ 'summary' = array( 'summary' ), 'watchthis' = array( 'watchthis' ), 'visualeditor-browserwarning' = array( 'visualeditor-browserwarning' ), - 'visualeditor-report-notice' = array( 'visualeditor-report-notice' ), 'visualeditor-wikitext-warning' = array( 'visualeditor-wikitext-warning' ), ); -- To view, visit https://gerrit.wikimedia.org/r/149855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e8b9ea7957f8495dc9713ac5db811f42dfb19fe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused CSS classes - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149856
Change subject: Remove unused CSS classes
..
Remove unused CSS classes
By searching for CSS classes that don't exist in the code.
Change-Id: Ib45f86beb96021cdbfa8272660d7416a0ccaa737
---
M modules/ve/ce/ve.ce.ResizableNode.js
D modules/ve/ui/styles/ve.ui.Inspector.css
D modules/ve/ui/themes/apex/ve.ui.Inspector.css
M modules/ve/ui/ve.ui.Surface.js
M modules/ve/ui/ve.ui.Toolbar.js
5 files changed, 20 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/56/149856/1
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js
b/modules/ve/ce/ve.ce.ResizableNode.js
index a81de9c..c654452 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -191,6 +191,11 @@
} else {
this.$resizeHandles.find( 'div' ).hide();
for ( i = handles.length; i = 0; i-- ) {
+ // The following classes can be used here:
+ // ve-ce-resizableNode-nwHandle
+ // ve-ce-resizableNode-neHandle
+ // ve-ce-resizableNode-swHandle
+ // ve-ce-resizableNode-seHandle
this.$resizeHandles.find( '.ve-ce-resizableNode-' +
handles[i] + 'Handle' ).show();
}
}
diff --git a/modules/ve/ui/styles/ve.ui.Inspector.css
b/modules/ve/ui/styles/ve.ui.Inspector.css
deleted file mode 100644
index 78746d4..000
--- a/modules/ve/ui/styles/ve.ui.Inspector.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
- * ObjectOriented UserInterface Inspector styles.
- *
- * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-.ve-ui-inspector {
- -webkit-transition: opacity 100ms;
- -moz-transition: opacity 100ms;
- -o-transition: opacity 100ms;
- transition: opacity 100ms;
-}
-
-.ve-ui-inspector-content .ve-ui-inspector-closeButton {
- float: left;
-}
-
-.ve-ui-inspector-content .ve-ui-inspector-removeButton {
- float: right;
-}
-
-.ve-ui-inspector-content .oo-ui-window-body form {
- margin: 0.25em 0 0 0;
- padding: 0;
- white-space: nowrap;
-}
diff --git a/modules/ve/ui/themes/apex/ve.ui.Inspector.css
b/modules/ve/ui/themes/apex/ve.ui.Inspector.css
deleted file mode 100644
index 9799ddc..000
--- a/modules/ve/ui/themes/apex/ve.ui.Inspector.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*!
- * ObjectOriented UserInterface Inspector styles.
- *
- * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-.ve-ui-inspector .oo-ui-frame {
- width: 17.25em;
- height: 3em;
-}
-
-.ve-ui-inspector-content .oo-ui-window-head {
- height: 2em;
- padding: 0.5em;
-}
-
-.ve-ui-inspector-content .oo-ui-window-icon {
- padding-left: 0.5em;
- margin-left: 0.25em;
- border-left: solid 1px #eee;
-}
diff --git a/modules/ve/ui/ve.ui.Surface.js b/modules/ve/ui/ve.ui.Surface.js
index 30a778c..9e7ebbe 100644
--- a/modules/ve/ui/ve.ui.Surface.js
+++ b/modules/ve/ui/ve.ui.Surface.js
@@ -145,6 +145,9 @@
// Attach globalOverlay to the global body, not the local frame's
body
$( 'body' ).append( this.globalOverlay.$element );
+ // The following classes can be used here:
+ // ve-ui-surface-dir-ltr
+ // ve-ui-surface-dir-rtl
this.$element.addClass( 've-ui-surface-dir-' + this.getDir() );
this.getView().initialize();
diff --git a/modules/ve/ui/ve.ui.Toolbar.js b/modules/ve/ui/ve.ui.Toolbar.js
index f766fe8..672287c 100644
--- a/modules/ve/ui/ve.ui.Toolbar.js
+++ b/modules/ve/ui/ve.ui.Toolbar.js
@@ -49,8 +49,13 @@
return toolbar.onSurfaceViewKeyUp.apply( toolbar,
arguments );
}
};
- // default directions:
+ // Default directions
this.contextDirection = { inline: 'ltr', block: 'ltr' };
+ // The following classes can be used here:
+ // ve-ui-dir-inline-ltr
+ // ve-ui-dir-inline-rtl
+ // ve-ui-dir-block-ltr
+ // ve-ui-dir-block-rtl
this.$element
.addClass( 've-ui-dir-inline-' + this.contextDirection.inline )
.addClass( 've-ui-dir-block-' + this.contextDirection.block );
@@ -184,11 +189,17 @@
if ( dirInline !== this.contextDirection.inline ) {
// remove previous class:
this.$element.removeClass( 've-ui-dir-inline-rtl
ve-ui-dir-inline-ltr' );
+ // The following classes can be used here:
+ // ve-ui-dir-inline-ltr
+ // ve-ui-dir-inline-rtl
this.$element.addClass( 've-ui-dir-inline-' + dirInline
);
[MediaWiki-commits] [Gerrit] Add aliases file for Special:TwoFactorAuth - change (mediawiki...TwoFactorAuthentication)
Parent5446 has submitted this change and it was merged. Change subject: Add aliases file for Special:TwoFactorAuth .. Add aliases file for Special:TwoFactorAuth Bug: 68698 Change-Id: I37eb96a6f5a74fcb72518a009f0a544edeb14647 --- A TwoFactorAuth.alias.php M TwoFactorAuth.php 2 files changed, 15 insertions(+), 0 deletions(-) Approvals: Parent5446: Verified; Looks good to me, approved diff --git a/TwoFactorAuth.alias.php b/TwoFactorAuth.alias.php new file mode 100644 index 000..00ff14c --- /dev/null +++ b/TwoFactorAuth.alias.php @@ -0,0 +1,14 @@ +?php +/** + * Aliases for Special:TwoFactorAuth + * + * @file + * @ingroup Extensions + */ + +$specialPageAliases = array(); + +/** English (English) */ +$specialPageAliases[ 'en' ] = array( +'TwoFactorAuth' = array( 'TwoFactorAuth' ), +); diff --git a/TwoFactorAuth.php b/TwoFactorAuth.php index 779fc26..4b30c20 100644 --- a/TwoFactorAuth.php +++ b/TwoFactorAuth.php @@ -56,6 +56,7 @@ $wgMessagesDirs['TwoFactorAuth'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['TwoFactorAuth'] = __DIR__ . '/TwoFactorAuth.i18n.php'; +$wgExtensionMessagesFiles[ 'TwoFactorAuthAlias' ] = __DIR__ . '/TwoFactorAuth.alias.php'; $wgSpecialPages['TwoFactorAuth'] = 'SpecialTwoFactorAuth'; $wgResourceModules['ext.twofactorauth'] = array( -- To view, visit https://gerrit.wikimedia.org/r/149848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37eb96a6f5a74fcb72518a009f0a544edeb14647 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoFactorAuthentication Gerrit-Branch: master Gerrit-Owner: MegaAlex alexivano...@gmail.com Gerrit-Reviewer: Parent5446 tylerro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a tick mark to the selected MT provider in the menu - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a tick mark to the selected MT provider in the menu
..
Add a tick mark to the selected MT provider in the menu
The tick images are taken from jquery.ime; credit to Pau Giner.
Change-Id: I5cd196778585b200248d0f1b5f3f74b76be886d9
---
M modules/tools/ext.cx.tools.mt.js
A modules/tools/images/tick.png
A modules/tools/images/tick.svg
M modules/tools/styles/ext.cx.tools.mt.less
4 files changed, 24 insertions(+), 12 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 1b470fd..76f3519 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -99,7 +99,7 @@
this.$section = null;
this.$card = null;
this.$translations = null;
- this.$definition = null;
+ this.$providersMenu = null;
// This is static because the card can be reinitialized.
// Indexed by section id.
@@ -234,7 +234,11 @@
var $providerItem = $( '#' + providerIdPrefix + providerId );
// Hide the menu
- $providerItem.parent().addClass( 'hidden' );
+ this.$providersMenu.addClass( 'hidden' );
+
+ // Mark the selected item
+ this.$providersMenu.find( 'li' ).removeClass( 'selected' );
+ $providerItem.addClass( 'selected' );
// Set the global engine
// TODO This should be saved in a preference or a cookie
@@ -260,14 +264,15 @@
};
MTControlCard.prototype.buildProvidersMenu = function () {
- var provider, $providersMenu;
+ var provider,
+ cxMtCard = this;
- $providersMenu = $( 'ul' )
+ this.$providersMenu = $( 'ul' )
.addClass( 'card__providers-menu hidden' );
// Add available machine translation engines to the menu
for ( provider in MTControlCard.providers ) {
- $providersMenu.append(
+ this.$providersMenu.append(
this.getProviderItem(
MTControlCard.providers[ provider ],
mw.cx.sourceLanguage,
@@ -277,14 +282,14 @@
}
// Add an item to disable machine translation for the language
- $providersMenu.append( this.getProviderItem( disableMT ) );
+ this.$providersMenu.append( this.getProviderItem( disableMT ) );
this.$providerSelectorTrigger
.on( 'click', function ( e ) {
- $providersMenu.toggleClass( 'hidden' );
+ cxMtCard.$providersMenu.toggleClass( 'hidden' );
e.stopPropagation();
} )
- .after( $providersMenu );
+ .after( this.$providersMenu );
};
/**
diff --git a/modules/tools/images/tick.png b/modules/tools/images/tick.png
new file mode 100644
index 000..5499831
--- /dev/null
+++ b/modules/tools/images/tick.png
Binary files differ
diff --git a/modules/tools/images/tick.svg b/modules/tools/images/tick.svg
new file mode 100644
index 000..1e548a3
--- /dev/null
+++ b/modules/tools/images/tick.svg
@@ -0,0 +1 @@
+?xml version=1.0 encoding=UTF-8?svg xmlns=http://www.w3.org/2000/svg;
width=12 height=9path d=M11.226.257l-6.718 6.453-2.699-2.575-1.292
1.302c1.33 1.273 2.65 2.557 3.99 3.821 2.654-2.591 5.337-5.153 8.01-7.726z
fill=#222//svg
\ No newline at end of file
diff --git a/modules/tools/styles/ext.cx.tools.mt.less
b/modules/tools/styles/ext.cx.tools.mt.less
index c3e06b3..360a910 100644
--- a/modules/tools/styles/ext.cx.tools.mt.less
+++ b/modules/tools/styles/ext.cx.tools.mt.less
@@ -1,4 +1,5 @@
@import ../../base/styles/grid/agora-grid;
+@import mediawiki.mixins;
/* TODO remove when the grid is updated */
.hidden {
@@ -50,10 +51,15 @@
li {
cursor: pointer;
padding: 5px;
- }
- li:hover{
- background-color: #6698FF;
- color: #FFF;
+ .selected {
+ .background-image-svg('../images/tick.svg',
'../images/tick.png');
+ background-repeat: no-repeat;
+ background-position: right 4px center;
+ }
+ :hover {
+ background-color: #6698FF;
+ color: #FFF;
+ }
[MediaWiki-commits] [Gerrit] Hide the providers menu on clicking outside of it - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide the providers menu on clicking outside of it
..
Hide the providers menu on clicking outside of it
Change-Id: I1de9cf0c56cbcecb2502730ce0d223d6a7e9b855
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 76f3519..5b5d241 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -290,6 +290,13 @@
e.stopPropagation();
} )
.after( this.$providersMenu );
+
+ // Hide the dropdown on clicking outside of it
+ $( 'html' ).on( 'click', function ( e ) {
+ if ( !e.isDefaultPrevented() ) {
+ cxMtCard.$providersMenu.addClass( 'hidden' );
+ }
+ } );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/149840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1de9cf0c56cbcecb2502730ce0d223d6a7e9b855
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Divec da...@sheetmusic.org.uk
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test projects are in Gerrit - change (integration/zuul-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149857
Change subject: Test projects are in Gerrit
..
Test projects are in Gerrit
The list of defined projects is not actively maintained when Gerrit
projects are deleted. This rather simple testsuite query Gerrit for a
list of all code projects and assert that Zuul projects are defined in
Gerrit.
Change-Id: If7ee4aafd8caf41688bd6f5a93b36a12bf0856d8
---
A .gitignore
A tests/test_zuul_layout.py
A tox.ini
3 files changed, 45 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config
refs/changes/57/149857/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..9f8054b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+/.tox
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
new file mode 100644
index 000..46240e8
--- /dev/null
+++ b/tests/test_zuul_layout.py
@@ -0,0 +1,34 @@
+import json
+import os
+import urllib2
+import yaml
+
+GERRIT_URL = 'https://gerrit.wikimedia.org/r/projects/?type=code'
+ZUUL_LAYOUT = os.path.join(os.path.dirname(__file__), '../layout.yaml')
+
+
+def get_gerrit_repos():
+
+Connect to gerrit.wikimedia.org to retrieve a list of public projects.
+
+Returns a sorted list of project names
+
+request = urllib2.urlopen(GERRIT_URL)
+# Strip Gerrit json harness: )]}'
+request.readline()
+projects = json.load(request)
+return sorted(projects.keys())
+
+GERRIT_REPOS = get_gerrit_repos()
+
+
+def test_zuul_project_in_gerrit():
+
+with open(ZUUL_LAYOUT) as f:
+layout = yaml.load(f)
+for pj in layout.get('projects'):
+yield is_in_gerrit, pj.get('name')
+
+
+def is_in_gerrit(zuul_project):
+assert zuul_project in GERRIT_REPOS
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000..4f6a78e
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,9 @@
+[tox]
+# Ensure 1.6+ is used to support 'skipsdist'
+minversion = 1.6
+skipsdist = True
+envlist = py27
+
+[testenv]
+commands = nosetests
+deps = nose
--
To view, visit https://gerrit.wikimedia.org/r/149857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7ee4aafd8caf41688bd6f5a93b36a12bf0856d8
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move legally required policy links. - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Move legally required policy links.
..
Move legally required policy links.
Move privacy policy and terms of use links from the about page to underneath
the button to access the about page, per a legal requirement that these links
be more accessible.
Change-Id: I4a6688e6aebd185241d091dfa55fa25c5dba2a87
---
M wikipedia/res/layout/activity_about.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values/strings.xml
M wikipedia/res/xml/preferences.xml
M wikipedia/src/main/java/org/wikipedia/settings/AboutActivity.java
5 files changed, 18 insertions(+), 32 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/layout/activity_about.xml
b/wikipedia/res/layout/activity_about.xml
index 74d75b0..ebea734 100644
--- a/wikipedia/res/layout/activity_about.xml
+++ b/wikipedia/res/layout/activity_about.xml
@@ -49,36 +49,6 @@
/LinearLayout
/LinearLayout
-LinearLayout android:layout_width=match_parent
android:layout_height=wrap_content
- android:orientation=horizontal
- android:layout_marginTop=8dp
- android:layout_marginBottom=16dp
-
-TextView android:id=@+id/about_privacy_policy
- android:layout_width=0dp
android:layout_height=wrap_content
- android:layout_weight=1
- android:gravity=start|left
- style=?android:textAppearanceSmall
- android:layout_gravity=center_horizontal
- android:text=@string/about_privacy_policy
- android:paddingTop=4dp
- android:paddingBottom=4dp
- android:textColorLink=?attr/link_color
-/
-TextView android:id=@+id/about_terms_of_use
- android:layout_width=0dp
android:layout_height=wrap_content
- android:layout_weight=1
- style=?android:textAppearanceSmall
- android:layout_gravity=center_horizontal
- android:gravity=end|right
- android:text=@string/about_terms_of_use
- android:paddingTop=4dp
- android:paddingBottom=4dp
- android:textColorLink=?attr/link_color
-/
-
-/LinearLayout
-
TextView
android:layout_width=match_parent
android:layout_height=wrap_content
diff --git a/wikipedia/res/values-qq/strings.xml
b/wikipedia/res/values-qq/strings.xml
index c5646c9..11ccf0b 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -227,6 +227,10 @@
* {{msg-wm|Wikipedia-android-strings-more item preferences}} - menu item to
come to this screen
{{Identical|More}}/string
string name=about_descriptionSummary of the preference item to show the
About screen./string
+ string name=privacy_policy_descriptionSummary of the preference item to
show the Wikimedia Foundation\'s privacy policy./string
+ string name=terms_of_use_descriptionSummary of the preference item to
show the Wikimedia Foundation\'s terms of use./string
+ string name=privacy_policy_urlNot to be translated/string
+ string name=terms_of_use_urlNot to be translated/string
string name=preference_title_versionText for the preference item that
shows the app version number.
{{Identical|Version}}/string
string name=about_terms_of_useTerms of use link that links to the WMF\'s
Terms of Use/string
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 0268e93..778facf 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -166,6 +166,10 @@
string name=more_item_preferencesMore/string
string name=more_activity_titleMore/string
string name=about_descriptionAbout the Wikipedia app/string
+string name=privacy_policy_descriptionPrivacy policy/string
+string name=terms_of_use_descriptionTerms of use/string
+string
name=privacy_policy_urlhttps://wikimediafoundation.org/wiki/Privacy_Policy/string
+string
name=terms_of_use_urlhttps://wikimediafoundation.org/wiki/Terms_of_Use/string
string name=preference_title_versionVersion/string
string name=about_terms_of_use![CDATA[a
href=http://wikimediafoundation.org/wiki/Terms_of_Use;Terms of
Use/a]]/string
string name=about_privacy_policy![CDATA[a
href=http://wikimediafoundation.org/wiki/Privacy_policy;Privacy
Policy/a]]/string
diff --git a/wikipedia/res/xml/preferences.xml
b/wikipedia/res/xml/preferences.xml
index 39c009d..63afca9 100644
--- a/wikipedia/res/xml/preferences.xml
+++
[MediaWiki-commits] [Gerrit] Beta builds Cirrus speed up field - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/149859 Change subject: Beta builds Cirrus speed up field .. Beta builds Cirrus speed up field Change-Id: Ifffa2375b35c8ab3009f6c32ae80f6f2d8a95751 --- M wmf-config/CirrusSearch-labs.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/59/149859/1 diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php index 02094ca..46a9ef0 100644 --- a/wmf-config/CirrusSearch-labs.php +++ b/wmf-config/CirrusSearch-labs.php @@ -24,3 +24,4 @@ } $wgSearchTypeAlternatives = array(); +$wgCirrusSearchAllFields = array( 'build' = true, 'use' = false ); -- To view, visit https://gerrit.wikimedia.org/r/149859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifffa2375b35c8ab3009f6c32ae80f6f2d8a95751 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
