[MediaWiki-commits] [Gerrit] Fixes for CollapsibleVector - change (mediawiki...CollapsibleVector)
Paladox has submitted this change and it was merged.
Change subject: Fixes for CollapsibleVector
..
Fixes for CollapsibleVector
* Includes fixes for prefernce.
* Bumps version to 0.1.4
Bug: T76314
Change-Id: I9387a31b5478a83c7db1b111ae9e8c3cc184fa88
---
M CollapsibleVector.hooks.php
M CollapsibleVector.php
2 files changed, 32 insertions(+), 8 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/CollapsibleVector.hooks.php b/CollapsibleVector.hooks.php
index 796b381..3bda843 100644
--- a/CollapsibleVector.hooks.php
+++ b/CollapsibleVector.hooks.php
@@ -35,9 +35,19 @@
),
);
- /* Protected Static Methods */
-
- protected static function isEnabled( $name ) {
+
+ /* Static Methods */
+
+ /**
+* Checks if a certain option is enabled
+*
+* This method is public to allow other extensions that use
CollapsibleVector to use the
+* same configuration as CollapsibleVector itself
+*
+* @param $name string Name of the feature, should be a key of $features
+* @return bool
+*/
+ public static function isEnabled( $name ) {
global $wgVectorFeatures, $wgUser;
// Features with global set to true are always enabled
diff --git a/CollapsibleVector.php b/CollapsibleVector.php
index 8266f5f..07aa280 100644
--- a/CollapsibleVector.php
+++ b/CollapsibleVector.php
@@ -6,7 +6,7 @@
* @ingroup Extensions
*
* @license GPL v2 or later
- * @version 0.1.2
+ * @version 0.1.4
*
* Requires MediaWiki 1.24+
*/
@@ -21,16 +21,31 @@
// Each module may be configured individually to be globally on/off or user
preference based
$GLOBALS['wgVectorFeatures'] = array(
- 'collapsiblenav' => array( 'global' => true, 'user' => true ),
+ 'collapsiblenav' => array( 'global' => false, 'user' => true ),
);
+
+/*
+ * Setting default option.
+ *
+ * Do not remove this.
+ *
+ * Bug T76314
+ */
+$wgDefaultUserOptions['vector-collapsiblenav'] = 1;
+
+/*
+ * Setting default option.
+ * Do not remove this.
+ */
+$wgDefaultUserOptions['vector-noexperiments'] = 0;
/* Setup */
$GLOBALS['wgExtensionCredits']['other'][] = array(
'path' => __FILE__,
'name' => 'CollapsibleVector',
- 'author' => array( 'paladox' ),
- 'version' => '0.1.3',
+ 'author' => array( 'Paladox' ),
+ 'version' => '0.1.4',
'url' => 'https://www.mediawiki.org/wiki/Extension:CollapsibleVector',
'descriptionmsg' => 'collapsiblevector-desc',
);
@@ -47,7 +62,6 @@
'group' => 'ext.vector',
);
$GLOBALS['wgResourceModules'] += array(
- // TODO this module should be merged with ext.vector.collapsibleTabs
'ext.vector.collapsibleNav' => $vectorResourceTemplate + array(
'scripts' => 'ext.vector.collapsibleNav.js',
'styles' => 'ext.vector.collapsibleNav.less',
--
To view, visit https://gerrit.wikimedia.org/r/177608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9387a31b5478a83c7db1b111ae9e8c3cc184fa88
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CollapsibleVector
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for CollapsibleVector - change (mediawiki...CollapsibleVector)
Paladox has submitted this change and it was merged.
Change subject: Fixes for CollapsibleVector
..
Fixes for CollapsibleVector
* Includes fixes for prefernce.
* Bumps version to 0.1.4
Bug: T76314
Change-Id: I9387a31b5478a83c7db1b111ae9e8c3cc184fa88
---
M CollapsibleVector.hooks.php
M CollapsibleVector.php
2 files changed, 32 insertions(+), 8 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CollapsibleVector.hooks.php b/CollapsibleVector.hooks.php
index 796b381..3bda843 100644
--- a/CollapsibleVector.hooks.php
+++ b/CollapsibleVector.hooks.php
@@ -35,9 +35,19 @@
),
);
- /* Protected Static Methods */
-
- protected static function isEnabled( $name ) {
+
+ /* Static Methods */
+
+ /**
+* Checks if a certain option is enabled
+*
+* This method is public to allow other extensions that use
CollapsibleVector to use the
+* same configuration as CollapsibleVector itself
+*
+* @param $name string Name of the feature, should be a key of $features
+* @return bool
+*/
+ public static function isEnabled( $name ) {
global $wgVectorFeatures, $wgUser;
// Features with global set to true are always enabled
diff --git a/CollapsibleVector.php b/CollapsibleVector.php
index 8266f5f..07aa280 100644
--- a/CollapsibleVector.php
+++ b/CollapsibleVector.php
@@ -6,7 +6,7 @@
* @ingroup Extensions
*
* @license GPL v2 or later
- * @version 0.1.2
+ * @version 0.1.4
*
* Requires MediaWiki 1.24+
*/
@@ -21,16 +21,31 @@
// Each module may be configured individually to be globally on/off or user
preference based
$GLOBALS['wgVectorFeatures'] = array(
- 'collapsiblenav' => array( 'global' => true, 'user' => true ),
+ 'collapsiblenav' => array( 'global' => false, 'user' => true ),
);
+
+/*
+ * Setting default option.
+ *
+ * Do not remove this.
+ *
+ * Bug T76314
+ */
+$wgDefaultUserOptions['vector-collapsiblenav'] = 1;
+
+/*
+ * Setting default option.
+ * Do not remove this.
+ */
+$wgDefaultUserOptions['vector-noexperiments'] = 0;
/* Setup */
$GLOBALS['wgExtensionCredits']['other'][] = array(
'path' => __FILE__,
'name' => 'CollapsibleVector',
- 'author' => array( 'paladox' ),
- 'version' => '0.1.3',
+ 'author' => array( 'Paladox' ),
+ 'version' => '0.1.4',
'url' => 'https://www.mediawiki.org/wiki/Extension:CollapsibleVector',
'descriptionmsg' => 'collapsiblevector-desc',
);
@@ -47,7 +62,6 @@
'group' => 'ext.vector',
);
$GLOBALS['wgResourceModules'] += array(
- // TODO this module should be merged with ext.vector.collapsibleTabs
'ext.vector.collapsibleNav' => $vectorResourceTemplate + array(
'scripts' => 'ext.vector.collapsibleNav.js',
'styles' => 'ext.vector.collapsibleNav.less',
--
To view, visit https://gerrit.wikimedia.org/r/177609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9387a31b5478a83c7db1b111ae9e8c3cc184fa88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollapsibleVector
Gerrit-Branch: REL1_24
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GlobalUserPage] Remove central module - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [GlobalUserPage] Remove central module .. [GlobalUserPage] Remove central module https://gerrit.wikimedia.org/r/#/c/177697/ Change-Id: I7f1cae89f3b62c42cbc14fe71aeb87083cd449bb --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5a6d4b5..8470de6 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1029,9 +1029,6 @@ Global User Page -Global User Page - Central -file = GlobalUserPage/i18n-central/%CODE%.json - Global Userrights # Aliases conflict with CentralAuth's #aliasfile = GlobalUserrights/GlobalUserrights.alias.php -- To view, visit https://gerrit.wikimedia.org/r/177753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f1cae89f3b62c42cbc14fe71aeb87083cd449bb Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GlobalUserPage] Remove central module - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/177753 Change subject: [GlobalUserPage] Remove central module .. [GlobalUserPage] Remove central module https://gerrit.wikimedia.org/r/#/c/177697/ Change-Id: I7f1cae89f3b62c42cbc14fe71aeb87083cd449bb --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/53/177753/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5a6d4b5..8470de6 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1029,9 +1029,6 @@ Global User Page -Global User Page - Central -file = GlobalUserPage/i18n-central/%CODE%.json - Global Userrights # Aliases conflict with CentralAuth's #aliasfile = GlobalUserrights/GlobalUserrights.alias.php -- To view, visit https://gerrit.wikimedia.org/r/177753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f1cae89f3b62c42cbc14fe71aeb87083cd449bb Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Title search gets descriptions, too - change (apps...wikipedia)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177752
Change subject: Title search gets descriptions, too
..
Title search gets descriptions, too
Now that we can easily get descriptions from our own API,
why not have them for both search types.
Using common data type for both full text and title search: PageTitle
Also using same layout for both fragments.
This will enable us to refactor things even more.
The two tasks and the two fragments have a lot of common code.
Change-Id: Ied3ca27a36e0ff26f7c8f5404289e8ecee062336
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
M
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D wikipedia/res/layout/item_full_search_result.xml
M wikipedia/res/layout/item_search_result.xml
M wikipedia/src/main/java/org/wikipedia/PageTitle.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
D wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
15 files changed, 141 insertions(+), 149 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/52/177752/1
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index ad7b104..8fc2854 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -1,9 +1,10 @@
package org.wikipedia.test;
+import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.search.FullSearchArticlesTask;
-import org.wikipedia.search.FullSearchResult;
+
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
@@ -38,8 +39,8 @@
assertEquals(results.getSuggestion(), "");
assertNotNull(results.getContinueOffset());
-for (FullSearchResult result : results.getResults()) {
-if
(result.getTitle().getPrefixedText().equals("Test")) {
+for (PageTitle result : results.getResults()) {
+if (result.getPrefixedText().equals("Test")) {
assertEquals(result.getDescription(),
"Wikipedia disambiguation page");
}
}
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
index d4ac13b..b143bfd 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/SuggestionsTaskTests.java
@@ -1,9 +1,10 @@
package org.wikipedia.test;
+import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.page.SuggestionsTask;
-import org.wikipedia.search.FullSearchResult;
+
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import java.util.concurrent.CountDownLatch;
@@ -39,8 +40,8 @@
assertNotNull(results);
assertEquals(results.getResults().size(), BATCH_SIZE);
-for (FullSearchResult result : results.getResults()) {
-
assertFalse(result.getTitle().getPrefixedText().equals("Test"));
+for (PageTitle result : results.getResults()) {
+
assertFalse(result.getPrefixedText().equals("Test"));
}
completionLatch.countDown();
}
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
index c557c4a..4acc2b2 100644
---
a/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
+++
b/wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
@@ -3,11 +3,11 @@
import org.wikipedia.PageTitle;
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.search.FullSearchResult;
import org.wiki
[MediaWiki-commits] [Gerrit] testing - change (mediawiki/core)
David392 has uploaded a new change for review. https://gerrit.wikimedia.org/r/177751 Change subject: testing .. testing Change-Id: I8e1634bb0def7f3f3d9501047bb85aa1eed04c02 --- A test.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/177751/1 diff --git a/test.txt b/test.txt new file mode 100644 index 000..fdd8d9b --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +test Gerrit -- To view, visit https://gerrit.wikimedia.org/r/177751 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e1634bb0def7f3f3d9501047bb85aa1eed04c02 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: David392 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Recognize "PD" as public domain in lincense names - change (mediawiki...CommonsMetadata)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177750
Change subject: Recognize "PD" as public domain in lincense names
..
Recognize "PD" as public domain in lincense names
Bug: T76836
Change-Id: Ia4ec5be560a3369a30e079dba9d9a06514e927a5
---
M LicenseParser.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonsMetadata
refs/changes/50/177750/1
diff --git a/LicenseParser.php b/LicenseParser.php
index ccdcfa5..b67a684 100644
--- a/LicenseParser.php
+++ b/LicenseParser.php
@@ -140,7 +140,7 @@
*/
protected function parsePublicDomainLicenseString( $str ) {
// A very simple approach, but should work most of the time
with licence shortnames.
- if ( strtolower( $str ) === 'public domain' ) {
+ if ( strtolower( $str ) === 'public domain' || strtolower( $str
) === 'pd' ) {
return array(
'family' => 'pd',
'name' => 'pd',
--
To view, visit https://gerrit.wikimedia.org/r/177750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4ec5be560a3369a30e079dba9d9a06514e927a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommonsMetadata
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1027 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1027 .. repool db1027 Change-Id: I49ecdfcb22596f7eb8d283db66fc62aa288353bd --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0528758..4776e88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1038' => 0, # 1.4TB 64GB 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1019' => 0, # 1.4TB 64GB, vslow, dump - # upgrade 'db1027' => 400, # 1.4TB 64GB + 'db1027' => 400, # 1.4TB 64GB 'db1035' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/177749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49ecdfcb22596f7eb8d283db66fc62aa288353bd Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1027 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/177749 Change subject: repool db1027 .. repool db1027 Change-Id: I49ecdfcb22596f7eb8d283db66fc62aa288353bd --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/49/177749/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0528758..4776e88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1038' => 0, # 1.4TB 64GB 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1019' => 0, # 1.4TB 64GB, vslow, dump - # upgrade 'db1027' => 400, # 1.4TB 64GB + 'db1027' => 400, # 1.4TB 64GB 'db1035' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/177749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49ecdfcb22596f7eb8d283db66fc62aa288353bd Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix ProfilerStandard sorting and a profile error - change (mediawiki/core)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177748
Change subject: Fix ProfilerStandard sorting and a profile error
..
Fix ProfilerStandard sorting and a profile error
* Sort $this->collated even if collateOnly is set. Also I don't think
arsort works that way.
* Fix a profiling error in every DB query, which was due to the two
scoped profiling sections being destroyed in the wrong order.
Change-Id: I6af05f37a5c0391acfa80d54ecbca7a08ad81250
---
M includes/db/Database.php
M includes/profiler/ProfilerStandard.php
2 files changed, 25 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/48/177748/1
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 6c53f6a..2e4ab66 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1049,7 +1049,13 @@
$this->reportQueryError( $this->lastError(),
$this->lastErrno(), $sql, $fname, $tempIgnore );
}
- return $this->resultObject( $ret );
+ $res = $this->resultObject( $ret );
+
+ // Destroy profile sections in the opposite order to their
creation
+ $queryProfSection = false;
+ $totalProfSection = false;
+
+ return $res;
}
/**
diff --git a/includes/profiler/ProfilerStandard.php
b/includes/profiler/ProfilerStandard.php
index 87706e6..19e2ea8 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -345,7 +345,9 @@
$this->close(); // set "-total" entry
if ( $this->collateOnly ) {
- return; // already collated as methods exited
+ // already collated as methods exited
+ $this->sortCollated();
+ return;
}
$this->collated = array();
@@ -400,7 +402,21 @@
}
$this->collated['-overhead-total']['count'] = $profileCount;
- arsort( $this->collated, SORT_NUMERIC );
+ $this->sortCollated();
+ }
+
+ protected function sortCollated() {
+ uksort( $this->collated, function ( $a, $b ) {
+ $ca = $this->collated[$a]['real'];
+ $cb = $this->collated[$b]['real'];
+ if ( $ca > $cb ) {
+ return -1;
+ } elseif ( $cb > $ca ) {
+ return 1;
+ } else {
+ return 0;
+ }
+ } );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/177748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6af05f37a5c0391acfa80d54ecbca7a08ad81250
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API edit: allow ConfirmEdit to use the merged parse - change (mediawiki/core)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177747
Change subject: API edit: allow ConfirmEdit to use the merged parse
..
API edit: allow ConfirmEdit to use the merged parse
ConfirmEdit was tripling the amount of time it took to save a typical
page via the API, since it was assuming that the APIEditBeforeSave hook
was giving unmerged wikitext, requiring a full parse of the content
before and after the edit in order to check the addurl trigger.
Apparently nobody bothered to update it after Ia59fb6bb.
APIEditBeforeSave is unusable anyway, because it is given the serialized
content, without any information about the content model. It really
needs the Content object in order to do it properly. So instead, adapt
EditFilterMergedContent for the purpose. Incidentally, that avoids the
inelegant defined('MW_API') check in ConfirmEdit's
EditFilterMergedContent handler, since both API and normal edits are
handled by EditFilterMergedContent in the same way.
Unfortunately the interpretation of the 'value' member in the Status
object passed to EditFilterMergedContent is not extensible, being an
integer instead of an associative array. So we add a custom member in
order to get the result array back down the stack.
Another obstacle to this design was the lack of an EditPage object
passed to EditFilterMergedContent. ConfirmEdit was previously directly
calling EditPage::showEditForm() with a $formCallback which outputs the
necessary HTML. Instead, I hacked up runPostMergeFilters() a bit, to
allow the hook to request that the edit page be shown again even if
hookError is not set. Then a new EditPage::showEditForm:fields hook does
the necessary HTML output, instead of $formCallback.
Marked $formCallback as deprecated, since I think it is now unused.
Change-Id: I4b4270dd868a643512d4717927858b6ef0556d8a
---
M docs/hooks.txt
M includes/Defines.php
M includes/EditPage.php
M includes/api/ApiEditPage.php
4 files changed, 33 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/177747/1
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 062a0c8..1c6e5c5 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1048,7 +1048,8 @@
Use the $status object to indicate whether the edit should be allowed, and to
provide
a reason for disallowing it. Return false to abort the edit, and true to
continue.
Returning true if $status->isOK() returns false means "don't save but continue
user
-interaction", e.g. show the edit form.
+interaction", e.g. show the edit form. $status->apiHookResult can be set to an
array
+to be returned by api.php action=edit. This is used to deliver captchas.
$context: object implementing the IContextSource interface.
$content: content of the edit box, as a Content object.
$status: Status object to represent errors, etc.
diff --git a/includes/Defines.php b/includes/Defines.php
index d0c2226..d63d5ca 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -2,10 +2,6 @@
/**
* A few constants that might be needed during LocalSettings.php.
*
- * Note: these constants must all be resolvable at compile time by HipHop,
- * since this file will not be executed during request startup for a compiled
- * MediaWiki.
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -216,6 +212,7 @@
define( 'MW_SUPPORTS_PARSERFIRSTCALLINIT', 1 );
define( 'MW_SUPPORTS_LOCALISATIONCACHE', 1 );
define( 'MW_SUPPORTS_CONTENTHANDLER', 1 );
+define( 'MW_EDITFILTERMERGED_SUPPORTS_API', 1 );
/**@}*/
/** Support for $wgResourceModules */
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4a013ef..7b010ea 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1420,8 +1420,8 @@
protected function runPostMergeFilters( Content $content, Status
$status, User $user ) {
// Run old style post-section-merge edit filter
if ( !ContentHandler::runLegacyHooks( 'EditFilterMerged',
- array( $this, $content, &$this->hookError,
$this->summary ) ) ) {
-
+ array( $this, $content, &$this->hookError,
$this->summary ) ) )
+ {
# Error messages etc. could be handled within the
hook...
$status->fatal( 'hookaborted' );
$status->value = self::AS_HOOK_ERROR;
@@ -1435,14 +1435,23 @@
// Run new style post-section-merge edit filter
if ( !wfRunHooks( 'EditFilterMergedContent',
- array( $this->mArticle->getContext(), $content,
$status, $this->summary,
- $user, $this->minoredit ) ) ) {
-
+ array( $this->mArticle->getC
[MediaWiki-commits] [Gerrit] Use the shared parse on API edit - change (mediawiki...ConfirmEdit)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177746
Change subject: Use the shared parse on API edit
..
Use the shared parse on API edit
ConfirmEdit was tripling the API save time, because it was parsing the
entire content twice to evaluate whether the addurl trigger is hit.
While I was here, I stopped using the deprecated non-Content hooks. The
new hook, EditEditFilterMergedContent, does not pass an EditPage object,
which means that Title or WikiPage objects need to be passed around
instead. Also, since EditPage::showEditForm() cannot be called with no
EditPage object, use a EditPage::showEditForm:fields hook instead.
If non-wikitext content is edited, assume that the addurl and regex
triggers are not hit.
For further architectural details, see the associated core change:
I4b4270dd868a . MW_EDITFILTERMERGED_SUPPORTS_API is a constant
introduced to detect the presence of the associated core change.
Also, in APIGetAllowedParams, set the allowed parameters even if we are
not on the help screen. This allows API users to submit their CAPTCHA
answer without it failing with an "unrecognized parameter" error.
Compatibility with MediaWiki 1.21 is retained, compatibility before that
is dropped.
Change-Id: I9529b7e8d3fc9301c754b28fda185aa3ab36f13e
---
M Captcha.php
M ConfirmEdit.php
M ConfirmEditHooks.php
3 files changed, 81 insertions(+), 57 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/46/177746/1
diff --git a/Captcha.php b/Captcha.php
index 968a7a8..7b42686 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -56,9 +56,15 @@
/**
* Insert the captcha prompt into an edit form.
+* @param EditPage $editPage
* @param OutputPage $out
*/
- function editCallback( &$out ) {
+ function showEditFormFields( &$editPage, &$out ) {
+ $page = $editPage->getArticle()->getPage();
+ if ( !isset( $page->ConfirmEdit_ActivateCaptcha ) ) {
+ return;
+ }
+ unset( $page->ConfirmEdit_ActivateCaptcha );
$out->addWikiText( $this->getMessage( $this->action ) );
$out->addHTML( $this->getForm() );
}
@@ -223,29 +229,29 @@
// --
/**
-* @param EditPage $editPage
+* @param Title $title
* @param string $action (edit/create/addurl...)
-* @return bool true if action triggers captcha on editPage's namespace
+* @return bool true if action triggers captcha on $title's namespace
*/
- function captchaTriggers( &$editPage, $action ) {
+ function captchaTriggers( $title, $action ) {
global $wgCaptchaTriggers, $wgCaptchaTriggersOnNamespace;
// Special config for this NS?
- if ( isset(
$wgCaptchaTriggersOnNamespace[$editPage->mTitle->getNamespace()][$action] ) )
- return
$wgCaptchaTriggersOnNamespace[$editPage->mTitle->getNamespace()][$action];
+ if ( isset(
$wgCaptchaTriggersOnNamespace[$title->getNamespace()][$action] ) )
+ return
$wgCaptchaTriggersOnNamespace[$title->getNamespace()][$action];
return ( !empty( $wgCaptchaTriggers[$action] ) ); // Default
}
/**
-* @param $editPage EditPage
+* @param WikiPage $page
* @param $newtext string
* @param $section string
* @param $merged bool
* @return bool true if the captcha should run
*/
- function shouldCheck( &$editPage, $newtext, $section, $merged = false )
{
+ function shouldCheck( WikiPage $page, $newtext, $section, $merged =
false ) {
+ $title = $page->getTitle();
$this->trigger = '';
- $title = $editPage->mArticle->getTitle();
global $wgUser;
if ( $wgUser->isAllowed( 'skipcaptcha' ) ) {
@@ -263,7 +269,7 @@
return false;
}
- if ( $this->captchaTriggers( $editPage, 'edit' ) ) {
+ if ( $this->captchaTriggers( $title, 'edit' ) ) {
// Check on all edits
global $wgUser;
$this->trigger = sprintf( "edit trigger by '%s' at
[[%s]]",
@@ -274,7 +280,7 @@
return true;
}
- if ( $this->captchaTriggers( $editPage, 'create' ) &&
!$editPage->mTitle->exists() ) {
+ if ( $this->captchaTriggers( $title, 'create' ) &&
!$title->exists() ) {
// Check if creating a page
global $wgUser;
$this->trigger = sprintf( "Create trigger by '%s' at
[[%s]]",
@@ -285,19 +291,19 @@
return true;
[MediaWiki-commits] [Gerrit] When annotation mapping fails, fallback to translation witho... - change (mediawiki...cxserver)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177745
Change subject: When annotation mapping fails, fallback to translation without
annotation
..
When annotation mapping fails, fallback to translation without annotation
Bug: T76443
Change-Id: I666319fd223f571f5fda820b217353b1587519b4
---
M mt/MTClient.js
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/45/177745/1
diff --git a/mt/MTClient.js b/mt/MTClient.js
index 4758093..c31eb91 100644
--- a/mt/MTClient.js
+++ b/mt/MTClient.js
@@ -1,5 +1,6 @@
-var LinearDoc = require( '../lineardoc/LinearDoc' ),
+var LinearDoc = require( __dirname + '/../lineardoc/LinearDoc' ),
Q = require( 'q' ),
+ logger = require( __dirname + '/../utils/Logger.js' ),
SubSequenceMatcher = require(
'./annotationmapper/SubsequenceMatcher.js' );
/**
@@ -134,8 +135,10 @@
targetLines
);
} catch ( ex ) {
- deferred.reject( ex );
- return;
+ // If annotation mapping fails for any reason, return
translated text
+ // without annotations.
+ logger.error( 'Error while mapping annotations: ',
ex.stack );
+ rangeMappings = {};
}
deferred.resolve( {
text: targetText,
--
To view, visit https://gerrit.wikimedia.org/r/177745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I666319fd223f571f5fda820b217353b1587519b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1027 to trusty and mariadb 10 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: upgrade db1027 to trusty and mariadb 10
..
upgrade db1027 to trusty and mariadb 10
Change-Id: Iaf36e351882728bb036308eacc40aa7494b4ac44
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 5431673..e990fe8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -777,7 +777,7 @@
}
}
-node /^db10(35|44)\.eqiad\.wmnet/ {
+node /^db10(27|35|44)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/177743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf36e351882728bb036308eacc40aa7494b4ac44
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More error report content - change (apps...wikipedia)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177744
Change subject: More error report content
..
More error report content
Change-Id: I52a3572f8cb4605797115473325b5e529577c9c9
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/44/177744/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index a3192a9..f869563 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,5 +1,6 @@
package org.wikipedia.page;
+import org.acra.ACRA;
import org.wikipedia.NavDrawerFragment;
import org.wikipedia.PageTitle;
import org.wikipedia.R;
@@ -434,6 +435,9 @@
}
public void displayNewPage(final PageTitle title, final HistoryEntry
entry) {
+ACRA.getErrorReporter().putCustomData("api",
title.getSite().getApiDomain());
+ACRA.getErrorReporter().putCustomData("title", title.toString());
+
if (drawerLayout.isDrawerOpen(Gravity.START)) {
drawerLayout.closeDrawer(Gravity.START);
}
--
To view, visit https://gerrit.wikimedia.org/r/177744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52a3572f8cb4605797115473325b5e529577c9c9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1027 to trusty and mariadb 10 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177743
Change subject: upgrade db1027 to trusty and mariadb 10
..
upgrade db1027 to trusty and mariadb 10
Change-Id: Iaf36e351882728bb036308eacc40aa7494b4ac44
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/177743/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 5431673..e990fe8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -777,7 +777,7 @@
}
}
-node /^db10(35|44)\.eqiad\.wmnet/ {
+node /^db10(27|35|44)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/177743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf36e351882728bb036308eacc40aa7494b4ac44
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1027 for upgrade - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: depool db1027 for upgrade .. depool db1027 for upgrade Change-Id: I4c47d52d003c3d9aa1c1311cb5fb846e2bf21538 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4776e88..0528758 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1038' => 0, # 1.4TB 64GB 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1019' => 0, # 1.4TB 64GB, vslow, dump - 'db1027' => 400, # 1.4TB 64GB + # upgrade 'db1027' => 400, # 1.4TB 64GB 'db1035' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/177742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c47d52d003c3d9aa1c1311cb5fb846e2bf21538 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1027 for upgrade - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/177742 Change subject: depool db1027 for upgrade .. depool db1027 for upgrade Change-Id: I4c47d52d003c3d9aa1c1311cb5fb846e2bf21538 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/42/177742/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4776e88..0528758 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1038' => 0, # 1.4TB 64GB 'db1003' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1019' => 0, # 1.4TB 64GB, vslow, dump - 'db1027' => 400, # 1.4TB 64GB + # upgrade 'db1027' => 400, # 1.4TB 64GB 'db1035' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/177742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c47d52d003c3d9aa1c1311cb5fb846e2bf21538 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cxserver to 81bc108 on Beta - change (mediawiki...deploy)
KartikMistry has submitted this change and it was merged. Change subject: Update cxserver to 81bc108 on Beta .. Update cxserver to 81bc108 on Beta Changes: * 81bc108 Merge "Normalize whitespace of each Apertium output line" |\ | * 8665495 Normalize whitespace of each Apertium output line * | f001abf Fix command-line apertium-xhtml script |/ * 80dfe4d Refactor lineardoc module to multiple small files * 918f51c MT: Subsequence extraction and mapping * 6489523 Merge "Add missing urd (Urdu) and hin (Hindi) mapping" |\ | * a41d053 Add missing urd (Urdu) and hin (Hindi) mapping * | 8fbf85e Merge "Fix registry/README.md" |\ \ | |/ |/| | * 3b9424a Fix registry/README.md Change-Id: I5126eee8a52ff0713475268fc180768818a1a3d5 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Verified; Looks good to me, approved diff --git a/src b/src index 31d6559..81bc108 16 --- a/src +++ b/src -Subproject commit 31d6559bd993c32b81fb9dec8fe2d9dce044a017 +Subproject commit 81bc1081b6c9a87e0f95aa45c9047276f7a6c682 -- To view, visit https://gerrit.wikimedia.org/r/177534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5126eee8a52ff0713475268fc180768818a1a3d5 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry Gerrit-Reviewer: KartikMistry Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Santhosh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Normalize whitespace of each Apertium output line - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Normalize whitespace of each Apertium output line
..
Normalize whitespace of each Apertium output line
When translateLines pushes multiple strings through Apertium in a single API
call, strip leading/trailing whitespace from each of the returned strings.
Apertium.js already ensured that no leading/trailing whitespace is passed to
Apertium. However, in some cases Apertium can add extraneous leading/trailing
whitespace where none existed before (e.g. translating 'It is' from en to es).
This ensures that substring detection code has correct data to work on.
Bug: T76124
Change-Id: I676ad2d80bc6eb99757c984a31ba1f17b2225575
---
M mt/MTClient.js
1 file changed, 22 insertions(+), 15 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mt/MTClient.js b/mt/MTClient.js
index c0ce71c..15f3d4c 100644
--- a/mt/MTClient.js
+++ b/mt/MTClient.js
@@ -98,7 +98,7 @@
* @return {Object} Deferred promise: Translated plain text and range mappings
*/
MTClient.prototype.translateTextWithTagOffsets = function ( sourceLang,
targetLang, sourceText, tagOffsets ) {
- var subSequences, sourceLines, m, preSpace, postSpace,
trimmedSourceLines, deferred,
+ var subSequences, sourceLines, i, m, preSpaces, postSpaces,
trimmedSourceLines, deferred,
self = this;
subSequences = this.getSubSequences( sourceLang, sourceText, tagOffsets
);
@@ -106,13 +106,18 @@
return variant.text;
} );
sourceLines.splice( 0, 0, sourceText );
- // Don't push leading and trailing whitespace through MT client
- m = sourceText.match( /^(\s*).*?(\s*)$/ );
- preSpace = m[ 1 ];
- postSpace = m[ 2 ];
- trimmedSourceLines = sourceLines.map( function ( line ) {
- return line.trim();
- } );
+
+ // Strip and store leading/trailing whitespace before sending text to
MT server
+ preSpaces = [];
+ postSpaces = [];
+ trimmedSourceLines = [];
+ for ( i = 0; i < sourceLines.length; i++ ) {
+ // Search for zero or more leading and trailing spaces. This
will always match.
+ m = sourceLines[ i ].match( /^(\s*)(.*?)(\s*)$/ );
+ preSpaces[ i ] = m[ 1 ];
+ trimmedSourceLines[ i ] = m[ 2 ];
+ postSpaces[ i ] = m[ 3 ];
+ }
deferred = Q.defer();
// Join segments with a string that will definitely break sentences and
be preserved
@@ -120,13 +125,15 @@
sourceLang,
targetLang,
trimmedSourceLines
- ).then( function ( targetLines ) {
- var targetText, rangeMappings;
+ ).then( function ( unnormalizedTargetLines ) {
+ var targetLines, targetText, rangeMappings;
+ // Restore leading/trailing whitespace from source
+ targetLines = unnormalizedTargetLines.map( function ( line, i )
{
+ return preSpaces[ i ] + line.replace( /^\s+|\s+$/g, ''
) + postSpaces[ i ];
+ } );
try {
targetText = targetLines.splice( 0, 1 )[ 0 ];
- // restore trailing spaces if any.
- targetText = preSpace + targetText + postSpace;
rangeMappings = self.getSequenceMappings(
targetLang,
subSequences,
@@ -150,6 +157,8 @@
/**
* Translate multiple lines of plaintext
+ *
+ * The output may need normalizing for leading/trailing whitespace etc.
* @param {string} sourceLang Source language code
* @param {string} targetLang Target language code
* @param {string[]} sourceLines Source plaintext lines
@@ -168,9 +177,7 @@
targetLang,
sourceLinesText
).then( function ( targetLinesText ) {
- var targetText = targetLinesText
- .replace( /^\s+|\s+$/g, '' )
- .split( /\.॥॥\./g );
+ var targetText = targetLinesText.split( /\.॥॥\./g );
deferred.resolve( targetText );
}, function ( error ) {
deferred.reject( error );
--
To view, visit https://gerrit.wikimedia.org/r/176507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I676ad2d80bc6eb99757c984a31ba1f17b2225575
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Divec
Gerrit-Reviewer: Divec
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix command-line apertium-xhtml script - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix command-line apertium-xhtml script
..
Fix command-line apertium-xhtml script
The refactor commit 9739d66fe36fe33663dd230c10dcc1a649b66df4 changed the
Apertium
call interface so this script needed updating accordingly.
Change-Id: I84affdd50c6116d652122f0ddf84afda2a943c34
---
M bin/apertium-xhtml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/apertium-xhtml b/bin/apertium-xhtml
index af7a897..4d23f06 100755
--- a/bin/apertium-xhtml
+++ b/bin/apertium-xhtml
@@ -22,7 +22,7 @@
sourceHtml.push( data );
} );
process.stdin.on( 'end', function() {
- Apertium.translate(
+ new Apertium().translate(
sourceLang,
targetLang,
sourceHtml.join( '' )
--
To view, visit https://gerrit.wikimedia.org/r/177595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84affdd50c6116d652122f0ddf84afda2a943c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Divec
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1060 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: repool db1060 .. repool db1060 Change-Id: I25a060a0bfb562184c514f2f92ced573d836a3a0 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 95f266e..4776e88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -104,7 +104,7 @@ 'db1036' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1009' => 100, # 1.4TB 64GB, traffic sampling 'db1054' => 200, # 2.8TB 96GB, api - # upgrade 'db1060' => 200, # 2.8TB 96GB, api + 'db1060' => 200, # 2.8TB 96GB, api 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB ), @@ -178,7 +178,7 @@ ), 'api' => array( 'db1054' => 1, - # 'db1060' => 1, + 'db1060' => 1, ), 'watchlist' => array( 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/177741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25a060a0bfb562184c514f2f92ced573d836a3a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1060 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/177741 Change subject: repool db1060 .. repool db1060 Change-Id: I25a060a0bfb562184c514f2f92ced573d836a3a0 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/41/177741/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 95f266e..4776e88 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -104,7 +104,7 @@ 'db1036' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1009' => 100, # 1.4TB 64GB, traffic sampling 'db1054' => 200, # 2.8TB 96GB, api - # upgrade 'db1060' => 200, # 2.8TB 96GB, api + 'db1060' => 200, # 2.8TB 96GB, api 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB ), @@ -178,7 +178,7 @@ ), 'api' => array( 'db1054' => 1, - # 'db1060' => 1, + 'db1060' => 1, ), 'watchlist' => array( 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/177741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25a060a0bfb562184c514f2f92ced573d836a3a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikidata descriptions retrieved via new PageTerms API - change (apps...wikipedia)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177740
Change subject: Wikidata descriptions retrieved via new PageTerms API
..
Wikidata descriptions retrieved via new PageTerms API
This patch affects retrieving descriptions for
- Full text search items
- Lead image
- Disambig items
Change-Id: I6b308f57de805b6d1193cf6b55e5d74307f1aaa0
---
M wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
A wikipedia-it/src/main/java/org/wikipedia/test/GetDescriptionsTaskTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/PageTests.java
M wikipedia-it/src/main/java/org/wikipedia/test/ParcelableTest.java
M
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionFeederTests.java
D
wikipedia-it/src/main/java/org/wikipedia/test/WikidataDescriptionsTaskTests.java
M wikipedia/src/main/java/org/wikipedia/page/DisambigListAdapter.java
M wikipedia/src/main/java/org/wikipedia/page/PageProperties.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchResult.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchFragment.java
M wikipedia/src/main/java/org/wikipedia/search/TitleSearchTask.java
A wikipedia/src/main/java/org/wikipedia/wikidata/GetDescriptionsTask.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataCache.java
M wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionFeeder.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataDescriptionsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataIdsTask.java
D wikipedia/src/main/java/org/wikipedia/wikidata/WikidataSite.java
21 files changed, 215 insertions(+), 360 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/40/177740/1
diff --git
a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
index f3322d1..ad7b104 100644
--- a/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia-it/src/main/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -16,11 +16,13 @@
private static final int TASK_COMPLETION_TIMEOUT = 2;
private static final int BATCH_SIZE = 12;
private static final Site SITE = new Site("test.wikipedia.org");
+private static final Site EN_SITE = new Site("en.wikipedia.org");
public FullSearchTaskTests() {
super(TestDummyActivity.class);
}
+/** Have to use enwiki since I don't think there are any Wikidata
descriptions for testwiki. */
public void testFullTextSearchWithResults() throws Throwable {
startActivity(new Intent(), null, null);
final CountDownLatch completionLatch = new CountDownLatch(1);
@@ -28,7 +30,7 @@
@Override
public void run() {
final WikipediaApp app = (WikipediaApp)
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE,
"test", BATCH_SIZE, null) {
+new FullSearchArticlesTask(app.getAPIForSite(EN_SITE),
EN_SITE, "test", BATCH_SIZE, null) {
@Override
public void onFinish(FullSearchResults results) {
assertNotNull(results);
@@ -38,7 +40,7 @@
for (FullSearchResult result : results.getResults()) {
if
(result.getTitle().getPrefixedText().equals("Test")) {
-assertEquals(result.getWikiBaseId(), "Q377");
+assertEquals(result.getDescription(),
"Wikipedia disambiguation page");
}
}
completionLatch.countDown();
@@ -49,25 +51,27 @@
assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT,
TimeUnit.MILLISECONDS));
}
-public void testFullTextSearchWithSuggestion() throws Throwable {
-startActivity(new Intent(), null, null);
-final CountDownLatch completionLatch = new CountDownLatch(1);
-runTestOnUiThread(new Runnable() {
-@Override
-public void run() {
-final WikipediaApp app = (WikipediaApp)
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE,
"teest", BATCH_SIZE, null) { // small typo should produce a suggestion
-@Override
-public void onFinish(FullSearchResults results) {
-assertNotNull(results
[MediaWiki-commits] [Gerrit] [WIP] Manage warehouse migrations with alembic - change (analytics/data-warehouse)
Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177739
Change subject: [WIP] Manage warehouse migrations with alembic
..
[WIP] Manage warehouse migrations with alembic
Initial commit to validate strategy
Bug: T76829
Change-Id: I5d8e9e120f0a62c311b4b47e9ee7baf694ae27e2
---
A README
A requirements.txt
A setup.py
A warehouse-migrations/README
A warehouse-migrations/alembic.ini
A warehouse-migrations/migrations/env.py
A warehouse-migrations/migrations/versions/1_initial_revision.py
A warehouse-migrations/migrations/warehouse_schema.sql
A warehouse-migrations/models/__init__.py
A warehouse-migrations/models/base.py
A warehouse-migrations/models/edit.py
A warehouse-migrations/models/page.py
A warehouse-migrations/models/user.py
13 files changed, 479 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/data-warehouse
refs/changes/39/177739/1
diff --git a/README b/README
new file mode 100644
index 000..e96fc37
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+To install alembic run the following in the current directory
+
+pip install .
+
+
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000..baf465b
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+sqlalchemy>=0.8.1
+mysql-python==1.2.5
+alembic==0.6.4
diff --git a/setup.py b/setup.py
new file mode 100644
index 000..6cb8b61
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,29 @@
+"""
+Loads dependencies from requirements.txt and specifies installation details
+"""
+#!/usr/bin/env python
+# follow the frog
+
+from setuptools import setup
+from pip.req import parse_requirements
+
+# parse_requirements() returns generator of pip.req.InstallRequirement objects
+INSTALL_REQS = parse_requirements('requirements.txt')
+
+# REQS is a list of requirement
+# e.g. ['flask==0.9', 'sqlalchemye==0.8.1']
+REQS = [str(ir.req) for ir in INSTALL_REQS]
+
+setup(
+name='warehouse-migrations',
+version='0.0.1',
+description='Helper for Warehouse to run migrations via alembic ',
+url='http://blah',
+author='Dan Andreescu, Nuria Ruiz',
+packages=[
+'warehouse-migrations',
+],
+install_requires=REQS,
+entry_points={
+},
+)
diff --git a/warehouse-migrations/README b/warehouse-migrations/README
new file mode 100644
index 000..190102d
--- /dev/null
+++ b/warehouse-migrations/README
@@ -0,0 +1,10 @@
+
+Alembic scripts can be executed from the warehouse-migrations directory
+in order for things to work nicely you need to add the path to
warehouse-migrations
+to PYTHONPATH.
+
+export PYTHONPATH="$PYTHONPATH:/some/path/data-warehouse/warehouse-migrations"
+
+
+To get the sql for the initial revision:
+alembic upgrade 1 --sql
diff --git a/warehouse-migrations/alembic.ini b/warehouse-migrations/alembic.ini
new file mode 100644
index 000..1863506
--- /dev/null
+++ b/warehouse-migrations/alembic.ini
@@ -0,0 +1,54 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = migrations
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# max length of characters to apply to the
+# "slug" field
+#truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+sqlalchemy.url = not-used
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/warehouse-migrations/migrations/env.py
b/warehouse-migrations/migrations/env.py
new file mode 100644
index 000..5f0fe12
--- /dev/null
+++ b/warehouse-migrations/migrations/env.py
@@ -0,0 +1,72 @@
+from __future__ import with_statement
+from copy import deepcopy
+from os import environ, path
+from alembic import context
+from sqlalchemy import engine_from_config, pool, create_engine
+from logging.config import fileConfig
+from models import Base
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers
+fileConfig(config.config_file_name)
+
+# add your model's MetaData object here for 'autogenerate' support
+# initialize metadata
+#db.get_session()
+# set metadata
+target_metadata = Base.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_
[MediaWiki-commits] [Gerrit] Slimmed down Expert store initialization - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Slimmed down Expert store initialization
..
Slimmed down Expert store initialization
Change-Id: Ief8668d6935b2149ebe6902a7ec97f0741515577
---
M repo/resources/experts/getStore.js
1 file changed, 15 insertions(+), 37 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/experts/getStore.js
b/repo/resources/experts/getStore.js
index 1d6a447..e88ae5d 100644
--- a/repo/resources/experts/getStore.js
+++ b/repo/resources/experts/getStore.js
@@ -36,44 +36,22 @@
// Register experts for data types defined in Wikibase. Since those
data types are defined by a
// setting, it needs to be checked whether they are actually defined.
- var commonsMediaType = dataTypeStore.getDataType( 'commonsMedia' );
- if( commonsMediaType ) {
- expertStore.registerDataTypeExpert(
- vv.experts.CommonsMediaType,
- commonsMediaType.getId()
- );
- }
+ var dataTypeIdToExpertConstructor = {
+ 'commonsMedia': vv.experts.CommonsMediaType,
+ 'monolingualtext': vv.experts.MonolingualText,
+ 'url': vv.experts.StringValue,
+ 'wikibase-item': wb.experts.Item,
+ 'wikibase-property': wb.experts.Property
+ };
- var monoTextType = dataTypeStore.getDataType( 'monolingualtext' );
- if( monoTextType ) {
- expertStore.registerDataTypeExpert(
- vv.experts.MonolingualText,
- monoTextType.getId()
- );
- }
-
- var urlType = dataTypeStore.getDataType( 'url' );
- if( urlType ) {
- expertStore.registerDataTypeExpert(
- vv.experts.StringValue,
- urlType.getId()
- );
- }
-
- var wikibaseItemType = dataTypeStore.getDataType( 'wikibase-item' );
- if( wikibaseItemType ) {
- expertStore.registerDataTypeExpert(
- wb.experts.Item,
- wikibaseItemType.getId()
- );
- }
-
- var wikibasePropertyType = dataTypeStore.getDataType(
'wikibase-property' );
- if( wikibasePropertyType ) {
- expertStore.registerDataTypeExpert(
- wb.experts.Property,
- wikibasePropertyType.getId()
- );
+ for( var dataTypeId in dataTypeIdToExpertConstructor ) {
+ var dataType = dataTypeStore.getDataType( dataTypeId );
+ if( dataType ) {
+ expertStore.registerDataTypeExpert(
+ dataTypeIdToExpertConstructor[dataTypeId],
+ dataType.getId()
+ );
+ }
}
return expertStore;
--
To view, visit https://gerrit.wikimedia.org/r/177530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief8668d6935b2149ebe6902a7ec97f0741515577
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented wb.experts.Property - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Implemented wb.experts.Property
..
Implemented wb.experts.Property
for referencing Wikibase Properties
Bug: T76704
Change-Id: I002bd7f50fc951838a97f473ac9e1207023e2064
---
A repo/resources/experts/Property.js
M repo/resources/experts/getStore.js
M repo/resources/experts/resources.php
A repo/tests/qunit/experts/Property.tests.js
M repo/tests/qunit/resources.php
5 files changed, 78 insertions(+), 0 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/experts/Property.js
b/repo/resources/experts/Property.js
new file mode 100644
index 000..b9390b1
--- /dev/null
+++ b/repo/resources/experts/Property.js
@@ -0,0 +1,32 @@
+( function( wb, vv ) {
+ 'use strict';
+
+var MODULE = wb.experts,
+ PARENT = wb.experts.Entity;
+
+/**
+ * `valueview` `Expert` for specifying a reference to a Wikibase `Property`.
+ * @see jQuery.valueview.expert
+ * @see jQuery.valueview.Expert
+ * @class wikibase.experts.Property
+ * @extends wikibase.experts.Entity
+ * @uses jQuery.valueview
+ * @since 0.5
+ * @licence GNU GPL v2+
+ * @author H. Snater < mediaw...@snater.com >
+ */
+var SELF = MODULE.Property = vv.expert( 'wikibaseproperty', PARENT, {
+ /**
+* @inheritdoc
+*/
+ _init: function() {
+ PARENT.prototype._initEntityExpert.call( this );
+ }
+} );
+
+/**
+ * @inheritdoc
+ */
+SELF.TYPE = 'property';
+
+}( wikibase, jQuery.valueview ) );
diff --git a/repo/resources/experts/getStore.js
b/repo/resources/experts/getStore.js
index ef3a691..1d6a447 100644
--- a/repo/resources/experts/getStore.js
+++ b/repo/resources/experts/getStore.js
@@ -68,6 +68,14 @@
);
}
+ var wikibasePropertyType = dataTypeStore.getDataType(
'wikibase-property' );
+ if( wikibasePropertyType ) {
+ expertStore.registerDataTypeExpert(
+ wb.experts.Property,
+ wikibasePropertyType.getId()
+ );
+ }
+
return expertStore;
};
diff --git a/repo/resources/experts/resources.php
b/repo/resources/experts/resources.php
index 67bae85..a1dc338 100644
--- a/repo/resources/experts/resources.php
+++ b/repo/resources/experts/resources.php
@@ -41,6 +41,7 @@
'wikibase.datamodel.EntityId',
'wikibase.experts.__namespace',
'wikibase.experts.Item',
+ 'wikibase.experts.Property',
),
),
@@ -69,6 +70,17 @@
'wikibase.experts.Entity',
),
),
+
+ 'wikibase.experts.Property' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'Property.js',
+ ),
+ 'dependencies' => array(
+ 'jquery.valueview.Expert',
+ 'wikibase.experts.__namespace',
+ 'wikibase.experts.Entity',
+ ),
+ ),
);
} );
diff --git a/repo/tests/qunit/experts/Property.tests.js
b/repo/tests/qunit/experts/Property.tests.js
new file mode 100644
index 000..7e1e144
--- /dev/null
+++ b/repo/tests/qunit/experts/Property.tests.js
@@ -0,0 +1,16 @@
+/**
+ * @licence GNU GPL v2+
+ * @author H. Snater < mediaw...@snater.com >
+ */
+( function( QUnit, valueview, wb ) {
+ 'use strict';
+
+ var testExpert = valueview.tests.testExpert;
+
+ QUnit.module( 'wikibase.experts.Property' );
+
+ testExpert( {
+ expertConstructor: wb.experts.Property
+ } );
+
+}( QUnit, jQuery.valueview, wikibase ) );
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 8334384..903193c 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -111,6 +111,16 @@
),
),
+ 'wikibase.experts.Property.tests' => $moduleBase + array(
+ 'scripts' => array(
+ 'experts/Property.tests.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.experts.Property',
+ 'wikibase.tests.qunit.testrunner',
+ ),
+ ),
+
'wikibase.getLanguageNameByCode.tests' => $moduleBase + array(
'scripts' => array(
'wikibase.getLanguageNameByCode.tests.js'
--
To view, visit https://gerrit.wikimedia.org/r/177529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I002bd7f50fc951
[MediaWiki-commits] [Gerrit] Spin off wb.experts.Item from wb.experts.Entity - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Spin off wb.experts.Item from wb.experts.Entity
..
Spin off wb.experts.Item from wb.experts.Entity
Change-Id: I300a3abf0f10f0b3cf8048215ccd015e6e369fee
---
M repo/resources/experts/Entity.js
A repo/resources/experts/Item.js
M repo/resources/experts/getStore.js
M repo/resources/experts/resources.php
R repo/tests/qunit/experts/Item.tests.js
M repo/tests/qunit/resources.php
6 files changed, 99 insertions(+), 22 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/experts/Entity.js b/repo/resources/experts/Entity.js
index ceabd41..7a4a216 100644
--- a/repo/resources/experts/Entity.js
+++ b/repo/resources/experts/Entity.js
@@ -14,41 +14,64 @@
* `valueview` `Expert` for specifying a reference to a Wikibase
`Entity`.
* @class wikibase.experts.Entity
* @extends jQuery.valueview.experts.StringValue
+* @abstract
+* @uses jQuery.wikibase.entityselector
* @since 0.4
* @licence GNU GPL v2+
* @author Daniel Werner < daniel.wer...@wikimedia.de >
*/
- MODULE.Entity = vv.expert( 'wikibaseentity', PARENT, {
+ var SELF = MODULE.Entity = vv.expert( 'wikibaseentity', PARENT, {
/**
* @inheritdoc
+*
+* @throws {Error} when called because this `Expert` is meant
to be abstract.
*/
_init: function() {
+ throw new Error( 'Abstract Entity id expert cannot be
instantiated directly' );
+ },
+
+ /**
+* @protected
+*/
+ _initEntityExpert: function() {
PARENT.prototype._init.call( this );
// FIXME: Use SuggestedStringValue
var notifier = this._viewNotifier,
- $input = this.$input,
self = this,
repoConfig = mw.config.get( 'wbRepo' ),
repoApiUrl = repoConfig.url +
repoConfig.scriptPath + '/api.php';
- $input.entityselector( {
- url: repoApiUrl,
- selectOnAutocomplete: true
- } );
+ this._initEntityselector( repoApiUrl );
var value = this.viewState().value(),
entityId = value && value.getPrefixedId(
WB_ENTITIES_PREFIXMAP );
this.$input.data( 'entityselector' ).selectedEntity(
entityId );
- $input
+
+ this.$input
.on( 'eachchange.' + this.uiBaseClass, function( e ) {
$( this ).data( 'entityselector'
).repositionMenu();
} )
.on( 'entityselectorselected.' + this.uiBaseClass,
function( e ) {
self._resizeInput();
notifier.notify( 'change' );
+ } );
+ },
+
+ /**
+* Initializes a `jQuery.wikibase.entityselector` instance on
the `Expert`'s input element.
+* @abstract
+* @protected
+*
+* @param {string} repoApiUrl
+*/
+ _initEntityselector: function( repoApiUrl ) {
+ this.$input.entityselector( {
+ url: repoApiUrl,
+ type: this.constructor.TYPE,
+ selectOnAutocomplete: true
} );
},
@@ -81,4 +104,11 @@
}
} );
+ /**
+* `Entity` type this `Expert` supports.
+* @property {string} [TYPE=null]
+* @static
+*/
+ SELF.TYPE = null;
+
}( mediaWiki, wikibase, jQuery, jQuery.valueview ) );
diff --git a/repo/resources/experts/Item.js b/repo/resources/experts/Item.js
new file mode 100644
index 000..bf41a4b
--- /dev/null
+++ b/repo/resources/experts/Item.js
@@ -0,0 +1,32 @@
+( function( wb, vv ) {
+ 'use strict';
+
+var MODULE = wb.experts,
+ PARENT = wb.experts.Entity;
+
+/**
+ * `valueview` `Expert` for specifying a reference to a Wikibase `Item`.
+ * @see jQuery.valueview.expert
+ * @see jQuery.valueview.Expert
+ * @class wikibase.experts.Item
+ * @extends wikibase.experts.Entity
+ * @uses jQuery.valueview
+ * @since 0.5
+ * @licence GNU GPL v2+
+ * @author H. Snater < mediaw...@snater.com >
+ */
+var SELF = MODULE.Item = vv.expert( 'wikibaseitem', PARENT, {
+ /**
+* @inheritdoc
+*/
+ _init: function() {
+ PARENT.prototy
[MediaWiki-commits] [Gerrit] upgrade db1060 to trusty and mariadb 10 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: upgrade db1060 to trusty and mariadb 10
..
upgrade db1060 to trusty and mariadb 10
Change-Id: I1c8426fc7290fcc4c362834b85c7adc275df9e4d
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 688fa18..5431673 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -678,7 +678,7 @@
}
}
-node /^db10(02|09|18|54|60)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|54)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -759,7 +759,7 @@
}
}
-node /^db10(36|63|67)\.eqiad\.wmnet/ {
+node /^db10(36|60|63|67)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/177738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c8426fc7290fcc4c362834b85c7adc275df9e4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1060 to trusty and mariadb 10 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177738
Change subject: upgrade db1060 to trusty and mariadb 10
..
upgrade db1060 to trusty and mariadb 10
Change-Id: I1c8426fc7290fcc4c362834b85c7adc275df9e4d
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/177738/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 688fa18..5431673 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -678,7 +678,7 @@
}
}
-node /^db10(02|09|18|54|60)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|54)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -759,7 +759,7 @@
}
}
-node /^db10(36|63|67)\.eqiad\.wmnet/ {
+node /^db10(36|60|63|67)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/177738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c8426fc7290fcc4c362834b85c7adc275df9e4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RequestContext doesn't take any arguments - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/177737 Change subject: RequestContext doesn't take any arguments .. RequestContext doesn't take any arguments Change-Id: Ia0c32362d1c6ae850890aaa29b9b5bb6f1b47bec --- M client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/37/177737/1 diff --git a/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php b/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php index e328348..75b8650 100644 --- a/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php +++ b/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php @@ -138,7 +138,7 @@ $languageLinkTitle = Title::makeTitle( NS_MAIN, 'Test', '', 'en' ); - $context = new RequestContext( new FauxRequest() ); + $context = new RequestContext(); $output = new OutputPage( $context ); $output->setProperty( 'wikibase_badges', $badges ); diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php index bd194f9..a4320e6 100644 --- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php +++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php @@ -271,7 +271,7 @@ $parserOutput = new ParserOutput(); - $context = new RequestContext( new FauxRequest() ); + $context = new RequestContext(); $outputPage = new OutputPage( $context ); $outputPage->setTitle( $title ); @@ -305,7 +305,7 @@ $dummy = Title::makeTitle( NS_MAIN, 'Dummy' ); - $context = new RequestContext( new FauxRequest() ); + $context = new RequestContext(); $output = new OutputPage( $context ); $output->setProperty( 'wikibase_badges', $badges ); -- To view, visit https://gerrit.wikimedia.org/r/177737 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0c32362d1c6ae850890aaa29b9b5bb6f1b47bec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Track the most recent upload time for performance events - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Track the most recent upload time for performance events
..
Track the most recent upload time for performance events
Change-Id: I673f9487deea15dc148452a3a4d6b91563a2c417
Bug: T76035
---
M MultimediaViewer.php
M resources/mmv/logging/mmv.logging.PerformanceLogger.js
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboximage.js
M resources/mmv/model/mmv.model.Image.js
M resources/mmv/provider/mmv.provider.Image.js
M tests/qunit/mmv/logging/mmv.logging.PerformanceLogger.test.js
M tests/qunit/mmv/mmv.EmbedFileFormatter.test.js
M tests/qunit/mmv/mmv.test.js
M tests/qunit/mmv/model/mmv.model.Image.test.js
M tests/qunit/mmv/provider/mmv.provider.ImageInfo.test.js
11 files changed, 181 insertions(+), 86 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index f69e4ae..e8f8628 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -1063,7 +1063,7 @@
$wgHooks['EventLoggingRegisterSchemas'][] = function( array &$schemas ) {
$schemas += array(
'MediaViewer' => 10536413,
- 'MultimediaViewerNetworkPerformance' => 7917896,
+ 'MultimediaViewerNetworkPerformance' => 10596581,
'MultimediaViewerDuration' => 10427980,
'MultimediaViewerAttribution' => 9758179,
'MultimediaViewerDimensions' => 10014238,
diff --git a/resources/mmv/logging/mmv.logging.PerformanceLogger.js
b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
index bfde462..2ac6e1b 100644
--- a/resources/mmv/logging/mmv.logging.PerformanceLogger.js
+++ b/resources/mmv/logging/mmv.logging.PerformanceLogger.js
@@ -62,9 +62,10 @@
* cached by the browser, as it will consume unnecessary bandwidth for
the user.
* @param {string} type the type of request to be measured
* @param {string} url URL to be measured
+* @param {jQuery.Deferred.} [extraStatsDeferred] A promise
which resolves to the extra stats.
* @returns {jQuery.Promise} A promise that resolves when the contents
of the URL have been fetched
*/
- PL.record = function ( type, url ) {
+ PL.record = function ( type, url, extraStatsDeferred ) {
var deferred = $.Deferred(),
request,
perf = this,
@@ -89,7 +90,7 @@
if ( request.readyState === 4 ) {
deferred.notify( request.response, 100
);
deferred.resolve( request.response );
- perf.recordEntryDelayed( type, total,
url, request );
+ perf.recordEntryDelayed( type, total,
url, request, extraStatsDeferred );
}
};
@@ -111,9 +112,11 @@
* @param {number} total the total load time tracked with a basic
technique
* @param {string} url URL of that was measured
* @param {XMLHttpRequest} request HTTP request that just completed
+* @param {jQuery.Deferred.} [extraStatsDeferred] A promise
which resolves to extra stats to be included.
*/
- PL.recordEntry = function ( type, total, url, request ) {
+ PL.recordEntry = function ( type, total, url, request,
extraStatsDeferred ) {
var matches,
+ logger = this,
stats = { type: type,
contentHost: window.location.host,
isHttps: window.location.protocol === 'https:',
@@ -165,7 +168,11 @@
}
}
- this.log( stats );
+ ( extraStatsDeferred || $.Deferred().reject() ).done( function
( extraStats ) {
+ stats = $.extend( stats, extraStats );
+ } ).always( function () {
+ logger.log( stats );
+ } );
};
/**
@@ -305,14 +312,15 @@
* @param {number} total the total load time tracked with a basic
technique
* @param {string} url URL of that was measured
* @param {XMLHttpRequest} request HTTP request that just completed
+* @param {jQuery.Promise.} extraStatsDeferred A promise which
resolves to extra stats.
*/
- PL.recordEntryDelayed = function ( type, total, url, request ) {
+ PL.recordEntryDelayed = function ( type, total, url, request,
extraStatsDeferred ) {
var perf = this;
// The timeout is necessary because if there's an entry in
window.performance,
// it hasn't been added yet at this point
setTimeout( function() {
- perf.recordEntry( type, total,
[MediaWiki-commits] [Gerrit] depool db1060 for upgrade - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: depool db1060 for upgrade .. depool db1060 for upgrade Change-Id: Ib1f9d5d8cf46fdc77dbfe566da5e98cf0baead1a --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4776e88..95f266e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -104,7 +104,7 @@ 'db1036' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1009' => 100, # 1.4TB 64GB, traffic sampling 'db1054' => 200, # 2.8TB 96GB, api - 'db1060' => 200, # 2.8TB 96GB, api + # upgrade 'db1060' => 200, # 2.8TB 96GB, api 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB ), @@ -178,7 +178,7 @@ ), 'api' => array( 'db1054' => 1, - 'db1060' => 1, + # 'db1060' => 1, ), 'watchlist' => array( 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/177736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1f9d5d8cf46fdc77dbfe566da5e98cf0baead1a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1060 for upgrade - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/177736 Change subject: depool db1060 for upgrade .. depool db1060 for upgrade Change-Id: Ib1f9d5d8cf46fdc77dbfe566da5e98cf0baead1a --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/36/177736/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4776e88..95f266e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -104,7 +104,7 @@ 'db1036' => 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1009' => 100, # 1.4TB 64GB, traffic sampling 'db1054' => 200, # 2.8TB 96GB, api - 'db1060' => 200, # 2.8TB 96GB, api + # upgrade 'db1060' => 200, # 2.8TB 96GB, api 'db1063' => 500, # 2.8TB 128GB 'db1067' => 500, # 2.8TB 160GB ), @@ -178,7 +178,7 @@ ), 'api' => array( 'db1054' => 1, - 'db1060' => 1, + # 'db1060' => 1, ), 'watchlist' => array( 'db1036' => 1, -- To view, visit https://gerrit.wikimedia.org/r/177736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1f9d5d8cf46fdc77dbfe566da5e98cf0baead1a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cache the "otherProjectsLinks" setting - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177735
Change subject: Cache the "otherProjectsLinks" setting
..
Cache the "otherProjectsLinks" setting
This will make sure we don't always load all sites just to
compute that setting. This is for example relevant for pages
that are linked to an item, but don't have any links to other
projects.
Also it will make sure we don't loop over all 800+ sites
several times this often (in a test computing this list of
site ids took about 4ms with Zend on tin and 2ms with hhvm
on osmium, excluding time to fetch and unserialize the sitelist).
Change-Id: Icfe95f9b0b3ad3a53c9f973657dcb133c88286a6
---
A client/includes/CachingOtherProjectsSitesProvider.php
A client/includes/OtherProjectsSitesGenerator.php
M client/includes/OtherProjectsSitesProvider.php
M client/includes/WikibaseClient.php
A client/tests/phpunit/includes/CachingOtherProjectsSitesProviderTest.php
R client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
6 files changed, 285 insertions(+), 116 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/35/177735/1
diff --git a/client/includes/CachingOtherProjectsSitesProvider.php
b/client/includes/CachingOtherProjectsSitesProvider.php
new file mode 100644
index 000..cfee7ff
--- /dev/null
+++ b/client/includes/CachingOtherProjectsSitesProvider.php
@@ -0,0 +1,85 @@
+
+ */
+class CachingOtherProjectsSitesProvider implements OtherProjectsSitesProvider {
+
+ /**
+* @var OtherProjectsSitesProvider
+*/
+ private $otherProjectsSitesProvider;
+
+ /**
+* @var BagOStuff
+*/
+ private $cache;
+
+ /**
+* @var int
+*/
+ private $duration;
+
+ /**
+* @param OtherProjectsSitesProvider $otherProjectsSitesProvider
+* @param BagOStuff $cache
+* @param int $duration Cache duration
+*/
+ public function __construct(
+ OtherProjectsSitesProvider $otherProjectsSitesProvider,
+ BagOStuff $cache,
+ $duration
+ ) {
+ $this->otherProjectsSitesProvider = $otherProjectsSitesProvider;
+ $this->cache = $cache;
+ $this->duration = $duration;
+ }
+
+ /**
+* Get the site ids of other projects to use.
+*
+* @param array $siteLinkGroups
+* @return string[]
+*/
+ public function getOtherProjectsSiteIds( array $siteLinkGroups ) {
+ $cacheKey = $this->getCacheKey( $siteLinkGroups );
+ $siteIds = $this->cache->get( $cacheKey );
+
+ if ( $siteIds === false ) {
+ $siteIds = $this->generateAndCache( $cacheKey,
$siteLinkGroups );
+ }
+
+ return $siteIds;
+ }
+
+ /**
+* @param string $cacheKey
+* @param array $siteLinkGroups
+* @return string[]
+*/
+ private function generateAndCache( $cacheKey, array $siteLinkGroups ) {
+ $siteIds =
$this->otherProjectsSitesProvider->getOtherProjectsSiteIds( $siteLinkGroups );
+ $this->cache->set( $cacheKey, $siteIds, $this->duration );
+
+ return $siteIds;
+ }
+
+ /**
+* @param array $siteLinkGroups
+* @return string
+*/
+ private function getCacheKey( array $siteLinkGroups ) {
+ $settingsHash = sha1( json_encode( $siteLinkGroups ) );
+ return wfMemcKey( 'OtherProjectsSites', $settingsHash );
+ }
+}
diff --git a/client/includes/OtherProjectsSitesGenerator.php
b/client/includes/OtherProjectsSitesGenerator.php
new file mode 100644
index 000..7bb1c40
--- /dev/null
+++ b/client/includes/OtherProjectsSitesGenerator.php
@@ -0,0 +1,129 @@
+
+ */
+class OtherProjectsSitesGenerator implements OtherProjectsSitesProvider {
+
+ /**
+* @param SiteStore
+*/
+ private $siteStore;
+
+ /**
+* @var Site
+*/
+ private $currentSite;
+
+ /**
+* @var string[]
+*/
+ private $specialSiteGroups;
+
+ /**
+* @param SiteStore $siteStore
+* @param Site $currentSite
+* @param string[] $specialSiteGroups
+*/
+ public function __construct( SiteStore $siteStore, Site $currentSite,
array $specialSiteGroups ) {
+ $this->siteStore = $siteStore;
+ $this->currentSite = $currentSite;
+ $this->specialSiteGroups = $specialSiteGroups;
+ }
+
+ /**
+* Provides a list of sites to link to in the "other project" sidebar
+*
+* This list contains the wiki in the same language if it exists for
each other site groups and the wikis alone in their
+* sites groups (like commons)
+*
+* @param string[]
[MediaWiki-commits] [Gerrit] Remove jQuery Migrate and $wgIncludejQueryMigrate - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove jQuery Migrate and $wgIncludejQueryMigrate
..
Remove jQuery Migrate and $wgIncludejQueryMigrate
As indicated in MediaWiki 1.24, removing the jQuery Migrate bridging patch
that allows legacy Javascript code that depends ancient features of
jQuery removed in jQuery 1.9 to work.
Change-Id: I0934247182e2737716c9d40f4bf93415adcdadf3
---
M RELEASE-NOTES-1.25
M includes/DefaultSettings.php
M resources/Resources.php
D resources/lib/jquery/jquery.migrate.js
4 files changed, 6 insertions(+), 568 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index ce825e5..36d698f 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -29,6 +29,9 @@
* $wgOpenSearchTemplate is deprecated in favor of $wgOpenSearchTemplates.
* Edits are now prepared via AJAX as users type edit summaries. This behavior
can be disabled via $wgAjaxEditStash.
+* (bug 44740) The temporary option $wgIncludejQueryMigrate was removed, along
+ with the jQuery Migrate library, as indicated when this option was provided
in
+ MediaWiki 1.24.
=== New features in 1.25 ===
* (T64861) Updated plural rules to CLDR 26. Includes incompatible changes
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e644e09..64d9892 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3414,15 +3414,6 @@
$wgIncludeLegacyJavaScript = true;
/**
- * Whether to include the jQuery Migrate library, which lets legacy JS that
- * requires jQuery 1.8.x to work and breaks with 1.9.x+.
- *
- * @since 1.24
- * @deprecated since 1.24, to be removed in 1.25
- */
-$wgIncludejQueryMigrate = false;
-
-/**
* Whether to preload the mediawiki.util module as blocking module in the top
* queue.
*
diff --git a/resources/Resources.php b/resources/Resources.php
index 72cc2ef..d6a3181 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -121,14 +121,9 @@
/* jQuery */
'jquery' => array(
- 'scripts' => ( $GLOBALS['wgIncludejQueryMigrate'] ?
- array(
- 'resources/lib/jquery/jquery.js',
- 'resources/lib/jquery/jquery.migrate.js'
- ) :
- array(
- 'resources/lib/jquery/jquery.js'
- ) ),
+ 'scripts' => array(
+ 'resources/lib/jquery/jquery.js',
+ ),
'raw' => true,
'targets' => array( 'desktop', 'mobile' ),
),
diff --git a/resources/lib/jquery/jquery.migrate.js
b/resources/lib/jquery/jquery.migrate.js
deleted file mode 100644
index 5b18236..000
--- a/resources/lib/jquery/jquery.migrate.js
+++ /dev/null
@@ -1,551 +0,0 @@
-/*!
- * jQuery Migrate - v1.2.1 - 2013-05-08
- * https://github.com/jquery/jquery-migrate
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors;
Licensed MIT
- *
- * Patched for MediaWiki to add mw.track calls. --Krinkle 2014-04-14
- */
-(function( jQuery, window, undefined ) {
-// See http://bugs.jquery.com/ticket/13335
-// "use strict";
-
-
-var warnedAbout = {};
-
-// List of warnings already given; public read only
-jQuery.migrateWarnings = [];
-
-// Set to true to prevent console output; migrateWarnings still maintained
-// jQuery.migrateMute = false;
-
-// Show a message on the console so devs know we're active
-if ( !jQuery.migrateMute && window.console && window.console.log ) {
- window.console.log("JQMIGRATE: Logging is active");
-}
-
-// Set to false to disable traces that appear with warnings
-if ( jQuery.migrateTrace === undefined ) {
- jQuery.migrateTrace = true;
-}
-
-// Forget any warnings we've already given; public
-jQuery.migrateReset = function() {
- warnedAbout = {};
- jQuery.migrateWarnings.length = 0;
-};
-
-function migrateWarn( msg, key ) {
- var console = window.console;
- /*
- MediaWiki patch for tracking usage.
-
- Custom keys:
- - andSelf
- - attr-pass
- - attr-prop
- - bind-error
- - clean
- - create-html
- - data-events
- - die
- - event-ajax
- - event-global
- - event-hover
- - event-handle
- - input-type
- - json-invalid
- - live
- - sub
- - toggle-handle
-
- Prop keys:
- - attrFn
- - browser
- */
- mw.track( "jquery.migrate", key || "unknown" );
-
- if ( !warnedAbout[ msg ] ) {
- warnedAbout[ msg ] = true;
- jQuery.migrateWarnings
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: I419bd26888ca5c36c938dfc5a26b882bbc0434ae --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 0266dbc..1196491 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 +Subproject commit 1196491486c1d638f82b5723fd5f45f5d635cec2 -- To view, visit https://gerrit.wikimedia.org/r/177734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I419bd26888ca5c36c938dfc5a26b882bbc0434ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Awight Gerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Iefa0e2e9170c26120b2a639773652e5fee060261 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 0266dbc..1196491 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 +Subproject commit 1196491486c1d638f82b5723fd5f45f5d635cec2 -- To view, visit https://gerrit.wikimedia.org/r/177733 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefa0e2e9170c26120b2a639773652e5fee060261 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Awight Gerrit-Reviewer: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/177734 Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: I419bd26888ca5c36c938dfc5a26b882bbc0434ae --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/177734/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 0266dbc..1196491 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 +Subproject commit 1196491486c1d638f82b5723fd5f45f5d635cec2 -- To view, visit https://gerrit.wikimedia.org/r/177734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I419bd26888ca5c36c938dfc5a26b882bbc0434ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/177733 Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Iefa0e2e9170c26120b2a639773652e5fee060261 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/33/177733/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 0266dbc..1196491 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 +Subproject commit 1196491486c1d638f82b5723fd5f45f5d635cec2 -- To view, visit https://gerrit.wikimedia.org/r/177733 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefa0e2e9170c26120b2a639773652e5fee060261 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Don't insert banner for bots" (take 2) - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177732
Change subject: Revert "Don't insert banner for bots" (take 2)
..
Revert "Don't insert banner for bots" (take 2)
The fact that this didn't work the first time is causing me time travel.
This reverts commit 62742836702db175bfa7cfa31d229451ebd1c13b.
Change-Id: I8f92accc8f3ae475ba6130bfd357c11a58bcda9c
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/32/177732/1
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index fb2f671..26891cd 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -356,10 +356,6 @@
var url, targets, durations, cookieName, cookieVal, deleteOld,
now,
parsedCookie, bucket;
- if ( navigator.userAgent.match (
/bot|googlebot|crawler|spider|robot|crawling/i ) ) {
- return;
- }
-
var impressionData = {
country: mw.centralNotice.data.country,
uselang: mw.config.get( 'wgUserLanguage' ),
--
To view, visit https://gerrit.wikimedia.org/r/177732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f92accc8f3ae475ba6130bfd357c11a58bcda9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Don't insert banner for bots" (take 2) - change (mediawiki...CentralNotice)
Awight has submitted this change and it was merged.
Change subject: Revert "Don't insert banner for bots" (take 2)
..
Revert "Don't insert banner for bots" (take 2)
The fact that this didn't work the first time is causing me time travel.
This reverts commit 62742836702db175bfa7cfa31d229451ebd1c13b.
Change-Id: I8f92accc8f3ae475ba6130bfd357c11a58bcda9c
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Awight: Verified; Looks good to me, approved
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index fb2f671..26891cd 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -356,10 +356,6 @@
var url, targets, durations, cookieName, cookieVal, deleteOld,
now,
parsedCookie, bucket;
- if ( navigator.userAgent.match (
/bot|googlebot|crawler|spider|robot|crawling/i ) ) {
- return;
- }
-
var impressionData = {
country: mw.centralNotice.data.country,
uselang: mw.config.get( 'wgUserLanguage' ),
--
To view, visit https://gerrit.wikimedia.org/r/177732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f92accc8f3ae475ba6130bfd357c11a58bcda9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Infoboxes: Use correct urls in infoboxes. - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177731
Change subject: Infoboxes: Use correct urls in infoboxes.
..
Infoboxes: Use correct urls in infoboxes.
Was doing it wrong...
Don't make URLs that will throw 404s.
Change-Id: Ifb265636704c71864fc53fb08628929f165eede1
---
M javascripts/modules/infobox/Infobox.js
M javascripts/modules/wikigrok/WikiDataApi.js
2 files changed, 50 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/31/177731/1
diff --git a/javascripts/modules/infobox/Infobox.js
b/javascripts/modules/infobox/Infobox.js
index f2a0ab2..56eafc5 100644
--- a/javascripts/modules/infobox/Infobox.js
+++ b/javascripts/modules/infobox/Infobox.js
@@ -409,13 +409,14 @@
} );
// work out what they all mean
- return this.api.getLabels( labelIds ).then( function (
labels ) {
+ return this.api.getExpandedItemsData( labelIds ).then(
function ( labels ) {
// map the property id to the actual label.
$.each( rows, function ( i, row ) {
$.each( row.values, function ( j, value
) {
- if ( labels[ value.id ] ) {
- value.value = labels[
value.id ];
- value.url =
mw.util.getUrl( value.value );
+ var item = labels[ value.id ];
+ if ( item ) {
+ value.value =
item.label;
+ value.url = item.url;
}
} );
} );
diff --git a/javascripts/modules/wikigrok/WikiDataApi.js
b/javascripts/modules/wikigrok/WikiDataApi.js
index 2964a76..558149d 100644
--- a/javascripts/modules/wikigrok/WikiDataApi.js
+++ b/javascripts/modules/wikigrok/WikiDataApi.js
@@ -109,6 +109,51 @@
} );
return map;
} );
+ },
+ /**
+* Expand item ids to find associated data such as labels and
urls
+* for the wikidata entities for the current sitename.
+*
+* @param {Array} itemIds for items in Wikidata
+* @return {jQuery.Deferred} Object returned by ajax call
+*/
+ getExpandedItemsData: function ( itemIds ) {
+ var lang = this.language,
+ wiki = mw.config.get( 'wgDBname' ) || 'enwiki';
+
+ return this.ajax( {
+ action: 'wbgetentities',
+ sites: wiki,
+ props: [ 'labels', 'sitelinks/urls' ],
+ languages: lang,
+ ids: itemIds
+ } ).then( function ( data ) {
+ var map = {};
+
+ $.each( itemIds, function ( i, itemId ) {
+ var item, sitelink;
+
+ if ( data.entities[ itemId ].labels &&
+ data.entities[ itemId ].labels[
lang ] !== undefined
+ ) {
+ item = data.entities[ itemId ];
+ if ( item.sitelinks &&
item.sitelinks[wiki] ) {
+ sitelink =
item.sitelinks[wiki];
+ }
+
+ map[ itemId ] = {
+ label: sitelink ?
sitelink.title : item.labels[ lang ].value
+ };
+
+ if ( sitelink && sitelink.url )
{
+ map[ itemId ].url =
sitelink.url;
+ }
+ } else {
+ map[ itemId ] = null;
+ }
+ } );
+ return map;
+ } );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/177731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType:
[MediaWiki-commits] [Gerrit] WIP WorldPay Lynk (WP US) reconciliation - change (wikimedia...SmashPig)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177730
Change subject: WIP WorldPay Lynk (WP US) reconciliation
..
WIP WorldPay Lynk (WP US) reconciliation
Change-Id: I20d7fa469f4982da19626d432b7db1a4c394c54a
---
A PaymentProviders/WorldPay/Audit/LynkReconciliationFile.php
M PaymentProviders/WorldPay/Audit/WorldPayAudit.php
2 files changed, 163 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/30/177730/1
diff --git a/PaymentProviders/WorldPay/Audit/LynkReconciliationFile.php
b/PaymentProviders/WorldPay/Audit/LynkReconciliationFile.php
new file mode 100644
index 000..5387a69
--- /dev/null
+++ b/PaymentProviders/WorldPay/Audit/LynkReconciliationFile.php
@@ -0,0 +1,162 @@
+columnHeaders = array(
+ 'Record Type',
+ // TODO: turns out this number is not actually unique,
we are getting final zeroes
+ 'Reference Number',
+ //This doesn't exist?
+ // 'Lowest Defined User field',
+ 'Merchant Number',
+ 'Terminal ID',
+ 'Process Date',
+ 'Batch Number',
+ 'Sequence Number',
+ 'Card Network Type',
+ 'Transaction Type',
+ 'Transaction Date Time',
+ 'Authorization Only',
+ 'Authorization Date Time',
+ 'Card Payment Date',
+ 'Approval Code',
+ 'Settled Amount',
+ 'Dispensed Amount',
+ 'Cash Back Amount',
+ 'Surcharge Amount',
+ 'Original Authorized Amt',
+ 'Total Authorized Amount',
+ 'Complete Code',
+ 'Card Number',
+ 'Expiration Date',
+ 'Card Merchant Number',
+ 'Switch Network',
+ 'Authorized Network',
+ 'Authorized Code',
+ 'Authorized Type',
+ 'Authorized Response Code',
+ 'Response ACI',
+ 'Authorized Source Code',
+ 'VISA Trans Ref Num',
+ 'MC Banknet Data ',
+ 'Validation Code',
+ 'AVS Response Code',
+ 'Capture Type',
+ 'POS Entry Mode',
+ 'POS Term Capability',
+ 'Card ID Method',
+ 'Industry Type',
+ 'Restaurant Server ID',
+ 'Restaurant Tip Amt',
+ 'Lodge Folio Number ',
+ 'Lodge Arrival Date',
+ 'Lodge Departure Date',
+ 'Lodge No Show',
+ 'Lodge Stay Duration',
+ 'Lodge Local Phone ',
+ 'Lodge Customer Service Phone',
+ 'Lodge Charge Description',
+ 'Lodge Room Rate',
+ 'Lodge Prestige Prop Indicator',
+ 'Merchant Order Number',
+ );
+ }
+
+ static function isMine( $path ) {
+ $filename = basename( $path );
+ return preg_match( self::filenamePattern, $filename );
+ }
+
+ function parse( $path ) {
+ $this->path = $path;
+ $this->file = fopen( $path, 'r' );
+
+ $ignoreLines = 2;
+ for ( $i = 0; $i < $ignoreLines; $i++ ) {
+ fgets( $this->file );
+ }
+
+ while ( $line = fgetcsv( $this->file, 0, ',', '"', '\\' ) ) {
+ $this->parseLine( $line );
+ }
+ fclose( $this->file );
+
+ return $this->fileData;
+ }
+
+ /**
+* Parse one line.
+*/
+ protected function parseLine( $line ) {
+ $row = array_combine( $this->columnHeaders, $line );
+
+ $msg = $this->normalize( $row );
+ $this->fileData[] = $msg;
+ }
+
+ /**
+* Normalize the pieces of the message that exist, according to the
+* definition of a standard WMF queue message.
+*
+* Defaults should always be left up to the relevant queue consumer.
+*
+* See https://wikitech.wikimedia.org/wiki/Fundraising/Queue_messages
+*/
+ protected function normalize( $record ) {
+ $msg = array( );
+
+ if ( $record['Transaction Type'] == 'Credit Sale' ) {
+ $queue
[MediaWiki-commits] [Gerrit] Add and use Title::getOtherPage() - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177729
Change subject: Add and use Title::getOtherPage()
..
Add and use Title::getOtherPage()
Change-Id: I40a51c14ce07c301c15c6c2128cc18bb12e71103
---
M includes/Title.php
M includes/page/WikiPage.php
M tests/phpunit/includes/TitleMethodsTest.php
3 files changed, 47 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/177729/1
diff --git a/includes/Title.php b/includes/Title.php
index 638da08..562fc54 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1336,6 +1336,25 @@
}
/**
+* Get the other title for this page, if this is a subject page
+* get the talk page, if it is a subject page get the talk page
+*
+* @since 1.25
+* @throws MWException
+* @return Title
+*/
+ public function getOtherPage() {
+ if ( $this->isSpecialPage() ) {
+ throw new MWException( 'Special pages cannot have other
pages' );
+ }
+ if ( $this->isTalkPage() ) {
+ return $this->getSubjectPage();
+ } else {
+ return $this->getTalkPage();
+ }
+ }
+
+ /**
* Get the default namespace index, for when there is no namespace
*
* @return int Default namespace index
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 8b26c23..31d6fc8 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3158,11 +3158,7 @@
*/
public static function onArticleCreate( $title ) {
// Update existence markers on article/talk tabs...
- if ( $title->isTalkPage() ) {
- $other = $title->getSubjectPage();
- } else {
- $other = $title->getTalkPage();
- }
+ $other = $title->getOtherPage();
$other->invalidateCache();
$other->purgeSquid();
@@ -3179,11 +3175,7 @@
*/
public static function onArticleDelete( $title ) {
// Update existence markers on article/talk tabs...
- if ( $title->isTalkPage() ) {
- $other = $title->getSubjectPage();
- } else {
- $other = $title->getTalkPage();
- }
+ $other = $title->getOtherPage();
$other->invalidateCache();
$other->purgeSquid();
diff --git a/tests/phpunit/includes/TitleMethodsTest.php
b/tests/phpunit/includes/TitleMethodsTest.php
index 5904fac..707a4a1 100644
--- a/tests/phpunit/includes/TitleMethodsTest.php
+++ b/tests/phpunit/includes/TitleMethodsTest.php
@@ -297,4 +297,30 @@
$title = Title::newFromText( $title );
$this->assertEquals( $expectedBool, $title->isWikitextPage() );
}
+
+ public static function provideGetOtherPage() {
+ return array(
+ array( 'Main Page', 'Talk:Main Page' ),
+ array( 'Talk:Main Page', 'Main Page' ),
+ array( 'Help:Main Page', 'Help talk:Main Page' ),
+ array( 'Help talk:Main Page', 'Help:Main Page' ),
+ array( 'Special:FooBar', null ),
+ );
+ }
+
+ /**
+* @dataProvider provideGetOtherpage
+* @covers Title::getOtherPage
+*
+* @param string $text
+* @param string|null $expected
+*/
+ public function testGetOtherPage( $text, $expected ) {
+ if ( $expected === null ) {
+ $this->setExpectedException( 'MWException' );
+ }
+
+ $title = Title::newFromText( $text );
+ $this->assertEquals( $expected,
$title->getOtherPage()->getPrefixedText() );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/177729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40a51c14ce07c301c15c6c2128cc18bb12e71103
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gulped and ready for deploy - change (wikimedia...dash)
jenkins-bot has submitted this change and it was merged. Change subject: Gulped and ready for deploy .. Gulped and ready for deploy Change-Id: I4c7c22f40f8a54de5ccc1f41b5ab22158de7ac1b --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-97471915.js R dist/style-65aa068f.css 5 files changed, 34 insertions(+), 23 deletions(-) Approvals: Ssmith: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/177728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c7c22f40f8a54de5ccc1f41b5ab22158de7ac1b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith Gerrit-Reviewer: Ssmith Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gulped and ready for deploy - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/177728 Change subject: Gulped and ready for deploy .. Gulped and ready for deploy Change-Id: I4c7c22f40f8a54de5ccc1f41b5ab22158de7ac1b --- M dist/css.manifest.json M dist/index.html M dist/js.manifest.json R dist/scripts-97471915.js R dist/style-65aa068f.css 5 files changed, 34 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/28/177728/1 -- To view, visit https://gerrit.wikimedia.org/r/177728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c7c22f40f8a54de5ccc1f41b5ab22158de7ac1b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ssmith ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix txstatsd (deployed version turns out to have no batch su... - change (mediawiki...deploy)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177727
Change subject: Fix txstatsd (deployed version turns out to have no batch
support)
..
Fix txstatsd (deployed version turns out to have no batch support)
Change-Id: Ia8fbbb6292b55d5664f29836c130717ad3cfd4f3
---
M node_modules/node-txstatsd/index.js
M node_modules/node-txstatsd/package.json
M restbase
3 files changed, 21 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/27/177727/1
diff --git a/node_modules/node-txstatsd/index.js
b/node_modules/node-txstatsd/index.js
index 0c85e85..3a5e69a 100644
--- a/node_modules/node-txstatsd/index.js
+++ b/node_modules/node-txstatsd/index.js
@@ -146,14 +146,22 @@
if (!Array.isArray(stats)) {
stats = [stats];
}
-var message = stats.filter(function(item) {
-return item !== undefined;
-}).map(function(item) {
-return self.makeMessage(item, value, type, sampleRate);
-}).join('\n');
-if (message) {
-this._send(message, callback);
-}
+
+// txstatsd doesn't actually support multiple metrics in one packet
+//var message = stats.filter(function(item) {
+//return item !== undefined;
+//}).map(function(item) {
+//return self.makeMessage(item, value, type, sampleRate);
+//}).join('\n');
+//console.log(message);
+//if (message) {
+//this._send(message, callback);
+//}
+
+// So send them all individually
+stats.forEach(function(item) {
+self._send(self.makeMessage(item, value, type, sampleRate), callback);
+});
};
/**
diff --git a/node_modules/node-txstatsd/package.json
b/node_modules/node-txstatsd/package.json
index b3a60c7..63139a2 100644
--- a/node_modules/node-txstatsd/package.json
+++ b/node_modules/node-txstatsd/package.json
@@ -1,6 +1,6 @@
{
"name": "node-txstatsd",
- "version": "0.1.4",
+ "version": "0.1.5",
"description": "Modified version of https://github.com/sivy/node-statsd/ for
WMF specific",
"main": "index.js",
"scripts": {
@@ -25,8 +25,8 @@
},
"readme": "# node-txstatsd\n\nModified version of
https://github.com/sivy/node-statsd/ for WMF specific\ntxstatsd constraints.
We've removed increment/decrement and nullified the sets\nfunction if operating
in txstatsd mode.\n\n",
"readmeFilename": "README.md",
- "gitHead": "6713e28792419066ec51e0a0344070b0f1e66b66",
- "_id": "node-txstatsd@0.1.4",
- "_shasum": "35014b0dd0041583ec70f0a4400459c3be5472fd",
- "_from": "node-txstatsd@~0.1.4"
+ "gitHead": "779d8ca71694d22a4bf11b547b25e0c2d5521f14",
+ "_id": "node-txstatsd@0.1.5",
+ "_shasum": "9a7a9bcc149319fb553b228909dd2b9996f903bc",
+ "_from": "node-txstatsd@~0.1.5"
}
diff --git a/restbase b/restbase
index 5d29e1f..f11466e 16
--- a/restbase
+++ b/restbase
-Subproject commit 5d29e1f046e3ee7e8611b7b568de3bf9635ded97
+Subproject commit f11466e32d883458516261fba268fc3adb27531d
--
To view, visit https://gerrit.wikimedia.org/r/177727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8fbbb6292b55d5664f29836c130717ad3cfd4f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix txstatsd (deployed version turns out to have no batch su... - change (mediawiki...deploy)
GWicke has submitted this change and it was merged.
Change subject: Fix txstatsd (deployed version turns out to have no batch
support)
..
Fix txstatsd (deployed version turns out to have no batch support)
Change-Id: Ia8fbbb6292b55d5664f29836c130717ad3cfd4f3
---
M node_modules/node-txstatsd/index.js
M node_modules/node-txstatsd/package.json
M restbase
3 files changed, 21 insertions(+), 13 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/node_modules/node-txstatsd/index.js
b/node_modules/node-txstatsd/index.js
index 0c85e85..3a5e69a 100644
--- a/node_modules/node-txstatsd/index.js
+++ b/node_modules/node-txstatsd/index.js
@@ -146,14 +146,22 @@
if (!Array.isArray(stats)) {
stats = [stats];
}
-var message = stats.filter(function(item) {
-return item !== undefined;
-}).map(function(item) {
-return self.makeMessage(item, value, type, sampleRate);
-}).join('\n');
-if (message) {
-this._send(message, callback);
-}
+
+// txstatsd doesn't actually support multiple metrics in one packet
+//var message = stats.filter(function(item) {
+//return item !== undefined;
+//}).map(function(item) {
+//return self.makeMessage(item, value, type, sampleRate);
+//}).join('\n');
+//console.log(message);
+//if (message) {
+//this._send(message, callback);
+//}
+
+// So send them all individually
+stats.forEach(function(item) {
+self._send(self.makeMessage(item, value, type, sampleRate), callback);
+});
};
/**
diff --git a/node_modules/node-txstatsd/package.json
b/node_modules/node-txstatsd/package.json
index b3a60c7..63139a2 100644
--- a/node_modules/node-txstatsd/package.json
+++ b/node_modules/node-txstatsd/package.json
@@ -1,6 +1,6 @@
{
"name": "node-txstatsd",
- "version": "0.1.4",
+ "version": "0.1.5",
"description": "Modified version of https://github.com/sivy/node-statsd/ for
WMF specific",
"main": "index.js",
"scripts": {
@@ -25,8 +25,8 @@
},
"readme": "# node-txstatsd\n\nModified version of
https://github.com/sivy/node-statsd/ for WMF specific\ntxstatsd constraints.
We've removed increment/decrement and nullified the sets\nfunction if operating
in txstatsd mode.\n\n",
"readmeFilename": "README.md",
- "gitHead": "6713e28792419066ec51e0a0344070b0f1e66b66",
- "_id": "node-txstatsd@0.1.4",
- "_shasum": "35014b0dd0041583ec70f0a4400459c3be5472fd",
- "_from": "node-txstatsd@~0.1.4"
+ "gitHead": "779d8ca71694d22a4bf11b547b25e0c2d5521f14",
+ "_id": "node-txstatsd@0.1.5",
+ "_shasum": "9a7a9bcc149319fb553b228909dd2b9996f903bc",
+ "_from": "node-txstatsd@~0.1.5"
}
diff --git a/restbase b/restbase
index 5d29e1f..f11466e 16
--- a/restbase
+++ b/restbase
-Subproject commit 5d29e1f046e3ee7e8611b7b568de3bf9635ded97
+Subproject commit f11466e32d883458516261fba268fc3adb27531d
--
To view, visit https://gerrit.wikimedia.org/r/177727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8fbbb6292b55d5664f29836c130717ad3cfd4f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke
Gerrit-Reviewer: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Ia6c1a935b87c66c552889a9c3a4092002bd825c3 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 78f6b61..0266dbc 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 78f6b61cf24b1272cacf9f2020c954fa6c2d668f +Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 -- To view, visit https://gerrit.wikimedia.org/r/177725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6c1a935b87c66c552889a9c3a4092002bd825c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Awight Gerrit-Reviewer: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has submitted this change and it was merged. Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Ifee665014da4b55a2b28ffac8bfa3a1d15166aa2 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 78f6b61..0266dbc 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 78f6b61cf24b1272cacf9f2020c954fa6c2d668f +Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 -- To view, visit https://gerrit.wikimedia.org/r/177726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifee665014da4b55a2b28ffac8bfa3a1d15166aa2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Awight Gerrit-Reviewer: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Register a shutdown function to log fatal errors - change (mediawiki/core)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177724
Change subject: Register a shutdown function to log fatal errors
..
Register a shutdown function to log fatal errors
MWExceptionHandler::handleFatalError() is installed as a shutdown
function to inspect `error_get_last()` output and log the error via
MWExceptionHandler::logError(). The error is examined to determine if it
is a "Class undefined" error so that a descriptive log message can be
provided instructing the server administrator on 3rd party library
installation methods.
Bug: T74777
Change-Id: I04748626487022c51050ffa7846236947a082d68
---
M includes/exception/MWExceptionHandler.php
1 file changed, 51 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/177724/1
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index 9db04cb..ae7f69b 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -24,12 +24,24 @@
*/
class MWExceptionHandler {
+ protected static $reservedMemory;
+ protected static $fatalErrorTypes = array(
+ E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR,
+ /* HHVM's FATAL_ERROR level */ 16777217,
+ );
+
/**
* Install handlers with PHP.
*/
public static function installHandler() {
set_exception_handler( array( 'MWExceptionHandler',
'handleException' ) );
set_error_handler( array( 'MWExceptionHandler', 'handleError' )
);
+
+ // Reserve 16k of memory so we can report OOM fatals
+ self::$reservedMemory = str_repeat( ' ', 16384 );
+ register_shutdown_function(
+ array( 'MWExceptionHandler', 'handleFatalError' )
+ );
}
/**
@@ -194,6 +206,9 @@
case E_USER_DEPRECATED:
$levelName = 'Deprecated';
break;
+ case /* HHVM's FATAL_ERROR */ 16777217:
+ $levelName = 'Fatal';
+ break;
default:
$levelName = 'Unknown error';
break;
@@ -207,6 +222,42 @@
return false;
}
+
+ /**
+* Look for a fatal error as the cause of the request termination and
log
+* as an exception.
+*
+* Special handling is included for "Class undefined" errors as they may
+* indicate that the user needs to install 3rd-party libraries via
+* Composer or other means.
+*
+* @since 1.25
+*/
+ public static function handleFatalError () {
+ self::$reservedMemory = null;
+ $lastError = error_get_last();
+
+ var_dump( $lastError );
+
+ if ( $lastError &&
+ isset( $lastError['type'] ) &&
+ in_array( $lastError['type'], self::$fatalErrorTypes )
+ ) {
+ $msg = "Fatal Error: {$lastError['message']}";
+ if ( preg_match( '/Class undefined/',
$lastError['message'] ) ) {
+ $msg = <mediawiki.org
for help on installing the required components.
+TXT;
+ }
+ $e = new ErrorException( $msg, 0, $lastError['type'] );
+ self::logError( $e );
+ }
+ }
+
/**
* Generate a string representation of an exception's stack trace
*
--
To view, visit https://gerrit.wikimedia.org/r/177724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04748626487022c51050ffa7846236947a082d68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/177726 Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Ifee665014da4b55a2b28ffac8bfa3a1d15166aa2 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/177726/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 78f6b61..0266dbc 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 78f6b61cf24b1272cacf9f2020c954fa6c2d668f +Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 -- To view, visit https://gerrit.wikimedia.org/r/177726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifee665014da4b55a2b28ffac8bfa3a1d15166aa2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update CentralNotice submodule - change (mediawiki/core)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/177725 Change subject: update CentralNotice submodule .. update CentralNotice submodule Change-Id: Ia6c1a935b87c66c552889a9c3a4092002bd825c3 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/25/177725/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 78f6b61..0266dbc 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 78f6b61cf24b1272cacf9f2020c954fa6c2d668f +Subproject commit 0266dbc0b146b60958ef5e523c64384c48ed4052 -- To view, visit https://gerrit.wikimedia.org/r/177725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6c1a935b87c66c552889a9c3a4092002bd825c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge master into wmf_deploy - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: Merge master into wmf_deploy .. Merge master into wmf_deploy Change-Id: Iffac5bf4067f559f5788b3be213af117108f509e --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/177723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffac5bf4067f559f5788b3be213af117108f509e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Awight Gerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge master into wmf_deploy - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/177723 Change subject: Merge master into wmf_deploy .. Merge master into wmf_deploy Change-Id: Iffac5bf4067f559f5788b3be213af117108f509e --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/23/177723/1 -- To view, visit https://gerrit.wikimedia.org/r/177723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffac5bf4067f559f5788b3be213af117108f509e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update node-txstatsd package - change (mediawiki...deploy)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177722
Change subject: Update node-txstatsd package
..
Update node-txstatsd package
Change-Id: I8a8b3d8b3ade518acbeb2da5ca2986b82d04f182
---
M node_modules/node-txstatsd/index.js
M node_modules/node-txstatsd/package.json
M restbase
3 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/22/177722/1
diff --git a/node_modules/node-txstatsd/index.js
b/node_modules/node-txstatsd/index.js
index 07673d8..0c85e85 100644
--- a/node_modules/node-txstatsd/index.js
+++ b/node_modules/node-txstatsd/index.js
@@ -182,11 +182,13 @@
if(sampleRate && sampleRate < 1){
if(Math.random() < sampleRate){
-message += '|@' + sampleRate;
+return message + '|@' + sampleRate;
} else {
//don't want to send if we don't meet the sample ratio
return;
}
+} else {
+return message;
}
};
diff --git a/node_modules/node-txstatsd/package.json
b/node_modules/node-txstatsd/package.json
index fb5a8a9..b3a60c7 100644
--- a/node_modules/node-txstatsd/package.json
+++ b/node_modules/node-txstatsd/package.json
@@ -1,6 +1,6 @@
{
"name": "node-txstatsd",
- "version": "0.1.3",
+ "version": "0.1.4",
"description": "Modified version of https://github.com/sivy/node-statsd/ for
WMF specific",
"main": "index.js",
"scripts": {
@@ -25,8 +25,8 @@
},
"readme": "# node-txstatsd\n\nModified version of
https://github.com/sivy/node-statsd/ for WMF specific\ntxstatsd constraints.
We've removed increment/decrement and nullified the sets\nfunction if operating
in txstatsd mode.\n\n",
"readmeFilename": "README.md",
- "gitHead": "cbd4f6f91a87a5f50d399174e78106d5ced95149",
- "_id": "node-txstatsd@0.1.3",
- "_shasum": "fc592bbbd50bdcde81202c1a6713457f38181653",
- "_from": "node-txstatsd@~0.1.1"
+ "gitHead": "6713e28792419066ec51e0a0344070b0f1e66b66",
+ "_id": "node-txstatsd@0.1.4",
+ "_shasum": "35014b0dd0041583ec70f0a4400459c3be5472fd",
+ "_from": "node-txstatsd@~0.1.4"
}
diff --git a/restbase b/restbase
index 2271604..5d29e1f 16
--- a/restbase
+++ b/restbase
-Subproject commit 2271604c64cb1aa0f13d299b4ab17d0ce68680b1
+Subproject commit 5d29e1f046e3ee7e8611b7b568de3bf9635ded97
--
To view, visit https://gerrit.wikimedia.org/r/177722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a8b3d8b3ade518acbeb2da5ca2986b82d04f182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update node-txstatsd package - change (mediawiki...deploy)
GWicke has submitted this change and it was merged.
Change subject: Update node-txstatsd package
..
Update node-txstatsd package
Change-Id: I8a8b3d8b3ade518acbeb2da5ca2986b82d04f182
---
M node_modules/node-txstatsd/index.js
M node_modules/node-txstatsd/package.json
M restbase
3 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/node_modules/node-txstatsd/index.js
b/node_modules/node-txstatsd/index.js
index 07673d8..0c85e85 100644
--- a/node_modules/node-txstatsd/index.js
+++ b/node_modules/node-txstatsd/index.js
@@ -182,11 +182,13 @@
if(sampleRate && sampleRate < 1){
if(Math.random() < sampleRate){
-message += '|@' + sampleRate;
+return message + '|@' + sampleRate;
} else {
//don't want to send if we don't meet the sample ratio
return;
}
+} else {
+return message;
}
};
diff --git a/node_modules/node-txstatsd/package.json
b/node_modules/node-txstatsd/package.json
index fb5a8a9..b3a60c7 100644
--- a/node_modules/node-txstatsd/package.json
+++ b/node_modules/node-txstatsd/package.json
@@ -1,6 +1,6 @@
{
"name": "node-txstatsd",
- "version": "0.1.3",
+ "version": "0.1.4",
"description": "Modified version of https://github.com/sivy/node-statsd/ for
WMF specific",
"main": "index.js",
"scripts": {
@@ -25,8 +25,8 @@
},
"readme": "# node-txstatsd\n\nModified version of
https://github.com/sivy/node-statsd/ for WMF specific\ntxstatsd constraints.
We've removed increment/decrement and nullified the sets\nfunction if operating
in txstatsd mode.\n\n",
"readmeFilename": "README.md",
- "gitHead": "cbd4f6f91a87a5f50d399174e78106d5ced95149",
- "_id": "node-txstatsd@0.1.3",
- "_shasum": "fc592bbbd50bdcde81202c1a6713457f38181653",
- "_from": "node-txstatsd@~0.1.1"
+ "gitHead": "6713e28792419066ec51e0a0344070b0f1e66b66",
+ "_id": "node-txstatsd@0.1.4",
+ "_shasum": "35014b0dd0041583ec70f0a4400459c3be5472fd",
+ "_from": "node-txstatsd@~0.1.4"
}
diff --git a/restbase b/restbase
index 2271604..5d29e1f 16
--- a/restbase
+++ b/restbase
-Subproject commit 2271604c64cb1aa0f13d299b4ab17d0ce68680b1
+Subproject commit 5d29e1f046e3ee7e8611b7b568de3bf9635ded97
--
To view, visit https://gerrit.wikimedia.org/r/177722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a8b3d8b3ade518acbeb2da5ca2986b82d04f182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke
Gerrit-Reviewer: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Promoting WikiGrok to stable and disabling for anons (with f... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Promoting WikiGrok to stable and disabling for anons (with flag)
..
Promoting WikiGrok to stable and disabling for anons (with flag)
See:
https://trello.com/c/oE0pz4EK/5-5-wikigrok-a-b-test-in-stable-logged-in
Change-Id: Id0b1bdc26636c51abb405566eb1a5a39346fe10b
---
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
M includes/Resources.php
M javascripts/modules/wikigrok/WikiGrokDialog.js
M javascripts/modules/wikigrok/WikiGrokDialogB.js
M javascripts/modules/wikigrok/WikiGrokMoreInfo.js
M javascripts/modules/wikigrok/init.js
7 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
MaxSem: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
Phuedx: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/MobileFrontend.php b/MobileFrontend.php
index 857678e..a257efa 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -549,7 +549,13 @@
$wgMFEnableWikiGrok = false;
/**
- * Controls whether the WikiGrok is permitted on all devices
+ * Controls whether WikiGrok is displayed to anonymous users
+ * (If $wgMFEnableWikiGrok is false, this setting is moot)
+ */
+$wgMFEnableWikiGrokForAnons = false;
+
+/**
+ * Controls whether WikiGrok is permitted on all devices
*/
$wgMFEnableWikiGrokOnAllDevices = false;
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index a9aa607..3600ba0 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -362,7 +362,7 @@
*/
public static function onResourceLoaderGetConfigVars( &$vars ) {
global $wgMFNearbyEndpoint, $wgMFContentNamespace,
$wgMFEnableWikiGrok,
- $wgMFEnableWikiGrokOnAllDevices;
+ $wgMFEnableWikiGrokForAnons,
$wgMFEnableWikiGrokOnAllDevices;
$vars['wgMFNearbyEndpoint'] = $wgMFNearbyEndpoint;
$vars['wgMFThumbnailSizes'] = array(
'tiny' => MobilePage::TINY_IMAGE_WIDTH,
@@ -372,6 +372,7 @@
$vars['wgMFContentNamespace'] = $wgMFContentNamespace;
// Requires WikiGrok extension
$vars['wgMFEnableWikiGrok'] = $wgMFEnableWikiGrok &&
class_exists( 'WikiGrok\Api\ApiResponse' );
+ $vars['wgMFEnableWikiGrokForAnons'] =
$wgMFEnableWikiGrokForAnons;
$vars['wgMFEnableWikiGrokOnAllDevices'] =
$wgMFEnableWikiGrokOnAllDevices;
// Set the licensing agreement that is displayed in the editor.
diff --git a/includes/Resources.php b/includes/Resources.php
index 5dc50b4..df3c77e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1269,6 +1269,7 @@
'mobile.search',
'mobile.references',
'mobile.redirect',
+ 'mobile.wikigrok',
// FIXME: only load when uploads enabled
'mobile.upload.ui',
),
@@ -1285,7 +1286,6 @@
// Feature modules that should be loaded in beta should
be listed below here.
// These modules should only setup routes/events or
// load code under certain conditions.
- 'mobile.wikigrok',
'mobile.preferredLanguages',
'mobile.references.beta',
),
diff --git a/javascripts/modules/wikigrok/WikiGrokDialog.js
b/javascripts/modules/wikigrok/WikiGrokDialog.js
index 6dbcd99..0a5393f 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialog.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialog.js
@@ -1,6 +1,4 @@
( function ( M, $ ) {
- M.assertMode( [ 'beta', 'alpha' ] );
-
var Panel = M.require( 'Panel' ),
settings = M.require( 'settings' ),
WikiGrokResponseApi = M.require(
'modules/wikigrok/WikiGrokResponseApi' ),
diff --git a/javascripts/modules/wikigrok/WikiGrokDialogB.js
b/javascripts/modules/wikigrok/WikiGrokDialogB.js
index 7b10779..805ea90 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialogB.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialogB.js
@@ -1,6 +1,4 @@
( function ( M, $ ) {
- M.assertMode( [ 'beta', 'alpha' ] );
-
var WikiGrokDialog = M.require( 'modules/wikigrok/WikiGrokDialog' ),
WikiGrokDialogB;
diff --git a/javascripts/modules/wikigrok/WikiGrokMoreInfo.js
b/javascripts/modules/wikigrok/WikiGrokMoreInfo.js
index 3cfa621..bb65a2d 100644
--- a/javascripts/modules/wikigrok/WikiGrokMoreInfo.js
+++ b/javascripts/modules/wikigrok/WikiGrokMoreInfo.js
@@ -1,6 +1,4 @@
( function ( M ) {
- M.assertMode( [ 'beta', 'alpha' ] );
-
var Overlay = M.require( 'Overlay' ),
WikiGrokMoreInfo;
diff --git a/javascripts
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.3.0 - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177721
Change subject: Update OOjs UI to v0.3.0
..
Update OOjs UI to v0.3.0
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.3.0/History.md
Change-Id: I8c81656d4f95138d7c187e71e52ee60b669a46a5
---
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
11 files changed, 601 insertions(+), 57 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/21/177721/1
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index 2756079..f719d0c 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-12-02T18:45:30Z
+ * Date: 2014-12-05T00:54:15Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -303,6 +303,27 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
+.oo-ui-draggableElement {
+ cursor: -webkit-grab -moz-grab,
url(https://mail.google.com/mail/images/2/openhand.cur), move;
+ /*
+* HACK: In order to style horizontally, we must override
+* OO.ui.OptionWidget's display rule that is currently set
+* to be 'block'
+*/
+}
+.oo-ui-draggableElement-dragging {
+ cursor: -webkit-grabbing -moz-grabbing,
url(https://mail.google.com/mail/images/2/closedhand.cur), move;
+ background: rgba(0, 0, 0, 0.2);
+ opacity: 0.4;
+}
+.oo-ui-draggableGroupElement-horizontal
.oo-ui-draggableElement.oo-ui-optionWidget {
+ display: inline-block;
+}
+.oo-ui-draggableGroupElement-placeholder {
+ position: absolute;
+ display: block;
+ background: rgba(0, 0, 0, 0.4);
+}
.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous
.oo-ui-panelLayout-scrollable {
overflow-y: hidden;
}
diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js
index bf7e39f..c2e5a9e 100644
--- a/lib/oojs-ui/oojs-ui-apex.js
+++ b/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-12-02T18:45:19Z
+ * Date: 2014-12-05T00:54:04Z
*/
/* Instantiation */
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index 36dbe18..813a182 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-12-02T18:45:30Z
+ * Date: 2014-12-05T00:54:15Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-right: -40%;
@@ -303,6 +303,27 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
+.oo-ui-draggableElement {
+ cursor: -webkit-grab -moz-grab,
url(https://mail.google.com/mail/images/2/openhand.cur), move;
+ /*
+* HACK: In order to style horizontally, we must override
+* OO.ui.OptionWidget's display rule that is currently set
+* to be 'block'
+*/
+}
+.oo-ui-draggableElement-dragging {
+ cursor: -webkit-grabbing -moz-grabbing,
url(https://mail.google.com/mail/images/2/closedhand.cur), move;
+ background: rgba(0, 0, 0, 0.2);
+ opacity: 0.4;
+}
+.oo-ui-draggableGroupElement-horizontal
.oo-ui-draggableElement.oo-ui-optionWidget {
+ display: inline-block;
+}
+.oo-ui-draggableGroupElement-placeholder {
+ position: absolute;
+ display: block;
+ background: rgba(0, 0, 0, 0.4);
+}
.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous
.oo-ui-panelLayout-scrollable {
overflow-y: hidden;
}
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css
index 7d4acb5..06e7c33 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date:
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.3.0 - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177720
Change subject: Update OOjs UI to v0.3.0
..
Update OOjs UI to v0.3.0
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.3.0/History.md
Change-Id: I8c81656d4f95138d7c187e71e52ee60b669a46a5
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui.js
7 files changed, 507 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/20/177720/1
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index 2756079..f719d0c 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-12-02T18:45:30Z
+ * Date: 2014-12-05T00:54:15Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -303,6 +303,27 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
+.oo-ui-draggableElement {
+ cursor: -webkit-grab -moz-grab,
url(https://mail.google.com/mail/images/2/openhand.cur), move;
+ /*
+* HACK: In order to style horizontally, we must override
+* OO.ui.OptionWidget's display rule that is currently set
+* to be 'block'
+*/
+}
+.oo-ui-draggableElement-dragging {
+ cursor: -webkit-grabbing -moz-grabbing,
url(https://mail.google.com/mail/images/2/closedhand.cur), move;
+ background: rgba(0, 0, 0, 0.2);
+ opacity: 0.4;
+}
+.oo-ui-draggableGroupElement-horizontal
.oo-ui-draggableElement.oo-ui-optionWidget {
+ display: inline-block;
+}
+.oo-ui-draggableGroupElement-placeholder {
+ position: absolute;
+ display: block;
+ background: rgba(0, 0, 0, 0.4);
+}
.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous
.oo-ui-panelLayout-scrollable {
overflow-y: hidden;
}
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js
b/resources/lib/oojs-ui/oojs-ui-apex.js
index bf7e39f..c2e5a9e 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-12-02T18:45:19Z
+ * Date: 2014-12-05T00:54:04Z
*/
/* Instantiation */
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index 7d4acb5..06e7c33 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-12-02T18:45:30Z
+ * Date: 2014-12-05T00:54:15Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -303,6 +303,27 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
+.oo-ui-draggableElement {
+ cursor: -webkit-grab -moz-grab,
url(https://mail.google.com/mail/images/2/openhand.cur), move;
+ /*
+* HACK: In order to style horizontally, we must override
+* OO.ui.OptionWidget's display rule that is currently set
+* to be 'block'
+*/
+}
+.oo-ui-draggableElement-dragging {
+ cursor: -webkit-grabbing -moz-grabbing,
url(https://mail.google.com/mail/images/2/closedhand.cur), move;
+ background: rgba(0, 0, 0, 0.2);
+ opacity: 0.4;
+}
+.oo-ui-draggableGroupElement-horizontal
.oo-ui-draggableElement.oo-ui-optionWidget {
+ display: inline-block;
+}
+.oo-ui-draggableGroupElement-placeholder {
+ position: absolute;
+ display: block;
+ background: rgba(0, 0, 0, 0.4);
+}
.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous
.oo-ui-panelLayout-scrollable {
overflow-y: hidden;
}
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index e360991..75c5aa2 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.2.4
+ * OOjs UI v0.3.0
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released
[MediaWiki-commits] [Gerrit] nagios_common: Rename check_http_generic appropriately - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177719
Change subject: nagios_common: Rename check_http_generic appropriately
..
nagios_common: Rename check_http_generic appropriately
Was. Not. Very. Generic.
Change-Id: I77104a53b58794f518d47a6eb19f485488f48407
---
M modules/nagios_common/files/checkcommands.cfg
M modules/varnish/manifests/instance.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/177719/1
diff --git a/modules/nagios_common/files/checkcommands.cfg
b/modules/nagios_common/files/checkcommands.cfg
index 2c8b791..88f092e 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -225,9 +225,9 @@
command_line$USER1$/check_http -H bits.wikimedia.org -I $HOSTADDRESS$
-u /skins/common/images/poweredby_mediawiki_88x31.png
}
-# 'check_http_generic' command definition
+# 'check_http_varnish' command definition
define command{
-command_namecheck_http_generic
+command_namecheck_http_varnish
command_line$USER1$/check_http -H $ARG1$ -p $ARG2$ -I $HOSTADDRESS$ -u
/wikimedia-monitoring-test
}
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index bbdf54e..ed77ba7 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -119,6 +119,6 @@
monitoring::service { "varnish http ${title}":
description => "Varnish HTTP ${title}",
-check_command => "check_http_generic!varnishcheck!${port}"
+check_command => "check_http_varnish!varnishcheck!${port}"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77104a53b58794f518d47a6eb19f485488f48407
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.3.0 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Tag v0.3.0
..
Tag v0.3.0
Change-Id: I3eb10758cfc7e8c2b45fdaf40d0679f2ee30ceb1
---
M History.md
M package.json
2 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/History.md b/History.md
index 661f2dc..e8fe5db 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,15 @@
# OOjs UI Release History
+## v0.3.0 / 2014-12-04
+* [BREAKING CHANGE] ButtonWidget: Don't default 'target' to 'blank' (Bartosz
Dziewoński)
+* InputWidget: Update DOM value before firing 'change' event (Bartosz
Dziewoński)
+* TextInputWidget: Reuse a single clone instead of appending and removing new
ones (Prateek Saxena)
+* build: Have grunt watch run 'quick-build' instead of 'build' (Prateek Saxena)
+* MediaWiki Theme: Reduce indentation in theme-oo-ui-checkboxInputWidget
(Prateek Saxena)
+* Adding DraggableGroupElement and DraggableElement mixins (Moriel
Schottlender)
+* Remove window even if closing promise rejects (Ed Sanders)
+* Fix lies in documentation (Trevor Parscal)
+
## v0.2.4 / 2014-12-02
* TextInputWidget: Use .css( propertyName, value ) instead of .css(
properties) for single property (Prateek Saxena)
* TextInputWidget: Stop adjustSize if the value of the textarea is the same
(Prateek Saxena)
diff --git a/package.json b/package.json
index 36b3972..e29aae4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.2.4",
+ "version": "0.3.0",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/177705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb10758cfc7e8c2b45fdaf40d0679f2ee30ceb1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP SmashPig can process WPUS files now - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177718
Change subject: WIP SmashPig can process WPUS files now
..
WIP SmashPig can process WPUS files now
Change-Id: I0e1a49aaadb684de0457919ea963303565a5b133
---
M sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/18/177718/1
diff --git a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
index 447b318..90917b6 100644
--- a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
+++ b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
@@ -108,7 +108,9 @@
function worldpay_audit_regex_for_recon() {
//WP recon files look like the following thing:
// MA.PISCESSW.#M.RECON.WIKI.D280514
- return '/\.RECON\.WIKI\./';
+ // or
+ // TranDetVer2_530860_11-26-2014_8'27'08 AM.csv
+ return '/\.RECON\.WIKI\.|TranDetVer2/';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/177718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e1a49aaadb684de0457919ea963303565a5b133
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: typofix in shinken config - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: beta: typofix in shinken config
..
beta: typofix in shinken config
Change-Id: I2474ec55aa194e83c89492e56833d75acd7e0440
---
M modules/beta/files/shinken/hosts.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/beta/files/shinken/hosts.cfg
b/modules/beta/files/shinken/hosts.cfg
index e8130dc..19cb316 100644
--- a/modules/beta/files/shinken/hosts.cfg
+++ b/modules/beta/files/shinken/hosts.cfg
@@ -9,6 +9,6 @@
define service {
service_description English Wikipedia Main page
host_name beta-cluster
-check_command
check_http_url_for_string!en.wikipedia.beta.wmflabs.org!-u!/wiki/Main_Page?debug=true!Wikipedia
+check_command
check_http_url_for_string!en.wikipedia.beta.wmflabs.org!/wiki/Main_Page?debug=true!Wikipedia
use generic-service
}
--
To view, visit https://gerrit.wikimedia.org/r/177717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2474ec55aa194e83c89492e56833d75acd7e0440
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...dash)
jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 8d163ac Fix number formats on donation chart 8ec0532 Change the way unlogged-in screen looks e274bcd Check cache QS param correctly d96e411 Add missing packages to package.json 6ab1715 Cache db query results for 5 minutes da5eb33 Un-break usd_per_second graph Change-Id: Icf5785ddade22eab8d8762928214140b18c816f8 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ssmith: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/177711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf5785ddade22eab8d8762928214140b18c816f8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ssmith Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove $wgAutoloadClasses entry for removed class - change (mediawiki...GlobalUserPage)
jenkins-bot has submitted this change and it was merged. Change subject: Remove $wgAutoloadClasses entry for removed class .. Remove $wgAutoloadClasses entry for removed class Change-Id: Idbf6fd3df7bc97ccedfe12cf0deeeb3325624d2a --- M GlobalUserPage.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalUserPage.php b/GlobalUserPage.php index b3cb1e3..ca465af 100644 --- a/GlobalUserPage.php +++ b/GlobalUserPage.php @@ -78,7 +78,6 @@ $wgAutoloadClasses['GlobalUserPage'] = __DIR__ . '/GlobalUserPage.body.php'; $wgAutoloadClasses['GlobalUserPageHooks'] = __DIR__ . '/GlobalUserPage.hooks.php'; -$wgAutoloadClasses['ResourceLoaderGlobalUserPageModule'] = __DIR__ . '/ResourceLoaderGlobalUserPageModule.php'; // i18n $wgMessagesDirs['GlobalUserPage'] = __DIR__ . '/i18n'; -- To view, visit https://gerrit.wikimedia.org/r/177712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbf6fd3df7bc97ccedfe12cf0deeeb3325624d2a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUserPage Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: typofix in shinken config - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177717
Change subject: beta: typofix in shinken config
..
beta: typofix in shinken config
Change-Id: I2474ec55aa194e83c89492e56833d75acd7e0440
---
M modules/beta/files/shinken/hosts.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/177717/1
diff --git a/modules/beta/files/shinken/hosts.cfg
b/modules/beta/files/shinken/hosts.cfg
index e8130dc..19cb316 100644
--- a/modules/beta/files/shinken/hosts.cfg
+++ b/modules/beta/files/shinken/hosts.cfg
@@ -9,6 +9,6 @@
define service {
service_description English Wikipedia Main page
host_name beta-cluster
-check_command
check_http_url_for_string!en.wikipedia.beta.wmflabs.org!-u!/wiki/Main_Page?debug=true!Wikipedia
+check_command
check_http_url_for_string!en.wikipedia.beta.wmflabs.org!/wiki/Main_Page?debug=true!Wikipedia
use generic-service
}
--
To view, visit https://gerrit.wikimedia.org/r/177717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2474ec55aa194e83c89492e56833d75acd7e0440
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Abort deployment, if Oozie's Hive config seems to contain pa... - change (analytics/refinery)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/177714
to review the following change.
Change subject: Abort deployment, if Oozie's Hive config seems to contain
passwords
..
Abort deployment, if Oozie's Hive config seems to contain passwords
Analytics1027 is used for many maintenance tasks around
refinery. However, it should not be used to deploy refinery, as the
hive-site.xml on analytics1027 contains passwords.
To guard against refinery deployments from analytics1027, we check if
Oozie's hive config seems to contain passwords. If it does, we abort
the deployment. If it doesn't, we deploy.
Bug: T76806
Change-Id: I01f7f8b0a2195cba4083fab84be32f8de82f93af
---
M bin/refinery-deploy-to-hdfs
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/14/177714/1
diff --git a/bin/refinery-deploy-to-hdfs b/bin/refinery-deploy-to-hdfs
index df40569..c0d1c75 100755
--- a/bin/refinery-deploy-to-hdfs
+++ b/bin/refinery-deploy-to-hdfs
@@ -5,6 +5,7 @@
#
# _ABS - absolute path
# _RELB - path, relative to $REFINERY_BASE_HDFSDIR_ABS
+# _RELR - path, relative to root of the refinery repository
#
# _FILE - file in plain file system
# _DIR - directory in plain file system
@@ -24,6 +25,8 @@
VERBOSE=no
CURRENT_TARGET_HDFSDIR_RELB="current"
SKIP_UPDATING_CURRENT=no
+
+OOZIES_HIVE_CONFIG_FILE_RELR="oozie/util/hive/hive-site.xml"
print_help() {
cat
[MediaWiki-commits] [Gerrit] Drop jars that are not on all worker nodes from Oozie's Hive... - change (analytics/refinery)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/177716
to review the following change.
Change subject: Drop jars that are not on all worker nodes from Oozie's Hive
config
..
Drop jars that are not on all worker nodes from Oozie's Hive config
Stat1002 includes
file:///srv/deployment/analytics/refinery/artifacts/refinery-hive.jar
in its hive-site.xml's hive.aux.jars.path. But we cannot use such a
config for Oozie's Hive config, as worker nodes do not have this
jar. Hence, Oozie jobs would fail.
So we strip such jars from Oozie's Hive config upon deploying
Refinery.
Bug: T76806
Change-Id: Ic24607e98457c9243064a2cec12165c2a36d1230
---
M bin/refinery-deploy-to-hdfs
1 file changed, 32 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/16/177716/1
diff --git a/bin/refinery-deploy-to-hdfs b/bin/refinery-deploy-to-hdfs
index b5ce60c..6120f7b 100755
--- a/bin/refinery-deploy-to-hdfs
+++ b/bin/refinery-deploy-to-hdfs
@@ -86,17 +86,26 @@
run_hdfs() {
local SKIP_RUNNING_COMMAND="$DRY_RUN"
+local LOG_INVOCATION="yes"
+if [ "$1" = "--without-log" ]
+then
+shift
+LOG_INVOCATION="no"
+fi
if [ "$1" = "--run-also-for-dry-run" ]
then
shift
SKIP_RUNNING_COMMAND="no"
fi
local CMD=( hdfs "$@" )
-if [ "$DRY_RUN" = "no" ]
+if [ "$LOG_INVOCATION" = "yes" ]
then
-verbose_log "${CMD[@]}"
-else
-log "Dry run:" "${CMD[@]}"
+if [ "$DRY_RUN" = "no" ]
+then
+verbose_log "${CMD[@]}"
+else
+log "Dry run:" "${CMD[@]}"
+fi
fi
if [ "$SKIP_RUNNING_COMMAND" = "no" ]
then
@@ -183,6 +192,23 @@
error "Oozie's hive config at '$OOZIES_HIVE_CONFIG_FILE_RELR' matches \
password. Aborting to avoid accidentally deploying passwords."
fi
+}
+
+monkey_patch_oozies_hive_config() {
+local TARGET_HDFSFILE_ABS="$1"
+shift
+
+# We strip out references to
+# file:///srv/deployment/
+# as they won't be around on all worker nodes. Currently, this
+# addresses removing refinery-hive.jar from the plain filesystem
+# location. When not removing it, Oozie's Hive jobs would try to
+# pick it up, and consequently fail on the worker node, as they do
+# not have that jar.
+run_hdfs dfs -put -f <( \
+run_hdfs --without-log dfs -cat "$TARGET_HDFSFILE_ABS" \
+| sed -e 's@\(\(>\)\|,\)file:///srv/deployment/[^<,]*\([<,]\)@\2\3@'
+) "$TARGET_HDFSFILE_ABS"
}
describe_deployment() {
@@ -275,6 +301,8 @@
# Note that we only copy *, and not dot-files, hence excluding '.git'.
run_hdfs dfs -put -f * "$VERSIONED_TMP_TARGET_HDFSDIR_ABS"
+monkey_patch_oozies_hive_config
"$VERSIONED_TMP_TARGET_HDFSDIR_ABS/$OOZIES_HIVE_CONFIG_FILE_RELR"
+
describe_deployment "$VERSIONED_TMP_TARGET_HDFSDIR_ABS/.deployment" "$@"
# Bringing the temporary directory into place
--
To view, visit https://gerrit.wikimedia.org/r/177716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic24607e98457c9243064a2cec12165c2a36d1230
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: QChris
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search-redirect: check for parameter existence consistently - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: search-redirect: check for parameter existence consistently .. search-redirect: check for parameter existence consistently Change-Id: I24437591bb6df7d3cbfa9bdb4a48b1c2b863f2b1 --- M search-redirect.php 1 file changed, 4 insertions(+), 9 deletions(-) Approvals: Hoo man: Looks good to me, but someone else must approve MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/search-redirect.php b/search-redirect.php index a856d2d..ea7169f 100644 --- a/search-redirect.php +++ b/search-redirect.php @@ -1,15 +1,10 @@ https://gerrit.wikimedia.org/r/177665 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24437591bb6df7d3cbfa9bdb4a48b1c2b863f2b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem Gerrit-Reviewer: Hoo man Gerrit-Reviewer: MaxSem Gerrit-Reviewer: Reedy 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 error message in deploy script, if Oozie's Hive conf... - change (analytics/refinery)
Hello Ottomata, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/177715 to review the following change. Change subject: Improve error message in deploy script, if Oozie's Hive config is not readable .. Improve error message in deploy script, if Oozie's Hive config is not readable Change-Id: Ic5e69089d11eae3e86f4ec0fc082ad6acc04c0cf --- M bin/refinery-deploy-to-hdfs 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery refs/changes/15/177715/1 diff --git a/bin/refinery-deploy-to-hdfs b/bin/refinery-deploy-to-hdfs index c0d1c75..b5ce60c 100755 --- a/bin/refinery-deploy-to-hdfs +++ b/bin/refinery-deploy-to-hdfs @@ -168,6 +168,16 @@ error "Could not find oozie's hive config at '$OOZIES_HIVE_CONFIG_FILE_RELR'" fi +# Since Oozie's hive config is typically a link to /etc/hive/... it might be +# that the below test for passwords fails because the config file is not +# readable. To provide a better error message for this case, we single it +# out. +if [ ! -r "$OOZIES_HIVE_CONFIG_FILE_RELR" ] +then +error "Oozie's hive config at '$OOZIES_HIVE_CONFIG_FILE_RELR' is not \ +readable" +fi + if grep -q -i 'password' "$OOZIES_HIVE_CONFIG_FILE_RELR" then error "Oozie's hive config at '$OOZIES_HIVE_CONFIG_FILE_RELR' matches \ -- To view, visit https://gerrit.wikimedia.org/r/177715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5e69089d11eae3e86f4ec0fc082ad6acc04c0cf Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery Gerrit-Branch: master Gerrit-Owner: QChris Gerrit-Reviewer: Ottomata ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Autoload through Composer - change (wikimedia...SmashPig)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177713
Change subject: Autoload through Composer
..
Autoload through Composer
Change-Id: Iea011636c45595c71ad8390d3979b1c4c3cee5c5
---
M composer.json
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/13/177713/1
diff --git a/composer.json b/composer.json
index dc6f8a4..4999f52 100644
--- a/composer.json
+++ b/composer.json
@@ -22,5 +22,10 @@
"php": ">=5.3.3",
"symfony/event-dispatcher": ">=2.1,<2.4-dev",
"symfony/http-foundation": ">=2.1,<2.4-dev"
-}
+},
+ "autoload": {
+ "psr-4": {
+ "SmashPig\\": "./"
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/177713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea011636c45595c71ad8390d3979b1c4c3cee5c5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove $wgAutoloadClasses entry for removed class - change (mediawiki...GlobalUserPage)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/177712 Change subject: Remove $wgAutoloadClasses entry for removed class .. Remove $wgAutoloadClasses entry for removed class Change-Id: Idbf6fd3df7bc97ccedfe12cf0deeeb3325624d2a --- M GlobalUserPage.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage refs/changes/12/177712/1 diff --git a/GlobalUserPage.php b/GlobalUserPage.php index b3cb1e3..ca465af 100644 --- a/GlobalUserPage.php +++ b/GlobalUserPage.php @@ -78,7 +78,6 @@ $wgAutoloadClasses['GlobalUserPage'] = __DIR__ . '/GlobalUserPage.body.php'; $wgAutoloadClasses['GlobalUserPageHooks'] = __DIR__ . '/GlobalUserPage.hooks.php'; -$wgAutoloadClasses['ResourceLoaderGlobalUserPageModule'] = __DIR__ . '/ResourceLoaderGlobalUserPageModule.php'; // i18n $wgMessagesDirs['GlobalUserPage'] = __DIR__ . '/i18n'; -- To view, visit https://gerrit.wikimedia.org/r/177712 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbf6fd3df7bc97ccedfe12cf0deeeb3325624d2a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUserPage Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/177711 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 8d163ac Fix number formats on donation chart 8ec0532 Change the way unlogged-in screen looks e274bcd Check cache QS param correctly d96e411 Add missing packages to package.json 6ab1715 Cache db query results for 5 minutes da5eb33 Un-break usd_per_second graph Change-Id: Icf5785ddade22eab8d8762928214140b18c816f8 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/11/177711/1 -- To view, visit https://gerrit.wikimedia.org/r/177711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf5785ddade22eab8d8762928214140b18c816f8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Another bump - change (mediawiki...deploy)
GWicke has submitted this change and it was merged. Change subject: Another bump .. Another bump Change-Id: Ia230293d855cc289a788ddf78cbed7450b6e4735 --- M restbase 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/restbase b/restbase index afe5c11..2271604 16 --- a/restbase +++ b/restbase -Subproject commit afe5c1186929c0030b3339617b3bfc3e9ccfb010 +Subproject commit 2271604c64cb1aa0f13d299b4ab17d0ce68680b1 -- To view, visit https://gerrit.wikimedia.org/r/177710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia230293d855cc289a788ddf78cbed7450b6e4735 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke Gerrit-Reviewer: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: Fix http uptime check - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: beta: Fix http uptime check
..
beta: Fix http uptime check
Change-Id: Ie0cb0c25a31668f5f2afd9dc9ae554987456ea5d
---
M modules/beta/files/shinken/hosts.cfg
1 file changed, 12 insertions(+), 13 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/beta/files/shinken/hosts.cfg
b/modules/beta/files/shinken/hosts.cfg
index 20010a9..e8130dc 100644
--- a/modules/beta/files/shinken/hosts.cfg
+++ b/modules/beta/files/shinken/hosts.cfg
@@ -1,15 +1,14 @@
-# Virtual 'host' that refers to the entire beta cluster being up or down
-# UP/DOWN status defined as http availability of english betawiki main page
define host{
- host_namebeta-cluster
- aliasGeneric Beta Cluster
- address en.wikipedia.beta.wmflabs.org
- check_commandcheck_http!-h
en.wikipedia.beta.wmflabs.org -u / -t 10 -s 'Wikipedia'
- max_check_attempts 3
- check_period 24x7
- notification_interval0
- notification_period 24x7
- retry_interval 1
- check_interval 5
- contact_groups deployment-prep
+host_name beta-cluster
+alias Generic Beta Cluster
+address en.wikipedia.beta.wmflabs.org
+contact_groups deployment-prep
+use generic-host
+}
+
+define service {
+service_description English Wikipedia Main page
+host_name beta-cluster
+check_command
check_http_url_for_string!en.wikipedia.beta.wmflabs.org!-u!/wiki/Main_Page?debug=true!Wikipedia
+use generic-service
}
--
To view, visit https://gerrit.wikimedia.org/r/177692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0cb0c25a31668f5f2afd9dc9ae554987456ea5d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Another bump - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/177710 Change subject: Another bump .. Another bump Change-Id: Ia230293d855cc289a788ddf78cbed7450b6e4735 --- M restbase 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/10/177710/1 diff --git a/restbase b/restbase index afe5c11..2271604 16 --- a/restbase +++ b/restbase -Subproject commit afe5c1186929c0030b3339617b3bfc3e9ccfb010 +Subproject commit 2271604c64cb1aa0f13d299b4ab17d0ce68680b1 -- To view, visit https://gerrit.wikimedia.org/r/177710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia230293d855cc289a788ddf78cbed7450b6e4735 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove $wgHooks entry for BeforePageDisplay handler that was... - change (mediawiki...GlobalUserPage)
jenkins-bot has submitted this change and it was merged. Change subject: Remove $wgHooks entry for BeforePageDisplay handler that was removed .. Remove $wgHooks entry for BeforePageDisplay handler that was removed Change-Id: I8cb5695ae57d68f1f06124017708b9be112443ef --- M GlobalUserPage.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalUserPage.php b/GlobalUserPage.php index 6f8a055..b3cb1e3 100644 --- a/GlobalUserPage.php +++ b/GlobalUserPage.php @@ -89,7 +89,6 @@ $wgHooks['SkinTemplateNavigation::Universal'][] = 'GlobalUserPageHooks::onSkinTemplateNavigationUniversal'; $wgHooks['LinkBegin'][] = 'GlobalUserPageHooks::brokenLink'; $wgHooks['ArticleFromTitle'][] = 'GlobalUserPageHooks::onArticleFromTitle'; -$wgHooks['BeforePageDisplay'][] = 'GlobalUserPageHooks::onBeforePageDisplay'; // Register the CSS as a module with ResourceLoader $wgResourceModules['ext.GlobalUserPage'] = array( -- To view, visit https://gerrit.wikimedia.org/r/177709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8cb5695ae57d68f1f06124017708b9be112443ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUserPage Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Yuvipanda 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 $wgHooks entry for BeforePageDisplay handler that was... - change (mediawiki...GlobalUserPage)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/177709 Change subject: Remove $wgHooks entry for BeforePageDisplay handler that was removed .. Remove $wgHooks entry for BeforePageDisplay handler that was removed Change-Id: I8cb5695ae57d68f1f06124017708b9be112443ef --- M GlobalUserPage.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage refs/changes/09/177709/1 diff --git a/GlobalUserPage.php b/GlobalUserPage.php index 6f8a055..b3cb1e3 100644 --- a/GlobalUserPage.php +++ b/GlobalUserPage.php @@ -89,7 +89,6 @@ $wgHooks['SkinTemplateNavigation::Universal'][] = 'GlobalUserPageHooks::onSkinTemplateNavigationUniversal'; $wgHooks['LinkBegin'][] = 'GlobalUserPageHooks::brokenLink'; $wgHooks['ArticleFromTitle'][] = 'GlobalUserPageHooks::onArticleFromTitle'; -$wgHooks['BeforePageDisplay'][] = 'GlobalUserPageHooks::onBeforePageDisplay'; // Register the CSS as a module with ResourceLoader $wgResourceModules['ext.GlobalUserPage'] = array( -- To view, visit https://gerrit.wikimedia.org/r/177709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cb5695ae57d68f1f06124017708b9be112443ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUserPage Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix number formats on donation chart - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Fix number formats on donation chart
..
Fix number formats on donation chart
Change-Id: I0ec0f75a5755ad7cac35d282320ebfa1bd4fda13
---
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
index dca881b..bf9ebd7 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
+++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
@@ -62,10 +62,13 @@
},
y: {
tick: {
- format:
function(x){ return numeral(x).format('0,0') }
+ format:
function(x){ return numeral(x).format('$0,0') }
}
},
y2: {
+ tick: {
+ format:
function(x){ return numeral(x).format('0,0') }
+ },
show: true
}
},
@@ -127,10 +130,13 @@
},
y: {
tick: {
- format:
function(x){ return numeral(x).format('0,0') }
+ format:
function(x){ return numeral(x).format('$0,0') }
}
},
y2: {
+ tick: {
+ format:
function(x){ return numeral(x).format('0,0') }
+ },
show: true
}
},
--
To view, visit https://gerrit.wikimedia.org/r/177699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ec0f75a5755ad7cac35d282320ebfa1bd4fda13
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Expand ConfirmEdit disabling test to all group0 wikis" - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Expand ConfirmEdit disabling test to all group0 wikis"
..
Revert "Expand ConfirmEdit disabling test to all group0 wikis"
MediaWiki.org is being run over by Spam right now.
This reverts commit d47b9e06bc46e3fefe40b9d4cba7510faafa8e43.
Change-Id: Ic7aab5300d0438da453d9e80d3d0b82c7cc40ed1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 96c1922..f2990cd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -197,7 +197,7 @@
$wikiTags = array();
foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient',
'mediaviewer', 'visualeditor-default',
- 'echowikis', 'commonsuploads', 'nonbetafeatures',
'group0' ) as $tag ) {
+ 'echowikis', 'commonsuploads', 'nonbetafeatures' ) as
$tag ) {
$dblist = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../$tag.dblist" ) ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index ebedefd..36b1eb8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9519,7 +9519,7 @@
'closed' => false,
// testing
- 'group0' => false,
+ 'testwiki' => false,
),
'wmgEmergencyCaptcha' => array(
--
To view, visit https://gerrit.wikimedia.org/r/177708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7aab5300d0438da453d9e80d3d0b82c7cc40ed1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Expand ConfirmEdit disabling test to all group0 wikis" - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177708
Change subject: Revert "Expand ConfirmEdit disabling test to all group0 wikis"
..
Revert "Expand ConfirmEdit disabling test to all group0 wikis"
MediaWiki.org is being run over by Spam right now.
This reverts commit d47b9e06bc46e3fefe40b9d4cba7510faafa8e43.
Change-Id: Ic7aab5300d0438da453d9e80d3d0b82c7cc40ed1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/08/177708/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 96c1922..f2990cd 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -197,7 +197,7 @@
$wikiTags = array();
foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient',
'mediaviewer', 'visualeditor-default',
- 'echowikis', 'commonsuploads', 'nonbetafeatures',
'group0' ) as $tag ) {
+ 'echowikis', 'commonsuploads', 'nonbetafeatures' ) as
$tag ) {
$dblist = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../$tag.dblist" ) ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index ebedefd..36b1eb8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9519,7 +9519,7 @@
'closed' => false,
// testing
- 'group0' => false,
+ 'testwiki' => false,
),
'wmgEmergencyCaptcha' => array(
--
To view, visit https://gerrit.wikimedia.org/r/177708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7aab5300d0438da453d9e80d3d0b82c7cc40ed1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] give baby SmashPig our family vendor name - change (wikimedia...SmashPig)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177707
Change subject: give baby SmashPig our family vendor name
..
give baby SmashPig our family vendor name
Change-Id: I245872fdad813c6da9579fb1732b0d399b859cd3
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/07/177707/1
diff --git a/composer.json b/composer.json
index dc6f8a4..4528e3b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
{
- "name": "smashpig/smashpig",
+ "name": "wikimedia/SmashPig",
"description": "The open source PHP flexible payments library and
frontend/backend mediator.",
"keywords": ["payments, donations"],
"homepage": "http://smashpig.org";,
--
To view, visit https://gerrit.wikimedia.org/r/177707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I245872fdad813c6da9579fb1732b0d399b859cd3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the way unlogged-in screen looks - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Change the way unlogged-in screen looks
..
Change the way unlogged-in screen looks
Change-Id: Ib7c443cbcbd00050ee3c0faef2c3cedc5bf076b8
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/css/style.css
M src/index.html
6 files changed, 43 insertions(+), 21 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 4606be5..e2a6390 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -1,4 +1,8 @@
-
+
+
+
+
+
@@ -6,3 +10,12 @@
+
+
+
+
+ Welcome To Dash.
+ Please Log in to continue.
+
+
+
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 4a5558c..42816ac 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -18,6 +18,15 @@
return value === e;
};
};
+
+self.loggedIn = ko.observable(false);
+self.welcome = ko.observable('');
+$.get('/user/info', function(userInfo) {
+if (userInfo) {
+self.welcome(userInfo['name'].charAt(0).toUpperCase() +
userInfo['name'].slice(1));
+self.loggedIn(true);
+};
+});
}
return { viewModel: AppContent, template: templateMarkup };
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index 2504971..69844bc 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -24,10 +24,9 @@
-
- Log
in
-
- Log out
+
+ Log out
+
diff --git a/src/components/nav-bar/nav-bar.js
b/src/components/nav-bar/nav-bar.js
index 4f498e4..6f08632 100644
--- a/src/components/nav-bar/nav-bar.js
+++ b/src/components/nav-bar/nav-bar.js
@@ -6,8 +6,8 @@
function NavBarViewModel( params ){
var self = this;
-
-self.route = params.route;
+self.loggedIn = ko.observable(params.loggedIn()),
+self.welcome = ko.observable(params.welcome());
self.hideNav = function(){
//make the nav menu fold out of view.
@@ -22,16 +22,6 @@
$('#dashApp').css('padding-left', '175px');
}, 200);
};
-
-self.showLogIn = ko.observable(false);
-self.welcome = ko.observable('');
-$.get('/user/info', function(userInfo) {
-if (userInfo) {
-self.welcome('Welcome, ' + userInfo.name);
-} else {
-self.showLogIn(true);
-}
-});
}
return { viewModel: NavBarViewModel, template: template };
diff --git a/src/css/style.css b/src/css/style.css
index 2298c52..e60c807 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -105,6 +105,19 @@
border-bottom: 1px #555 solid;
}
+.loginWelcome > i {
+padding: 0 3px;
+}
+
+.loginWelcome {
+width: 100px;
+padding: 3px;
+background-color: rgba(255,255,255,0.4);
+overflow-wrap: break-word;
+padding: 3px;
+font-size: .8em;
+}
+
.titlebrand, .titlebrandToggle {
background-color: #d9534f;
overflow: hidden;
diff --git a/src/index.html b/src/index.html
index e8c5e44..7c2acc6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -18,13 +18,11 @@
-
-
-
-
+
+
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/177463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c443cbcbd00050ee3c0faef2c3cedc5bf076b8
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually update restbase to master - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/177706 Change subject: Actually update restbase to master .. Actually update restbase to master Had pushed to a branch earlier. Change-Id: Ie604907a98a39a83289c539e96a6b681f5d23e20 --- M restbase 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/06/177706/1 diff --git a/restbase b/restbase index 3f9e631..afe5c11 16 --- a/restbase +++ b/restbase -Subproject commit 3f9e63130b23fe1319cc38bed0fed42ef72a9522 +Subproject commit afe5c1186929c0030b3339617b3bfc3e9ccfb010 -- To view, visit https://gerrit.wikimedia.org/r/177706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie604907a98a39a83289c539e96a6b681f5d23e20 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually update restbase to master - change (mediawiki...deploy)
GWicke has submitted this change and it was merged. Change subject: Actually update restbase to master .. Actually update restbase to master Had pushed to a branch earlier. Change-Id: Ie604907a98a39a83289c539e96a6b681f5d23e20 --- M restbase 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 3f9e631..afe5c11 16 --- a/restbase +++ b/restbase -Subproject commit 3f9e63130b23fe1319cc38bed0fed42ef72a9522 +Subproject commit afe5c1186929c0030b3339617b3bfc3e9ccfb010 -- To view, visit https://gerrit.wikimedia.org/r/177706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie604907a98a39a83289c539e96a6b681f5d23e20 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke Gerrit-Reviewer: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable gadgets caching - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Disable gadgets caching
..
Disable gadgets caching
Re-parsing of config page takes approximately the same time as deserialization
from cache, however with caching you're just putting an extra load on memcached.
The bug that made this experiment fail last time has since been fixed by
Legoktm.
Change-Id: I9c1f4f0e086637d0d6fa907a6a4a4b4fbf2ac053
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, but someone else must approve
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 322ff18..00a02c8 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -212,9 +212,6 @@
include(
"$IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php"
);
}
-// Experimental
-$wgGadgetsCaching = false;
-
$wgAjaxEditStash = true;
} # end safeguard
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f2990cd..3a71a9c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -677,6 +677,7 @@
if ( $wmgUseGadgets ) {
include( "$IP/extensions/Gadgets/Gadgets.php" );
+ $wgGadgetsCaching = false;
}
if ( $wmgUseMwEmbedSupport ) {
--
To view, visit https://gerrit.wikimedia.org/r/177600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c1f4f0e086637d0d6fa907a6a4a4b4fbf2ac053
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.3.0 - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177705
Change subject: Tag v0.3.0
..
Tag v0.3.0
Change-Id: I3eb10758cfc7e8c2b45fdaf40d0679f2ee30ceb1
---
M History.md
M package.json
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/177705/1
diff --git a/History.md b/History.md
index 661f2dc..e8fe5db 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,15 @@
# OOjs UI Release History
+## v0.3.0 / 2014-12-04
+* [BREAKING CHANGE] ButtonWidget: Don't default 'target' to 'blank' (Bartosz
Dziewoński)
+* InputWidget: Update DOM value before firing 'change' event (Bartosz
Dziewoński)
+* TextInputWidget: Reuse a single clone instead of appending and removing new
ones (Prateek Saxena)
+* build: Have grunt watch run 'quick-build' instead of 'build' (Prateek Saxena)
+* MediaWiki Theme: Reduce indentation in theme-oo-ui-checkboxInputWidget
(Prateek Saxena)
+* Adding DraggableGroupElement and DraggableElement mixins (Moriel
Schottlender)
+* Remove window even if closing promise rejects (Ed Sanders)
+* Fix lies in documentation (Trevor Parscal)
+
## v0.2.4 / 2014-12-02
* TextInputWidget: Use .css( propertyName, value ) instead of .css(
properties) for single property (Prateek Saxena)
* TextInputWidget: Stop adjustSize if the value of the textarea is the same
(Prateek Saxena)
diff --git a/package.json b/package.json
index 36b3972..e29aae4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.2.4",
+ "version": "0.3.0",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/177705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eb10758cfc7e8c2b45fdaf40d0679f2ee30ceb1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change ru.wikinews.org to HTTPS only. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Change ru.wikinews.org to HTTPS only. .. Change ru.wikinews.org to HTTPS only. Redirect was done in: I4e50f5305d8d04539b0b1b1ed794f3c05f54118e Change-Id: I8996b9841581d91cd709e0a610f5165a4532eecf --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: MaxSem: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fbde319..ce64053 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1368,6 +1368,7 @@ 'outreachwiki' => 'http://outreach.wikimedia.org', 'pa_uswikimedia' => 'http://pa-us.wikimedia.org', 'qualitywiki' => 'http://quality.wikimedia.org', + 'ruwikinews' => 'https://ru.wikinews.org', 'searchcomwiki' => 'https://searchcom.wikimedia.org', 'sourceswiki' => 'http://wikisource.org', 'spcomwiki' => 'https://spcom.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/173083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8996b9841581d91cd709e0a610f5165a4532eecf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: JanZerebecki Gerrit-Reviewer: BBlack Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Greg Grossmeier Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: MaxSem Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Reedy 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 include SmashPig through Composer - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177704
Change subject: WIP include SmashPig through Composer
..
WIP include SmashPig through Composer
Change-Id: I38d9c6cc0fc31e6e624aab6e0abcc6255da112d0
---
M composer.json
M sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
2 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/04/177704/1
diff --git a/composer.json b/composer.json
index b76a461..ae4f7c3 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
"require": {
"cogpowered/finediff": "0.*",
"wikimedia/DonationInterface": "dev-drupal",
+"wikimedia/SmashPig": "dev-master",
"fusesource/stomp-php": "2.*",
"phpmailer/phpmailer": "5.2.6",
"phpseclib/phpseclib": "0.3.7",
diff --git a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
index 447b318..8679c1b 100644
--- a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
+++ b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
@@ -7,6 +7,8 @@
define('WP_AUDIT_LOG_SEARCH_PAST_DAYS', 7);
define( 'WP_AUDIT_TEST_MODE', true );
+use SmashPig\PaymentProviders\WorldPay\Audit\WorldPayAudit;
+
/**
* Implementation of hook_menu()
*/
@@ -214,18 +216,8 @@
* @return mixed An array of recon data, or false
*/
function worldpay_audit_parse_recon_file($file) {
- static $parserClass = null;
- if (is_null($parserClass)) {
-$parser_directory = variable_get('worldpay_audit_recon_parser_dir',
WP_AUDIT_RECON_PARSER_DIR);
-
-//get the classes we need
-require_once( $parser_directory . 'WorldPayAudit.php' );
-require_once( $parser_directory . 'TransactionReconciliationFile.php' );
-$parserClass = 'SmashPig\PaymentProviders\WorldPay\Audit\WorldPayAudit';
//yeesh.
- }
-
$recon_data = array();
- $recon_parser = new $parserClass();
+ $recon_parser = new WorldPayAudit();
$data = null;
try {
--
To view, visit https://gerrit.wikimedia.org/r/177704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38d9c6cc0fc31e6e624aab6e0abcc6255da112d0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set $wgCentralAuthPreventUnattached = true on mediawiki.org - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Set $wgCentralAuthPreventUnattached = true on mediawiki.org
..
Set $wgCentralAuthPreventUnattached = true on mediawiki.org
Bug: T76146
Change-Id: I854b31096012cc0f2b5fb1af2cbe7df1e4ffa4e5
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f2990cd..6bcaba5 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1240,6 +1240,7 @@
$wgDisableUnmergedEditing = $wmgDisableUnmergedEdits;
$wgCentralAuthUseEventLogging = $wmgCentralAuthUseEventLogging;
+ $wgCentralAuthPreventUnattached = $wmgCentralAuthPreventUnattached;
if( $wmfRealm == 'production' ) {
$wgCentralAuthRC[] = array(
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 36b1eb8..ffef06f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10414,6 +10414,10 @@
'default' => true,
),
+'wmgCentralAuthPreventUnattached' => array(
+ 'default' => false,
+ 'mediawikiwiki' => true,
+),
// This is also guarded by $wmgUseCentralAuth
'wmgUseGlobalCssJs' => array(
'default' => true,
--
To view, visit https://gerrit.wikimedia.org/r/177660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I854b31096012cc0f2b5fb1af2cbe7df1e4ffa4e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update to latest master - change (mediawiki...deploy)
Jdouglas has submitted this change and it was merged.
Change subject: Update to latest master
..
Update to latest master
Change-Id: I61fc32637b2d1997097d66295a3f4fb3fe159918
---
M node_modules/extend/package.json
M node_modules/gelf-stream/package.json
M node_modules/js-yaml/package.json
M node_modules/mocha/node_modules/debug/node_modules/ms/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/mocha/package.json
M node_modules/node-txstatsd/index.js
M node_modules/node-txstatsd/package.json
M node_modules/preq/package.json
M node_modules/request/node_modules/aws-sign2/package.json
M node_modules/request/node_modules/forever-agent/package.json
M node_modules/request/node_modules/stringstream/package.json
M node_modules/restbase-cassandra/node_modules/async/package.json
M node_modules/routeswitch/package.json
M node_modules/yargs/package.json
15 files changed, 102 insertions(+), 115 deletions(-)
Approvals:
Jdouglas: Verified; Looks good to me, approved
diff --git a/node_modules/extend/package.json b/node_modules/extend/package.json
index e798f3e..af0f4c9 100644
--- a/node_modules/extend/package.json
+++ b/node_modules/extend/package.json
@@ -40,7 +40,7 @@
"homepage": "https://github.com/justmoon/node-extend";,
"_id": "extend@1.3.0",
"_shasum": "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8",
- "_from": "extend@^1.3.0",
+ "_from": "extend@~1.3.0",
"_npmVersion": "1.4.14",
"_npmUser": {
"name": "ljharb",
diff --git a/node_modules/gelf-stream/package.json
b/node_modules/gelf-stream/package.json
index 1058c36..63b481d 100644
--- a/node_modules/gelf-stream/package.json
+++ b/node_modules/gelf-stream/package.json
@@ -36,7 +36,7 @@
"homepage": "https://github.com/mhart/gelf-stream";,
"_id": "gelf-stream@0.2.4",
"_shasum": "a418c8c2e39b85b7932a3e8523f6022d6852e013",
- "_from": "gelf-stream@^0.2.4",
+ "_from": "gelf-stream@~0.2.4",
"_npmVersion": "1.4.10",
"_npmUser": {
"name": "hichaelmart",
diff --git a/node_modules/js-yaml/package.json
b/node_modules/js-yaml/package.json
index 1b938b8..43c4b9c 100644
--- a/node_modules/js-yaml/package.json
+++ b/node_modules/js-yaml/package.json
@@ -61,7 +61,7 @@
"_id": "js-yaml@3.2.3",
"scripts": {},
"_shasum": "a3af632d13df5bfa95f3b8f3c4b61efe212cd750",
- "_from": "js-yaml@^3.2.2",
+ "_from": "js-yaml@~3.2.2",
"_npmVersion": "1.4.28",
"_npmUser": {
"name": "vitaly",
diff --git a/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
b/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
index 87ad70d..48de118 100644
--- a/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
+++ b/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
@@ -40,5 +40,6 @@
"directories": {},
"_shasum": "d89c2124c6fdc1353d65a8b77bf1aac4b193708c",
"_resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";,
- "readme": "ERROR: No README data found!"
+ "readme": "ERROR: No README data found!",
+ "scripts": {}
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index a915c51..a6de8f3 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@0.5.0",
+ "_from": "mkdirp@~0.5.0",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/mocha/package.json b/node_modules/mocha/package.json
index b00149b..72475fd 100644
--- a/node_modules/mocha/package.json
+++ b/node_modules/mocha/package.json
@@ -94,7 +94,7 @@
"homepage": "https://github.com/visionmedia/mocha";,
"_id": "mocha@1.21.5",
"_shasum": "7c58b09174df976e434a23b1e8d639873fc529e9",
- "_from": "mocha@^1.x.x",
+ "_from": "mocha@~1.x.x",
"_npmVersion": "1.4.9",
"_npmUser": {
"name": "travisjeffery",
diff --git a/node_modules/node-txstatsd/index.js
b/node_modules/node-txstatsd/index.js
index 294f918..07673d8 100644
--- a/node_modules/node-txstatsd/index.js
+++ b/node_modules/node-txstatsd/index.js
@@ -31,7 +31,7 @@
*/
var dgram = require('dgram'),
- dns = require('dns');
+dns = require('dns');
/**
* The UDP Client for StatsD
@@ -47,42 +47,43 @@
* @constructor
*/
var Client = function (host, port, prefix, suffix, txstatsd, globalize,
cacheDns, mock) {
- var options = host || {},
- self = this;
+var options = host || {},
+self = this;
- if(arguments.length > 1 || typeof(host) === 'string'){
- options = {
- host : host,
- port : port,
- prefix: prefix,
- suffix: suffix,
-
[MediaWiki-commits] [Gerrit] Remove ext.GlobalUserPage.site / MediaWiki:GlobalUserPage.css - change (mediawiki...GlobalUserPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove ext.GlobalUserPage.site / MediaWiki:GlobalUserPage.css
..
Remove ext.GlobalUserPage.site / MediaWiki:GlobalUserPage.css
This was never truly necessary, and attempts to solve a problem
that really should be solved by other means (standardizing
CSS rules across a wikifarm and removing local customizations
of MediaWiki extensions).
Change-Id: I88df9da9d7c5844a21bddd67ab5c6a4ea51cbcee
---
M GlobalUserPage.body.php
M GlobalUserPage.hooks.php
M GlobalUserPage.php
D ResourceLoaderGlobalUserPageModule.php
D i18n-central/de.json
D i18n-central/en.json
D i18n-central/es-formal.json
D i18n-central/fr.json
D i18n-central/it.json
D i18n-central/ko.json
D i18n-central/ksh.json
D i18n-central/lb.json
D i18n-central/mk.json
D i18n-central/ms.json
D i18n-central/pl.json
D i18n-central/pt.json
D i18n-central/qqq.json
D i18n-central/ru.json
D i18n-central/sr-ec.json
D i18n-central/sr-el.json
D i18n-central/sv.json
D i18n-central/tr.json
D i18n-central/uk.json
D i18n-central/zh-hans.json
24 files changed, 2 insertions(+), 282 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GlobalUserPage.body.php b/GlobalUserPage.body.php
index 3b02a30..c931103 100644
--- a/GlobalUserPage.body.php
+++ b/GlobalUserPage.body.php
@@ -49,7 +49,7 @@
return;
}
$out->addHTML( $parsedOutput['text']['*'] );
- $out->addModuleStyles( array( 'ext.GlobalUserPage',
'ext.GlobalUserPage.site' ) );
+ $out->addModuleStyles( 'ext.GlobalUserPage' );
$footerKey = $this->config->get( 'GlobalUserPageFooterKey' );
if ( $footerKey ) {
diff --git a/GlobalUserPage.hooks.php b/GlobalUserPage.hooks.php
index 17d35f2..7119b01 100644
--- a/GlobalUserPage.hooks.php
+++ b/GlobalUserPage.hooks.php
@@ -42,44 +42,6 @@
}
/**
-* Loads MediaWiki:GlobalUserPage.css on the central wikis
-* root userpages
-*
-* @param OutputPage $out
-* @return bool
-*/
- public static function onBeforePageDisplay( OutputPage &$out ) {
- global $wgGlobalUserPageDBname;
- $title = $out->getTitle();
- if ( $wgGlobalUserPageDBname === wfWikiID() // On the central
wiki,
- && $title->inNamespace( NS_USER ) // a user page
- && $title->exists() // that exists
- && $title->getRootTitle()->equals( $title ) // and is a
root page.
- ) {
- $out->addModuleStyles( 'ext.GlobalUserPage.site' );
- }
-
- return true;
- }
-
- public static function onResourceLoaderRegisterModules( ResourceLoader
&$resourceLoader ) {
- global $wgGlobalUserPageCSSRLSourceName,
$wgGlobalUserPageDBname;
-
- $isEnabled = (bool)$wgGlobalUserPageCSSRLSourceName;
-
- // Always register the module, but if it is disabled via config,
- // pass it some dummy parameters.
- $resourceLoader->register( 'ext.GlobalUserPage.site', array(
- 'class' => 'ResourceLoaderGlobalUserPageModule',
- 'wiki' => $isEnabled ? $wgGlobalUserPageDBname :
wfWikiID(),
- 'source' => $isEnabled ?
$wgGlobalUserPageCSSRLSourceName : 'local',
- 'enabled' => $isEnabled,
- ) );
-
- return true;
- }
-
- /**
* Turn red links into blue in the navigation tabs (Monobook's
p-cactions).
*
* @param SkinTemplate $sktemplate
diff --git a/GlobalUserPage.php b/GlobalUserPage.php
index aedc73d..6f8a055 100644
--- a/GlobalUserPage.php
+++ b/GlobalUserPage.php
@@ -59,16 +59,6 @@
$wgGlobalUserPageFooterKey = 'globaluserpage-footer';
/**
- * The name of the ResourceLoaderSource referring
- * to the central wiki to load MediaWiki:GlobalUserPage.css
- * from. Setting this variable to false disables that
- * feature. This requires MediaWiki 1.24 to work properly.
- *
- * @var string|bool
- */
-$wgGlobalUserPageCSSRLSourceName = false;
-
-/**
* Timeout for internal API requests. To use $wgHTTPTimeout,
* set this to 'default'
*
@@ -80,7 +70,7 @@
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'GlobalUserPage',
- 'version' => '0.10.0',
+ 'version' => '0.11.0',
'author' => array( 'Kunal Mehta', 'Jack Phoenix' ),
'url' => 'https://www.mediawiki.org/wiki/Extension:GlobalUserPage',
'descriptionmsg' => 'globaluserpage-desc',
@@ -92,16 +82,6 @@
// i18n
$wgMessagesDirs['GlobalUserPage'] = __DIR__ . '/i18n';
-// extra message for the central wiki
-$wgExtensionFunctions[] = 'efGlobalUserPage';
-function efGlobalUserPag
[MediaWiki-commits] [Gerrit] Add support for timezones while creating reports - change (analytics/wikimetrics)
Nuria has submitted this change and it was merged.
Change subject: Add support for timezones while creating reports
..
Add support for timezones while creating reports
Since the whole list of timezones can be overwhelming for the user, only
a few timezones have been added.
Bug: T74116
Change-Id: I5651dc6753f834c6cdc94df6a102a5dc683b80be
---
M wikimetrics/static/js/reportCreate.js
M wikimetrics/templates/report.html
2 files changed, 45 insertions(+), 7 deletions(-)
Approvals:
Nuria: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikimetrics/static/js/reportCreate.js
b/wikimetrics/static/js/reportCreate.js
index 78b1d99..7da18f7 100644
--- a/wikimetrics/static/js/reportCreate.js
+++ b/wikimetrics/static/js/reportCreate.js
@@ -5,7 +5,8 @@
$(document).ready(function(){
-var viewModel = {
+var utcTimezone = {name: 'UTC', value: '+00:00'},
+viewModel = {
filter: ko.observable(''),
cohorts: ko.observableArray([]),
toggleCohort: function(cohort){
@@ -20,6 +21,21 @@
}
return true;
},
+
+// Add more timezones as necessary
+availableTimezones : ko.observableArray([
+{name: 'Central European Time', value: '+01:00'},
+{name: 'Eastern European Time', value: '+02:00'},
+{name: 'East Australian Standard Time', value: '+10:00'},
+utcTimezone,
+{name: 'Atlantic Standard Time', value: '-04:00'},
+{name: 'Eastern Standard Time', value: '-05:00'},
+{name: 'Central Standard Time', value: '-06:00'},
+{name: 'Mountain Standard Time', value: '-07:00'},
+{name: 'Pacific Standard Time', value: '-08:00'},
+{name: 'Hawaii Standard Time', value: '-10:00'}
+]),
+timezone: ko.observable(utcTimezone), // no default
metrics: ko.observableArray([]),
toggleMetric: function(metric){
@@ -41,12 +57,13 @@
},
save: function(formElement){
-
+var timezone = this.timezone();
+
if (site.hasValidationErrors()){
site.showWarning('Please configure and click Save
Configuration for each selected metric.');
return;
}
-
+
var vm = ko.dataFor(formElement);
if (vm.request().responses().length === 0){
site.showWarning('Please select at least one cohort and one
metric.');
@@ -69,7 +86,7 @@
var form = $(formElement);
var data = ko.toJSON(vm.request().responses);
data = JSON.parse(data);
-
+
ko.utils.arrayForEach(data, function(response){
delete response.metric.configure;
delete response.cohort.wikiusers;
@@ -80,9 +97,16 @@
delete response.metric.tabIdSelector;
delete response.metric.selected;
delete response.metric.description;
+// apply timezone info
+ko.utils.arrayForEach(response.metric.dateTimeFieldNames,
function(name) {
+response.metric[name] = moment
+.utc(response.metric[name] + ' ' + timezone.value)
+.format('-MM-DD HH:mm:ss');
+});
+delete response.metric.dateTimeFieldNames;
});
data = JSON.stringify(data);
-
+
$.ajax({ type: 'post', url: form.attr('action'), data: {responses:
data, recurrent: vm.request().recurrent()} })
.done(site.handleWith(function(response){
// should redirect to the reports page, so show an error
otherwise
@@ -235,6 +259,11 @@
var parentId = metric.tabId();
var controls = $('#' + parentId + ' div.datetimepicker');
controls.datetimepicker({language: 'en'});
+// save datetime field names for later use (timezone conversion)
+metric.dateTimeFieldNames = [];
+controls.each(function () {
+metric.dateTimeFieldNames.push($(this).find('input').attr('name'));
+});
// TODO: this might be cleaner if it metric[name] was an observable
controls.on('changeDate', function(){
var input = $(this).find('input');
@@ -248,8 +277,7 @@
e.preventDefault();
$(this).tab('show');
});
-
-
+
// apply bindings - this connects the DOM with the view model constructed
above
ko.applyBindings(viewModel);
});
diff --git a/wikimetrics/templates/report.html
b/wikimetrics/templates/report.html
index 4775d82..1641534 100644
--- a/wikimetrics/templates/report.html
+++ b/wikimetrics/templates/report.html
@@ -32,6 +32,16 @@
+
+
+ Pick Timezone
+
+
+
Pick Metrics
--
To view, visit https:
[MediaWiki-commits] [Gerrit] Expand ConfirmEdit disabling test to all group0 wikis - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Expand ConfirmEdit disabling test to all group0 wikis
..
Expand ConfirmEdit disabling test to all group0 wikis
They're all test wikis, except mw.org which is sort of
a test wiki too.
Change-Id: I01026fd12cb142bc7c6054879c0ade3ef75e8f35
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Legoktm: Looks good to me, but someone else must approve
MZMcBride: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, but someone else must approve
MaxSem: Looks good to me, approved
Swalling: Looks good to me, but someone else must approve
Jforrester: Looks good to me, but someone else must approve
Florianschmidtwelzow: Looks good to me, but someone else must approve
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f2990cd..96c1922 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -197,7 +197,7 @@
$wikiTags = array();
foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient',
'mediaviewer', 'visualeditor-default',
- 'echowikis', 'commonsuploads', 'nonbetafeatures' ) as
$tag ) {
+ 'echowikis', 'commonsuploads', 'nonbetafeatures',
'group0' ) as $tag ) {
$dblist = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../$tag.dblist" ) ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 36b1eb8..ebedefd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9519,7 +9519,7 @@
'closed' => false,
// testing
- 'testwiki' => false,
+ 'group0' => false,
),
'wmgEmergencyCaptcha' => array(
--
To view, visit https://gerrit.wikimedia.org/r/177494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01026fd12cb142bc7c6054879c0ade3ef75e8f35
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MZMcBride
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Nemo bis
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Swalling
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TextInputWidget: Reuse a single clone instead of appending a... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: TextInputWidget: Reuse a single clone instead of appending and
removing new ones
..
TextInputWidget: Reuse a single clone instead of appending and removing new ones
Also, use '.style.display' instead of '.show()' and '.hide()'
http://jsperf.com/adjustsize/2
Bug: T75328
Change-Id: I45ba2ba9d0009918043a91888f5f281f7a67e65b
---
M src/widgets/TextInputWidget.js
1 file changed, 32 insertions(+), 12 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index 9b0da89..8c8bc42 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -37,6 +37,14 @@
this.maxRows = config.maxRows !== undefined ? config.maxRows : 10;
this.validate = null;
+ // Clone for resizing
+ if ( this.autosize ) {
+ this.$clone = this.$input
+ .clone()
+ .insertAfter( this.$input )
+ .hide();
+ }
+
this.setValidation( config.validate );
// Events
@@ -199,28 +207,40 @@
* @chainable
*/
OO.ui.TextInputWidget.prototype.adjustSize = function () {
- var $clone, scrollHeight, innerHeight, outerHeight, maxInnerHeight,
measurementError, idealHeight;
+ var scrollHeight, innerHeight, outerHeight, maxInnerHeight,
measurementError, idealHeight;
if ( this.multiline && this.autosize && this.$input.val() !==
this.valCache ) {
- $clone = this.$input.clone()
+ this.$clone
.val( this.$input.val() )
+ .attr( 'rows', '' )
// Set inline height property to 0 to measure scroll
height
- .css( 'height', 0 )
- .insertAfter( this.$input );
+ .css( 'height', 0 );
+
+ this.$clone[0].style.display = 'block';
+
this.valCache = this.$input.val();
- scrollHeight = $clone[0].scrollHeight;
+
+ scrollHeight = this.$clone[0].scrollHeight;
+
// Remove inline height property to measure natural heights
- $clone.css( 'height', '' );
- innerHeight = $clone.innerHeight();
- outerHeight = $clone.outerHeight();
+ this.$clone.css( 'height', '' );
+ innerHeight = this.$clone.innerHeight();
+ outerHeight = this.$clone.outerHeight();
+
// Measure max rows height
- $clone.attr( 'rows', this.maxRows ).css( 'height', 'auto'
).val( '' );
- maxInnerHeight = $clone.innerHeight();
+ this.$clone
+ .attr( 'rows', this.maxRows )
+ .css( 'height', 'auto' )
+ .val( '' );
+ maxInnerHeight = this.$clone.innerHeight();
+
// Difference between reported innerHeight and scrollHeight
with no scrollbars present
// Equals 1 on Blink-based browsers and 0 everywhere else
- measurementError = maxInnerHeight - $clone[0].scrollHeight;
- $clone.remove();
+ measurementError = maxInnerHeight - this.$clone[0].scrollHeight;
idealHeight = Math.min( maxInnerHeight, scrollHeight +
measurementError );
+
+ this.$clone[0].style.display = 'none';
+
// Only apply inline height when expansion beyond natural
height is needed
if ( idealHeight > innerHeight ) {
// Use the difference between the inner and outer
height as a buffer
--
To view, visit https://gerrit.wikimedia.org/r/176476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45ba2ba9d0009918043a91888f5f281f7a67e65b
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Move subselects into the main pager query" - change (mediawiki...CentralNotice)
Ejegg has submitted this change and it was merged.
Change subject: Revert "Move subselects into the main pager query"
..
Revert "Move subselects into the main pager query"
This reverts commit 87a5f77199e5b1101a8b5f9de6ad615ef4eaafc2.
Unfortunately, this only worked on some of our db servers.
Change-Id: I412d10db9d6c72b16c118d2b671c4c339280ab6c
---
M includes/CNCampaignPager.php
1 file changed, 11 insertions(+), 41 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/includes/CNCampaignPager.php b/includes/CNCampaignPager.php
index 6dd41a5..4900aa5 100644
--- a/includes/CNCampaignPager.php
+++ b/includes/CNCampaignPager.php
@@ -56,34 +56,6 @@
* @see IndexPager::getQueryInfo()
*/
public function getQueryInfo() {
- $db = CNDatabase::getDb();
- /* FIXME: waiting for @Ic0a5db43727ed9c3ea13d0898a06009f5d94034c
-* $db->setSessionOptions( array(
-* 'group_concat_max_len' => 1,
-* ) );
-*/
- $db->query( 'SET SESSION group_concat_max_len = 1' );
-
- $join_fields = array(
- $db->buildGroupConcatField(
- ',',
- array( 'cn_notice_countries' ),
- 'nc_country',
- 'nc_notice_id = notices.not_id'
- ) . ' AS countries',
- $db->buildGroupConcatField(
- ',',
- array( 'cn_notice_languages' ),
- 'nl_language',
- 'nl_notice_id = notices.not_id'
- ) . ' AS languages',
- $db->buildGroupConcatField(
- ',',
- array( 'cn_notice_projects' ),
- 'np_project',
- 'np_notice_id = notices.not_id'
- ) . ' AS projects',
- );
if ( $this->assignedBannerId ) {
@@ -93,7 +65,7 @@
'notices' => 'cn_notices',
'assignments' => 'cn_assignments'
),
- 'fields' => array_merge( $join_fields, array(
+ 'fields' => array(
'notices.not_id',
'not_name',
'not_start',
@@ -104,7 +76,7 @@
'not_geo',
'not_locked',
'not_archived'
- ) ),
+ ),
'conds' => array(
'notices.not_id = assignments.not_id',
'assignments.tmp_id = ' .
(int)$this->assignedBannerId
@@ -112,12 +84,11 @@
);
} else {
+
// Query for all campaigns
return array(
- 'tables' => array(
- 'notices' => 'cn_notices',
- ),
- 'fields' => array_merge( $join_fields, array(
+ 'tables' => 'cn_notices',
+ 'fields' => array(
'not_id',
'not_name',
'not_start',
@@ -127,9 +98,9 @@
'not_throttle',
'not_geo',
'not_locked',
- 'not_archived',
- ) ),
- 'conds' => array(),
+ 'not_archived'
+ ),
+ 'conds' => array()
);
}
}
@@ -208,18 +179,17 @@
);
case 'projects':
- $p = explode( ',', $this->mCurrentRow->projects
);
+ $p = Campaign::getNoticeProjects( $name );
return $this->onSpecialCN->listProjects( $p );
case 'languages':
- $l = explode( ',',
$this->mCurrentRow->languages );
+ $l = Campaign::getNoticeLanguages( $name );
retu
[MediaWiki-commits] [Gerrit] Update to latest master - change (mediawiki...deploy)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177703
Change subject: Update to latest master
..
Update to latest master
Change-Id: I61fc32637b2d1997097d66295a3f4fb3fe159918
---
M node_modules/extend/package.json
M node_modules/gelf-stream/package.json
M node_modules/js-yaml/package.json
M node_modules/mocha/node_modules/debug/node_modules/ms/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/mocha/package.json
M node_modules/node-txstatsd/index.js
M node_modules/node-txstatsd/package.json
M node_modules/preq/package.json
M node_modules/request/node_modules/aws-sign2/package.json
M node_modules/request/node_modules/forever-agent/package.json
M node_modules/request/node_modules/stringstream/package.json
M node_modules/restbase-cassandra/node_modules/async/package.json
M node_modules/routeswitch/package.json
M node_modules/yargs/package.json
15 files changed, 102 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/03/177703/1
diff --git a/node_modules/extend/package.json b/node_modules/extend/package.json
index e798f3e..af0f4c9 100644
--- a/node_modules/extend/package.json
+++ b/node_modules/extend/package.json
@@ -40,7 +40,7 @@
"homepage": "https://github.com/justmoon/node-extend";,
"_id": "extend@1.3.0",
"_shasum": "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8",
- "_from": "extend@^1.3.0",
+ "_from": "extend@~1.3.0",
"_npmVersion": "1.4.14",
"_npmUser": {
"name": "ljharb",
diff --git a/node_modules/gelf-stream/package.json
b/node_modules/gelf-stream/package.json
index 1058c36..63b481d 100644
--- a/node_modules/gelf-stream/package.json
+++ b/node_modules/gelf-stream/package.json
@@ -36,7 +36,7 @@
"homepage": "https://github.com/mhart/gelf-stream";,
"_id": "gelf-stream@0.2.4",
"_shasum": "a418c8c2e39b85b7932a3e8523f6022d6852e013",
- "_from": "gelf-stream@^0.2.4",
+ "_from": "gelf-stream@~0.2.4",
"_npmVersion": "1.4.10",
"_npmUser": {
"name": "hichaelmart",
diff --git a/node_modules/js-yaml/package.json
b/node_modules/js-yaml/package.json
index 1b938b8..43c4b9c 100644
--- a/node_modules/js-yaml/package.json
+++ b/node_modules/js-yaml/package.json
@@ -61,7 +61,7 @@
"_id": "js-yaml@3.2.3",
"scripts": {},
"_shasum": "a3af632d13df5bfa95f3b8f3c4b61efe212cd750",
- "_from": "js-yaml@^3.2.2",
+ "_from": "js-yaml@~3.2.2",
"_npmVersion": "1.4.28",
"_npmUser": {
"name": "vitaly",
diff --git a/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
b/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
index 87ad70d..48de118 100644
--- a/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
+++ b/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
@@ -40,5 +40,6 @@
"directories": {},
"_shasum": "d89c2124c6fdc1353d65a8b77bf1aac4b193708c",
"_resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";,
- "readme": "ERROR: No README data found!"
+ "readme": "ERROR: No README data found!",
+ "scripts": {}
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index a915c51..a6de8f3 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@0.5.0",
+ "_from": "mkdirp@~0.5.0",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/mocha/package.json b/node_modules/mocha/package.json
index b00149b..72475fd 100644
--- a/node_modules/mocha/package.json
+++ b/node_modules/mocha/package.json
@@ -94,7 +94,7 @@
"homepage": "https://github.com/visionmedia/mocha";,
"_id": "mocha@1.21.5",
"_shasum": "7c58b09174df976e434a23b1e8d639873fc529e9",
- "_from": "mocha@^1.x.x",
+ "_from": "mocha@~1.x.x",
"_npmVersion": "1.4.9",
"_npmUser": {
"name": "travisjeffery",
diff --git a/node_modules/node-txstatsd/index.js
b/node_modules/node-txstatsd/index.js
index 294f918..07673d8 100644
--- a/node_modules/node-txstatsd/index.js
+++ b/node_modules/node-txstatsd/index.js
@@ -31,7 +31,7 @@
*/
var dgram = require('dgram'),
- dns = require('dns');
+dns = require('dns');
/**
* The UDP Client for StatsD
@@ -47,42 +47,43 @@
* @constructor
*/
var Client = function (host, port, prefix, suffix, txstatsd, globalize,
cacheDns, mock) {
- var options = host || {},
- self = this;
+var options = host || {},
+self = this;
- if(arguments.length > 1 || typeof(host) === 'string'){
- options = {
- host : host,
- port : port,
-
[MediaWiki-commits] [Gerrit] Revert "Move subselects into the main pager query" - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177702
Change subject: Revert "Move subselects into the main pager query"
..
Revert "Move subselects into the main pager query"
This reverts commit 87a5f77199e5b1101a8b5f9de6ad615ef4eaafc2.
Unfortunately, this only worked on some of our db servers.
Change-Id: I412d10db9d6c72b16c118d2b671c4c339280ab6c
---
M includes/CNCampaignPager.php
1 file changed, 11 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/02/177702/1
diff --git a/includes/CNCampaignPager.php b/includes/CNCampaignPager.php
index 6dd41a5..4900aa5 100644
--- a/includes/CNCampaignPager.php
+++ b/includes/CNCampaignPager.php
@@ -56,34 +56,6 @@
* @see IndexPager::getQueryInfo()
*/
public function getQueryInfo() {
- $db = CNDatabase::getDb();
- /* FIXME: waiting for @Ic0a5db43727ed9c3ea13d0898a06009f5d94034c
-* $db->setSessionOptions( array(
-* 'group_concat_max_len' => 1,
-* ) );
-*/
- $db->query( 'SET SESSION group_concat_max_len = 1' );
-
- $join_fields = array(
- $db->buildGroupConcatField(
- ',',
- array( 'cn_notice_countries' ),
- 'nc_country',
- 'nc_notice_id = notices.not_id'
- ) . ' AS countries',
- $db->buildGroupConcatField(
- ',',
- array( 'cn_notice_languages' ),
- 'nl_language',
- 'nl_notice_id = notices.not_id'
- ) . ' AS languages',
- $db->buildGroupConcatField(
- ',',
- array( 'cn_notice_projects' ),
- 'np_project',
- 'np_notice_id = notices.not_id'
- ) . ' AS projects',
- );
if ( $this->assignedBannerId ) {
@@ -93,7 +65,7 @@
'notices' => 'cn_notices',
'assignments' => 'cn_assignments'
),
- 'fields' => array_merge( $join_fields, array(
+ 'fields' => array(
'notices.not_id',
'not_name',
'not_start',
@@ -104,7 +76,7 @@
'not_geo',
'not_locked',
'not_archived'
- ) ),
+ ),
'conds' => array(
'notices.not_id = assignments.not_id',
'assignments.tmp_id = ' .
(int)$this->assignedBannerId
@@ -112,12 +84,11 @@
);
} else {
+
// Query for all campaigns
return array(
- 'tables' => array(
- 'notices' => 'cn_notices',
- ),
- 'fields' => array_merge( $join_fields, array(
+ 'tables' => 'cn_notices',
+ 'fields' => array(
'not_id',
'not_name',
'not_start',
@@ -127,9 +98,9 @@
'not_throttle',
'not_geo',
'not_locked',
- 'not_archived',
- ) ),
- 'conds' => array(),
+ 'not_archived'
+ ),
+ 'conds' => array()
);
}
}
@@ -208,18 +179,17 @@
);
case 'projects':
- $p = explode( ',', $this->mCurrentRow->projects
);
+ $p = Campaign::getNoticeProjects( $name );
return $this->onSpecialCN->listProjects( $p );
case 'languages':
- $l = explode( ',',
$this->mCurrentRow->languages );
+
