[MediaWiki-commits] [Gerrit] Remove unused message - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/148951 Change subject: Remove unused message .. Remove unused message This message was never used, and now cx-tools-mt-provider-title can be used for the same purpose. Change-Id: I552396f028cbe4556a0b1626076fa449771a06cd --- M Resources.php M i18n/en.json 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/51/148951/1 diff --git a/Resources.php b/Resources.php index 3075cf5..e68c0db 100644 --- a/Resources.php +++ b/Resources.php @@ -274,7 +274,6 @@ 'cx-tools-mt-provider-title', 'cx-tools-mt-not-available', 'cx-tools-mt-dont-use', - 'cx-tools-mt-use-other-language', ), 'dependencies' = array( 'ext.cx.model', diff --git a/i18n/en.json b/i18n/en.json index 64129c9..03c73c4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -59,7 +59,6 @@ cx-tools-mt-provider-title: From $1, $2 to $3, cx-tools-mt-not-available: Not available for $1, cx-tools-mt-dont-use: Don't use machine translation, - cx-tools-mt-use-other-language: $1 ($2), cx-stats-title: Content translation statistics, cx-stats-page-title: Page, cx-stats-from: Source language, -- To view, visit https://gerrit.wikimedia.org/r/148951 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I552396f028cbe4556a0b1626076fa449771a06cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove cx-tools-mt-use-other-language from ContentTranslation - change (translatewiki)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/148952 Change subject: Remove cx-tools-mt-use-other-language from ContentTranslation .. Remove cx-tools-mt-use-other-language from ContentTranslation This message is removed in I552396f028cbe4556a0b1626076fa449771a06cd Change-Id: I9c702af5ada47ad4b36aa630bd8f4b018c83b475 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/52/148952/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0c4fefc..9f3daad 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -594,7 +594,6 @@ Content Translation descmsg = cx-desc aliasfile = ContentTranslation/ContentTranslation.alias.php -optional = cx-tools-mt-use-other-language ignored = cx-tools-view-guidelines-link #Contest / Unused per https://bugzilla.wikimedia.org/show_bug.cgi?id=41526#c0 -- To view, visit https://gerrit.wikimedia.org/r/148952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c702af5ada47ad4b36aa630bd8f4b018c83b475 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not load CX modules outside Special:CX - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148953
Change subject: Do not load CX modules outside Special:CX
..
Do not load CX modules outside Special:CX
Redo I45815806b0527555a80379e09489f8268f630f8b
Somehow it was overwritten in master
Change-Id: I6ff9dbb419f43a442300f4a00366c7985136a182
---
M ContentTranslation.hooks.php
M specials/SpecialContentTranslation.php
2 files changed, 11 insertions(+), 9 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/53/148953/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index bda6e29..953ed97 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -16,7 +16,7 @@
* Hook: BeforePageDisplay
*/
public static function addModules( $out, $skin ) {
- global $wgContentTranslationEventLogging,
$wgContentTranslationExperimentalFeatures;
+ global $wgContentTranslationEventLogging;
$title = $out-getTitle();
$user = $out-getUser();
@@ -44,14 +44,6 @@
'schema.ContentTranslation',
'ext.cx.eventlogging',
) );
- }
-
- if ( $wgContentTranslationExperimentalFeatures ) {
- // WYSIWYGEditor
- $out-addModules( 'ext.cx.editor.medium' );
- } else {
- // Just ContentEditable
- $out-addModules( 'ext.cx.editor' );
}
return true;
diff --git a/specials/SpecialContentTranslation.php
b/specials/SpecialContentTranslation.php
index b50b5c1..4f13c76 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -22,11 +22,21 @@
}
public function execute( $parameters ) {
+ global $wgContentTranslationExperimentalFeatures;
+
$out = $this-getOutput();
$skin = $this-getSkin();
$out-addModuleStyles( 'mediawiki.ui.button' );
$out-addModules( 'ext.cx.base' );
+ if ( $wgContentTranslationExperimentalFeatures ) {
+ // WYSIWYGEditor
+ $out-addModules( 'ext.cx.editor.medium' );
+ } else {
+ // Just ContentEditable
+ $out-addModules( 'ext.cx.editor' );
+ }
+
$this-setHeaders();
$out-setArticleBodyOnly( true );
--
To view, visit https://gerrit.wikimedia.org/r/148953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ff9dbb419f43a442300f4a00366c7985136a182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused message - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused message .. Remove unused message This message was never used, and now cx-tools-mt-provider-title can be used for the same purpose. Change-Id: I552396f028cbe4556a0b1626076fa449771a06cd --- M Resources.php M i18n/en.json 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Santhosh: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 3075cf5..e68c0db 100644 --- a/Resources.php +++ b/Resources.php @@ -274,7 +274,6 @@ 'cx-tools-mt-provider-title', 'cx-tools-mt-not-available', 'cx-tools-mt-dont-use', - 'cx-tools-mt-use-other-language', ), 'dependencies' = array( 'ext.cx.model', diff --git a/i18n/en.json b/i18n/en.json index 64129c9..03c73c4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -59,7 +59,6 @@ cx-tools-mt-provider-title: From $1, $2 to $3, cx-tools-mt-not-available: Not available for $1, cx-tools-mt-dont-use: Don't use machine translation, - cx-tools-mt-use-other-language: $1 ($2), cx-stats-title: Content translation statistics, cx-stats-page-title: Page, cx-stats-from: Source language, -- To view, visit https://gerrit.wikimedia.org/r/148951 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I552396f028cbe4556a0b1626076fa449771a06cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not load CX modules outside Special:CX - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not load CX modules outside Special:CX
..
Do not load CX modules outside Special:CX
Redo I45815806b0527555a80379e09489f8268f630f8b
Somehow it was overwritten in master
Change-Id: I6ff9dbb419f43a442300f4a00366c7985136a182
---
M ContentTranslation.hooks.php
M specials/SpecialContentTranslation.php
2 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index bda6e29..953ed97 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -16,7 +16,7 @@
* Hook: BeforePageDisplay
*/
public static function addModules( $out, $skin ) {
- global $wgContentTranslationEventLogging,
$wgContentTranslationExperimentalFeatures;
+ global $wgContentTranslationEventLogging;
$title = $out-getTitle();
$user = $out-getUser();
@@ -44,14 +44,6 @@
'schema.ContentTranslation',
'ext.cx.eventlogging',
) );
- }
-
- if ( $wgContentTranslationExperimentalFeatures ) {
- // WYSIWYGEditor
- $out-addModules( 'ext.cx.editor.medium' );
- } else {
- // Just ContentEditable
- $out-addModules( 'ext.cx.editor' );
}
return true;
diff --git a/specials/SpecialContentTranslation.php
b/specials/SpecialContentTranslation.php
index b50b5c1..4f13c76 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -22,11 +22,21 @@
}
public function execute( $parameters ) {
+ global $wgContentTranslationExperimentalFeatures;
+
$out = $this-getOutput();
$skin = $this-getSkin();
$out-addModuleStyles( 'mediawiki.ui.button' );
$out-addModules( 'ext.cx.base' );
+ if ( $wgContentTranslationExperimentalFeatures ) {
+ // WYSIWYGEditor
+ $out-addModules( 'ext.cx.editor.medium' );
+ } else {
+ // Just ContentEditable
+ $out-addModules( 'ext.cx.editor' );
+ }
+
$this-setHeaders();
$out-setArticleBodyOnly( true );
--
To view, visit https://gerrit.wikimedia.org/r/148953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ff9dbb419f43a442300f4a00366c7985136a182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ExtendedSearch: CSS more skin agnostic #2 - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148954
Change subject: ExtendedSearch: CSS more skin agnostic #2
..
ExtendedSearch: CSS more skin agnostic #2
Fixed little issue with styling of newly nested element
div#bs-extendedsearch-autocomplete (What a difference a whitespace makes
:) )
Added little scoped CSS overrides for jQuery UI, to avoid calls to
background-image resources that would produce 404 responses.
Change-Id: If9698c50cacd710589320d0e984df501320ab0ef
---
M ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
1 file changed, 3 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/54/148954/1
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
index 8f031ba..4d03653 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
@@ -13,7 +13,7 @@
/ Autocomplete /
-#bs-extendedsearch-autocomplete.ui-widget {
+#bs-extendedsearch-autocomplete .ui-widget {
font-family: inherit;
font-size: inherit;
border-radius: 0;
@@ -21,7 +21,7 @@
}
#bs-extendedsearch-autocomplete .ui-widget-content {
- background-image: none;
+ background: none;
}
#bs-extendedsearch-autocomplete li.ui-menu-item a{
@@ -37,6 +37,7 @@
}
#bs-extendedsearch-autocomplete a.ui-state-hover {
+ background-image: none;
margin: 0px;
}
--
To view, visit https://gerrit.wikimedia.org/r/148954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9698c50cacd710589320d0e984df501320ab0ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSpiceSkin/ExtendedSearch: Added some CSS - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148955
Change subject: BlueSpiceSkin/ExtendedSearch: Added some CSS
..
BlueSpiceSkin/ExtendedSearch: Added some CSS
This is kind of experimental. The one thing that should be in, is the
fixed width of the menu. All the other stuff like rounded corners and
borders are just a test.
Any feedback welcome.
Change-Id: If1480c50af34d1bd9872d22780f76db7f04da87e
---
M resources/components/extension.extendedSearch.less
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/55/148955/1
diff --git a/resources/components/extension.extendedSearch.less
b/resources/components/extension.extendedSearch.less
index 718765f..e0fc106 100644
--- a/resources/components/extension.extendedSearch.less
+++ b/resources/components/extension.extendedSearch.less
@@ -1,3 +1,12 @@
-#bs-extendedsearch-autocomplete {
- width: 300px;
+#bs-extendedsearch-autocomplete .ui-menu {
+ width: 336px; /* Comes from '#searchform input' in skin.search.less.
Sums up width, margin and border */
+ box-sizing: border-box;
+ border-top: none;
+ border-width: 2px;
+ border-radius: 0 0 8px 8px;
+ overflow: hidden;
+}
+
+#searchform input:focus {
+ border-radius: 8px 8px 0 0;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/148955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1480c50af34d1bd9872d22780f76db7f04da87e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Moving upload panel/dialog to BSF - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148956
Change subject: [WIP] Moving upload panel/dialog to BSF
..
[WIP] Moving upload panel/dialog to BSF
This should make it easier to reuse the components
REQUEST FOR COMMENTS: What do I do wth the 'bs-insertfile-upload*'
messages? Refactor them to 'bs-extjs-upload*'? How about the already
translated messages?
Change-Id: I27081530c7594a9f7e70226cc133a1b2aabd229c
---
M BlueSpiceFoundation.php
M includes/AutoLoader.php
M includes/CommonAJAXInterface.php
M includes/CoreHooks.php
A includes/JsonLicenses.php
A resources/bluespice.extjs/BS/dialog/Base.js
A resources/bluespice.extjs/BS/dialog/Upload.js
A resources/bluespice.extjs/BS/panel/Base.js
A resources/bluespice.extjs/BS/panel/Upload.js
9 files changed, 439 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/56/148956/1
diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php
index 7e2760c..282ef22 100644
--- a/BlueSpiceFoundation.php
+++ b/BlueSpiceFoundation.php
@@ -63,6 +63,7 @@
$wgAjaxExportList[] = 'BsCommonAJAXInterface::getCategoryStoreData';
$wgAjaxExportList[] = 'BsCommonAJAXInterface::getAsyncCategoryTreeStoreData';
$wgAjaxExportList[] = 'BsCommonAJAXInterface::getFileUrl';
+$wgAjaxExportList[] = 'BsCommonAJAXInterface::getLicenses';
$wgAjaxExportList[] = 'BsCore::ajaxBSPing';
//I18N MW1.23+
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 84196fb..1c8f225 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -40,6 +40,7 @@
$GLOBALS['wgAutoloadClasses']['BsCAResponse'] = __DIR__./CAResponse.php;
$GLOBALS['wgAutoloadClasses']['BsCAIResponse'] = __DIR__./CAResponse.php;
$GLOBALS['wgAutoloadClasses']['BsExtJSStoreParams'] =
__DIR__./ExtJSStoreParams.php;
+$GLOBALS['wgAutoloadClasses']['JsonLicenses'] = __DIR__ . '/JsonLicenses.php';
//adapter
$GLOBALS['wgAutoloadClasses']['BsExtensionMW'] =
__DIR__./ExtensionMW.class.php;
diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index b6faa62..57a23fd 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -509,6 +509,11 @@
}
return $image-getUrl();
}
+
+ public static function getLicenses() {
+ $oLicenses = new JsonLicenses();
+ return $oLicenses-getJsonOutput();
+ }
}
//Alias
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index da7f66d..de8f33a 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -161,6 +161,10 @@
$sExtJS.= Ext.Loader.setPath( 'BS', '$sBasePath' +
'/BS');;
$sExtJS.= Ext.Loader.setPath( 'Ext.ux', '$sBasePath' +
'/Ext.ux');;
$sExtJS.= ' Ext.Loader.setPath('.FormatJson::encode(
$aExtJSPaths).');';
+ $sExtJS.= '';
+ $sExtJS.= ' /* Maintain some downwards compatibility */';
+ $sExtJS.= ' Ext.ClassManager.setAlias( BS.panel.Upload,
BS.InsertFile.UploadPanel );';
+ $sExtJS.= ' Ext.ClassManager.setAlias( BS.dialog.Upload,
BS.InsertFile.UploadDialog );';
$sExtJS.= '});';
$out-addScript(
diff --git a/includes/JsonLicenses.php b/includes/JsonLicenses.php
new file mode 100644
index 000..197e37e
--- /dev/null
+++ b/includes/JsonLicenses.php
@@ -0,0 +1,44 @@
+?php
+
+/**
+ * JsonLicenses
+ *
+ * Extends the mediawiki licenses class to put the available licenses out in a
json format for ExtJS combobox.
+ *
+ * @author Sebastian Ulbricht
+ */
+class JsonLicenses extends Licenses {
+
+ protected $json;
+
+ public function __construct() {
+ parent::__construct( array( 'fieldname' = 'JsonLicenses' ) );
+ }
+
+ public function getJsonOutput() {
+ $this-json[] = $this-outputJsonOption( wfMessage( 'nolicense'
)-text(), '' );
+ $this-makeJson( $this-getLicenses() );
+ return json_encode(array('items' = $this-json));
+ }
+
+ protected function outputJsonOption( $text, $value, $depth = 0 ) {
+ return array(
+ 'text' = $text,
+ 'value' = \n\n==. wfMessage( 'license-header'
)-inContentLanguage()-text().==\n{{.$value.}},
+ 'indent'= $depth
+ );
+ }
+
+ protected function makeJson( $tagset, $depth = 0 ) {
+ foreach ( $tagset as $key = $val ) {
+ if ( is_array( $val ) ) {
+ $this-json[] = $this-outputJsonOption( $key,
'', $depth );
+ $this-makeJson( $val, $depth + 1 );
+ }
+ else {
+ $this-json[] = $this-outputJsonOption(
[MediaWiki-commits] [Gerrit] [WIP] Moving upload panel/dialog to BSF (Part 2) - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148957
Change subject: [WIP] Moving upload panel/dialog to BSF (Part 2)
..
[WIP] Moving upload panel/dialog to BSF (Part 2)
Depends on https://gerrit.wikimedia.org/r/#/c/148956/
Change-Id: I0d653700c09e64ab1fa3e82d87fc8feb7aafb557
---
M InsertFile/InsertFile.setup.php
M InsertFile/includes/InsertFileAJAXBackend.php
D InsertFile/includes/JsonLicenses.php
M InsertFile/resources/BS.InsertFile/BaseDialog.js
D InsertFile/resources/BS.InsertFile/UploadDialog.js
D InsertFile/resources/BS.InsertFile/UploadPanel.js
6 files changed, 3 insertions(+), 426 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/57/148957/1
diff --git a/InsertFile/InsertFile.setup.php b/InsertFile/InsertFile.setup.php
index d13d235..b2b7fa5 100644
--- a/InsertFile/InsertFile.setup.php
+++ b/InsertFile/InsertFile.setup.php
@@ -6,7 +6,6 @@
$wgExtensionMessagesFiles['InsertFile'] = __DIR__ .
'/languages/InsertFile.i18n.php';
-$wgAutoloadClasses['JsonLicenses'] = __DIR__ .
'/includes/JsonLicenses.php';
$wgAutoloadClasses['InsertFileAJAXBackend'] = __DIR__ .
'/includes/InsertFileAJAXBackend.php';
$wgAjaxExportList[] = 'InsertFileAJAXBackend::getFilePage';
diff --git a/InsertFile/includes/InsertFileAJAXBackend.php
b/InsertFile/includes/InsertFileAJAXBackend.php
index b9ad6ca..52818fb 100644
--- a/InsertFile/includes/InsertFileAJAXBackend.php
+++ b/InsertFile/includes/InsertFileAJAXBackend.php
@@ -3,8 +3,7 @@
class InsertFileAJAXBackend {
public static function getLicenses() {
- $oLicenses = new JsonLicenses();
- return $oLicenses-getJsonOutput();
+ return BsCommonAJAXInterface::getLicenses();
}
/**
diff --git a/InsertFile/includes/JsonLicenses.php
b/InsertFile/includes/JsonLicenses.php
deleted file mode 100644
index 197e37e..000
--- a/InsertFile/includes/JsonLicenses.php
+++ /dev/null
@@ -1,44 +0,0 @@
-?php
-
-/**
- * JsonLicenses
- *
- * Extends the mediawiki licenses class to put the available licenses out in a
json format for ExtJS combobox.
- *
- * @author Sebastian Ulbricht
- */
-class JsonLicenses extends Licenses {
-
- protected $json;
-
- public function __construct() {
- parent::__construct( array( 'fieldname' = 'JsonLicenses' ) );
- }
-
- public function getJsonOutput() {
- $this-json[] = $this-outputJsonOption( wfMessage( 'nolicense'
)-text(), '' );
- $this-makeJson( $this-getLicenses() );
- return json_encode(array('items' = $this-json));
- }
-
- protected function outputJsonOption( $text, $value, $depth = 0 ) {
- return array(
- 'text' = $text,
- 'value' = \n\n==. wfMessage( 'license-header'
)-inContentLanguage()-text().==\n{{.$value.}},
- 'indent'= $depth
- );
- }
-
- protected function makeJson( $tagset, $depth = 0 ) {
- foreach ( $tagset as $key = $val ) {
- if ( is_array( $val ) ) {
- $this-json[] = $this-outputJsonOption( $key,
'', $depth );
- $this-makeJson( $val, $depth + 1 );
- }
- else {
- $this-json[] = $this-outputJsonOption(
$val-text, $val-template, $depth );
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/InsertFile/resources/BS.InsertFile/BaseDialog.js
b/InsertFile/resources/BS.InsertFile/BaseDialog.js
index 8968cd9..3e7e9ab 100644
--- a/InsertFile/resources/BS.InsertFile/BaseDialog.js
+++ b/InsertFile/resources/BS.InsertFile/BaseDialog.js
@@ -2,7 +2,7 @@
extend: 'BS.Window',
requires: [
'Ext.data.Store', 'Ext.form.TextField',
'Ext.ux.form.SearchField',
- 'BS.InsertFile.UploadDialog', 'Ext.Button',
'Ext.toolbar.Toolbar',
+ 'BS.dialog.Upload', 'Ext.Button', 'Ext.toolbar.Toolbar',
'Ext.grid.Panel', 'Ext.form.Panel'
],
modal: true,
@@ -99,8 +99,7 @@
}
});
- this.dlgUpload = Ext.create('BS.InsertFile.UploadDialog',{
- title: mw.message('bs-insertfile-labelupload').plain(),
+ this.dlgUpload = Ext.create('BS.dialog.Upload',{
id: this.getId()+'-upload-dlg',
allowedFileExtensions: this.allowedFileExtensions
});
diff --git a/InsertFile/resources/BS.InsertFile/UploadDialog.js
b/InsertFile/resources/BS.InsertFile/UploadDialog.js
deleted file mode 100644
index d2476e2..000
--- a/InsertFile/resources/BS.InsertFile/UploadDialog.js
+++
[MediaWiki-commits] [Gerrit] Remove unused XMLReader2 class - change (mediawiki/core)
TTO has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148958
Change subject: Remove unused XMLReader2 class
..
Remove unused XMLReader2 class
Undocumented and unused within core. Was previously used in WikiImporter,
but that use was removed in r81437.
Change-Id: I45f4ff3fae19a7d9c1a0dacb2e02d53ee4bdaefb
---
M RELEASE-NOTES-1.24
M includes/AutoLoader.php
M includes/Import.php
3 files changed, 1 insertion(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/148958/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 6d13c91..a08e4f6 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -316,6 +316,7 @@
* HistoryPage - Use HistoryAction directly
* RawPage - Use RawAction directly
* StubContLang - Use Language::factory() instead
+* XMLReader2 - Use XMLReader directly
== Compatibility ==
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1393685..159ae62 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -193,7 +193,6 @@
'Xml' = 'includes/Xml.php',
'XmlDumpWriter' = 'includes/Export.php',
'XmlJsCode' = 'includes/Xml.php',
- 'XMLReader2' = 'includes/Import.php',
'XmlSelect' = 'includes/Xml.php',
# includes/actions
diff --git a/includes/Import.php b/includes/Import.php
index 6aab157..0516b83 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -1050,30 +1050,6 @@
}
}
-class XMLReader2 extends XMLReader {
-
- /**
-* @return bool|string
-*/
- function nodeContents() {
- if ( $this-isEmptyElement ) {
- return ;
- }
- $buffer = ;
- while ( $this-read() ) {
- switch ( $this-nodeType ) {
- case XmlReader::TEXT:
- case XmlReader::SIGNIFICANT_WHITESPACE:
- $buffer .= $this-value;
- break;
- case XmlReader::END_ELEMENT:
- return $buffer;
- }
- }
- return $this-close();
- }
-}
-
/**
* @todo document (e.g. one-sentence class description).
* @ingroup SpecialPage
--
To view, visit https://gerrit.wikimedia.org/r/148958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45f4ff3fae19a7d9c1a0dacb2e02d53ee4bdaefb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [ContentTranslation] Remove deleted message key - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/148959 Change subject: [ContentTranslation] Remove deleted message key .. [ContentTranslation] Remove deleted message key https://gerrit.wikimedia.org/r/#/c/148951/1/i18n/en.json,unified Change-Id: I8b77fb48ed96000fc8f96fea27dd411e847184d1 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/59/148959/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0c4fefc..9f3daad 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -594,7 +594,6 @@ Content Translation descmsg = cx-desc aliasfile = ContentTranslation/ContentTranslation.alias.php -optional = cx-tools-mt-use-other-language ignored = cx-tools-view-guidelines-link #Contest / Unused per https://bugzilla.wikimedia.org/show_bug.cgi?id=41526#c0 -- To view, visit https://gerrit.wikimedia.org/r/148959 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b77fb48ed96000fc8f96fea27dd411e847184d1 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [ContentTranslation] Remove deleted message key - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [ContentTranslation] Remove deleted message key .. [ContentTranslation] Remove deleted message key https://gerrit.wikimedia.org/r/#/c/148951/1/i18n/en.json,unified Change-Id: I8b77fb48ed96000fc8f96fea27dd411e847184d1 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 0c4fefc..9f3daad 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -594,7 +594,6 @@ Content Translation descmsg = cx-desc aliasfile = ContentTranslation/ContentTranslation.alias.php -optional = cx-tools-mt-use-other-language ignored = cx-tools-view-guidelines-link #Contest / Unused per https://bugzilla.wikimedia.org/show_bug.cgi?id=41526#c0 -- To view, visit https://gerrit.wikimedia.org/r/148959 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b77fb48ed96000fc8f96fea27dd411e847184d1 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MobileFrontend] Add new optional message key - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [MobileFrontend] Add new optional message key .. [MobileFrontend] Add new optional message key https://gerrit.wikimedia.org/r/#/c/148727/1/i18n/en.json,unified Change-Id: I57f9682e74ee9be69a82a5b8eaf4f5956ecf88c8 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 9f3daad..e948a72 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1189,6 +1189,7 @@ aliasfile = MobileFrontend/MobileFrontend.alias.php optional = mobile-frontend-page-menu-language-current optional = mobile.js, mobile.css, mobile-frontend-diffview-comma +optional = skinname-minerva ignored = mobile-frontend-current-language ignored = mobile-frontend-page-menu-language, mobile-frontend-terms-url -- To view, visit https://gerrit.wikimedia.org/r/148960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57f9682e74ee9be69a82a5b8eaf4f5956ecf88c8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MobileFrontend] Add new optional message key - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/148960 Change subject: [MobileFrontend] Add new optional message key .. [MobileFrontend] Add new optional message key https://gerrit.wikimedia.org/r/#/c/148727/1/i18n/en.json,unified Change-Id: I57f9682e74ee9be69a82a5b8eaf4f5956ecf88c8 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/60/148960/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 9f3daad..e948a72 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -1189,6 +1189,7 @@ aliasfile = MobileFrontend/MobileFrontend.alias.php optional = mobile-frontend-page-menu-language-current optional = mobile.js, mobile.css, mobile-frontend-diffview-comma +optional = skinname-minerva ignored = mobile-frontend-current-language ignored = mobile-frontend-page-menu-language, mobile-frontend-terms-url -- To view, visit https://gerrit.wikimedia.org/r/148960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57f9682e74ee9be69a82a5b8eaf4f5956ecf88c8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Each line in a doc block should start with * - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/148961 Change subject: Each line in a doc block should start with * .. Each line in a doc block should start with * Added missing * to some doc blocks Change-Id: I0709f2e94b053437fa0f06bb67ae7ae4c248a618 --- M includes/Block.php M languages/messages/MessagesEn.php M tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php M tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php 4 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/148961/1 diff --git a/includes/Block.php b/includes/Block.php index aaabec9..ac7450b 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -1104,7 +1104,7 @@ * - Other softblocks are chosen over autoblocks * - If there are multiple exact or range blocks at the same level, the one chosen *is random - +* * @param array $ipChain List of IPs (strings). This is used to determine how close *a block is to the server, and if a block matches exactly, or is in a range. *The order is furthest from the server to nearest e.g., (Browser, proxy1, proxy2, diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9bacac2..ccdd310 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -103,9 +103,11 @@ * Array of gender specific. namespace aliases. * Mapping NS_xxx to array of GENDERKEY to alias. * Example: -$namespaceGenderAliases = array( - NS_USER = array( 'male' = 'Male_user', 'female' = 'Female_user' ), -); + * @code + * $namespaceGenderAliases = array( + * NS_USER = array( 'male' = 'Male_user', 'female' = 'Female_user' ), + * ); + * @endcode */ $namespaceGenderAliases = array(); diff --git a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php index 041adb8..166d641 100644 --- a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php +++ b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php @@ -97,7 +97,7 @@ * az-Arab-x-AZE-derbend * AZE being private, it should be lower case, hence the test above * should probably be: - #array( 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ), +* array( 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ), */ # Private use registry values: diff --git a/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php b/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php index f1425ef..b13df89 100644 --- a/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php +++ b/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- To view, visit https://gerrit.wikimedia.org/r/148961 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0709f2e94b053437fa0f06bb67ae7ae4c248a618 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove transparent selection from focusable nodes in FF - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148962
Change subject: Remove transparent selection from focusable nodes in FF
..
Remove transparent selection from focusable nodes in FF
This only made sense when we had selection sheilds.
Change-Id: Ibec223976a580fc060dbab6e07f488d365dd6466
---
M modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/62/148962/1
diff --git a/modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css
b/modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css
index 57497f6..b500a97 100644
--- a/modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css
+++ b/modules/ve/ce/styles/nodes/ve.ce.FocusableNode.css
@@ -35,8 +35,3 @@
background: #000;
background: rgba(0, 0, 0, 1);
}
-
-.ve-ce-focusableNode::-moz-selection,
-.ve-ce-focusableNode *::-moz-selection {
- background: transparent;
-}
--
To view, visit https://gerrit.wikimedia.org/r/148962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibec223976a580fc060dbab6e07f488d365dd6466
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make OATHAuth jslint job voting - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/148963 Change subject: Make OATHAuth jslint job voting .. Make OATHAuth jslint job voting Bug: 61617 Change-Id: Ia2ff481dba781c6ac8d695e5c028f80c182a5283 --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/63/148963/1 diff --git a/layout.yaml b/layout.yaml index 2ce1397..f8bfdf5 100644 --- a/layout.yaml +++ b/layout.yaml @@ -463,8 +463,6 @@ voting: false - name: mwext-Nonlinear-jslint # bug 61614 voting: false - - name: mwext-OATHAuth-jslint # bug 61617 -voting: false - name: mwext-PageTriage-jslint # bug 61618 voting: false - name: mwext-Quiz-jslint # bug 61620 -- To view, visit https://gerrit.wikimedia.org/r/148963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2ff481dba781c6ac8d695e5c028f80c182a5283 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make OATHAuth jslint job voting - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Make OATHAuth jslint job voting .. Make OATHAuth jslint job voting Bug: 61617 Change-Id: Ia2ff481dba781c6ac8d695e5c028f80c182a5283 --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 2ce1397..f8bfdf5 100644 --- a/layout.yaml +++ b/layout.yaml @@ -463,8 +463,6 @@ voting: false - name: mwext-Nonlinear-jslint # bug 61614 voting: false - - name: mwext-OATHAuth-jslint # bug 61617 -voting: false - name: mwext-PageTriage-jslint # bug 61618 voting: false - name: mwext-Quiz-jslint # bug 61620 -- To view, visit https://gerrit.wikimedia.org/r/148963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2ff481dba781c6ac8d695e5c028f80c182a5283 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a space to the comment node for selection highlighting - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/148964 Change subject: Add a space to the comment node for selection highlighting .. Add a space to the comment node for selection highlighting Change-Id: I82ff9329d7f04ad9068408c17f1545d4071d6360 --- M modules/ve/ce/nodes/ve.ce.CommentNode.js 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/64/148964/1 diff --git a/modules/ve/ce/nodes/ve.ce.CommentNode.js b/modules/ve/ce/nodes/ve.ce.CommentNode.js index 1dc58b5..440eb6a 100644 --- a/modules/ve/ce/nodes/ve.ce.CommentNode.js +++ b/modules/ve/ce/nodes/ve.ce.CommentNode.js @@ -22,7 +22,9 @@ // DOM changes this.$element - .addClass( 've-ce-commentNode oo-ui-indicator-comment' ); + .addClass( 've-ce-commentNode oo-ui-indicator-comment' ) + // Add em space for selection highlighting + .text( '\u2003' ); // Mixin constructors ve.ce.FocusableNode.call( this, this.$element, config ); -- To view, visit https://gerrit.wikimedia.org/r/148964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82ff9329d7f04ad9068408c17f1545d4071d6360 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send 404 in various special pages when there're no results - change (mediawiki/core)
Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148965
Change subject: Send 404 in various special pages when there're no results
..
Send 404 in various special pages when there're no results
Bug: 67182
Change-Id: I442645d8b98731282768e6cc19a8f426b1d0b519
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialContributions.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWhatlinkshere.php
4 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/148965/1
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 008200d..80c612f 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -54,6 +54,7 @@
if ( $rows === false ) {
if ( !$this-including() ) {
$this-doHeader( $opts );
+ $this-getOutput()-setStatusCode( 404 );
}
return;
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 251ac51..a884a39 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -255,6 +255,9 @@
wfEscapeWikiText(
$userObj-getName() ),
)
);
+ if ( !$this-including() ) {
+ $this-getOutput()-setStatusCode( 404
);
+ }
}
$user = htmlspecialchars( $userObj-getName() );
} else {
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index aa8ed82..c3d9d3e 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -344,6 +344,9 @@
$this-msg( 'recentchanges-noresult' )-parse()
.
'/div'
);
+ if ( !$this-including() ) {
+ $this-getOutput()-setStatusCode( 404 );
+ }
} else {
$this-getOutput()-addHTML( $rclistOutput );
}
diff --git a/includes/specials/SpecialWhatlinkshere.php
b/includes/specials/SpecialWhatlinkshere.php
index 694bc83..a3f71d1 100644
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -208,6 +208,7 @@
}
$errMsg = is_int( $namespace ) ?
'nolinkshere-ns' : 'nolinkshere';
$out-addWikiMsg( $errMsg,
$this-target-getPrefixedText() );
+ $out-setStatusCode( 404 );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/148965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I442645d8b98731282768e6cc19a8f426b1d0b519
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: translation tweaks - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: i18n: translation tweaks
..
i18n: translation tweaks
- fix typos (ascending, responsibility, notifications, necessary, etc.)
- PLURAL redundancy
Spotted by Liuxinyu970226 and Chrumps
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Bs-smartlist-sort-asc/en
https://translatewiki.net/w/i.php?title=MediaWiki:Bs-smartlist-tag-smartlist-desc/endiff=prevoldid=5663997
Change-Id: Ib6f30b42bdb02fcdd4d089798601ae9c5d7639bb
---
M ExtendedSearch/i18n/en.json
M ExtendedSearch/i18n/qqq.json
M Flexiskin/i18n/en.json
M InsertCategory/InsertCategory.class.php
M InsertFile/InsertFile.class.php
M InsertLink/InsertLink.class.php
M InsertLink/i18n/en.json
M Notifications/i18n/en.json
M PagesVisited/i18n/en.json
M PagesVisited/i18n/qqq.json
M ResponsibleEditors/i18n/en.json
M ResponsibleEditors/i18n/qqq.json
M Review/i18n/en.json
M Review/i18n/qqq.json
M ShoutBox/i18n/en.json
M SmartList/i18n/en.json
M SmartList/i18n/qqq.json
M WantedArticle/i18n/en.json
M WantedArticle/i18n/qqq.json
M WatchList/i18n/en.json
M WatchList/i18n/qqq.json
21 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
Robert Vogel: Checked; Looks good to me, but someone else must approve
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/i18n/en.json b/ExtendedSearch/i18n/en.json
index 55bf39f..d694fa4 100644
--- a/ExtendedSearch/i18n/en.json
+++ b/ExtendedSearch/i18n/en.json
@@ -29,7 +29,7 @@
bs-extendedsearch-invalid-query: The query could not be processed.,
bs-extendedsearch-nosearchterm: Please enter a search term.,
bs-extendedsearch-result: Search for \$1\ found $2
{{PLURAL:$2|result|results}}.,
- bs-extendedsearch-result-caption: $1 - $2 out of $3
result{{PLURAL:$3||s}},
+ bs-extendedsearch-result-caption: $1 - $2 out of $3
{{PLURAL:$3|result|results}},
bs-extendedsearch-search-category: Search in the categories:,
bs-extendedsearch-search-editors: Search for authors:,
bs-extendedsearch-search-help-multiselect: Hold CTRL key to select
multiple items.,
diff --git a/ExtendedSearch/i18n/qqq.json b/ExtendedSearch/i18n/qqq.json
index 959ca4c..9e751d3 100644
--- a/ExtendedSearch/i18n/qqq.json
+++ b/ExtendedSearch/i18n/qqq.json
@@ -12,7 +12,7 @@
bs-extendedsearch-desc: Used in
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}}
Special:WikiAdmin?mode=ExtensionInfo], description of extended search
extension,
specialextendedsearch: Special page name for extended search,
prefs-extendedsearch: Used in
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}}
Special:WikiAdmin?mode=Preferences], headline for extended search section in
preferences.\n{{Identical|Extended search}},
- bs-extendedsearch-category-filter: Text for
{{PLURAL:$1|Category|Categories}}: $2\n* $1 - the number of categories - use
for PLURAL distinction\n* $2 - a comma seperated list of
categories\n{{Identical|Category}},
+ bs-extendedsearch-category-filter: Text for
{{PLURAL:$1|Category|Categories}}: $2\n* $1 - the number of categories - use
for PLURAL distinction\n* $2 - a comma separated list of
categories\n{{Identical|Category}},
bs-extendedsearch-curl-not-active: Text for the cURL extension is
not activated.\n \cUrl\ is a PHP extension,
bs-extendedsearch-error: Text for error:\n{{Identical|Error}},
bs-extendedsearch-facet-category: Facet headline for
category\n{{Identical|Category}},
@@ -90,7 +90,7 @@
bs-extendedsearch-delete-lock: Anchor text for delete lock file,
bs-extendedsearch-warning: Dialog title for
warning\n{{Identical|Warning}},
bs-extendedsearch-lockfiletext: Text for please, only delete the
lock file if you are sure indexing is not in progress.,
- bs-extendedsearch-did-you-mean: Text for did you mean \$1\? $1 is
a comma sperated list of proposals,
+ bs-extendedsearch-did-you-mean: Text for did you mean \$1\? $1 is
a comma separated list of proposals,
bs-extendedsearch-ascending: Text for
ascending\n{{Identical|Ascending}},
bs-extendedsearch-descending: Text for
descending\n{{Identical|Descending}},
bs-extendedsearch-unknown: Text for unknown\n{{Identical|Unknown}},
@@ -99,7 +99,7 @@
bs-extendedsearch-recentsearchterms: Headline for recent search
terms\n{{Identical|Recent search terms}},
bs-extendedsearch-recentsearchtermsdesc: Text for list of the most
recent searched terms inside this Wiki sorted by their count.,
bs-extendedsearch-no-mlt-found: Text for no similar pages found.,
- bs-extendedsearch-redirect: Text for redirect from: $1 \n\n* $1 is a
comma sperated list of redirects,
+ bs-extendedsearch-redirect: Text for redirect from: $1 \n\n* $1 is a
comma separated list of redirects,
bs-extendedsearch-totalnoofarticles: Text for number of
[MediaWiki-commits] [Gerrit] ExtendedSearch: CSS more skin agnostic #2 - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: ExtendedSearch: CSS more skin agnostic #2
..
ExtendedSearch: CSS more skin agnostic #2
Fixed little issue with styling of newly nested element
div#bs-extendedsearch-autocomplete (What a difference a whitespace makes
:) )
Added little scoped CSS overrides for jQuery UI, to avoid calls to
background-image resources that would produce 404 responses.
Change-Id: If9698c50cacd710589320d0e984df501320ab0ef
---
M ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
index 8f031ba..4d03653 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.css
@@ -13,7 +13,7 @@
/ Autocomplete /
-#bs-extendedsearch-autocomplete.ui-widget {
+#bs-extendedsearch-autocomplete .ui-widget {
font-family: inherit;
font-size: inherit;
border-radius: 0;
@@ -21,7 +21,7 @@
}
#bs-extendedsearch-autocomplete .ui-widget-content {
- background-image: none;
+ background: none;
}
#bs-extendedsearch-autocomplete li.ui-menu-item a{
@@ -37,6 +37,7 @@
}
#bs-extendedsearch-autocomplete a.ui-state-hover {
+ background-image: none;
margin: 0px;
}
--
To view, visit https://gerrit.wikimedia.org/r/148954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9698c50cacd710589320d0e984df501320ab0ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Highlight and bind events to $focusable, not $element - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148966
Change subject: Highlight and bind events to $focusable, not $element
..
Highlight and bind events to $focusable, not $element
Still use this.$element for setting classes and properties.
Change-Id: I2415bbcdf94bbb25773a37e4f3a5048a567bb025
---
M modules/ve/ce/ve.ce.FocusableNode.js
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/66/148966/1
diff --git a/modules/ve/ce/ve.ce.FocusableNode.js
b/modules/ve/ce/ve.ce.FocusableNode.js
index 4ae1bec..b627f2e 100644
--- a/modules/ve/ce/ve.ce.FocusableNode.js
+++ b/modules/ve/ce/ve.ce.FocusableNode.js
@@ -100,7 +100,7 @@
.prop( 'contentEditable', 'false' );
// Events
- this.$element.on( {
+ this.$focusable.on( {
'mouseenter.ve-ce-focusableNode': ve.bind(
this.onFocusableMouseEnter, this ),
'mousedown.ve-ce-focusableNode touchend.ve-ce-focusableNode':
ve.bind( this.onFocusableMouseDown, this )
} );
@@ -120,7 +120,7 @@
}
// Events
- this.$element.off( '.ve-ce-focusableNode' );
+ this.$focusable.off( '.ve-ce-focusableNode' );
// Highlights
this.clearHighlights();
@@ -308,13 +308,13 @@
this.focused = value;
if ( this.focused ) {
this.emit( 'focus' );
- this.$focusable.addClass( 've-ce-node-focused' );
+ this.$element.addClass( 've-ce-focusableNode-focused' );
this.createHighlights();
this.surface.appendHighlights( this.$highlights,
this.focused );
this.surface.$element.off( '.ve-ce-focusableNode' );
} else {
this.emit( 'blur' );
- this.$focusable.removeClass( 've-ce-node-focused' );
+ this.$element.removeClass(
've-ce-focusableNode-focused' );
this.clearHighlights();
}
}
@@ -402,7 +402,7 @@
rect2.bottom = rect1.bottom;
}
- this.$element.find( '*' ).addBack().each( function () {
+ this.$focusable.find( '*' ).addBack().each( function () {
var i, j, il, jl, contained, clientRects;
if ( $( this ).hasClass( 've-ce-noHighlight' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/148966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2415bbcdf94bbb25773a37e4f3a5048a567bb025
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update hhvm config - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148967
Change subject: Update hhvm config
..
Update hhvm config
* Bring closer to mediawiki vagrant
** Moved most settings to php.ini
** Updated dynamic extension path
** But the admin consoles etc were not added
* Use unix socket
* Disable hhvm fastcgi by default still
Change-Id: I9da2a1c359835df9fe246faf2f6d067a7f1e0ed7
---
A puppet/hiera.yaml
A puppet/modules/git
M puppet/modules/hhvm/files/config.hdf
A puppet/modules/hhvm/files/php.ini
D puppet/modules/hhvm/files/server.ini
M puppet/modules/hhvm/files/upstart
M puppet/modules/hhvm/manifests/init.pp
M puppet/modules/nginx/files/translatewiki.net
8 files changed, 45 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/67/148967/1
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/puppet/hiera.yaml
diff --git a/puppet/modules/git b/puppet/modules/git
new file mode 16
index 000..5a03063
--- /dev/null
+++ b/puppet/modules/git
+Subproject commit 5a03063a8a1c1beda56490f9601f788c98155bcb
diff --git a/puppet/modules/hhvm/files/config.hdf
b/puppet/modules/hhvm/files/config.hdf
index fc28082..160aafd 100644
--- a/puppet/modules/hhvm/files/config.hdf
+++ b/puppet/modules/hhvm/files/config.hdf
@@ -1,48 +1,11 @@
# This file is managed by puppet
-PidFile = /var/run/hhvm/pid
-
-Server {
- Type = fastcgi
- Port = 9000
- IP = 127.0.0.1
- GzipCompressionLevel = 0
-}
-
Eval {
- EnableZendCompat = true
- Jit = true
PerfPidMap = false
}
-
-DynamicExtensionPath = /usr/lib/hphp/extensions/20131007
DynamicExtensions {
* = luasandbox.so
* = fss.so
* = wikidiff2.so
-}
-
-Log {
- Level = Notice
- AlwaysLogUnhandledExceptions = true
- UseLogFile = true
- UseSyslog = false
- File = /var/log/hhvm/error.log
- Access {
-* {
- File = /var/log/hhvm/access.log
- Format = %h %l %u % t \”%r\” %s %b
-}
- }
-}
-
-Repo {
- Central {
-Path = /var/run/hhvm/hhvm.hhbc
- }
-}
-
-MySQL {
- TypedResults = false
}
diff --git a/puppet/modules/hhvm/files/php.ini
b/puppet/modules/hhvm/files/php.ini
new file mode 100644
index 000..d5f58af
--- /dev/null
+++ b/puppet/modules/hhvm/files/php.ini
@@ -0,0 +1,32 @@
+; This file is managed by puppet
+
+; php options
+pid = /run/hhvm/pid
+date.timezone = 'UTC'
+
+; hhvm specific
+hhvm.server.ip = 127.0.0.1
+hhvm.server.file_socket = /run/hhvm/hhvm.sock
+hhvm.server.type = fastcgi
+hhvm.server.gzip_compression_level = 0
+
+hhvm.dynamic_extension_path = /usr/lib/hphp/extensions/20140702
+
+hhvm.jit = true
+hhvm.jit_afrozen_size = 1
+
+hhvm.log.level = Notice
+hhvm.log.always_log_unhandled_exceptions = true
+hhvm.log.runtime_error_reporting_level = 8191
+hhvm.log.use_log_file = true
+hhvm.log.use_syslog = false
+hhvm.log.file = /var/log/hhvm/error.log
+hhvm.log.access.file = /var/log/hhvm/access.log
+hhvm.log.access.format = %h %l %u % t \”%r\” %s %b
+
+hhvm.repo.central.path = /run/hhvm/hhvm.hhbc
+
+hhvm.enable_zend_compat = true
+
+hhvm.mysql.typed_results = false
+hhvm.mysql.slow_query_threshold = 5000
diff --git a/puppet/modules/hhvm/files/server.ini
b/puppet/modules/hhvm/files/server.ini
deleted file mode 100644
index c3faa9f..000
--- a/puppet/modules/hhvm/files/server.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-; php options
-
-pid = /var/run/hhvm/pid
-
-; hhvm specific
-
-hhvm.server.port = 9000
-hhvm.server.type = fastcgi
-hhvm.log.level = Info
-hhvm.log.always_log_unhandled_exceptions = true
-hhvm.log.runtime_error_reporting_level = 8191
-hhvm.log.use_log_file = true
-hhvm.log.file = /var/log/hhvm/error.log
-hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
-hhvm.mysql.typed_results = false
-hhvm.mysql.connect_timeout = 100
-hhvm.mysql.slow_query_threshold = 1000
diff --git a/puppet/modules/hhvm/files/upstart
b/puppet/modules/hhvm/files/upstart
index 1c7fe5c..f489a93 100644
--- a/puppet/modules/hhvm/files/upstart
+++ b/puppet/modules/hhvm/files/upstart
@@ -5,8 +5,8 @@
start on (local-filesystems and net-device-up IFACE!=lo)
pre-start script
- mkdir -p -m0755 /var/run/hhvm
- chown -R www-data:www-data /var/run/hhvm
+ mkdir -p -m0755 /run/hhvm
+ chown -R www-data:www-data /run/hhvm
mkdir -p -m0755 /var/log/hhvm
chown -R www-data:www-data /var/log/hhvm
end script
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index 61a601c..b2faa5c 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -20,11 +20,10 @@
}
package { [ 'hhvm', 'hhvm-dev', 'hhvm-fss', 'hhvm-luasandbox',
'hhvm-wikidiff2' ]:
+ensure = latest,
before = Service['hhvm'],
require = Apt::Source['wikimedia'],
}
-
- package { 'hhvm-nightly': ensure = absent, }
file { '/etc/hhvm':
ensure = directory,
@@ -42,6 +41,12 @@
[MediaWiki-commits] [Gerrit] Fix socket errors: buffer apertium stdout - change (mediawiki...cxserver)
Divec has uploaded a new change for review. https://gerrit.wikimedia.org/r/148968 Change subject: Fix socket errors: buffer apertium stdout .. Fix socket errors: buffer apertium stdout Change-Id: I53bbc76df0099e092b92fee5a186a370f2dbe744 --- A apertium.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/68/148968/1 diff --git a/apertium.py b/apertium.py new file mode 100644 index 000..dd1d092 --- /dev/null +++ b/apertium.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python + +import sys, subprocess + +args = ['apertium'] +args += sys.argv[1:] +process = subprocess.Popen(args, stdin=sys.stdin, stdout=subprocess.PIPE) +for line in process.stdout: + sys.stdout.write(line) -- To view, visit https://gerrit.wikimedia.org/r/148968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53bbc76df0099e092b92fee5a186a370f2dbe744 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: Divec da...@sheetmusic.org.uk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return '' from getTokenSalt to enable token check - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148969
Change subject: Return '' from getTokenSalt to enable token check
..
Return '' from getTokenSalt to enable token check
Change-Id: I9395b65473167a205fb1970f5232b36a9a26bdd6
---
M repo/includes/api/ApiWikibase.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/69/148969/1
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index a8ddaab..ea23b53 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -215,6 +215,13 @@
}
/**
+* @see ApiBase::getTokenSalt()
+*/
+ public function getTokenSalt() {
+ return $this-needsToken() ? '' : false;
+ }
+
+ /**
* @see ApiBase::mustBePosted()
*/
public function mustBePosted() {
--
To view, visit https://gerrit.wikimedia.org/r/148969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9395b65473167a205fb1970f5232b36a9a26bdd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update hhvm config - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Update hhvm config
..
Update hhvm config
* Bring closer to mediawiki vagrant
** Moved most settings to php.ini
** Updated dynamic extension path
** But the admin console etc. were not added
* Use unix socket
* Disable hhvm fastcgi by default still
Change-Id: I9da2a1c359835df9fe246faf2f6d067a7f1e0ed7
---
A puppet/hiera.yaml
A puppet/modules/git
M puppet/modules/hhvm/files/config.hdf
A puppet/modules/hhvm/files/php.ini
D puppet/modules/hhvm/files/server.ini
M puppet/modules/hhvm/files/upstart
M puppet/modules/hhvm/manifests/init.pp
M puppet/modules/nginx/files/translatewiki.net
8 files changed, 45 insertions(+), 62 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/puppet/hiera.yaml
diff --git a/puppet/modules/git b/puppet/modules/git
new file mode 16
index 000..5a03063
--- /dev/null
+++ b/puppet/modules/git
+Subproject commit 5a03063a8a1c1beda56490f9601f788c98155bcb
diff --git a/puppet/modules/hhvm/files/config.hdf
b/puppet/modules/hhvm/files/config.hdf
index fc28082..160aafd 100644
--- a/puppet/modules/hhvm/files/config.hdf
+++ b/puppet/modules/hhvm/files/config.hdf
@@ -1,48 +1,11 @@
# This file is managed by puppet
-PidFile = /var/run/hhvm/pid
-
-Server {
- Type = fastcgi
- Port = 9000
- IP = 127.0.0.1
- GzipCompressionLevel = 0
-}
-
Eval {
- EnableZendCompat = true
- Jit = true
PerfPidMap = false
}
-
-DynamicExtensionPath = /usr/lib/hphp/extensions/20131007
DynamicExtensions {
* = luasandbox.so
* = fss.so
* = wikidiff2.so
-}
-
-Log {
- Level = Notice
- AlwaysLogUnhandledExceptions = true
- UseLogFile = true
- UseSyslog = false
- File = /var/log/hhvm/error.log
- Access {
-* {
- File = /var/log/hhvm/access.log
- Format = %h %l %u % t \”%r\” %s %b
-}
- }
-}
-
-Repo {
- Central {
-Path = /var/run/hhvm/hhvm.hhbc
- }
-}
-
-MySQL {
- TypedResults = false
}
diff --git a/puppet/modules/hhvm/files/php.ini
b/puppet/modules/hhvm/files/php.ini
new file mode 100644
index 000..d5f58af
--- /dev/null
+++ b/puppet/modules/hhvm/files/php.ini
@@ -0,0 +1,32 @@
+; This file is managed by puppet
+
+; php options
+pid = /run/hhvm/pid
+date.timezone = 'UTC'
+
+; hhvm specific
+hhvm.server.ip = 127.0.0.1
+hhvm.server.file_socket = /run/hhvm/hhvm.sock
+hhvm.server.type = fastcgi
+hhvm.server.gzip_compression_level = 0
+
+hhvm.dynamic_extension_path = /usr/lib/hphp/extensions/20140702
+
+hhvm.jit = true
+hhvm.jit_afrozen_size = 1
+
+hhvm.log.level = Notice
+hhvm.log.always_log_unhandled_exceptions = true
+hhvm.log.runtime_error_reporting_level = 8191
+hhvm.log.use_log_file = true
+hhvm.log.use_syslog = false
+hhvm.log.file = /var/log/hhvm/error.log
+hhvm.log.access.file = /var/log/hhvm/access.log
+hhvm.log.access.format = %h %l %u % t \”%r\” %s %b
+
+hhvm.repo.central.path = /run/hhvm/hhvm.hhbc
+
+hhvm.enable_zend_compat = true
+
+hhvm.mysql.typed_results = false
+hhvm.mysql.slow_query_threshold = 5000
diff --git a/puppet/modules/hhvm/files/server.ini
b/puppet/modules/hhvm/files/server.ini
deleted file mode 100644
index c3faa9f..000
--- a/puppet/modules/hhvm/files/server.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-; php options
-
-pid = /var/run/hhvm/pid
-
-; hhvm specific
-
-hhvm.server.port = 9000
-hhvm.server.type = fastcgi
-hhvm.log.level = Info
-hhvm.log.always_log_unhandled_exceptions = true
-hhvm.log.runtime_error_reporting_level = 8191
-hhvm.log.use_log_file = true
-hhvm.log.file = /var/log/hhvm/error.log
-hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
-hhvm.mysql.typed_results = false
-hhvm.mysql.connect_timeout = 100
-hhvm.mysql.slow_query_threshold = 1000
diff --git a/puppet/modules/hhvm/files/upstart
b/puppet/modules/hhvm/files/upstart
index 1c7fe5c..f489a93 100644
--- a/puppet/modules/hhvm/files/upstart
+++ b/puppet/modules/hhvm/files/upstart
@@ -5,8 +5,8 @@
start on (local-filesystems and net-device-up IFACE!=lo)
pre-start script
- mkdir -p -m0755 /var/run/hhvm
- chown -R www-data:www-data /var/run/hhvm
+ mkdir -p -m0755 /run/hhvm
+ chown -R www-data:www-data /run/hhvm
mkdir -p -m0755 /var/log/hhvm
chown -R www-data:www-data /var/log/hhvm
end script
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index 61a601c..b2faa5c 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -20,11 +20,10 @@
}
package { [ 'hhvm', 'hhvm-dev', 'hhvm-fss', 'hhvm-luasandbox',
'hhvm-wikidiff2' ]:
+ensure = latest,
before = Service['hhvm'],
require = Apt::Source['wikimedia'],
}
-
- package { 'hhvm-nightly': ensure = absent, }
file { '/etc/hhvm':
ensure = directory,
@@ -42,6 +41,12 @@
notify = Service['hhvm'],
}
+
[MediaWiki-commits] [Gerrit] Allow unzipped bundle - change (mediawiki...latex_renderer)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148970
Change subject: Allow unzipped bundle
..
Allow unzipped bundle
Allow the renderer to consume a unzipped bundle file and to accept
a working directory. This saves CPU cycles when the bundle was
created on the same machine. A manually specified working directory
allows the caller to define a better working space than /tmp -- e.g.
a RAM disk.
Change-Id: If2be196ca29a4b1d93cda1b818491d64746e44a0
---
M bin/mw-ocg-latexer
M lib/index.js
M package.json
3 files changed, 42 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
refs/changes/70/148970/1
diff --git a/bin/mw-ocg-latexer b/bin/mw-ocg-latexer
index 7e57a1c..5d4ba3c 100755
--- a/bin/mw-ocg-latexer
+++ b/bin/mw-ocg-latexer
@@ -13,7 +13,7 @@
program
.version(latexer.version)
- .usage('[options] bundle.zip')
+ .usage('[options] bundle')
.option('-o, --output filename',
'Save PDF to the given filename', null)
.option('-s, --size letter|a4',
@@ -31,7 +31,10 @@
.option('-D, --debug',
'Turn on debugging features (eg, full stack traces on
exceptions)')
.option('--syslog',
- 'Log errors using syslog (for production deployments)');
+ 'Log errors using syslog (for production deployments)')
+ .option('--builddir path',
+ 'Manually specify a working directory to place
temporary files. ' +
+ 'If specificed, this directory is not removed on
failure.');
program.parse(process.argv);
@@ -73,6 +76,7 @@
latex: !!program.latex,
debug: !!program.debug,
output: program.output,
+ builddir: program.builddir,
lang: program.lang,
onecolumn: program.oneColumn,
log: log
diff --git a/lib/index.js b/lib/index.js
index 49b9ba9..0b81bff 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -11,6 +11,7 @@
var fs = require('fs');
var gammalatex = require('gammalatex');
var path = require('path');
+var rimraf = require('rimraf');
var stream = require('stream');
var tmp = require('tmp');
var ubidi = require('icu-bidi');
@@ -1117,22 +1118,41 @@
status.createStage(0, 'Unpacking content bundle');
// first create a temporary directory
- return P.call(tmp.dir, tmp, {
- prefix: json.name,
- unsafeCleanup: !(options.debug || options.latex)
+ return Promise.resolve().then(function() {
+ // Either take the directory at face value or create one
+ // Note: we do not get automatic clean up when we take the
directory
+ if (options.builddir) {
+ return P.call(fs.mkdir, fs,
options.builddir).then(function() {
+ return options.builddir;
+ });
+ } else {
+ return P.call(tmp.dir, tmp, {
+ prefix: json.name,
+ unsafeCleanup: !(options.debug || options.latex)
+ });
+ }
}).then(function(_builddir) {
builddir = _builddir;
- // make bundle and latex subdirs
+
+ // deal with the bundle and latex dirs. latex dir is easy,
bundle..
+ // we will hardlink if the given bundle is a directory,
otherwise
+ // we will extract it
+ var dealWithBundle = function() {
+ return P.call(fs.stat, fs,
options.bundle).then(function(stat) {
+ if (stat.isDirectory()) {
+ return P.call(fs.symlink, fs,
options.bundle, path.join(builddir, 'bundle'))
+ } else {
+ return P.spawn('unzip', [ path.resolve(
options.bundle ) ], {
+ cwd: path.join(builddir,
'bundle')
+ });
+ }
+ })
+ };
+
return Promise.join(
- P.call(fs.mkdir, fs, path.join(builddir, 'bundle')),
+ dealWithBundle(),
P.call(fs.mkdir, fs, path.join(builddir, 'latex'))
);
- }).then(function() {
- // now unpack the zip archive
- var bundledir = path.join(builddir, 'bundle');
- return P.spawn('unzip', [ path.resolve( options.bundle ) ], {
- cwd: bundledir
- });
}).then(function() {
// now read in the main metabook.json file
return P.call(
@@ -1597,10
[MediaWiki-commits] [Gerrit] zuul: allow gearman access from mergers - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: zuul: allow gearman access from mergers
..
zuul: allow gearman access from mergers
We will get Zuul merger installed on lanthanum in addition to gallium.
Manually maintain a list of such hosts in network::constant and adjust
the ferm rule to allow them to reach gearman.
Note: the ferm::rule is being renamed.
Change-Id: Ie27fd16d3f1a0b0a6d8b625cd8d5dfea971c8212
---
M manifests/network.pp
M modules/contint/manifests/firewall.pp
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/network.pp b/manifests/network.pp
index eabc857..88a09a0 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -244,6 +244,16 @@
$analytics_networks,
]
+$contint_zuul_merger_hosts = {
+'production' = [
+'208.80.154.135', # gallium.wikimedia.org
+'10.64.0.161', # lanthanum.eqiad.wmnet
+],
+'labs' = [
+'127.0.0.1',
+],
+}
+
}
class network::checks {
diff --git a/modules/contint/manifests/firewall.pp
b/modules/contint/manifests/firewall.pp
index cf530cb..91d92ce 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -2,6 +2,7 @@
class contint::firewall {
include base::firewall
+include network::constants
# Restrict some services to be only reacheable from localhost over both
# IPv4 and IPv6 (to be safe)
@@ -14,11 +15,13 @@
ferm::rule { 'zuul_localhost_only':
rule = 'proto tcp dport 8001 { saddr (127.0.0.1 ::1) ACCEPT; }'
}
+
# Gearman is used between Zuul and the Jenkin master, both on the same
# server and communicating over localhost.
-# It is also used by Zuul merger daemon. The IPs will need to be collected
-ferm::rule { 'gearman_localhost_only':
-rule = 'proto tcp dport 4730 { saddr (127.0.0.1 208.80.154.135 ::1)
ACCEPT; }'
+# It is also used by Zuul merger daemons.
+$zuul_merger_hosts =
join($::network::constants::contint_zuul_merger_hosts[$::realm], ' ')
+ferm::rule { 'gearman_from_zuul_mergers':
+rule = proto tcp dport 4730 { saddr (127.0.0.1 ::1
${zuul_merger_hosts}) ACCEPT; }
}
# The master runs a git-daemon process used by slave to fetch changes from
--
To view, visit https://gerrit.wikimedia.org/r/148640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie27fd16d3f1a0b0a6d8b625cd8d5dfea971c8212
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Simple English translation to Persian - change (mediawiki...cldr)
Reza has uploaded a new change for review. https://gerrit.wikimedia.org/r/148971 Change subject: Add Simple English translation to Persian .. Add Simple English translation to Persian Change-Id: I4953afdd8bbb89762e55a1ecb855b90d6f4cbf2f --- M LocalNames/LocalNamesFa.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/cldr refs/changes/71/148971/1 diff --git a/LocalNames/LocalNamesFa.php b/LocalNames/LocalNamesFa.php index 0cc2e35..fb5792a 100644 --- a/LocalNames/LocalNamesFa.php +++ b/LocalNames/LocalNamesFa.php @@ -381,4 +381,7 @@ 'zh-sg' = 'چینی (سنگاپور)', 'zh-tw' = 'چینی (تایوان)', 'zh-yue' = 'کانتونی', # language redirect + + /* additional list from Japanese Wikipedia */ + 'simple' = 'انگلیسی ساده', ); -- To view, visit https://gerrit.wikimedia.org/r/148971 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4953afdd8bbb89762e55a1ecb855b90d6f4cbf2f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/cldr Gerrit-Branch: master Gerrit-Owner: Reza reza.ene...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: Fix signal sent by beta-apaches script - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: beta: Fix signal sent by beta-apaches script
..
beta: Fix signal sent by beta-apaches script
I missed changing a variable name during refactoring in patch set 5 of
Ia351ef7.
Change-Id: I4af2c99af2a255c8f14763e701c2ab79a6fb8da6
---
M modules/beta/files/scripts/beta-apaches
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/beta/files/scripts/beta-apaches
b/modules/beta/files/scripts/beta-apaches
index 48922b6..731902c 100755
--- a/modules/beta/files/scripts/beta-apaches
+++ b/modules/beta/files/scripts/beta-apaches
@@ -3,7 +3,7 @@
set -e
-APACHE_ROLE=role::applicationserver::appserver::beta
+APACHE_ROLE=role::beta::appserver
BATCH_SIZE=50%
ACTIONS=('start' 'stop' 'restart' 'graceful' 'graceful-stop' 'configtest')
ACTION=
@@ -73,4 +73,4 @@
exec /usr/bin/sudo -- /usr/bin/salt \
-G rolename:${APACHE_ROLE} \
--batch-size ${BATCH_SIZE} \
-apache.signal $1
+apache.signal $ACTION
--
To view, visit https://gerrit.wikimedia.org/r/148386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4af2c99af2a255c8f14763e701c2ab79a6fb8da6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split the applyRedirect method for readability. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Split the applyRedirect method for readability.
..
Split the applyRedirect method for readability.
Change-Id: I1ae5245073fe93f77bae5b20e67fee3846c94e38
---
M lib/includes/store/sql/SqlEntityInfoBuilder.php
M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
2 files changed, 72 insertions(+), 19 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
Aude: Looks good to me, but someone else must approve
WikidataJenkins: Verified
jenkins-bot: Verified
diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php
b/lib/includes/store/sql/SqlEntityInfoBuilder.php
index 7f6771b..b8c64b9 100644
--- a/lib/includes/store/sql/SqlEntityInfoBuilder.php
+++ b/lib/includes/store/sql/SqlEntityInfoBuilder.php
@@ -197,15 +197,16 @@
}
/**
-* Applied the given redirect to the internal data structure
+* Applied the given redirect to the internal data structure.
+*
+* After this method returns, the old ID will have been replaced by the
target ID
+* in the $entityInfo as well as the $numericIdsByType structures. In
$entityInfo,
+* the old key will remain as a reference to the entry under the new
(target) key.
*
* @param string $idString The redirected entity id
* @param EntityId $targetId The redirect target
*/
private function applyRedirect( $idString, EntityId $targetId ) {
- $redirectedId = $this-getEntityId( $idString );
- $type = $redirectedId-getEntityType();
-
$targetKey = $targetId-getSerialization();
if ( $idString === $targetKey ) {
@@ -213,25 +214,78 @@
return;
}
- // If the redirect target doesn't have a record yet, copy the
old record.
- // Since two IDs may be redirected to the same target, this may
already have
- // happened.
- if ( !isset( $this-entityInfo[$targetKey] ) ) {
- $this-entityInfo[$targetKey] =
$this-entityInfo[$idString]; // copy
- $this-entityInfo[$targetKey]['id'] = $targetKey; //
update id
- }
+ // Copy the record for the old key to the target key.
+ $this-initRecord( $targetKey, $this-entityInfo[$idString] );
+
+ // Remove the original entry for the old key.
+ $this-unsetKey( $idString );
// Make the redirected key a reference to the target record.
- unset( $this-entityInfo[$idString] ); // just to be sure not
to cause a mess
- $this-entityInfo[$idString] = $this-entityInfo[$targetKey];
+ $this-createEntityInfoReference( $idString,
$this-entityInfo[$targetKey] );
- // Remove the numeric id of the redirect, since we don't want to
- // use it in database queries.
+ // From now on, use the target ID in the record and for
database queries.
+ $this-forceEntityId( $targetKey, $targetId );
+ }
+
+ /**
+* Sets the given key in the $entityInfo data structure to a reference
+* to the given record. This allows the same record to be accessed
+* under multiple different keys.
+*
+* @param string $key
+* @param array $record
+*/
+ private function createEntityInfoReference( $key, array $record ) {
+ $this-entityInfo[$key] = $record;
+ }
+
+ /**
+* Removes any references to the given entity from the $entityInfo data
+* structure as well as the $numericIdsByType cache, but not from
+* the $entityIds cache.
+*
+* @param string $idString
+*/
+ private function unsetKey( $idString ) {
+ $id = $this-getEntityId( $idString );
+
+ $type = $id-getEntityType();
+
+ unset( $this-entityInfo[$idString] );
unset( $this-numericIdsByType[$type][$idString] );
+ }
- // Record the id of the target.
- $this-numericIdsByType[$type][$targetKey] =
$targetId-getNumericId();
- $this-entityIds[$targetKey] = $targetId;
+ /**
+* Sets the given key in the $entityInfo data structure to
+* the given record if that key is not already set.
+*
+* @param string $key
+* @param array $record
+*/
+ private function initRecord( $key, array $record ) {
+ if ( !isset( $this-entityInfo[$key] ) ) {
+ $this-entityInfo[$key] = $record;
+ }
+ }
+
+ /**
+* Forces the EntityId associated with the given key.
+* May be used on entries for ids that are redirected, when the
+* actual ID
[MediaWiki-commits] [Gerrit] Specify owner/group/mode for apache::conf - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Specify owner/group/mode for apache::conf
..
Specify owner/group/mode for apache::conf
Or else files end up with 664 and whatever uid/gid corresponds to the
uid the file has on puppetmaster (or defaults if those exist - but we
don't have any)
Change-Id: I4a79ace8e5c158b5c4e0039b8ede58dc0fe9c0e9
---
M modules/apache/manifests/conf.pp
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/apache/manifests/conf.pp b/modules/apache/manifests/conf.pp
index 5ed4209..d813bdc 100644
--- a/modules/apache/manifests/conf.pp
+++ b/modules/apache/manifests/conf.pp
@@ -58,6 +58,9 @@
ensure = $ensure,
content = $content,
source = $source,
+owner = 'root',
+group = 'root',
+mode= '0444',
}
file { /etc/apache2/${conf_type}-enabled/${conf_file}:
--
To view, visit https://gerrit.wikimedia.org/r/148652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a79ace8e5c158b5c4e0039b8ede58dc0fe9c0e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove colon after @deprecated/@param/@todo/@note - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148973
Change subject: Remove colon after @deprecated/@param/@todo/@note
..
Remove colon after @deprecated/@param/@todo/@note
Change-Id: I4e66dad85eecf7e8e03ac760af900395e1bc11b6
---
M includes/Linker.php
M includes/PrefixSearch.php
M includes/Revision.php
M includes/Title.php
M includes/content/ContentHandler.php
M includes/content/TextContent.php
M includes/content/WikitextContent.php
M includes/deferred/DataUpdate.php
M includes/deferred/LinksUpdate.php
M includes/deferred/SqlDataUpdate.php
M includes/page/Article.php
M includes/parser/ParserOutput.php
M includes/specials/SpecialCategories.php
M includes/specials/SpecialLinkSearch.php
M includes/specials/SpecialMergeHistory.php
M includes/specials/SpecialRunJobs.php
M includes/title/MediaWikiTitleCodec.php
M includes/title/TitleFormatter.php
M includes/title/TitleValue.php
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/includes/TitleMethodsTest.php
M tests/phpunit/includes/TitleTest.php
22 files changed, 37 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/73/148973/1
diff --git a/includes/Linker.php b/includes/Linker.php
index 1991694..d900e42 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -25,7 +25,7 @@
* for primarily page content: links, embedded images, table of contents. Links
* are also used in the skin.
*
- * @todo: turn this into a legacy interface for HtmlPageLinkRenderer and
similar services.
+ * @todo turn this into a legacy interface for HtmlPageLinkRenderer and
similar services.
*
* @ingroup Skins
*/
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index f794b2a..35be2a9 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -29,7 +29,7 @@
abstract class PrefixSearch {
/**
* Do a prefix search of titles and return a list of matching page
names.
-* @deprecated: Since 1.23, use TitlePrefixSearch or StringPrefixSearch
classes
+* @deprecated Since 1.23, use TitlePrefixSearch or StringPrefixSearch
classes
*
* @param string $search
* @param int $limit
diff --git a/includes/Revision.php b/includes/Revision.php
index bcd3fd8..836dbce 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1569,7 +1569,7 @@
* operations and other such meta-modifications.
*
* @param DatabaseBase $dbw
-* @param int $pageId: ID number of the page to read from
+* @param int $pageId ID number of the page to read from
* @param string $summary Revision's summary
* @param bool $minor Whether the revision should be considered as minor
* @param User|null $user User object to use or null for $wgUser
diff --git a/includes/Title.php b/includes/Title.php
index b7c0a25..266273f 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -608,7 +608,7 @@
* Note that this doesn't pick up many things that could be wrong with
titles, but that
* replacing this regex with something valid will make many titles
valid.
*
-* @todo: move this into MediaWikiTitleCodec
+* @todo move this into MediaWikiTitleCodec
*
* @return string Regex string
*/
@@ -853,7 +853,7 @@
/**
* Get a TitleValue object representing this Title.
*
-* @note: Not all valid Titles have a corresponding valid TitleValue
+* @note Not all valid Titles have a corresponding valid TitleValue
* (e.g. TitleValues cannot represent page-local links that have a
* fragment but no title text).
*
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 1343858..6be06c6 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -709,7 +709,7 @@
* typically based on the namespace or some other aspect of the title,
such as a special suffix
* (e.g. .svg for SVG content).
*
-* @note: this calls the ContentHandlerCanBeUsedOn hook which may be
used to override which
+* @note this calls the ContentHandlerCanBeUsedOn hook which may be
used to override which
* content model can be used where.
*
* @param Title $title The page's title.
diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index c3daf83..d292880 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -132,7 +132,7 @@
* Returns attempts to convert this content object to wikitext,
* and then returns the text string. The conversion may be lossy.
*
-* @note: this allows any text-based content to be transcluded as if it
was wikitext.
+* @note this allows any text-based content to
[MediaWiki-commits] [Gerrit] WIP Cloudfare - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148974
Change subject: WIP Cloudfare
..
WIP Cloudfare
Change-Id: I2cafb7b6bfc1bb8530e67cf182914aab7411f360
---
A puppet/modules/nginx/files/cloudfare
M puppet/modules/nginx/files/nginx.conf
M puppet/modules/nginx/files/translatewiki.net
M puppet/modules/nginx/manifests/init.pp
4 files changed, 29 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/74/148974/1
diff --git a/puppet/modules/nginx/files/cloudfare
b/puppet/modules/nginx/files/cloudfare
new file mode 100644
index 000..eaaf4ed
--- /dev/null
+++ b/puppet/modules/nginx/files/cloudfare
@@ -0,0 +1,21 @@
+# file managed by puppet
+
+set_real_ip_from 199.27.128.0/21;
+set_real_ip_from 173.245.48.0/20;
+set_real_ip_from 103.21.244.0/22;
+set_real_ip_from 103.22.200.0/22;
+set_real_ip_from 103.31.4.0/22;
+set_real_ip_from 141.101.64.0/18;
+set_real_ip_from 108.162.192.0/18;
+set_real_ip_from 190.93.240.0/20;
+set_real_ip_from 188.114.96.0/20;
+set_real_ip_from 197.234.240.0/22;
+set_real_ip_from 198.41.128.0/17;
+set_real_ip_from 162.158.0.0/15;
+set_real_ip_from 104.16.0.0/12;
+set_real_ip_from 2400:cb00::/32;
+set_real_ip_from 2606:4700::/32;
+set_real_ip_from 2803:f800::/32;
+set_real_ip_from 2405:b500::/32;
+set_real_ip_from 2405:8100::/32;
+real_ip_header CF-Connecting-IP;
diff --git a/puppet/modules/nginx/files/nginx.conf
b/puppet/modules/nginx/files/nginx.conf
index 713d1ff..8103ec1 100644
--- a/puppet/modules/nginx/files/nginx.conf
+++ b/puppet/modules/nginx/files/nginx.conf
@@ -22,6 +22,8 @@
include /etc/nginx/mime.types;
default_type application/octet-stream;
+ include /etc/nginx/cloudfare;
+
access_log /var/log/nginx/access.log main;
error_log /var/log/nginx/error.log;
diff --git a/puppet/modules/nginx/files/translatewiki.net
b/puppet/modules/nginx/files/translatewiki.net
index a257aa5..743fc54 100644
--- a/puppet/modules/nginx/files/translatewiki.net
+++ b/puppet/modules/nginx/files/translatewiki.net
@@ -18,7 +18,7 @@
spdy_headers_comp 7;
- server_name translatewiki.net dev.translatewiki.net
sandbox.translatewiki.net;
+ server_name translatewiki.net dev.translatewiki.net
sandbox.translatewiki.net translatewiki.org;
root /www/$host;
location = / {
diff --git a/puppet/modules/nginx/manifests/init.pp
b/puppet/modules/nginx/manifests/init.pp
index e0bc0c7..dbf56ed 100644
--- a/puppet/modules/nginx/manifests/init.pp
+++ b/puppet/modules/nginx/manifests/init.pp
@@ -28,6 +28,10 @@
source = 'puppet:///modules/nginx/mime.types',
}
+ file { '/etc/nginx/cloudfare':
+source = 'puppet:///modules/nginx/cloudfare',
+ }
+
file { '/etc/nginx/sites-available/translatewiki.net':
source = 'puppet:///modules/nginx/translatewiki.net',
}
@@ -42,7 +46,7 @@
}
file { '/etc/nginx/sites-enabled/translatewiki.org':
-ensure = 'link',
+ensure = 'absent',
target = '../sites-available/translatewiki.org',
}
--
To view, visit https://gerrit.wikimedia.org/r/148974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cafb7b6bfc1bb8530e67cf182914aab7411f360
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148976
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Moved to Json i18n files
Change-Id: I7c8319ca7ebf8add3b717a347f0f134dea1adf19
---
M RSSFeeder/RSSFeeder.class.php
M RSSFeeder/RSSFeeder.setup.php
M RSSFeeder/i18n/de-formal.json
M RSSFeeder/i18n/de.json
M RSSFeeder/i18n/en.json
M RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
8 files changed, 35 insertions(+), 35 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/76/148976/1
diff --git a/RSSFeeder/RSSFeeder.class.php b/RSSFeeder/RSSFeeder.class.php
index 5803e0f..cf5b19f 100644
--- a/RSSFeeder/RSSFeeder.class.php
+++ b/RSSFeeder/RSSFeeder.class.php
@@ -90,14 +90,14 @@
*/
public function onBSDashboardsAdminDashboardPortalPortlets( $aPortlets
) {
$aPortlets[] = array(
- 'type' =
'BS.RSSFeeder.RSSPortlet',
- 'config' = array(
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'height' = 660,
- 'rssurl' =
'http://blog.blue-spice.org/feed/'
- ),
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'description' = wfMessage(
'bs-dashboards-rss-desc' )-plain()
+ 'type' = 'BS.RSSFeeder.RSSPortlet',
+ 'config' = array(
+ 'title' = wfMessage( 'bs-rssfeeder-rss'
)-plain(),
+ 'height' = 660,
+ 'rssurl' = 'http://blog.blue-spice.org/feed/'
+ ),
+ 'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+ 'description' = wfMessage( 'bs-rssfeeder-rss-desc'
)-plain()
);
return true;
@@ -132,14 +132,14 @@
*/
public function onBSDashboardsUserDashboardPortalPortlets( $aPortlets
) {
$aPortlets[] = array(
- 'type' =
'BS.RSSFeeder.RSSPortlet',
- 'config' = array(
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'height' = 610,
- 'rssurl' =
'http://blog.blue-spice.org/feed/'
- ),
- 'title' = wfMessage(
'bs-rssfeeder-rss' )-plain(),
- 'description' = wfMessage(
'bs-dashboards-rss-desc' )-plain()
+ 'type' = 'BS.RSSFeeder.RSSPortlet',
+ 'config' = array(
+ 'title' = wfMessage( 'bs-rssfeeder-rss'
)-plain(),
+ 'height' = 610,
+ 'rssurl' = 'http://blog.blue-spice.org/feed/'
+ ),
+ 'title' = wfMessage( 'bs-rssfeeder-rss' )-plain(),
+ 'description' = wfMessage( 'bs-rssfeeder-rss-desc'
)-plain()
);
return true;
diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index eac09a5..25c4bdc 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -4,11 +4,11 @@
$wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ .
'/languages/RSSFeeder.i18n.php';
+$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ .
'/languages/RSSFeeder.i18n.php';
$wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ .
'/languages/SpecialRSSFeeder.alias.php';
$wgAutoloadClasses['SpecialRSSFeeder'] = __DIR__ .
'/includes/specials/SpecialRSSFeeder.class.php';
-$wgAutoloadClasses['RSSCreator'] = __DIR__ .
'/includes/RSSCreator.class.php';
+$wgAutoloadClasses['RSSCreator'] = __DIR__ . '/includes/RSSCreator.class.php';
$wgSpecialPageGroups['RSSFeeder'] = 'bluespice';
$wgSpecialPages['RSSFeeder'] = 'SpecialRSSFeeder';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
index 81b033f..efe675e 100644
--- a/RSSFeeder/i18n/de-formal.json
+++ b/RSSFeeder/i18n/de-formal.json
@@ -4,5 +4,5 @@
Stephan Muggli mug...@hallowelt.biz
]
},
- bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148975
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Moved to Json i18n files
Change-Id: Id4831bf2d5fe3e71f5a28644317ac07eb1c386bd
---
M RSSFeeder/RSSFeeder.setup.php
A RSSFeeder/i18n/de-formal.json
A RSSFeeder/i18n/de.json
A RSSFeeder/i18n/en.json
A RSSFeeder/i18n/qqq.json
M RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
M RSSFeeder/languages/RSSFeeder.i18n.php
7 files changed, 87 insertions(+), 68 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/75/148975/1
diff --git a/RSSFeeder/RSSFeeder.setup.php b/RSSFeeder/RSSFeeder.setup.php
index 1216fd8..eac09a5 100644
--- a/RSSFeeder/RSSFeeder.setup.php
+++ b/RSSFeeder/RSSFeeder.setup.php
@@ -1,6 +1,8 @@
?php
-BsExtensionManager::registerExtension('RSSFeeder',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE);
+BsExtensionManager::registerExtension( 'RSSFeeder',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE );
+
+$wgMessagesDirs['RSSFeeder'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['RSSFeeder'] = __DIR__ .
'/languages/RSSFeeder.i18n.php';
$wgExtensionMessagesFiles['RSSFeederAlias'] = __DIR__ .
'/languages/SpecialRSSFeeder.alias.php';
diff --git a/RSSFeeder/i18n/de-formal.json b/RSSFeeder/i18n/de-formal.json
new file mode 100644
index 000..81b033f
--- /dev/null
+++ b/RSSFeeder/i18n/de-formal.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-dashboards-rss-desc: Erstellen Sie Ihren eigenen RSS-Feed
+}
diff --git a/RSSFeeder/i18n/de.json b/RSSFeeder/i18n/de.json
new file mode 100644
index 000..f907bd6
--- /dev/null
+++ b/RSSFeeder/i18n/de.json
@@ -0,0 +1,16 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-rssfeeder-desc: Fügt RSS Funktionalität hinzu,
+ rssfeeder: RSS Feeder,
+ bs-rssfeeder-pagetext: Folgende RSS-Feeds stehen zur Verfügung,
+ bs-rssfeeder-recent-changes: Letzte Änderungen,
+ bs-rssfeeder-pages: Seite,
+ bs-rssfeeder-submit: Anzeigen,
+ bs-rssfeeder-rss: RSS-Feed,
+ bs-dashboards-rss-desc: Erstelle deinen eigenen RSS-Feed,
+ bs-extjs-rssfeeder-rss-title: RSS-URL
+}
diff --git a/RSSFeeder/i18n/en.json b/RSSFeeder/i18n/en.json
new file mode 100644
index 000..0ad5368
--- /dev/null
+++ b/RSSFeeder/i18n/en.json
@@ -0,0 +1,16 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-rssfeeder-desc: Adds RSS functionality,
+ rssfeeder: RSS feeder,
+ bs-rssfeeder-pagetext: You can subscribe to the following RSS feeds,
+ bs-rssfeeder-recent-changes: Recent changes,
+ bs-rssfeeder-pages: Page,
+ bs-rssfeeder-submit: Show,
+ bs-rssfeeder-rss: RSS feed,
+ bs-dashboards-rss-desc: Create your own RSS feed,
+ bs-extjs-rssfeeder-rss-title: RSS URL
+}
diff --git a/RSSFeeder/i18n/qqq.json b/RSSFeeder/i18n/qqq.json
new file mode 100644
index 000..fe46181
--- /dev/null
+++ b/RSSFeeder/i18n/qqq.json
@@ -0,0 +1,16 @@
+{
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-rssfeeder-desc: Used in
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}}
Special:WikiAdmin?mode=ExtensionInfo], description of rss feeder extension,
+ rssfeeder: {{doc-special|RSS feeder}},
+ bs-rssfeeder-pagetext: Headline on special page for all available
RSS feeds,
+ bs-rssfeeder-recent-changes: Headline for recent
changes\\n{{Identical|Recent changes}},
+ bs-rssfeeder-pages: Headline for page\\n{{Identical|Page}},
+ bs-rssfeeder-submit: Button label for show\\n{{Identical|Show}},
+ bs-rssfeeder-rss: Used in [[Special:AdminDashboard]] and
[[Special:UserDashboard]], headline for rss feed portlet\\n{{Identical|RSS
feed}}},
+ bs-dashboards-rss-desc: Used in [[Special:AdminDashboard]] and
[[Special:UserDashboard]], description of rss feed portlet,
+ bs-extjs-rssfeeder-rss-title: Used in [[Special:AdminDashboard]] and
[[Special:UserDashboard]], label for rss url\\n{{Identical|RSS URL}}}
+}
diff --git a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
index 7d009e5..2d1b4e6 100644
--- a/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
+++ b/RSSFeeder/includes/specials/SpecialRSSFeeder.class.php
@@ -35,7 +35,6 @@
return;
}
- $this-getOutput()-setPageTitle('RSS');
$this-getOutput()-addModuleStyles(
[MediaWiki-commits] [Gerrit] webserviće: Bug: 68431, Bug: 68499 - allow setting individua... - change (labs/toollabs)
Hedonil has uploaded a new change for review. https://gerrit.wikimedia.org/r/148977 Change subject: webserviće: Bug: 68431, Bug: 68499 - allow setting individual tools memory limits via config files in /data/project/.system/config - create blank .lighttpd.conf, if it doesn't exist .. webserviće: Bug: 68431, Bug: 68499 - allow setting individual tools memory limits via config files in /data/project/.system/config - create blank .lighttpd.conf, if it doesn't exist Change-Id: I9d5a3769eabc0c0925ab7ade2ae462f058fc5884 --- M misctools/webservice 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/77/148977/1 diff --git a/misctools/webservice b/misctools/webservice index cd57748..d35ef08 100755 --- a/misctools/webservice +++ b/misctools/webservice @@ -6,6 +6,11 @@ server=lighttpd public=public_html +memlimit=4g +if [ -r /data/project/.system/config/$tool.web-memlimit ]; then + memlimit=$(cat /data/project/.system/config/$tool.web-memlimit) +fi + case $1 in -tomcat) server=tomcat @@ -32,6 +37,8 @@ exit 1 fi +touch -a $home/.lighttpd.conf + job=$(qstat -q webgrid-$server -j $server-$tool 21 | grep job_number: | sed -e 's/^.* *\(.*\)$/\1/') if [ $job != ]; then si=$(qstat -j $job 21 | grep 'scheduling info': | sed -e 's/^.*: *\(.*\)$/\1/') @@ -53,7 +60,7 @@ if [ $job != ]; then echo Webservice already running. else -if qsub -e $home/error.log -o $home/error.log -i /dev/null -q webgrid-$server -l h_vmem=4g -b y -N $server-$tool /usr/local/bin/tool-$server /dev/null 21 ; then +if qsub -e $home/error.log -o $home/error.log -i /dev/null -q webgrid-$server -l h_vmem=$memlimit -b y -N $server-$tool /usr/local/bin/tool-$server /dev/null 21 ; then echo started. else echo failed. @@ -69,7 +76,7 @@ else echo -n . fi -if qsub -e $home/error.log -o /dev/null -i /dev/null -q webgrid-$server -l h_vmem=4g -b y -N $server-$tool /usr/local/bin/tool-$server /dev/null 21; then +if qsub -e $home/error.log -o /dev/null -i /dev/null -q webgrid-$server -l h_vmem=$memlimit -b y -N $server-$tool /usr/local/bin/tool-$server /dev/null 21; then echo restarted. else echo failed. @@ -107,4 +114,3 @@ exit 1 ;; esac - -- To view, visit https://gerrit.wikimedia.org/r/148977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d5a3769eabc0c0925ab7ade2ae462f058fc5884 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Hedonil hedo...@action.ms ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: install Zuul on all CI slaves - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: contint: install Zuul on all CI slaves
..
contint: install Zuul on all CI slaves
Zuul will have a command line utility to fetch out multiple
repositories. Thus install Zuul on all CI slaves to provide the
zuul-cloner utility.
The package python-pip is needed by both Zuul source code installation
and the contint::packages::labs class. So I wrapped the package
definition with ensure_packages() from stdlib to avoid a duplicate
definition.
Change-Id: Ib1c1fc777bdcba90b89ad4f3d46430ae8e7daadf
---
M manifests/role/ci.pp
M modules/contint/manifests/packages/labs.pp
2 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 367e2b9..1a2c40a 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -118,8 +118,9 @@
system::role { 'role::ci::slave': description = 'CI slave runner' }
-include contint::packages,
-role::gerrit::production::replicationdest
+include contint::packages
+include role::gerrit::production::replicationdest
+include role::zuul::install
deployment::target { 'contint-production-slaves': }
@@ -177,8 +178,9 @@
class role::ci::slave::labs::common {
# Jenkins slaves need to access beta cluster for the browsertests
-include role::beta::natfix
include contint::firewall::labs
+include role::beta::natfix
+include role::zuul::install
if $::site == 'eqiad' {
# Does not come with /dev/vdb, we need to mount it using lvm
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index a870952..81c49e2 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -46,7 +46,6 @@
package { [
'npm',
-'python-pip',
# Let us compile python modules:
'python-dev',
@@ -64,6 +63,9 @@
]: ensure = present,
}
+# Also provided by Zuul installation
+ensure_packages(['python-pip'])
+
# Bring tox/virtualenv... from pip bug 3
# TODO: Reevaluate this once we switch to trusty. Maybe provider being apt
# would be better then
--
To view, visit https://gerrit.wikimedia.org/r/141758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1c1fc777bdcba90b89ad4f3d46430ae8e7daadf
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added new message - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148979
Change subject: Added new message
..
Added new message
The new message is to show the origin of something
Change-Id: I37df7e085908c1a21331e7fccff15af4226aff3f
---
M i18n/core/de.json
M i18n/core/en.json
M i18n/core/qqq.json
3 files changed, 6 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/79/148979/1
diff --git a/i18n/core/de.json b/i18n/core/de.json
index d734876..f52b754 100644
--- a/i18n/core/de.json
+++ b/i18n/core/de.json
@@ -62,5 +62,6 @@
bs-navigation-support: Support,
bs-navigation-contact: Kontakt,
bs-imagepage-download-text: Herunterladen,
- bs-ns: Namensraum
+ bs-ns: Namensraum,
+ bs-from-something: (von $1)
}
diff --git a/i18n/core/en.json b/i18n/core/en.json
index e81979a..f9badde 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -62,5 +62,6 @@
bs-navigation-support: Support,
bs-navigation-contact: Contact,
bs-imagepage-download-text: Download,
- bs-ns: Namespace
+ bs-ns: Namespace,
+ bs-from-something: (from $1)
}
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 937b108..64abc61 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -66,5 +66,6 @@
bs-navigation-support: Used in navigation for support
link\n{{Identical|Support}},
bs-navigation-contact: Used in navigation for contact
link\n{{Identical|Contact}},
bs-imagepage-download-text: Text message for download used on image
pages\n{{Identical|Download}},
- bs-ns: Text message for namespace used multiple times in different
situations\n{{Identical|Namespace}}
+ bs-ns: Text message for namespace used multiple times in different
situations\n{{Identical|Namespace}},
+ bs-from-something: This is a suffix for a couple of message. The
meaning of this message is to show the origin of something.\n*$1 is the origin
for example a namespace
}
--
To view, visit https://gerrit.wikimedia.org/r/148979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37df7e085908c1a21331e7fccff15af4226aff3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Code style improvements to SqlEntityInfoBuilder - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Code style improvements to SqlEntityInfoBuilder
..
Code style improvements to SqlEntityInfoBuilder
This is a direct follow-up to I1ae5245.
Change-Id: I626bb5a949ab90f51f5021e64a292de5e8d8a3e0
---
M lib/includes/store/sql/SqlEntityInfoBuilder.php
1 file changed, 21 insertions(+), 33 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php
b/lib/includes/store/sql/SqlEntityInfoBuilder.php
index b8c64b9..7ea4949 100644
--- a/lib/includes/store/sql/SqlEntityInfoBuilder.php
+++ b/lib/includes/store/sql/SqlEntityInfoBuilder.php
@@ -2,18 +2,17 @@
namespace Wikibase\Lib\Store\Sql;
+use DBAccessBase;
use InvalidArgumentException;
-use OutOfBoundsException;
use ResultWrapper;
use RuntimeException;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel;
-use Wikibase\EntityId;
use Wikibase\Lib\Store\EntityInfoBuilder;
-use Wikibase\Property;
/**
* Class EntityInfoBuilder implementation relying on database access.
@@ -23,7 +22,7 @@
* @license GPL 2+
* @author Daniel Kinzler
*/
-class SqlEntityInfoBuilder extends \DBAccessBase implements EntityInfoBuilder {
+class SqlEntityInfoBuilder extends DBAccessBase implements EntityInfoBuilder {
/**
* Maps term types to fields used for lists of these terms in entity
serializations.
@@ -39,17 +38,17 @@
/**
* @var string The name of the database table holding terms.
*/
- protected $termTable;
+ private $termTable;
/**
* @var string The name of the database table holding property info.
*/
- protected $propertyInfoTable;
+ private $propertyInfoTable;
/**
* @var string The name of the database table connecting entities to
pages.
*/
- protected $entityPerPageTable;
+ private $entityPerPageTable;
/**
* @var bool
@@ -150,7 +149,7 @@
*/
private function setEntityIds( array $ids ) {
if ( $this-entityIds !== null ) {
- throw new \RuntimeException( 'EntityIds have already
been initialized' );
+ throw new RuntimeException( 'EntityIds have already
been initialized' );
}
$this-entityIds = array();
@@ -158,16 +157,7 @@
$this-numericIdsByType = array();
foreach ( $ids as $id ) {
- $key = $id-getSerialization();
- $type = $id-getEntityType();
-
- $this-entityInfo[$key] = array(
- 'id' = $key,
- 'type' = $type,
- );
-
- $this-numericIdsByType[$type][$key] =
$id-getNumericId();
- $this-entityIds[$key] = $id;
+ $this-updateEntityInfo( $id );
}
}
@@ -215,7 +205,7 @@
}
// Copy the record for the old key to the target key.
- $this-initRecord( $targetKey, $this-entityInfo[$idString] );
+ $this-initEntityInfo( $targetKey, $this-entityInfo[$idString]
);
// Remove the original entry for the old key.
$this-unsetKey( $idString );
@@ -224,7 +214,7 @@
$this-createEntityInfoReference( $idString,
$this-entityInfo[$targetKey] );
// From now on, use the target ID in the record and for
database queries.
- $this-forceEntityId( $targetKey, $targetId );
+ $this-updateEntityInfo( $targetId );
}
/**
@@ -236,7 +226,7 @@
* @param array $record
*/
private function createEntityInfoReference( $key, array $record ) {
- $this-entityInfo[$key] = $record;
+ $this-entityInfo[$key] = $record;
}
/**
@@ -262,30 +252,28 @@
* @param string $key
* @param array $record
*/
- private function initRecord( $key, array $record ) {
+ private function initEntityInfo( $key, array $record ) {
if ( !isset( $this-entityInfo[$key] ) ) {
$this-entityInfo[$key] = $record;
}
}
/**
-* Forces the EntityId associated with the given key.
-* May be used on entries for ids that are redirected, when the
-* actual ID differs from the original (redirected) entity id.
-*
-* This updates the
[MediaWiki-commits] [Gerrit] Remove colon after @deprecated/@param/@todo/@note - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove colon after @deprecated/@param/@todo/@note
..
Remove colon after @deprecated/@param/@todo/@note
Change-Id: I4e66dad85eecf7e8e03ac760af900395e1bc11b6
---
M includes/Linker.php
M includes/PrefixSearch.php
M includes/Revision.php
M includes/Title.php
M includes/content/ContentHandler.php
M includes/content/TextContent.php
M includes/content/WikitextContent.php
M includes/deferred/DataUpdate.php
M includes/deferred/LinksUpdate.php
M includes/deferred/SqlDataUpdate.php
M includes/page/Article.php
M includes/parser/ParserOutput.php
M includes/specials/SpecialCategories.php
M includes/specials/SpecialLinkSearch.php
M includes/specials/SpecialMergeHistory.php
M includes/specials/SpecialRunJobs.php
M includes/title/MediaWikiTitleCodec.php
M includes/title/TitleFormatter.php
M includes/title/TitleValue.php
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/includes/TitleMethodsTest.php
M tests/phpunit/includes/TitleTest.php
22 files changed, 37 insertions(+), 37 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Linker.php b/includes/Linker.php
index 1991694..d900e42 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -25,7 +25,7 @@
* for primarily page content: links, embedded images, table of contents. Links
* are also used in the skin.
*
- * @todo: turn this into a legacy interface for HtmlPageLinkRenderer and
similar services.
+ * @todo turn this into a legacy interface for HtmlPageLinkRenderer and
similar services.
*
* @ingroup Skins
*/
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index f794b2a..35be2a9 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -29,7 +29,7 @@
abstract class PrefixSearch {
/**
* Do a prefix search of titles and return a list of matching page
names.
-* @deprecated: Since 1.23, use TitlePrefixSearch or StringPrefixSearch
classes
+* @deprecated Since 1.23, use TitlePrefixSearch or StringPrefixSearch
classes
*
* @param string $search
* @param int $limit
diff --git a/includes/Revision.php b/includes/Revision.php
index bcd3fd8..836dbce 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1569,7 +1569,7 @@
* operations and other such meta-modifications.
*
* @param DatabaseBase $dbw
-* @param int $pageId: ID number of the page to read from
+* @param int $pageId ID number of the page to read from
* @param string $summary Revision's summary
* @param bool $minor Whether the revision should be considered as minor
* @param User|null $user User object to use or null for $wgUser
diff --git a/includes/Title.php b/includes/Title.php
index b7c0a25..266273f 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -608,7 +608,7 @@
* Note that this doesn't pick up many things that could be wrong with
titles, but that
* replacing this regex with something valid will make many titles
valid.
*
-* @todo: move this into MediaWikiTitleCodec
+* @todo move this into MediaWikiTitleCodec
*
* @return string Regex string
*/
@@ -853,7 +853,7 @@
/**
* Get a TitleValue object representing this Title.
*
-* @note: Not all valid Titles have a corresponding valid TitleValue
+* @note Not all valid Titles have a corresponding valid TitleValue
* (e.g. TitleValues cannot represent page-local links that have a
* fragment but no title text).
*
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 1343858..6be06c6 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -709,7 +709,7 @@
* typically based on the namespace or some other aspect of the title,
such as a special suffix
* (e.g. .svg for SVG content).
*
-* @note: this calls the ContentHandlerCanBeUsedOn hook which may be
used to override which
+* @note this calls the ContentHandlerCanBeUsedOn hook which may be
used to override which
* content model can be used where.
*
* @param Title $title The page's title.
diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index c3daf83..d292880 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -132,7 +132,7 @@
* Returns attempts to convert this content object to wikitext,
* and then returns the text string. The conversion may be lossy.
*
-* @note: this allows any text-based content to be transcluded as if it
was wikitext.
+* @note this allows any text-based content to be transcluded as if it
was wikitext.
[MediaWiki-commits] [Gerrit] Removed @since in MediaWikiPHPUnitTestListener - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed @since in MediaWikiPHPUnitTestListener
..
Removed @since in MediaWikiPHPUnitTestListener
mentioned phpunit release are already required
Usually @since has the mediawiki version
Change-Id: I1fb1e5d4995e44d8e596e7b15562282aefc4c017
---
M tests/phpunit/MediaWikiPHPUnitTestListener.php
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/tests/phpunit/MediaWikiPHPUnitTestListener.php
b/tests/phpunit/MediaWikiPHPUnitTestListener.php
index 9eeb251..8c761b9 100644
--- a/tests/phpunit/MediaWikiPHPUnitTestListener.php
+++ b/tests/phpunit/MediaWikiPHPUnitTestListener.php
@@ -77,8 +77,6 @@
* @param PHPUnit_Framework_Test $test
* @param Exception $e
* @param float $time
-*
-* @since Method available since Release 3.0.0
*/
public function addSkippedTest( PHPUnit_Framework_Test $test, Exception
$e, $time ) {
wfDebugLog(
@@ -91,7 +89,6 @@
* A test suite started.
*
* @param PHPUnit_Framework_TestSuite $suite
-* @since Method available since Release 2.2.0
*/
public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) {
wfDebugLog( $this-logChannel, 'START suite ' .
$suite-getName() );
@@ -101,7 +98,6 @@
* A test suite ended.
*
* @param PHPUnit_Framework_TestSuite $suite
-* @since Method available since Release 2.2.0
*/
public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) {
wfDebugLog( $this-logChannel, 'END suite ' . $suite-getName()
);
--
To view, visit https://gerrit.wikimedia.org/r/148749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1fb1e5d4995e44d8e596e7b15562282aefc4c017
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn WikibaseRepo::getRdfBaseURI into a setting - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Turn WikibaseRepo::getRdfBaseURI into a setting
..
Turn WikibaseRepo::getRdfBaseURI into a setting
Change-Id: I0d14882283266df970710ed3c1ed676931d62a9f
---
M docs/options.wiki
M repo/Wikibase.hooks.php
M repo/config/Wikibase.default.php
M repo/includes/WikibaseRepo.php
M repo/includes/specials/SpecialEntityData.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
6 files changed, 13 insertions(+), 35 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/options.wiki b/docs/options.wiki
index 4f85b02..071aa25 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -50,6 +50,7 @@
;dataRightsUrl: Url to link to license for data contents. Defaults to
$wgRightsUrl setting.
;dataRightsText: Text for data license link. Defaults to $wgRightsText setting.
;badgeItems: Items allowed to be used as badges. This setting expects an array
of serialized item ids pointing to their CSS class names.
+;conceptBaseUri: Base URI for building concept URIs (for example used in Rdf
output). This has to include the protocol and domain, only an entity identifier
will be appended.
=== Expert Settings ===
;idBlacklist: A list of IDs to reserve and skip for new entities. IDs are
given as integers, the blacklist applies to all types of entities. '''Note:'''
this may change in the future to allow separate blacklists for different kinds
of entities.
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 7158f2f..95c5027 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -1291,9 +1291,10 @@
return true;
}
+ $baseUri =
WikibaseRepo::getDefaultInstance()-getSettings()-getSetting( 'conceptBaseUri'
);
$nav_urls['wb-canonical-uri'] = array(
'text' = $skintemplate-msg( 'wikibase-concept-uri' ),
- 'href' =
WikibaseRepo::getDefaultInstance()-getRdfBaseURI() . $title-getDBKey(),
+ 'href' = $baseUri . $title-getDBKey(),
'title' = $skintemplate-msg(
'wikibase-concept-uri-tooltip' )
);
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 08243b2..012b681 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -93,6 +93,15 @@
},
'useRedirectTargetColumn' = true,
+
+ 'conceptBaseUri' = function() {
+ $uri = $GLOBALS['wgServer'];
+ $uri = preg_replace( '!^//!', 'http://', $uri );
+ $uri = $uri . '/entity/';
+
+ return $uri;
+ },
+
);
return $defaults;
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 16f86bf..9d15ec3 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -345,21 +345,6 @@
}
/**
-* Returns the base to use when generating URIs for use in RDF output.
-*
-* @return string
-*/
- public function getRdfBaseURI() {
- global $wgServer; //TODO: make this configurable
-
- $uri = $wgServer;
- $uri = preg_replace( '!^//!', 'http://', $uri );
- $uri = $uri . '/entity/';
- return $uri;
- }
-
-
- /**
* @since 0.4
*
* @return EntityIdParser
diff --git a/repo/includes/specials/SpecialEntityData.php
b/repo/includes/specials/SpecialEntityData.php
index b4f4876..ae2c95b 100644
--- a/repo/includes/specials/SpecialEntityData.php
+++ b/repo/includes/specials/SpecialEntityData.php
@@ -89,7 +89,7 @@
);
$serializationService = new EntityDataSerializationService(
- $repo-getRdfBaseURI(),
+ $repo-getSettings()-getSetting( 'conceptBaseUri' ),
$this-getPageTitle()-getCanonicalURL() . '/',
$repo-getStore()-getEntityLookup(),
$titleLookup,
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index cf9c6a5..a11cae4 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -71,24 +71,6 @@
$this-assertInstanceOf(
'Wikibase\Lib\SnakConstructionService', $returnValue );
}
- /**
-* @dataProvider provideGetRdfBaseURI
-*/
- public function testGetRdfBaseURI( $server, $expected ) {
- $this-setMwGlobals( 'wgServer', $server );
-
- $returnValue = $this-getDefaultInstance()-getRdfBaseURI();
-
[MediaWiki-commits] [Gerrit] Remove unused 'comment.svg' indicator image - change (VisualEditor/VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148980
Change subject: Remove unused 'comment.svg' indicator image
..
Remove unused 'comment.svg' indicator image
Follows-up ab2d4cb.
The image looks confusing (an orange rounded corner?
http://i.imgur.com/f8DV3EK.png) and isn't actually used anywhere.
CommentInspector and CommentInspectorTool both use an 'icon' image,
not an 'indicator' image named 'comment', which is provided by
OOjs UI (http://i.imgur.com/W3oGRuL.png).
Change-Id: Ie04a469c10ba178b0ed8fa77f7d088df68109e7c
---
D modules/ve/ui/styles/images/indicators/comment.svg
M modules/ve/ui/styles/ve.ui.Icons.css
2 files changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/80/148980/1
diff --git a/modules/ve/ui/styles/images/indicators/comment.svg
b/modules/ve/ui/styles/images/indicators/comment.svg
deleted file mode 100644
index f1d6b10..000
--- a/modules/ve/ui/styles/images/indicators/comment.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-svg xmlns=http://www.w3.org/2000/svg; width=8 height=8 viewBox=0 0 8 8
-g id=comment opacity=.75
-path fill=#ff5d00 d=M6 12c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686
6 6-2.686 6-6 6zm-1-5h2v-5h-2zm0 3h2v-2h-2z/
-/g
-/svg
diff --git a/modules/ve/ui/styles/ve.ui.Icons.css
b/modules/ve/ui/styles/ve.ui.Icons.css
index 4b82153..d68ae50 100644
--- a/modules/ve/ui/styles/ve.ui.Icons.css
+++ b/modules/ve/ui/styles/ve.ui.Icons.css
@@ -279,8 +279,3 @@
.ve-ui-icon-resize-ne-sw {
background-image: url(images/resize-ne-sw.svg);
}
-
-.oo-ui-indicator-comment {
- /* @embed */
- background-image: url(images/indicators/comment.svg);
-}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/148980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie04a469c10ba178b0ed8fa77f7d088df68109e7c
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] redis: qualify vars - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: redis: qualify vars
..
redis: qualify vars
Change-Id: I69c4585ae950ea9d1dd9e1bc6357fa298f4a9362
---
M modules/redis/templates/redis.conf.erb
1 file changed, 16 insertions(+), 16 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index f6d88d2..0edfcb9 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -18,11 +18,11 @@
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.
-pidfile /var/run/redis/%= servicename %.pid
+pidfile /var/run/redis/%= @servicename %.pid
# Accept connections on the specified port, default is 6379.
# If port 0 is specified Redis will not listen on a TCP socket.
-port %= port %
+port %= @port %
# If you want you can bind a single interface, if the bind option is not
# specified all the interfaces will listen for incoming connections.
@@ -88,7 +88,7 @@
# like in the following example:
#
# save
-% if persist == rdb or persist == both -%
+% if @persist == rdb or @persist == both -%
% @saves.each do |save_args| -%
save %= save_args %
% end -%
@@ -146,7 +146,7 @@
#
# Note that you must specify a directory here, not a file name.
# dir /a/redis
-dir %= dir %
+dir %= @dir %
# REPLICATION #
@@ -156,10 +156,10 @@
# different interval, or to listen to another port, and so on.
#
# slaveof masterip masterport
-% if @redis_replication and redis_replication.has_key?('site') and
redis_replication['site'] -%
-slaveof %= redis_replication[@hostname] %.%= redis_replication['site'] %
%= port %
-% elsif @redis_replication and redis_replication.has_key?(@hostname) -%
-slaveof %= redis_replication[@hostname] % %= port %
+% if @redis_replication and @redis_replication.has_key?('site') and
@redis_replication['site'] -%
+slaveof %= @redis_replication[@hostname] %.%= @redis_replication['site'] %
%= @port %
+% elsif @redis_replication and @redis_replication.has_key?(@hostname) -%
+slaveof %= @redis_replication[@hostname] % %= @port %
% end -%
# If the master is password protected (using the requirepass configuration
@@ -266,7 +266,7 @@
#
# rename-command CONFIG
-% rename_commands.sort.each do |command, renamed_to| -%
+% @rename_commands.sort.each do |command, renamed_to| -%
rename-command %= command % %= renamed_to %
% end -%
@@ -306,7 +306,7 @@
# limit for maxmemory so that there is some free RAM on the system for slave
# output buffers (but this is not needed if the policy is 'noeviction').
#
-maxmemory %= maxmemory %
+maxmemory %= @maxmemory %
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
# is reached? You can select among five behavior:
@@ -330,7 +330,7 @@
# The default is:
#
# maxmemory-policy volatile-lru
-maxmemory-policy %= maxmemory_policy %
+maxmemory-policy %= @maxmemory_policy %
# LRU and minimal TTL algorithms are not precise algorithms but approximated
# algorithms (in order to save memory), so you can select as well the sample
@@ -339,7 +339,7 @@
# using the following configuration directive.
#
# maxmemory-samples 3
-maxmemory-samples %= maxmemory_samples %
+maxmemory-samples %= @maxmemory_samples %
## APPEND ONLY MODE ###
@@ -360,13 +360,13 @@
# with the better durability guarantees.
#
# Please check http://redis.io/topics/persistence for more information.
-% if persist == aof or persist == both -%
+% if @persist == aof or @persist == both -%
appendonly yes
% else -%
appendonly no
% end -%
# The name of the append only file (default: appendonly.aof)
-appendfilename %= @hostname %-%= port %.aof
+appendfilename %= @hostname %-%= @port %.aof
# The fsync() call tells the Operating System to actually write data on disk
# instead to wait for more data in the output buffer. Some OS will really flush
@@ -431,7 +431,7 @@
# Specify a percentage of zero in order to disable the automatic AOF
# rewrite feature.
auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size %= auto_aof_rewrite_min_size %
+auto-aof-rewrite-min-size %= @auto_aof_rewrite_min_size %
LUA SCRIPTING ###
@@ -562,7 +562,7 @@
##
# Anything passed into redis_options ( i.e. { save = 20 1 } ) will
# appear here and override the above
-% redis_options.sort.each do |option, value| -%
+% @redis_options.sort.each do |option, value| -%
%= option % %= value %
% end -%
--
To view, visit https://gerrit.wikimedia.org/r/148621
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Add @embed directive for resize-nw-se and resize-nw-sw icons - change (VisualEditor/VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148981
Change subject: Add @embed directive for resize-nw-se and resize-nw-sw icons
..
Add @embed directive for resize-nw-se and resize-nw-sw icons
Follows-up 0d7ee1a74a7ad9fbf4c.
These were making 2 extra http requests when first clicking a
resizable image on a page.
Change-Id: I9a16a23853899800238294975fb481cafcfe4001
---
M modules/ve/ui/styles/ve.ui.Icons.css
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/81/148981/1
diff --git a/modules/ve/ui/styles/ve.ui.Icons.css
b/modules/ve/ui/styles/ve.ui.Icons.css
index d68ae50..6cc3533 100644
--- a/modules/ve/ui/styles/ve.ui.Icons.css
+++ b/modules/ve/ui/styles/ve.ui.Icons.css
@@ -273,9 +273,11 @@
}
.ve-ui-icon-resize-nw-se {
+ /* @embed */
background-image: url(images/resize-nw-se.svg);
}
.ve-ui-icon-resize-ne-sw {
+ /* @embed */
background-image: url(images/resize-ne-sw.svg);
}
--
To view, visit https://gerrit.wikimedia.org/r/148981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a16a23853899800238294975fb481cafcfe4001
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a space to the comment node for selection highlighting - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Add a space to the comment node for selection highlighting .. Add a space to the comment node for selection highlighting Change-Id: I82ff9329d7f04ad9068408c17f1545d4071d6360 --- M modules/ve/ce/nodes/ve.ce.CommentNode.js 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve/ce/nodes/ve.ce.CommentNode.js b/modules/ve/ce/nodes/ve.ce.CommentNode.js index 1dc58b5..440eb6a 100644 --- a/modules/ve/ce/nodes/ve.ce.CommentNode.js +++ b/modules/ve/ce/nodes/ve.ce.CommentNode.js @@ -22,7 +22,9 @@ // DOM changes this.$element - .addClass( 've-ce-commentNode oo-ui-indicator-comment' ); + .addClass( 've-ce-commentNode oo-ui-indicator-comment' ) + // Add em space for selection highlighting + .text( '\u2003' ); // Mixin constructors ve.ce.FocusableNode.call( this, this.$element, config ); -- To view, visit https://gerrit.wikimedia.org/r/148964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82ff9329d7f04ad9068408c17f1545d4071d6360 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc: Reformat @params declaration - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148982
Change subject: Doc: Reformat @params declaration
..
Doc: Reformat @params declaration
I have not found documentation about the @params command, so this seems
not valid.
I have moved the text to the corresponding @param
Change-Id: I443866d602b60570278289e6e24a77d37314cede
---
M includes/jobqueue/JobQueueFederated.php
M includes/jobqueue/JobQueueRedis.php
M includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
M includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
4 files changed, 4 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/148982/1
diff --git a/includes/jobqueue/JobQueueFederated.php
b/includes/jobqueue/JobQueueFederated.php
index d6f9560..01d7ec4 100644
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@ -64,7 +64,7 @@
const CACHE_TTL_LONG = 300; // integer; seconds to cache info that is
kept up to date
/**
-* @params include:
+* @param array $params Possible keys:
* - sectionsByWiki : A map of wiki IDs to section names.
* Wikis will default to using the section
default.
* - partitionsBySection : Map of section names to maps of (partition
name = weight).
@@ -80,7 +80,6 @@
* different partition queues. This improves
availability
* during failure, at the cost of added
latency and somewhat
* less reliable job de-duplication mechanisms.
-* @param array $params
* @throws MWException
*/
protected function __construct( array $params ) {
diff --git a/includes/jobqueue/JobQueueRedis.php
b/includes/jobqueue/JobQueueRedis.php
index 522bae1..3519eac 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -73,7 +73,7 @@
protected $key;
/**
-* @params include:
+* @param array $params Possible keys:
* - redisConfig : An array of parameters to
RedisConnectionPool::__construct().
* Note that the serializer option is ignored as
none is always used.
* - redisServer : A hostname/port combination or the absolute path
of a UNIX socket.
@@ -83,7 +83,6 @@
* - daemonized : Set to true if the redisJobRunnerService runs in
the background.
* This will disable job recycling/undelaying from
the MediaWiki side
* to avoid redundance and out-of-sync configuration.
-* @param array $params
*/
public function __construct( array $params ) {
parent::__construct( $params );
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
b/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
index d733a42..ae266ef 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
@@ -34,11 +34,10 @@
protected $cacheTTL; // integer; seconds
/**
-* @params include:
+* @param array $params Possible keys:
* - objectCache : Name of an object cache registered in
$wgObjectCaches.
* This defaults to the one specified by
$wgMainCacheType.
* - cacheTTL: Seconds to cache the aggregate data before
regenerating.
-* @param array $params
*/
protected function __construct( array $params ) {
parent::__construct( $params );
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index e8e8e30..db9e764 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -36,14 +36,13 @@
protected $servers;
/**
-* @params include:
+* @param array $params Possible keys:
* - redisConfig : An array of parameters to
RedisConnectionPool::__construct().
* - redisServers : Array of server entries, the first being the
primary and the
*others being fallback servers. Each entry is
either a hostname/port
*combination or the absolute path of a UNIX socket.
*If a hostname is specified but no port, the
standard port number
*6379 will be used. Required.
-* @param array $params
*/
protected function __construct( array $params ) {
parent::__construct( $params );
--
To view, visit https://gerrit.wikimedia.org/r/148982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] Add onbeforeunload handler when navigating away from unsubmi... - change (mediawiki...Flow)
SG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148983
Change subject: Add onbeforeunload handler when navigating away from
unsubmitted changes
..
Add onbeforeunload handler when navigating away from unsubmitted changes
Change-Id: I451437da738e57866b1013de3c659102da62a15d
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/new/mw-ui.enhance.js
4 files changed, 29 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/83/148983/1
diff --git a/Resources.php b/Resources.php
index e97c61d..45ff0ad 100644
--- a/Resources.php
+++ b/Resources.php
@@ -316,6 +316,7 @@
'messages' = array(
'flow-error-http',
'flow-error-fetch-after-open-close',
+ 'mw-ui-unsubmitted-confirm',
)
) + $mobile,
'ext.flow.vendor.storer' = $flowResourceTemplate + array(
diff --git a/i18n/en.json b/i18n/en.json
index a24bd22..f379ffc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -349,5 +349,6 @@
flow-preview-warning: You are seeing a preview. Submit the form to
finish posting this, or click \{{int:flow-preview-return-edit-post}}\ to
continue writing.,
flow-preview-return-edit-post : Keep editing,
flow-anonymous: Anonymous,
-flow-embedding-unsupported : Discussions cannot be embedded yet.
+flow-embedding-unsupported : Discussions cannot be embedded yet.,
+mw-ui-unsubmitted-confirm: You have unsubmitted changes on this page.
Are you sure you want to navigate away and lose your work?
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 54993a8..dd5473d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -353,5 +353,6 @@
flow-preview-warning: Refers to
{{msg-mw|Flow-preview-return-edit-post}} (Keep editing).,
flow-preview-return-edit-post: Used as text for a button that hides
previewed text and returns to the editing view,
flow-anonymous: {{Identical|Anonymous}},
- flow-embedding-unsupported: Error message displayed if a user tries
to transclude a Flow page.
+ flow-embedding-unsupported: Error message displayed if a user tries
to transclude a Flow page.,
+ mw-ui-unsubmitted-confirm: You have unsubmitted changes on this
page. Are you sure you want to navigate away and lose your work?
}
diff --git a/modules/new/mw-ui.enhance.js b/modules/new/mw-ui.enhance.js
index 37c0921..056aee9 100644
--- a/modules/new/mw-ui.enhance.js
+++ b/modules/new/mw-ui.enhance.js
@@ -413,4 +413,28 @@
.on( 'mouseleave.mw-ui-enhance blur.mw-ui-enhance
click.mw-ui-enhance', '.flow-ui-tooltip-target', onMwUiTooltipBlur );
} );
+ /*
+Ask a user to confirm navigating away from a page when they have
entered unsubmitted changes to a form.
+*/
+ var _oldOnBeforeUnload = window.onbeforeunload;
+ window.onbeforeunload = function () {
+ var uncommitted;
+
+ $( 'input, textarea' ).filter( '.mw-ui-input:visible' ).each(
function () {
+ if ( $.trim( this.value ) this.value !==
this.defaultValue ) {
+ uncommitted = true;
+ return false;
+ }
+ } );
+
+ // Ask the user if they want to navigate away
+ if ( uncommitted ) {
+ return mw.msg( 'mw-ui-unsubmitted-confirm' );
+ }
+
+ // Run the old on beforeunload fn if it exists
+ if ( _oldOnBeforeUnload ) {
+ return _oldOnBeforeUnload();
+ }
+ };
}( mw, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/148983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I451437da738e57866b1013de3c659102da62a15d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG shah...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Return '' from getTokenSalt to enable token check - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Return '' from getTokenSalt to enable token check
..
Return '' from getTokenSalt to enable token check
If getTokenSalt is not overwritten, it returns false,
disabling the token check in ApiMain. We forget about
this, but I don't think this was a big issue, since we
do our own token check in EditEntity (not the API module)
anyway.
Change-Id: I9395b65473167a205fb1970f5232b36a9a26bdd6
---
M repo/includes/api/ApiWikibase.php
M repo/tests/phpunit/includes/api/LinkTitlesTest.php
M repo/tests/phpunit/includes/api/ModifyTermTestCase.php
M repo/tests/phpunit/includes/api/SetAliasesTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
6 files changed, 53 insertions(+), 32 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
WikidataJenkins: Verified
jenkins-bot: Verified
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index a8ddaab..ea23b53 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -215,6 +215,13 @@
}
/**
+* @see ApiBase::getTokenSalt()
+*/
+ public function getTokenSalt() {
+ return $this-needsToken() ? '' : false;
+ }
+
+ /**
* @see ApiBase::mustBePosted()
*/
public function mustBePosted() {
diff --git a/repo/tests/phpunit/includes/api/LinkTitlesTest.php
b/repo/tests/phpunit/includes/api/LinkTitlesTest.php
index 7ee0d6e..4a126fc 100644
--- a/repo/tests/phpunit/includes/api/LinkTitlesTest.php
+++ b/repo/tests/phpunit/includes/api/LinkTitlesTest.php
@@ -87,28 +87,31 @@
public static function provideLinkTitleExceptions(){
return array(
- array( //0 badtoken
+ array( //0 notoken
'p' = array( 'tosite' = 'nnwiki', 'totitle'
= 'Oslo', 'fromsite' = 'nowiki', 'fromtitle' = 'AnotherPage' ),
- 'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'badtoken', 'message' = 'loss of session data' ) )
),
- array( //1 add two links already exist together
+ 'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'notoken', 'message' = 'The token parameter must
be set' ) ) ),
+ array( //1 badtoken
+ 'p' = array( 'tosite' = 'nnwiki', 'totitle'
= 'Oslo', 'fromsite' = 'nowiki', 'fromtitle' = 'AnotherPage', 'token' =
'+\\' ),
+ 'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'badtoken', 'message' = 'Invalid token' ) ) ),
+ array( //2 add two links already exist together
'p' = array( 'tosite' = 'nnwiki', 'totitle'
= 'Oslo', 'fromsite' = 'nowiki', 'fromtitle' = 'Oslo' ),
'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'common-item') ) ),
- array( //2 add two links already exist together
+ array( //3 add two links already exist together
'p' = array( 'tosite' = 'dewiki', 'totitle'
= 'Berlin', 'fromsite' = 'nlwiki', 'fromtitle' = 'Oslo' ),
'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'no-common-item') ) ),
- array( //3 add two links from the same site
+ array( //4 add two links from the same site
'p' = array( 'tosite' = 'nnwiki', 'totitle'
= 'Hammerfest', 'fromsite' = 'nnwiki', 'fromtitle' = 'Hammerfest' ),
'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'param-illegal') ) ),
- array( //4 missing title
+ array( //5 missing title
'p' = array( 'tosite' = 'nnwiki', 'totitle'
= '', 'fromsite' = 'dewiki', 'fromtitle' = 'Hammerfest' ),
'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'param-illegal') ) ),
- array( //5 bad tosite
+ array( //6 bad tosite
'p' = array( 'tosite' = 'qwerty', 'totitle'
= 'Hammerfest', 'fromsite' = 'nnwiki', 'fromtitle' = 'Hammerfest' ),
'e' = array( 'exception' = array( 'type' =
'UsageException', 'code' = 'unknown_tosite') ) ),
- array( //6 bad fromsite
+ array( //7 bad fromsite
'p' = array( 'tosite' = 'nnwiki', 'totitle'
= 'Hammerfest', 'fromsite' = 'qwerty', 'fromtitle' = 'Hammerfest'
[MediaWiki-commits] [Gerrit] Add hover effects to thanks and reply buttons - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Add hover effects to thanks and reply buttons
..
Add hover effects to thanks and reply buttons
constructive and progressive actions (reply was previously
regressive)
Change-Id: Ib56a1be8062bb0bb8937b909fefe0fc6c9329eaa
---
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post_meta_actions.handlebars
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 934b20b..72104ba 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -133,14 +133,14 @@
data-flow-api-handler=activateEditPost
data-flow-api-target= .flow-post-main
data-flow-interactive-handler=apiRequest
- class=mw-ui-button mw-ui-quiet flow-ui-inline
+ class=mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-post-action-edit-post'),Array()), 'encq').'
/a
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in['actions'])
isset($in['actions']['thank'])) ? $in['actions']['thank'] : null))) ? '
#8226;
'.'
- a class=mw-ui-button mw-ui-quiet
mw-thanks-flow-thank-link flow-ui-inline
+ a class=mw-ui-button mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link flow-ui-inline
href='.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['url'])) ? $in['actions']['thank']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a
' : '').'
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 4b5c896..cd1d71b 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -135,14 +135,14 @@
data-flow-api-handler=activateEditPost
data-flow-api-target= .flow-post-main
data-flow-interactive-handler=apiRequest
- class=mw-ui-button mw-ui-quiet flow-ui-inline
+ class=mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-post-action-edit-post'),Array()), 'encq').'
/a
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in['actions'])
isset($in['actions']['thank'])) ? $in['actions']['thank'] : null))) ? '
#8226;
'.'
- a class=mw-ui-button mw-ui-quiet
mw-thanks-flow-thank-link flow-ui-inline
+ a class=mw-ui-button mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link flow-ui-inline
href='.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['url'])) ? $in['actions']['thank']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a
' : '').'
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index 022a149..e245b27 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -102,14 +102,14 @@
data-flow-api-handler=activateEditPost
data-flow-api-target= .flow-post-main
data-flow-interactive-handler=apiRequest
- class=mw-ui-button mw-ui-quiet
[MediaWiki-commits] [Gerrit] More robust API error reporting - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: More robust API error reporting
..
More robust API error reporting
Single private apiErrorMessage() function handles other failure codes
than 'http'.
Bug: 68474
Change-Id: Id0201c0c9cf8f003d7619f0328a1b4222c3a16a4
---
M Resources.php
M modules/new/components/flow-board.js
2 files changed, 23 insertions(+), 2 deletions(-)
Approvals:
SG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index e97c61d..a8912e5 100644
--- a/Resources.php
+++ b/Resources.php
@@ -314,6 +314,7 @@
'mediawiki.util',
),
'messages' = array(
+ 'flow-error-external',
'flow-error-http',
'flow-error-fetch-after-open-close',
)
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 6c25eac..4005ff2 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -590,7 +590,7 @@
* fetching the new data to be displayed.
*/
FlowBoardComponent.UI.removeError( $target );
- var errorMsg = result.error ? result.error.info
: mw.msg( 'flow-error-http' );
+ var errorMsg = apiErrorMessage( code, result );
errorMsg = mw.msg(
'flow-error-fetch-after-open-close', errorMsg );
FlowBoardComponent.UI.showError( $target,
errorMsg );
} );
@@ -1326,6 +1326,26 @@
};
/**
+* Utility to get error message for API result.
+*
+* @param string code
+* @param Object result
+* @returns string
+*/
+ function apiErrorMessage( code, result ) {
+ if ( result.error result.error.info ) {
+ return result.error.info;
+ } else {
+ if ( code === 'http' ) {
+ // XXX: some network errors have
English info in result.exception and result.textStatus.
+ return mw.msg( 'flow-error-http' );
+ } else {
+ return mw.msg( 'flow-error-external',
code );
+ }
+ }
+ }
+
+ /**
* Triggers an API request based on URL and form data, and
triggers the callbacks based on flow-api-handler.
* @example a data-flow-interactive-handler=apiRequest
data-flow-api-handler=loadMore data-flow-api-target= .flow-component div
href=../a
* @param {Event} event
@@ -1446,7 +1466,7 @@
* same format. If the request
failed without a specific
* error message, just fall
back to some default error.
*/
- errorMsg = result.error ?
result.error.info : mw.msg( 'flow-error-http' );
+ errorMsg = apiErrorMessage(
code, result );
FlowBoardComponent.UI.showError( info.$target, errorMsg );
FlowBoardComponent.UI.events.apiHandlers[ handlerName ].apply( _this, args );
--
To view, visit https://gerrit.wikimedia.org/r/148870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0201c0c9cf8f003d7619f0328a1b4222c3a16a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage sp...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP test - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/148984 Change subject: WIP test .. WIP test Change-Id: Ie65fc2bd0ac01409684c5e17e9f20e330149dec5 --- M README.md 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/84/148984/1 diff --git a/README.md b/README.md index d3bc559..7c3d0fd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Mediawiki::Selenium +test + Several MediaWiki extensions share code that makes it easy to run Selenium tests. This gem makes it easy to update the shared code. -- To view, visit https://gerrit.wikimedia.org/r/148984 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie65fc2bd0ac01409684c5e17e9f20e330149dec5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't show wikibase recent changes / watchlist pref if featu... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148985
Change subject: Don't show wikibase recent changes / watchlist pref if feature
disabled
..
Don't show wikibase recent changes / watchlist pref if feature disabled
Bug: 68463
Change-Id: I488f3139bab48196140036a28497eb39022d5c98
---
M client/WikibaseClient.hooks.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/148985/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 26372b4..4796e2c 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -734,6 +734,12 @@
* @return bool
*/
public static function onGetPreferences( User $user, array $prefs ) {
+ $settings = WikibaseClient::getDefaultInstance()-getSettings();
+
+ if ( !$settings-getSetting( 'showExternalRecentChanges' ) ) {
+ return true;
+ }
+
$prefs['rcshowwikidata'] = array(
'type' = 'toggle',
'label-message' = 'wikibase-rc-show-wikidata-pref',
--
To view, visit https://gerrit.wikimedia.org/r/148985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I488f3139bab48196140036a28497eb39022d5c98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Construct user objects in context creation everytime - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148986
Change subject: Construct user objects in context creation everytime
..
Construct user objects in context creation everytime
Kills the need for /login/done
Change-Id: Ie0c1185d3cc5dce54b29a3f90470e50674823cb4
---
M quarry/web/app.py
M quarry/web/templates/landing.html
2 files changed, 16 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/86/148986/1
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 06da36e..4276f9f 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -17,10 +17,21 @@
def get_user():
-if 'user_id' in session:
-return User.get_by_id(session['user_id'])
+if 'user_id' not in session:
+user_name = mwoauth.get_current_user()
+if user_name:
+user_info = mwoauth.request({'action': 'query', 'meta':
'userinfo'})
+wiki_id = user_info['query']['userinfo']['id']
+user = User.get_by_id(wiki_id)
+if user is None:
+user = User(wiki_id, user_name)
+user.save()
+session['user_id'] = user.id
+else:
+user = None
else:
-return None
+user = User.get_by_id(session['user_id'])
+return user
@app.before_request
@@ -38,23 +49,10 @@
return render_template(landing.html, user=g.user)
-@app.route(/login/done)
-def login_done():
-user_name = mwoauth.get_current_user()
-user_info = mwoauth.request({'action': 'query', 'meta': 'userinfo'})
-wiki_id = user_info['query']['userinfo']['id']
-user = User.get_by_id(wiki_id)
-if user is None:
-user = User(wiki_id, user_name)
-user.save()
-session['user_id'] = user.id
-return redirect(/)
-
-
@app.route(/query/new)
def new_query():
if g.user is None:
-return Authentication required, 401
+return redirect(/login?next=/query/new)
query = Query()
query.user = g.user
query.save_new()
diff --git a/quarry/web/templates/landing.html
b/quarry/web/templates/landing.html
index 12bd417..9f8ceb1 100644
--- a/quarry/web/templates/landing.html
+++ b/quarry/web/templates/landing.html
@@ -9,7 +9,7 @@
{% if user %}
a class=btn btn-primary btn-lg role=button
href=/query/newNew Query/a
{% else %}
-a class=btn btn-primary btn-lg role=button
href=/login?next=/login/doneLogin via Wikitech/a
+a class=btn btn-primary btn-lg role=button
href=/login?next=/Login via Wikitech/a
{% endif %}
/p
/div
--
To view, visit https://gerrit.wikimedia.org/r/148986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0c1185d3cc5dce54b29a3f90470e50674823cb4
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/148987 Change subject: Implemented changes for translatewiki .. Implemented changes for translatewiki Moved to Json i18n files Change-Id: Id6bbf0788f23bf017159d5f7be4e93a392860dc6 --- M Statistics/Statistics.class.php M Statistics/Statistics.setup.php A Statistics/i18n/de-formal.json A Statistics/i18n/de.json A Statistics/i18n/en.json A Statistics/i18n/qqq.json M Statistics/includes/DiagramEditsPerUser.class.php M Statistics/includes/DiagramNumberOfArticles.class.php M Statistics/includes/DiagramNumberOfEdits.class.php M Statistics/includes/DiagramNumberOfPages.class.php M Statistics/includes/DiagramNumberOfUsers.class.php M Statistics/includes/DiagramSearches.class.php M Statistics/includes/FilterCategory.class.php M Statistics/includes/FilterNamespace.class.php M Statistics/includes/FilterSearchScope.class.php M Statistics/includes/FilterUsers.class.php M Statistics/includes/MultiSelectFilter.class.php M Statistics/languages/Statistics.i18n.php M Statistics/resources/BS.Statistics/Filter.js M Statistics/resources/BS.Statistics/Panel.js M Statistics/resources/BS.Statistics/StatisticsPortletConfig.js M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js 25 files changed, 308 insertions(+), 314 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/87/148987/1 diff --git a/Statistics/Statistics.class.php b/Statistics/Statistics.class.php index 1152a61..1862a19 100644 --- a/Statistics/Statistics.class.php +++ b/Statistics/Statistics.class.php @@ -101,21 +101,14 @@ $this-setHook( 'BSDashboardsUserDashboardPortalConfig' ); $this-setHook( 'BSDashboardsUserDashboardPortalPortlets' ); - //BsConfig::registerVar( 'MW::Statistics::DiagramDir', 'images/statistics', BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING, 'bs-statistics-pref-DiagramDir' ); - //BsConfig::registerVar( 'MW::Statistics::DiagramWidth', 700, BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 'bs-statistics-pref-DiagramWidth', 'int' ); - //BsConfig::registerVar( 'MW::Statistics::DiagramHeight', 500, BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 'bs-statistics-pref-DiagramHeight', 'int' ); - //BsConfig::registerVar( 'MW::Statistics::DiagramType', 'line',BsConfig::LEVEL_USER|BsConfig::TYPE_STRING, $this-mI18N ); - //BsConfig::registerVar( 'MW::Statistics::DiagramType', 'line', BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-statistics-pref-DiagramType', 'select' ); - //BsConfig::registerVar( 'MW::Statistics::DefaultFrom', '01 January 2010', BsConfig::LEVEL_USER|BsConfig::TYPE_STRING, 'bs-statistics-pref-DefaultFrom' ); - //BsConfig::registerVar( 'MW::Statistics::DisableCache', true, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-statistics-pref-DisableCache', 'toggle' ); + BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', array( 'WikiSysop' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 'bs-statistics-pref-excludeusers', 'multiselectplusadd' ); + BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals', 36, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-statistics-pref-maxnumberofintervals', 'int' ); - BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', array( 'WikiSysop' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING, 'bs-statistics-pref-ExcludeUsers', 'multiselectplusadd' ); - BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals', 36,BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-statistics-pref-MaxNumberOfIntervals', 'int' ); $aAvailableGrains = array( - 'Y' = 'bs-statistics-Y', - 'm' = 'bs-statistics-m', - 'W' = 'bs-statistics-W', - 'd' = 'bs-statistics-d', + 'Y' = 'bs-statistics-year', + 'm' = 'bs-statistics-month', + 'W' = 'bs-statistics-week', + 'd' = 'bs-statistics-day', ); BsConfig::registerVar( 'MW::Statistics::AvailableGrains', $aAvailableGrains, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_MIXED, 'bs-statistics-pref-AvailableGrains'); @@ -232,9 +225,9 @@ * @param Skin $oSkin
[MediaWiki-commits] [Gerrit] No longer running Ruby linter for Wikibase - change (integration/zuul-config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/148988 Change subject: No longer running Ruby linter for Wikibase .. No longer running Ruby linter for Wikibase Wikibase does not have any Ruby files, they are moved to WikidataBrowserTests repository. Change-Id: If8fcf196986acf37537ff0a1a67d6e1a64dc721b --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/88/148988/1 diff --git a/layout.yaml b/layout.yaml index f8bfdf5..edeb767 100644 --- a/layout.yaml +++ b/layout.yaml @@ -3122,12 +3122,10 @@ - name: mediawiki/extensions/Wikibase check-only: - mwext-Wikibase-jslint - - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint - php-composer-validate gate-and-submit: - mwext-Wikibase-jslint - - mwext-Wikibase-ruby1.9.3lint - mwext-Wikibase-lint - php-composer-validate -- To view, visit https://gerrit.wikimedia.org/r/148988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8fcf196986acf37537ff0a1a67d6e1a64dc721b Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] No longer running any jobs for qa/browsertests - change (integration/zuul-config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/148989 Change subject: No longer running any jobs for qa/browsertests .. No longer running any jobs for qa/browsertests The repository is now empty. Change-Id: Ib049bea5c1b0d181243c0bea8fe7d6a60c075dfc --- M layout.yaml 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/89/148989/1 diff --git a/layout.yaml b/layout.yaml index f8bfdf5..0d722c4 100644 --- a/layout.yaml +++ b/layout.yaml @@ -3271,18 +3271,6 @@ - name: 'python-lint' prefix: 'pywikibot-i18n' - - name: qa/browsertests -check: - - qa-browsertests-ruby1.9.3lint -test: - - qa-browsertests-ruby1.9.3lint - - qa-browsertests-build -gate-and-submit: - - qa-browsertests-ruby1.9.3lint - - qa-browsertests-build -postmerge: - - qa-browsertests-postmerge - - name: qrpedia check-voter: - qrpedia-phplint -- To view, visit https://gerrit.wikimedia.org/r/148989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib049bea5c1b0d181243c0bea8fe7d6a60c075dfc Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSpiceSkin/ExtendedSearch: Added some CSS - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged.
Change subject: BlueSpiceSkin/ExtendedSearch: Added some CSS
..
BlueSpiceSkin/ExtendedSearch: Added some CSS
This is kind of experimental. The one thing that should be in, is the
fixed width of the menu. All the other stuff like rounded corners and
borders are just a test.
Any feedback welcome.
Change-Id: If1480c50af34d1bd9872d22780f76db7f04da87e
---
M resources/components/extension.extendedSearch.less
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/components/extension.extendedSearch.less
b/resources/components/extension.extendedSearch.less
index 718765f..e0fc106 100644
--- a/resources/components/extension.extendedSearch.less
+++ b/resources/components/extension.extendedSearch.less
@@ -1,3 +1,12 @@
-#bs-extendedsearch-autocomplete {
- width: 300px;
+#bs-extendedsearch-autocomplete .ui-menu {
+ width: 336px; /* Comes from '#searchform input' in skin.search.less.
Sums up width, margin and border */
+ box-sizing: border-box;
+ border-top: none;
+ border-width: 2px;
+ border-radius: 0 0 8px 8px;
+ overflow: hidden;
+}
+
+#searchform input:focus {
+ border-radius: 8px 8px 0 0;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/148955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If1480c50af34d1bd9872d22780f76db7f04da87e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc: Reformat @params declaration - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Doc: Reformat @params declaration
..
Doc: Reformat @params declaration
I have not found documentation about the @params command, so this seems
not valid.
I have moved the text to the corresponding @param
Change-Id: I443866d602b60570278289e6e24a77d37314cede
---
M includes/jobqueue/JobQueueFederated.php
M includes/jobqueue/JobQueueRedis.php
M includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
M includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
4 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/JobQueueFederated.php
b/includes/jobqueue/JobQueueFederated.php
index d6f9560..01d7ec4 100644
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@ -64,7 +64,7 @@
const CACHE_TTL_LONG = 300; // integer; seconds to cache info that is
kept up to date
/**
-* @params include:
+* @param array $params Possible keys:
* - sectionsByWiki : A map of wiki IDs to section names.
* Wikis will default to using the section
default.
* - partitionsBySection : Map of section names to maps of (partition
name = weight).
@@ -80,7 +80,6 @@
* different partition queues. This improves
availability
* during failure, at the cost of added
latency and somewhat
* less reliable job de-duplication mechanisms.
-* @param array $params
* @throws MWException
*/
protected function __construct( array $params ) {
diff --git a/includes/jobqueue/JobQueueRedis.php
b/includes/jobqueue/JobQueueRedis.php
index 522bae1..3519eac 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -73,7 +73,7 @@
protected $key;
/**
-* @params include:
+* @param array $params Possible keys:
* - redisConfig : An array of parameters to
RedisConnectionPool::__construct().
* Note that the serializer option is ignored as
none is always used.
* - redisServer : A hostname/port combination or the absolute path
of a UNIX socket.
@@ -83,7 +83,6 @@
* - daemonized : Set to true if the redisJobRunnerService runs in
the background.
* This will disable job recycling/undelaying from
the MediaWiki side
* to avoid redundance and out-of-sync configuration.
-* @param array $params
*/
public function __construct( array $params ) {
parent::__construct( $params );
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
b/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
index d733a42..ae266ef 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php
@@ -34,11 +34,10 @@
protected $cacheTTL; // integer; seconds
/**
-* @params include:
+* @param array $params Possible keys:
* - objectCache : Name of an object cache registered in
$wgObjectCaches.
* This defaults to the one specified by
$wgMainCacheType.
* - cacheTTL: Seconds to cache the aggregate data before
regenerating.
-* @param array $params
*/
protected function __construct( array $params ) {
parent::__construct( $params );
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index e8e8e30..db9e764 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -36,14 +36,13 @@
protected $servers;
/**
-* @params include:
+* @param array $params Possible keys:
* - redisConfig : An array of parameters to
RedisConnectionPool::__construct().
* - redisServers : Array of server entries, the first being the
primary and the
*others being fallback servers. Each entry is
either a hostname/port
*combination or the absolute path of a UNIX socket.
*If a hostname is specified but no port, the
standard port number
*6379 will be used. Required.
-* @param array $params
*/
protected function __construct( array $params ) {
parent::__construct( $params );
--
To view, visit https://gerrit.wikimedia.org/r/148982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Fixed spacing - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed spacing
..
Fixed spacing
- Removed spaces after not operator (!)
- Removed spaces inside array index
- use tab as indent instead of spaces
- Add newline at end of file
- Removed spaces after casts
Change-Id: I9ba17c4385fcb43d38998d45f89cf42952bc791b
---
M includes/AjaxDispatcher.php
M includes/AjaxResponse.php
M includes/GlobalFunctions.php
M includes/HtmlFormatter.php
M includes/HttpFunctions.php
M includes/Import.php
M includes/Linker.php
M includes/OutputPage.php
M includes/Preferences.php
M includes/Setup.php
M includes/UserMailer.php
M includes/changes/EnhancedChangesList.php
M includes/config/GlobalVarConfig.php
M includes/deferred/ViewCountUpdate.php
M includes/filebackend/SwiftFileBackend.php
M includes/filerepo/file/File.php
M includes/installer/WebInstallerPage.php
M includes/media/Bitmap.php
M includes/media/DjVu.php
M includes/page/Article.php
M includes/page/WikiFilePage.php
M includes/page/WikiPage.php
M includes/resourceloader/ResourceLoaderStartUpModule.php
M includes/search/SearchHighlighter.php
M includes/specials/SpecialWhatlinkshere.php
M languages/Language.php
M languages/messages/MessagesFrp.php
M tests/parser/parserTest.inc
M tests/phpunit/includes/StatusTest.php
M tests/phpunit/includes/api/ApiTestCase.php
M tests/phpunit/includes/exception/MWExceptionHandlerTest.php
M tests/phpunit/includes/media/DjVuTest.php
M tests/phpunit/includes/specials/SpecialMyLanguageTest.php
M tests/phpunit/structure/ResourcesTest.php
M tests/testHelpers.inc
35 files changed, 77 insertions(+), 77 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index c9ca128..dde8467 100644
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -55,7 +55,7 @@
$this-mode = ;
- if ( ! empty( $_GET[rs] ) ) {
+ if ( !empty( $_GET[rs] ) ) {
$this-mode = get;
}
@@ -66,7 +66,7 @@
switch ( $this-mode ) {
case 'get':
$this-func_name = isset( $_GET[rs] ) ?
$_GET[rs] : '';
- if ( ! empty( $_GET[rsargs] ) ) {
+ if ( !empty( $_GET[rsargs] ) ) {
$this-args = $_GET[rsargs];
} else {
$this-args = array();
@@ -74,7 +74,7 @@
break;
case 'post':
$this-func_name = isset( $_POST[rs] ) ?
$_POST[rs] : '';
- if ( ! empty( $_POST[rsargs] ) ) {
+ if ( !empty( $_POST[rsargs] ) ) {
$this-args = $_POST[rsargs];
} else {
$this-args = array();
@@ -105,7 +105,7 @@
wfProfileIn( __METHOD__ );
- if ( ! in_array( $this-func_name, $wgAjaxExportList ) ) {
+ if ( !in_array( $this-func_name, $wgAjaxExportList ) ) {
wfDebug( __METHOD__ . ' Bad Request for unknown
function ' . $this-func_name . \n );
wfHttpError(
diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index a3808a5..41cbd24 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -132,7 +132,7 @@
* @param string $text
*/
function addText( $text ) {
- if ( ! $this-mDisabled $text ) {
+ if ( !$this-mDisabled $text ) {
$this-mText .= $text;
}
}
@@ -141,7 +141,7 @@
* Output text
*/
function printText() {
- if ( ! $this-mDisabled ) {
+ if ( !$this-mDisabled ) {
print $this-mText;
}
}
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6850734..8bcd56e 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1873,7 +1873,7 @@
$responseTime = round( ( microtime( true ) - $wgRequestTime ) * 1000 );
$reportVars = array( 'wgBackendResponseTime' = $responseTime );
if ( $wgShowHostnames ) {
- $reportVars[ 'wgHostname' ] = wfHostname();
+ $reportVars['wgHostname'] = wfHostname();
}
return Skin::makeVariablesScript( $reportVars );
}
diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
index ebced70..02c6c5e 100644
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -237,7 +237,7 @@
private function fixLibXML( $html ) {
wfProfileIn( __METHOD__ );
[MediaWiki-commits] [Gerrit] Each line in a doc block should start with * - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Each line in a doc block should start with * .. Each line in a doc block should start with * Added missing * to some doc blocks Change-Id: I0709f2e94b053437fa0f06bb67ae7ae4c248a618 --- M includes/Block.php M languages/messages/MessagesEn.php M tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php M tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php 4 files changed, 8 insertions(+), 6 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Block.php b/includes/Block.php index aaabec9..ac7450b 100644 --- a/includes/Block.php +++ b/includes/Block.php @@ -1104,7 +1104,7 @@ * - Other softblocks are chosen over autoblocks * - If there are multiple exact or range blocks at the same level, the one chosen *is random - +* * @param array $ipChain List of IPs (strings). This is used to determine how close *a block is to the server, and if a block matches exactly, or is in a range. *The order is furthest from the server to nearest e.g., (Browser, proxy1, proxy2, diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9bacac2..ccdd310 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -103,9 +103,11 @@ * Array of gender specific. namespace aliases. * Mapping NS_xxx to array of GENDERKEY to alias. * Example: -$namespaceGenderAliases = array( - NS_USER = array( 'male' = 'Male_user', 'female' = 'Female_user' ), -); + * @code + * $namespaceGenderAliases = array( + * NS_USER = array( 'male' = 'Male_user', 'female' = 'Female_user' ), + * ); + * @endcode */ $namespaceGenderAliases = array(); diff --git a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php index 041adb8..166d641 100644 --- a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php +++ b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php @@ -97,7 +97,7 @@ * az-Arab-x-AZE-derbend * AZE being private, it should be lower case, hence the test above * should probably be: - #array( 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ), +* array( 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ), */ # Private use registry values: diff --git a/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php b/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php index f1425ef..b13df89 100644 --- a/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php +++ b/tests/phpunit/includes/title/MediaWikiPageLinkRendererTest.php @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- To view, visit https://gerrit.wikimedia.org/r/148961 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0709f2e94b053437fa0f06bb67ae7ae4c248a618 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move more escaping logic to Escaper - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148990
Change subject: Move more escaping logic to Escaper
..
Move more escaping logic to Escaper
Change-Id: I626e9dc5edd63ff4666dbc38d220d6fffcfa2055
---
M includes/Search/Escaper.php
M includes/Searcher.php
2 files changed, 126 insertions(+), 125 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/90/148990/1
diff --git a/includes/Search/Escaper.php b/includes/Search/Escaper.php
index 466d09b..f7ec1e5 100644
--- a/includes/Search/Escaper.php
+++ b/includes/Search/Escaper.php
@@ -42,6 +42,116 @@
return $text;
}
+ /**
+* Make sure the the query string part is well formed by escaping some
syntax that we don't
+* want users to get direct access to and making sure quotes are
balanced.
+* These special characters _aren't_ escaped:
+* * and ?: Do a wildcard search against the stemmed text which isn't
strictly a good
+* idea but this is so rarely used that adding extra code to flip
prefix searches into
+* real prefix searches isn't really worth it.
+* ~: Do a fuzzy match against the stemmed text which isn't strictly a
good idea but it
+* gets the job done and fuzzy matches are a really rarely used feature
to be creating an
+* extra index for.
+* : Perform a phrase search for the quoted term. If the s aren't
balanced we insert one
+* at the end of the term to make sure elasticsearch doesn't barf at us.
+*/
+ public function fixupQueryStringPart( $string ) {
+ $profiler = new ProfileSection( __METHOD__ );
+
+ // Escape characters that can be escaped with \\
+ $string = preg_replace( '/(
+ \(| (?# no user supplied groupings)
+ \)|
+ \{| (?# no exclusive range queries)
+ }|
+ \[| (?# no inclusive range queries either)
+ ]|
+ \^| (?# no user supplied boosts at this
point, though I cant think why)
+ :| (?# no specifying your own
fields)
+ \\\(?!) (?# the only acceptable escaping is
for quotes)
+ )/x', '\\\$1', $string );
+ // Forward slash escaping doesn't work properly in all
environments so we just eat them. Nom.
+ $string = str_replace( '/', ' ', $string );
+
+ // Elasticsearch's query strings can't abide unbalanced quotes
+ return $this-balanceQuotes( $string );
+ }
+
+ /**
+* Make sure that all operators and lucene syntax is used correctly in
the query string
+* and store if this is a fuzzy query.
+* If it isn't then the syntax escaped so it becomes part of the query
text.
+* @return array(string, boolean) (fixedup query string, is this a
fuzzy query?)
+*/
+ public function fixupWholeQueryString( $string ) {
+ $profiler = new ProfileSection( __METHOD__ );
+
+ // Be careful when editing this method because the ordering of
the replacements matters.
+
+ // Escape ~ that don't follow a term or a quote
+ $string = preg_replace_callback( '/(?![\w])~/',
+ 'CirrusSearch\Search\Escaper::escapeBadSyntax', $string
);
+
+ // Remove ? and * that don't follow a term. These are slow so
we turned them off and escaping isn't working
+ $string = preg_replace( '/(?![\w])([?*])/', '', $string );
+
+ // Reduce token ranges to bare tokens without the or
+ $string = preg_replace( '/(?:|)([^\s])/', '$1', $string );
+
+ // Turn bad fuzzy searches into searches that contain a ~ and
set $this-fuzzyQuery for good ones.
+ $fuzzyQuery = false;
+ $string = preg_replace_callback(
'/(?leading\w)~(?trailing\S*)/',
+ function ( $matches ) use ( $fuzzyQuery ) {
+ if ( preg_match(
'/^(?:|0|(?:0?\.[0-9]+)|(?:1(?:\.0)?))$/', $matches[ 'trailing' ] ) ) {
+ $fuzzyQuery = true;
+ return $matches[ 0 ];
+ } else {
+ return $matches[ 'leading' ] . '\\~' .
+ preg_replace( '/(?!)~/',
'\~', $matches[ 'trailing' ] );
+ }
+ }, $string );
+
+ // Turn bad proximity searches into searches that contain a ~
+ $string =
[MediaWiki-commits] [Gerrit] Fix @deprecated of ImageGalleryBase - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix @deprecated of ImageGalleryBase
..
Fix @deprecated of ImageGalleryBase
Follows-up 0804f31c1c1167. @deprecated since, not in.
Change-Id: I9f28fd431eb84258d89c34c7c1e3e8a90a594dba
---
M includes/gallery/ImageGalleryBase.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/gallery/ImageGalleryBase.php
b/includes/gallery/ImageGalleryBase.php
index 837a731..53c2e10 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -30,37 +30,37 @@
abstract class ImageGalleryBase extends ContextSource {
/**
* @var array Gallery images
-* @deprecated in 1.23 (was declared var) and will be removed in 1.24
+* @deprecated since 1.23 (was declared var) and will be removed in
1.24
*/
public $mImages;
/**
* @var bool Whether to show the filesize in bytes in categories
-* @deprecated in 1.23 (was declared var) and will be removed in 1.24
+* @deprecated since 1.23 (was declared var) and will be removed in
1.24
*/
public $mShowBytes;
/**
* @var bool Whether to show the filename. Default: true
-* @deprecated in 1.23 (was declared var) and will be removed in 1.24
+* @deprecated since 1.23 (was declared var) and will be removed in
1.24
*/
public $mShowFilename;
/**
* @var string Gallery mode. Default: traditional
-* @deprecated in 1.23 (was declared var) and will be removed in 1.24
+* @deprecated since 1.23 (was declared var) and will be removed in
1.24
*/
public $mMode;
/**
* @var bool|string Gallery caption. Default: false
-* @deprecated in 1.23 (was declared var) and will be removed in 1.24
+* @deprecated since 1.23 (was declared var) and will be removed in
1.24
*/
public $mCaption = false;
/**
* @var bool Hide blacklisted images?
-* @deprecated in 1.23 (was declared var) and will be removed in 1.24
+* @deprecated since 1.23 (was declared var) and will be removed in
1.24
*/
public $mHideBadImages;
--
To view, visit https://gerrit.wikimedia.org/r/148849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f28fd431eb84258d89c34c7c1e3e8a90a594dba
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup some docs (languages, maintenance, tests) - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148991
Change subject: Cleanup some docs (languages, maintenance, tests)
..
Cleanup some docs (languages, maintenance, tests)
- Swap $variable type to type $variable
- Added missing types
- Fixed spacing inside docs
- Makes beginning of @param/@return/@var/@throws in capital
- Changed some types to match the more common spelling
Change-Id: Ia041964250d8b7c0349d79dc9b131c5b8696e795
---
M languages/Language.php
M languages/LanguageConverter.php
M languages/classes/LanguageZh.php
M maintenance/findHooks.php
M maintenance/language/languages.inc
M maintenance/parse.php
M maintenance/sql.php
M maintenance/sqlite.inc
M tests/parser/parserTest.inc
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/includes/HtmlFormatterTest.php
M tests/phpunit/includes/ImagePage404Test.php
M tests/phpunit/includes/ImagePageTest.php
M tests/phpunit/includes/MimeMagicTest.php
M tests/phpunit/includes/OutputPageTest.php
M tests/phpunit/includes/StatusTest.php
M tests/phpunit/includes/api/ApiMainTest.php
M tests/phpunit/includes/api/ApiTestCase.php
M tests/phpunit/includes/api/ApiTestCaseUpload.php
M tests/phpunit/includes/api/RandomImageGenerator.php
M tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
M tests/phpunit/includes/api/query/ApiQueryTestBase.php
M tests/phpunit/includes/cache/MessageCacheTest.php
M tests/phpunit/includes/content/ContentHandlerTest.php
M tests/phpunit/includes/db/ORMRowTest.php
M tests/phpunit/includes/diff/DifferenceEngineTest.php
M tests/phpunit/includes/filerepo/file/FileTest.php
M tests/phpunit/includes/media/JpegMetadataExtractorTest.php
M tests/phpunit/includes/media/MediaWikiMediaTestCase.php
M tests/phpunit/includes/media/PNGTest.php
M tests/phpunit/includes/media/XCFTest.php
M tests/phpunit/includes/parser/MagicVariableTest.php
M tests/phpunit/includes/parser/MediaWikiParserTest.php
M tests/phpunit/includes/specials/SpecialMIMESearchTest.php
M tests/phpunit/includes/specials/SpecialMyLanguageTest.php
M tests/phpunit/languages/LanguageTest.php
M tests/phpunit/maintenance/backupPrefetchTest.php
M tests/phpunit/maintenance/backupTextPassTest.php
M tests/phpunit/maintenance/fetchTextTest.php
39 files changed, 88 insertions(+), 88 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/91/148991/1
diff --git a/languages/Language.php b/languages/Language.php
index 8b41b4e..4ac6fdc 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2351,7 +2351,7 @@
* Get the formatted date and time for the given timestamp and
formatted for
* the given user.
*
-* @param mixed $ts the time format which needs to be turned into a
+* @param mixed $ts The time format which needs to be turned into a
* date('YmdHis') format with wfTimestamp(TS_MW,$ts)
* @param User $user User object used to get preferences for timezone
and format
* @param array $options Array, can contain the following keys:
@@ -3786,8 +3786,8 @@
*
* @since 1.23
*
-* @param int $count non-localized number
-* @param array $forms different plural forms
+* @param int $count Non-localized number
+* @param array $forms Different plural forms
*
* @return array|string
*/
@@ -3992,7 +3992,7 @@
* Get the list of variants supported by this language
* see sample implementation in LanguageZh.php
*
-* @return array an array of language codes
+* @return array An array of language codes
*/
public function getVariants() {
return $this-mConverter-getVariants();
@@ -4029,7 +4029,7 @@
* @param Title $nt The title object of the link
* @param bool $ignoreOtherCond To disable other conditions when
* we need to transclude a template or update a category's link
-* @return null the input parameters may be modified upon return
+* @return void The input parameters may be modified upon return
*/
public function findVariantLink( $link, $nt, $ignoreOtherCond = false
) {
$this-mConverter-findVariantLink( $link, $nt,
$ignoreOtherCond );
@@ -4284,7 +4284,7 @@
*
* @since 1.22
* @param string $code Language code
-* @return array array( fallbacks, site fallbacks )
+* @return array Array( fallbacks, site fallbacks )
*/
public static function getFallbacksIncludingSiteLanguage( $code ) {
global $wgLanguageCode;
@@ -4339,7 +4339,7 @@
*
* @since 1.19
* @param string $code Language code
-* @return array of message keys (strings)
+* @return array Array of message keys (strings)
*/
public static function getMessageKeysFor( $code ) {
[MediaWiki-commits] [Gerrit] lucene: qualify var - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148992
Change subject: lucene: qualify var
..
lucene: qualify var
Change-Id: Ib61ac9d816443ccd59a78b8f108ad3e8a5de7076
---
M templates/lucene/lsearch.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/148992/1
diff --git a/templates/lucene/lsearch.conf.erb
b/templates/lucene/lsearch.conf.erb
index d559110..f69c95c 100644
--- a/templates/lucene/lsearch.conf.erb
+++ b/templates/lucene/lsearch.conf.erb
@@ -86,7 +86,7 @@
# Pattern for OAI repo. {0} is replaced with dbname, {1} with language
#OAI.repo=http://{1}.wikipedia.org/wiki/Special:OAIRepository
OAI.username=lsearch2
-OAI.password=%= lucene_oai_pass %
+OAI.password=%= @lucene_oai_pass %
% end -%
# Max queue size on remote indexer after which we wait a bit
OAI.maxqueue=5000
--
To view, visit https://gerrit.wikimedia.org/r/148992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib61ac9d816443ccd59a78b8f108ad3e8a5de7076
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Decrease throttle for webrequest log verification - change (analytics/refinery)
Ottomata has submitted this change and it was merged. Change subject: Decrease throttle for webrequest log verification .. Decrease throttle for webrequest log verification The cluster default is unnecessarily high for this job, and only bought us jobs that unnecessarily check hdfs again and again. Change-Id: I254e96c4c92c3e842581570c54fc378e609747de --- M oozie/webrequest/partition/add/coordinator.xml 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/oozie/webrequest/partition/add/coordinator.xml b/oozie/webrequest/partition/add/coordinator.xml index db3577c..ab050ab 100644 --- a/oozie/webrequest/partition/add/coordinator.xml +++ b/oozie/webrequest/partition/add/coordinator.xml @@ -56,6 +56,17 @@ even-though the concurrency is low. -- concurrency2/concurrency + + +!-- +Since we expect only one incarnation per hourly dataset, the +default throttle of 12 is way to high, and there is not need +to keep that many materialized jobs around. + +By resorting to 2, we keep the hdfs checks on the datasets +low, while still being able to easily feed the concurrency. +-- +throttle2/throttle /controls datasets -- To view, visit https://gerrit.wikimedia.org/r/148700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I254e96c4c92c3e842581570c54fc378e609747de Gerrit-PatchSet: 2 Gerrit-Project: analytics/refinery Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make otherProjectsLinks setting compatible with the speci... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148993
Change subject: Make otherProjectsLinks setting compatible with the special
sitelink group
..
Make otherProjectsLinks setting compatible with the special sitelink group
Change-Id: I07abcbafbd18a66089685f8fba7164744f9011c9
---
M client/includes/OtherProjectsSitesProvider.php
M client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
2 files changed, 36 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/93/148993/1
diff --git a/client/includes/OtherProjectsSitesProvider.php
b/client/includes/OtherProjectsSitesProvider.php
index e8c93b0..72a0d28 100644
--- a/client/includes/OtherProjectsSitesProvider.php
+++ b/client/includes/OtherProjectsSitesProvider.php
@@ -28,12 +28,18 @@
private $currentSite;
/**
+* @var array
+*/
+ private $specialSiteGroups;
+
+ /**
* @param SiteStore $siteStore
* @param Site $currentSite
*/
- public function __construct( SiteStore $siteStore, Site $currentSite ) {
+ public function __construct( SiteStore $siteStore, Site $currentSite,
array $specialSiteGroups ) {
$this-siteStore = $siteStore;
$this-currentSite = $currentSite;
+ $this-specialSiteGroups = $specialSiteGroups;
}
/**
@@ -50,8 +56,9 @@
if ( !$localSite ) {
return array();
}
+ $specialSiteGroups = $settings-getSetting(
'specialSiteLinkGroups' );
- $otherProjectsSitesProvider = new self( $sitesStore, $localSite
);
+ $otherProjectsSitesProvider = new self( $sitesStore,
$localSite, $specialSiteGroups );
$otherProjectsSites =
$otherProjectsSitesProvider-getOtherProjectsSites( $settings-getSetting(
'siteLinkGroups' ) );
$otherProjectsSiteIds = array();
@@ -75,6 +82,8 @@
public function getOtherProjectsSites( array $supportedSiteGroupIds ) {
$currentGroupId = $this-currentSite-getGroup();
$otherProjectsSites = new SiteList();
+
+ $this-substituteSpecialSiteGroups( $supportedSiteGroupIds );
foreach ( $supportedSiteGroupIds as $groupId ) {
if ( $groupId === $currentGroupId ) {
@@ -115,4 +124,16 @@
return null;
}
+
+ /**
+* @param array $groups
+*/
+ private function substituteSpecialSiteGroups( $groups ) {
+ if ( !in_array( 'special', $groups ) ) {
+ return;
+ }
+
+ $groups = array_diff( $groups, array( 'special' ) );
+ $groups = array_merge( $groups, $this-specialSiteGroups );
+ }
}
\ No newline at end of file
diff --git a/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
b/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
index f4074c3..07d02dd 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php
@@ -6,7 +6,6 @@
use Site;
use SiteList;
use SiteStore;
-use TestSites;
use Wikibase\Client\OtherProjectsSitesProvider;
use Wikibase\Client\WikibaseClient;
use Wikibase\Test\MockSiteStore;
@@ -31,7 +30,7 @@
* @dataProvider otherProjectSitesProvider
*/
public function testOtherProjectSites( SiteStore $siteStore, array
$supportedSites, Site $inputSite, SiteList $expectedSites ) {
- $otherProjectsSitesProvider = new OtherProjectsSitesProvider(
$siteStore, $inputSite );
+ $otherProjectsSitesProvider = new OtherProjectsSitesProvider(
$siteStore, $inputSite, array() );
$this-assertEquals(
$expectedSites,
@@ -118,6 +117,12 @@
$site-setLanguageCode( 'en' );
$sites[] = $site;
+ $site = new MediaWikiSite();
+ $site-setGlobalId( 'wikidatawiki' );
+ $site-setGroup( 'wikidata' );
+ $site-setLanguageCode( 'en' );
+ $sites[] = $site;
+
return $sites;
}
@@ -137,11 +142,13 @@
$siteStore-saveSites( $sites );
+ $oldSpecialSiteLinkGroups = $settings-getSetting(
'specialSiteLinkGroups' );
$oldSiteGlobalId = $settings-getSetting( 'siteGlobalID' );
$oldSiteLinkGroups = $settings-getSetting( 'siteLinkGroups' );
$settings-setSetting( 'siteGlobalID', $siteGlobalID );
$settings-setSetting( 'siteLinkGroups', $siteLinkGroups );
+ $settings-setSetting( 'specialSiteLinkGroups', array(
'wikidata' ) );
$siteIds =
[MediaWiki-commits] [Gerrit] made compatible with SemanticTitle - change (mediawiki...TitleIcon)
Cicalese has submitted this change and it was merged.
Change subject: made compatible with SemanticTitle
..
made compatible with SemanticTitle
Change-Id: I31d7ce562dd720269e31fcab584b629858eb8163
---
M TitleIcon.class.php
M TitleIcon.php
2 files changed, 93 insertions(+), 107 deletions(-)
Approvals:
Cicalese: Verified; Looks good to me, approved
diff --git a/TitleIcon.class.php b/TitleIcon.class.php
index 8e3d06a..7cc75c6 100644
--- a/TitleIcon.class.php
+++ b/TitleIcon.class.php
@@ -26,50 +26,79 @@
private static $m_already_invoked = false;
- static function showIconInPageTitle($out, $skin) {
+ public static function showIconInPageTitle($out, $skin) {
+
if (self::$m_already_invoked) {
return true;
}
self::$m_already_invoked = true;
- $instance = new TitleIcon;
- $instance-instanceShowIconInPageTitle($out, $skin);
- return true;
- }
- static function showIconInSearchTitle($title, $text, $result, $terms,
- $page) {
- $instance = new TitleIcon;
- $text = $instance-getIconHTML($title) .
$instance-getPageLink($title);
- return true;
- }
+ $iconhtml = self::getIconHTML($skin-getTitle());
- private function instanceShowIconInPageTitle($out, $skin) {
- $iconhtml = $this-getIconHTML($skin-getTitle());
if (strlen($iconhtml) 0) {
+
$iconhtml = strtr($iconhtml, array('' = '));
- global $TitleIcon_UseDisplayTitle;
- if ($TitleIcon_UseDisplayTitle) {
- $title = $this-getPageTitle($skin-getTitle());
- $script =END
-jQuery(document).ready(function() {
- jQuery('#firstHeading').html($iconhtml + $title);
-});
-END;
- } else {
- $script =END
+
+ $prefix = Html::openElement('table', array(
+ 'style' = 'border:none;'
+ ));
+ $prefix .= Html::openElement('tr');
+ $prefix .= Html::openElement('td', array(
+ 'style' = 'border:none;'
+ ));
+
+ $middle = Html::closeElement('td');
+ $middle .= Html::openElement('td', array(
+ 'style' = 'border:none;'
+ ));
+
+ $suffix = Html::closeElement('td');
+ $suffix .= Html::closeElement('tr');
+ $suffix .= Html::closeElement('table');
+
+ $script =END
jQuery(document).ready(function() {
var title = jQuery('#firstHeading').html();
- jQuery('#firstHeading').html($iconhtml + title);
+ jQuery('#firstHeading').html('$prefix' + $iconhtml + '$middle' +
title + '$suffix');
});
END;
- }
$script = Html::inlineScript($script);
$out-addScript($script);
}
+
+ return true;
}
- private function getIconHTML($title) {
- $icons = $this-getIcons($title);
+ public static function showIconInSearchTitle($title, $text, $result,
+ $terms, $page) {
+
+ $pagelink = '[[' . $title-getPrefixedText() . ']]';
+ $pagelink = $GLOBALS['wgParser']-parse($pagelink,
+ $GLOBALS['wgTitle'], new ParserOptions())-getText();
+ $pagelink = substr($pagelink, 3, strlen($pagelink) - 7);
+
+ $text = Html::openElement('table', array(
+ 'style' = 'border:none;'
+ ));
+ $text .= Html::openElement('tr');
+ $text .= Html::openElement('td', array(
+ 'style' = 'vertical-align:top;border:none;'
+ ));
+ $text .= self::getIconHTML($title);
+ $text .= Html::closeElement('td');
+ $text .= Html::openElement('td', array(
+ 'style' = 'vertical-align:top;border:none;'
+ ));
+ $text .= $pagelink;
+ $text .= Html::closeElement('td');
+ $text .= Html::closeElement('tr');
+ $text .= Html::closeElement('table');
+
+ return true;
+ }
+
+ private static function getIconHTML($title) {
+ $icons = self::getIcons($title);
$iconhtml = ;
foreach ($icons as $iconinfo) {
$page = $iconinfo[page];
@@ -78,8 +107,7 @@
if ($imagefile !== false) {
$imageurl =
[MediaWiki-commits] [Gerrit] Rename script to generate sequence statistics - change (analytics/refinery)
Ottomata has submitted this change and it was merged.
Change subject: Rename script to generate sequence statistics
..
Rename script to generate sequence statistics
Follow-up to Code-Review of
24d2220057e3009d1563af78c59554752ee30b8f
Change-Id: I4f5dffd573123d29fe4f526d08ef7c301d6ce16b
---
R oozie/webrequest/partition/add/generate_sequence_statistics.hql
M oozie/webrequest/partition/add/workflow.xml
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/oozie/webrequest/partition/add/compute_sequence_statistics.hql
b/oozie/webrequest/partition/add/generate_sequence_statistics.hql
similarity index 100%
rename from oozie/webrequest/partition/add/compute_sequence_statistics.hql
rename to oozie/webrequest/partition/add/generate_sequence_statistics.hql
diff --git a/oozie/webrequest/partition/add/workflow.xml
b/oozie/webrequest/partition/add/workflow.xml
index 07b1580..17f4ec1 100644
--- a/oozie/webrequest/partition/add/workflow.xml
+++ b/oozie/webrequest/partition/add/workflow.xml
@@ -76,11 +76,11 @@
/property
/configuration
/sub-workflow
-ok to=compute_sequence_statistics/
+ok to=generate_sequence_statistics/
error to=kill/
/action
-action name=compute_sequence_statistics
+action name=generate_sequence_statistics
hive xmlns=uri:oozie:hive-action:0.3
job-tracker${job_tracker}/job-tracker
name-node${name_node}/name-node
@@ -92,7 +92,7 @@
/property
/configuration
-scriptcompute_sequence_statistics.hql/script
+scriptgenerate_sequence_statistics.hql/script
paramsource_table=${table}/param
paramdestination_table=${statistics_table}/param
--
To view, visit https://gerrit.wikimedia.org/r/148863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f5dffd573123d29fe4f526d08ef7c301d6ce16b
Gerrit-PatchSet: 2
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] statistics: Add packages for rgdal - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: statistics: Add packages for rgdal .. statistics: Add packages for rgdal rgdal is an R package(http://cran.r-project.org/web/packages/rgdal/index.html), installed using regular R means (that don't require puppet). This one is an interface to gdal, and I think lzia is doing some analysis/research that requires gdal. Since it just binds to gdal, it requires the packages be installed via apt. Change-Id: I0894b784bbe186148ce16007db51c83b311c8e36 --- M manifests/misc/statistics.pp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp index 6f62de5..d9f6e6e 100644 --- a/manifests/misc/statistics.pp +++ b/manifests/misc/statistics.pp @@ -87,6 +87,8 @@ 'zpubsub', # libwww-perl for wikistats stuff 'libwww-perl', +'libgdal1-dev', # Requested by lzia for rgdal +'libproj-dev', # Requested by lzia for rgdal ]: ensure = 'latest', } -- To view, visit https://gerrit.wikimedia.org/r/148847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0894b784bbe186148ce16007db51c83b311c8e36 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix lookup of family in config.usernames and config.sysopnames - change (pywikibot/core)
Ricordisamoa has uploaded a new change for review. https://gerrit.wikimedia.org/r/148994 Change subject: fix lookup of family in config.usernames and config.sysopnames .. fix lookup of family in config.usernames and config.sysopnames using fam.name instead of the string representation for Family objects bug: 68440 Change-Id: I5eb9d2b39768b047290ac8c14e0201114630daed --- M pywikibot/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/94/148994/1 diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 07a40ac..de518b8 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -463,6 +463,8 @@ # Fallback to config defaults code = code or config.mylang fam = fam or config.family +if hasattr(fam, 'name'): +fam = fam.name interface = interface or config.site_interface user = user or config.usernames[fam].get(code, None) \ -- To view, visit https://gerrit.wikimedia.org/r/148994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5eb9d2b39768b047290ac8c14e0201114630daed Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add aliases for analytics cluster - change (operations/dns)
Ottomata has submitted this change and it was merged.
Change subject: Add aliases for analytics cluster
..
Add aliases for analytics cluster
Since some services on the analytics Hadoop cluster (e.g.: Oozie)
require hardcoded hostnames in their configuration files, we abstract
those names through CNAMEs to gain the ability to switch machines
without having to reconfigure services.
Change-Id: I3f764d67a1cd1ccb09b7f646b5de8a6309938594
---
M templates/wmnet
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/templates/wmnet b/templates/wmnet
index f0cf89c..a5980b9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1996,6 +1996,14 @@
te 1H IN CNAME tellurium
thulium1H IN A10.64.40.162
+
+; EQIAD analytics cluster
+
+$ORIGIN analytics.eqiad.{{ zonename }}.
+namenode1H IN CNAME analytics1010.eqiad.wmnet.
+resourcemanager 1H IN CNAME analytics1010.eqiad.wmnet.
+
+
;
; CODFW
;
--
To view, visit https://gerrit.wikimedia.org/r/148714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f764d67a1cd1ccb09b7f646b5de8a6309938594
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
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 appearance of math formulae in Night mode. - change (mediawiki...MobileApp)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148995
Change subject: Fix appearance of math formulae in Night mode.
..
Fix appearance of math formulae in Night mode.
Change-Id: Ide2db30a6eeebb6a92a94740bfea0eb6719c9ce8
---
M less/night.less
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp
refs/changes/95/148995/1
diff --git a/less/night.less b/less/night.less
index 66f04b1..5b59a96 100644
--- a/less/night.less
+++ b/less/night.less
@@ -12,6 +12,10 @@
background-image: url( 'images/external-link-ltr.png' );
}
+img.mwe-math-fallback-png-inline {
+-webkit-filter: invert(100%);
+}
+
/* Same specificity as in less/content/main.less */
.content table td,
.content table th {
--
To view, visit https://gerrit.wikimedia.org/r/148995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide2db30a6eeebb6a92a94740bfea0eb6719c9ce8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove @todo in SpecialPage for making it into ContextSource - change (mediawiki/core)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148996
Change subject: Remove @todo in SpecialPage for making it into ContextSource
..
Remove @todo in SpecialPage for making it into ContextSource
It is better to have $context as a member variable,
which can be accessed, $special-getContext(), as needed
with a composition approach instead of inheritance.
Having SpecialPage directly inherit makes testing code
a bit more challenging and messy.
Change-Id: I5e5587cbbc9abfb2fa4ab1e7603cd2ddcad1b96d
---
M includes/specialpage/SpecialPage.php
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/96/148996/1
diff --git a/includes/specialpage/SpecialPage.php
b/includes/specialpage/SpecialPage.php
index f968276..ba7d538 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -27,7 +27,6 @@
* Includes some static functions for handling the special page list deprecated
* in favor of SpecialPageFactory.
*
- * @todo Turn this into a real ContextSource
* @ingroup SpecialPage
*/
class SpecialPage {
--
To view, visit https://gerrit.wikimedia.org/r/148996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e5587cbbc9abfb2fa4ab1e7603cd2ddcad1b96d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift-thumb-stats: dump thumb stats from swift - change (operations/software)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148997
Change subject: swift-thumb-stats: dump thumb stats from swift
..
swift-thumb-stats: dump thumb stats from swift
basic script to process thumbs into JSON for later analysis
Change-Id: Iec2e5e5dee17e2bb29d5d4c0e334f0c2defbc961
---
A thumbstats/swift-thumb-stats
1 file changed, 192 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/97/148997/1
diff --git a/thumbstats/swift-thumb-stats b/thumbstats/swift-thumb-stats
new file mode 100755
index 000..304ceb5
--- /dev/null
+++ b/thumbstats/swift-thumb-stats
@@ -0,0 +1,192 @@
+#!/usr/bin/python
+
+# this script will scan all containers with thumbnails for the given account
+# and feed each thumbnail to a filter. At the end the result from each filter
+# is printed on standard output in JSON in an object like:
+# {'FooFilter': result, 'BarFilter': result}
+
+import argparse
+import collections
+import datetime
+import json
+import os
+import pprint
+import re
+import sys
+import threading
+
+import swiftclient
+
+CONTAINER_THUMB_RE = re.compile('-thumb(\.[a-f0-9][a-f0-9])?$')
+THUMB_RE = re.compile('/(?Psize\d+)px-(?Pname.*)$')
+
+
+class Thumb(object):
+pass
+
+
+class Filter(object):
+def process(self, thumb):
+pass
+def result(self):
+pass
+
+
+class BytesPerSize(Filter):
+_bytes = {}
+def process(self, thumb):
+self._bytes[thumb.thumbsize] = \
+self._bytes.setdefault(thumb.thumbsize, 0) + int(thumb.bytes)
+def result(self):
+return self._bytes
+def str(self):
+return BytesPerSize
+
+
+class CountPerSize(Filter):
+Size vs count breakdown.
+
+_count = {}
+def process(self, thumb):
+self._count[thumb.thumbsize] = \
+self._count.setdefault(thumb.thumbsize, 0) + 1
+def result(self):
+return self._count
+def str(self):
+return CountPerSize
+
+
+class BytesByMonth(Filter):
+Year+month vs size vs bytes breakdown.
+_month = {}
+def process(self, thumb):
+key = thumb.last_modified[:7]
+size = thumb.thumbsize
+self._month[key] = self._month.setdefault(key, {})
+self._month[key][size] = \
+self._month[key].setdefault(size, 0) + int(thumb.bytes)
+def result(self):
+return self._month
+def str(self):
+return BytesPerMonth
+
+
+def iter_container(connection, name, limit=None):
+Iterate over the container contents.
+
+_, listing = connection.get_container(name, limit=limit)
+while listing:
+for container in listing:
+yield container
+marker = container['name']
+_, listing = connection.get_container(name, limit=limit, marker=marker)
+
+
+def iter_thumbs(container):
+Iterate over the container contents and yield Thumb objects.
+
+for thumb in container:
+m = THUMB_RE.search(thumb['name'])
+if not m:
+continue
+t = Thumb()
+t.name = m.group('name')
+t.thumbsize = m.group('size')
+t.filename = thumb['name']
+t.bytes = thumb['bytes']
+t.last_modified = thumb['last_modified']
+t.hash = thumb['hash']
+t.content_type = thumb['content_type']
+yield t
+
+
+def _process_container(container, connection, filters):
+Iterate over the container thumbs and pass items to each filter.
+
+container_name = container['name']
+thumbs = iter_thumbs(iter_container(connection, container_name))
+start = datetime.datetime.utcnow()
+for i, thumb in enumerate(thumbs):
+thumb.container_name = container_name
+for f in filters:
+f.process(thumb)
+if i and i % 1 == 0:
+now = datetime.datetime.utcnow()
+elapsed = now - start
+start = now
+print sys.stderr, %s: inserted 1 records from %s (%s) % (
+threading.current_thread().name, container_name, elapsed)
+
+
+def process_container(in_queue, connection, filters):
+while True:
+try:
+container = in_queue.popleft()
+_process_container(container, connection, filters)
+except IndexError:
+break
+
+
+def _join_threads(threads):
+Join the given threads while accepting KeyboardInterrupt.
+
+_threads = threads[:]
+while _threads:
+try:
+for thread in _threads[:]:
+if not thread.is_alive():
+_threads.remove(thread)
+else:
+thread.join(timeout=0.1)
+except KeyboardInterrupt:
+break
+
+
+def thumb_containers(connection):
+headers, containers = connection.get_account(full_listing=True)
+for container in containers:
+if
[MediaWiki-commits] [Gerrit] [BrowserTest] Switching from VE to wikitext update workflow - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] Switching from VE to wikitext update workflow .. [BrowserTest] Switching from VE to wikitext update workflow It got a little more complicated that it had been Change-Id: I511aa1b6d5738f1c19d9ac395efccfef6b328798 --- M modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb M modules/ve-mw/tests/browser/features/switch_editing_mode.feature 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb index d17aa6b..d2ec825 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/switch_editing_mode_steps.rb @@ -5,6 +5,7 @@ When(/^I enter the wikitext editor$/) do on(VisualEditorPage) do |page| page.edit_wikitext_element.when_present.click +step 'I clear the confirm dialog by clicking Keep changes' page.wikitext_editor_element.when_present end end diff --git a/modules/ve-mw/tests/browser/features/switch_editing_mode.feature b/modules/ve-mw/tests/browser/features/switch_editing_mode.feature index 00784ac..616fce0 100644 --- a/modules/ve-mw/tests/browser/features/switch_editing_mode.feature +++ b/modules/ve-mw/tests/browser/features/switch_editing_mode.feature @@ -6,7 +6,7 @@ Background: Given I am logged in And I go to the browser specific edit page page -When I click Edit for VisualEditor +When I edit the page with Switch edit mode test Scenario: Switch editing modes via toolbar When I enter the wikitext editor -- To view, visit https://gerrit.wikimedia.org/r/148855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I511aa1b6d5738f1c19d9ac395efccfef6b328798 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 04abfb3..90a58ff - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/148998 Change subject: Syncronize VisualEditor: 04abfb3..90a58ff .. Syncronize VisualEditor: 04abfb3..90a58ff Change-Id: I77b0698bca741016b05f8f9e82f3fcf52f55c3b4 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/98/148998/1 diff --git a/VisualEditor b/VisualEditor index 04abfb3..90a58ff 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 04abfb3e7932d83bb81e88379f081057f93419ef +Subproject commit 90a58ffe17613b2d6498700aa6afd8864cd3267a -- To view, visit https://gerrit.wikimedia.org/r/148998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77b0698bca741016b05f8f9e82f3fcf52f55c3b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 04abfb3..90a58ff - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 04abfb3..90a58ff .. Syncronize VisualEditor: 04abfb3..90a58ff Change-Id: I77b0698bca741016b05f8f9e82f3fcf52f55c3b4 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 04abfb3..90a58ff 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 04abfb3e7932d83bb81e88379f081057f93419ef +Subproject commit 90a58ffe17613b2d6498700aa6afd8864cd3267a -- To view, visit https://gerrit.wikimedia.org/r/148998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77b0698bca741016b05f8f9e82f3fcf52f55c3b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Better logging, simplify getWikiInfo - change (mediawiki...ZeroBanner)
jenkins-bot has submitted this change and it was merged.
Change subject: Better logging, simplify getWikiInfo
..
Better logging, simplify getWikiInfo
* getWikiInfo() now always includes cluster domain
* protocol is included in zero.log
* better opera-related slot error reporting
Change-Id: I99311c59175f778e92bab242e87a343d27ec518a
---
M includes/PageRendering.php
M includes/ZeroSpecialPage.php
2 files changed, 25 insertions(+), 19 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRendering.php b/includes/PageRendering.php
index 87e43d5..a1ce08d 100644
--- a/includes/PageRendering.php
+++ b/includes/PageRendering.php
@@ -609,13 +609,12 @@
private $config = false;
/**
-* @param bool $includeClusterDomain if true, includes org as the
last value
-* @return array with three values - language code (en), subdomain (m),
and site (wikipedia)
+* @return array with three values - language code (en), subdomain (m),
site (wikipedia), cluster domain (org)
*/
- public function getWikiInfo( $includeClusterDomain = false ) {
+ public function getWikiInfo() {
static $info = null;
if ( $info === null ) {
- global $wgConf, $wgDBname;
+ global $wgConf, $wgDBname, $wgZeroBannerClusterDomain;
list( $site, $langCode ) = $wgConf-siteFromDB(
$wgDBname );
if ( $langCode === '' || $langCode === 'test' ) {
$langCode = 'en'; // Useful for debugging,
should never be the case in production
@@ -623,14 +622,10 @@
if ( !$site ) {
$site = 'wikipedia';
}
- $info = array( $langCode, $this-isZeroSubdomain ?
'zero' : 'm', $site );
+ $subdomain = $this-isZeroSubdomain ? 'zero' : 'm';
+ $info = array( $langCode, $subdomain, $site,
$wgZeroBannerClusterDomain );
}
- $result = $info;
- if ( $includeClusterDomain ) {
- global $wgZeroBannerClusterDomain;
- $result[] = $wgZeroBannerClusterDomain;
- }
- return $result;
+ return $info;
}
/**
@@ -797,7 +792,7 @@
* @return string
*/
public function getStartPageUrl( $langCode = null, $flags = 0 ) {
- $info = $this-getWikiInfo( true );
+ $info = $this-getWikiInfo();
if ( $langCode !== null ) {
$info[0] = $langCode;
}
@@ -898,10 +893,11 @@
array_walk( $dbg,
function ( $v, $k ) { $v = is_string( $k ) ?
$k . '=' . FormatJson::encode( $v ) : $v; } );
} else {
- $dbg = (array) $dbg;
+ $dbg = (array)$dbg;
$dbg[] = $request-getIP();
}
- $dbg[] = implode( '.', $this-getWikiInfo( true ) );
+ $host = implode( '.', $this-getWikiInfo() );
+ $dbg[] = ( $request-getHeader( 'X-Forwarded-Proto' ) ?: 'http'
) . '://' . $host;
$dbg[] = $request-getRawQueryString();
$dbg = implode( \t, $dbg );
@@ -1026,8 +1022,18 @@
$forwardedByOpera = $req-getHeader( 'X-Forwarded-By' )
=== 'Opera';
$slot = $req-getHeader( 'X-OPERAMINI-ROUTE' );
if ( !$forwardedByOpera $slot ) {
- // Opera has marked it with a slot, but we
didn't recognize it as opera traffic
- $warn['not-opera-slot'] = $req-getHeader(
'X-Forwarded-For' );
+ if ( $req-getHeader( 'X-Forwarded-By2' ) ===
'Opera' ) {
+ if ( $configId2 ) {
+ // Opera traffic, and opera has
marked it with a slot, but we are not marking as zero
+ $warn['opera-slot-not-zero'] =
$configId2;
+ } else {
+ // Opera traffic, and opera has
marked it with a slot, but we don't know who this is
+ $warn['opera-slot-unknown'] =
$req-getHeader( 'X-Forwarded-For' );
+ }
+ } else {
+ // Opera has marked it with a slot, but
we didn't recognize it as opera traffic
+ $warn['not-opera-slot2'] =
$req-getHeader( 'X-Forwarded-For' );
+ }
[MediaWiki-commits] [Gerrit] Setup QueryRun model and API endpoints - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148999
Change subject: Setup QueryRun model and API endpoints
..
Setup QueryRun model and API endpoints
* Setup QueryRun model
* Add endpoint that submits a QueryRun
* Setup constants for the different statuses
Change-Id: If3a14025cd88c707972f4137c153dda3d3261596
---
M quarry/web/app.py
M quarry/web/models/query.py
M quarry/web/static/js/query/view.js
M tables.sql
4 files changed, 83 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/99/148999/1
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 4276f9f..3b9c07d 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -2,7 +2,7 @@
from flask_mwoauth import MWOAuth
import oursql
from models.user import User
-from models.query import Query, QueryRevision
+from models.query import Query, QueryRevision, QueryRun
import json
@@ -85,7 +85,19 @@
query_rev.save_new()
query.latest_rev = query_rev
query.save()
-return json.dumps({'id': query.id})
+return json.dumps({'id': query_rev.id})
+
+
+@app.route('/api/query/run', methods=['POST'])
+def api_run_query():
+if g.user is None:
+return Authentication required, 401
+print request.form.get('query_rev_id', '')
+query_rev = QueryRevision.get_by_id(request.form['query_rev_id'])
+query_run = QueryRun()
+query_run.query_rev = query_rev
+query_run.save_new()
+return json.dumps({'id': query_run.id})
@app.route(/query/all)
diff --git a/quarry/web/models/query.py b/quarry/web/models/query.py
index 3a4acac..4befb87 100644
--- a/quarry/web/models/query.py
+++ b/quarry/web/models/query.py
@@ -100,3 +100,58 @@
(self.query_id, self.text)
)
self.id = cur.lastrowid
+
+
+class QueryRun(object):
+STATUS_QUEUED = 0
+STATUS_SCHEDULED = 1
+STATUS_RUNNING = 2
+STATUS_KILLED = 3
+STATUS_COMPLETE = 4
+STATUS_SUPERSEDED = 5
+
+def __init__(self, id=None, query_rev_id=None, status=None,
timestamp=None):
+self.id = id
+self.query_rev_id = query_rev_id
+self.status = status
+self.timestamp = timestamp
+
+@classmethod
+def get_by_id(cls, id):
+with g.conn.cursor() as cur:
+cur.execute(
+SELECT id, query_rev_id, status, timestamp
+FROM query_run WHERE id = ?,
+(id, )
+)
+result = cur.fetchone()
+if result is None:
+return None
+
+return cls(result[0], result[1], result[2], result[3])
+
+def save_new(self):
+with g.conn.cursor() as cur:
+cur.execute(
+INSERT INTO query_run (query_rev_id) VALUES (?),
+(self.query_rev_id, )
+)
+self.id = cur.lastrowid
+
+def save(self):
+with g.conn.cursor() as cur:
+cur.execute(
+UPDATE query RUN SET status=?,
+(self.status, )
+)
+
+@property
+def query_rev(self):
+if not hasattr(self, '_query_rev'):
+self._query = QueryRevision.get_by_id(self.query_rev_id)
+return self._query
+
+@query_rev.setter
+def query_rev(self, value):
+self._query_rev = value
+self.query_rev_id = value.id
diff --git a/quarry/web/static/js/query/view.js
b/quarry/web/static/js/query/view.js
index 0dfc9f6..0c0c853 100644
--- a/quarry/web/static/js/query/view.js
+++ b/quarry/web/static/js/query/view.js
@@ -10,7 +10,12 @@
text: editor.getValue(),
query_id: vars.query_id
}).done( function( data ) {
-alert( data );
+var d = JSON.parse(data);
+$.post( /api/query/run, {
+query_rev_id: d.id,
+}).done( function( data ) {
+alert( data );
+});
} );
} );
diff --git a/tables.sql b/tables.sql
index 3010738..f0a0784 100644
--- a/tables.sql
+++ b/tables.sql
@@ -16,3 +16,11 @@
query_id INT UNSIGNED NOT NULL,
timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
+
+CREATE TABLE query_run(
+id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+query_rev_id INT UNSIGNED NOT NULL,
+status TINYINT UNSIGNED NOT NULL DEFAULT 0,
+timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+last_updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP
+);
--
To view, visit https://gerrit.wikimedia.org/r/148999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3a14025cd88c707972f4137c153dda3d3261596
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Add more DataValues to DataModelSerializationRoundtripTest - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149000
Change subject: Add more DataValues to DataModelSerializationRoundtripTest
..
Add more DataValues to DataModelSerializationRoundtripTest
At least the most basic DataValue implementations should be tested.
Somebody said all DataValue classes have their own serialization
tests so it is not necesarry to test them all again.
Bug: 66839
Change-Id: I213669827111ec3e743d30a98f152f5273cfd398
---
M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/00/149000/1
diff --git
a/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
b/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
index faa0142..6af6e5d 100644
--- a/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
+++ b/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php
@@ -2,9 +2,12 @@
namespace Tests\Wikibase\DataModel;
+use DataValues\BooleanValue;
use DataValues\Deserializers\DataValueDeserializer;
use DataValues\Serializers\DataValueSerializer;
use DataValues\StringValue;
+use DataValues\UnDeserializableValue;
+use DataValues\UnknownValue;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\Entity;
@@ -20,6 +23,9 @@
use Wikibase\Lib\Serializers\SerializationOptions;
/**
+ * @todo Add test for qualifiers.
+ * @todo Add test for references.
+ * @todo Add test for ranks.
* @todo Add tests with $options-setIndexTags( true ).
*
* @licence GNU GPL v2+
@@ -161,13 +167,27 @@
$this-addClaim( $item, new PropertyNoValueSnak(
new PropertyId( 'P401' )
) );
+
$this-addClaim( $item, new PropertySomeValueSnak(
new PropertyId( 'P402' )
) );
+
$this-addClaim( $item, new PropertyValueSnak(
new PropertyId( 'P403' ),
+ new BooleanValue( true )
+ ) );
+ $this-addClaim( $item, new PropertyValueSnak(
+ new PropertyId( 'P404' ),
new StringValue( 'stringvalue' )
) );
+ $this-addClaim( $item, new PropertyValueSnak(
+ new PropertyId( 'P405' ),
+ new UnDeserializableValue( 'undeserializable-data',
'string', 'undeserializable-error' )
+ ) );
+ $this-addClaim( $item, new PropertyValueSnak(
+ new PropertyId( 'P406' ),
+ new UnknownValue( 'unknown-value' )
+ ) );
}
private function addClaim( Item $item, Snak $mainSnak ) {
--
To view, visit https://gerrit.wikimedia.org/r/149000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I213669827111ec3e743d30a98f152f5273cfd398
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Link the c++ lua library if building for HHVM - change (mediawiki...luasandbox)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149001
Change subject: Link the c++ lua library if building for HHVM
..
Link the c++ lua library if building for HHVM
Change-Id: I2ee5ee8b7ebd6607665e24771035f0a6fde9ff36
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A FindLua51cpp.cmake
M config.cmake
M debian/rules
3 files changed, 101 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox
refs/changes/01/149001/1
diff --git a/FindLua51cpp.cmake b/FindLua51cpp.cmake
new file mode 100644
index 000..cefbf5e
--- /dev/null
+++ b/FindLua51cpp.cmake
@@ -0,0 +1,79 @@
+# Locate Lua library
+# This module defines
+# LUA51_FOUND, if false, do not try to link to Lua
+# LUA_LIBRARIES
+# LUA_INCLUDE_DIR, where to find lua.h
+# LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
+#
+# Note that the expected include convention is
+# #include lua.h
+# and not
+# #include lua/lua.h
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+
+find_path(LUA_INCLUDE_DIR lua.h
+ HINTS
+ENV LUA_DIR
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua
include
+ PATHS
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+ /opt
+)
+
+find_library(LUA_LIBRARY
+ NAMES lua5.1-c++
+ HINTS
+ENV LUA_DIR
+ PATH_SUFFIXES lib
+ PATHS
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /sw
+ /opt/local
+ /opt/csw
+ /opt
+)
+
+if(LUA_LIBRARY)
+ # include the math library for Unix
+ if(UNIX AND NOT APPLE AND NOT BEOS)
+find_library(LUA_MATH_LIBRARY m)
+set( LUA_LIBRARIES ${LUA_LIBRARY};${LUA_MATH_LIBRARY} CACHE STRING Lua
Libraries)
+ # For Windows and Mac, don't need to explicitly include the math library
+ else()
+set( LUA_LIBRARIES ${LUA_LIBRARY} CACHE STRING Lua Libraries)
+ endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS ${LUA_INCLUDE_DIR}/lua.h)
+ file(STRINGS ${LUA_INCLUDE_DIR}/lua.h lua_version_str REGEX ^#define[
\t]+LUA_RELEASE[ \t]+\Lua .+\)
+
+ string(REGEX REPLACE ^#define[ \t]+LUA_RELEASE[ \t]+\Lua ([^\]+)\.*
\\1 LUA_VERSION_STRING ${lua_version_str})
+ unset(lua_version_str)
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51
+ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+ VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
+
diff --git a/config.cmake b/config.cmake
index 894001a..3dc4884 100644
--- a/config.cmake
+++ b/config.cmake
@@ -1,6 +1,18 @@
-INCLUDE(FindLua51)
+# HHVM needs to link luasandbox to the c++ version of liblua
+if (LUA_USE_CPLUSPLUS)
+ INCLUDE(FindLua51cpp.cmake)
+else(!LUA_USE_CPLUSPLUS)
+ INCLUDE(FindLua51)
+endif(LUA_USE_CPLUSPLUS)
+
+
if (!LUA51_FOUND)
- message(FATAL_ERROR unable to find Lua 5.1)
+ message(FATAL_ERROR unable to find Lua 5.1)
+endif()
+
+# HHVM needs to link luasandbox to the c++ version of liblua
+if (ENV{USE_CPLUSPLUS_LUA})
+ SET(LUA_LIBRARIES /usr/lib/x86_64-linux-gnu/liblua5.1-c++.so.0)
endif()
# Parse version string from debian/changelog and use it to generate
luasandbox_version.h
@@ -9,12 +21,12 @@
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/luasandbox_version.h \#define
LUASANDBOX_VERSION \${LUASANDBOX_VERSION}\\n)
HHVM_COMPAT_EXTENSION(luasandbox
- alloc.c
- data_conversion.c
- library.c
- luasandbox.c
- timer.c
- luasandbox_lstrlib.c)
+ alloc.c
+ data_conversion.c
+ library.c
+ luasandbox.c
+ timer.c
+ luasandbox_lstrlib.c)
HHVM_ADD_INCLUDES(luasandbox ${LUA_INCLUDE_DIR})
HHVM_LINK_LIBRARIES(luasandbox ${LUA_LIBRARIES})
diff --git a/debian/rules b/debian/rules
index c247faf..92c8667 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,8 @@
cd debian/build-hhvm cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_BUILD_TYPE=None \
+ -DLUA_USE_CPLUSPLUS=1
cd debian/build-hhvm dh_auto_configure
override_dh_auto_build:
--
To view, visit
[MediaWiki-commits] [Gerrit] Remove czwiki, there is no such thing - change (analytics...config)
Gilles has submitted this change and it was merged. Change subject: Remove czwiki, there is no such thing .. Remove czwiki, there is no such thing Change-Id: Icb76ce73727d88130e07a775b7747eec4a77e1af --- M generate.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Gilles: Verified; Looks good to me, approved diff --git a/generate.py b/generate.py index f75d03b..91fdde0 100644 --- a/generate.py +++ b/generate.py @@ -7,7 +7,6 @@ 'global', 'cawiki', 'commonswiki', -'czwiki', 'dewiki', 'enwiki', 'enwikivoyage', -- To view, visit https://gerrit.wikimedia.org/r/148897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb76ce73727d88130e07a775b7747eec4a77e1af Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia/config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move PropertyIdResolver to DataAccess namespace - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/149002 Change subject: Move PropertyIdResolver to DataAccess namespace .. Move PropertyIdResolver to DataAccess namespace this can be useful for Lua and is more general functionality. Change-Id: I8db5e7247f413cbcb045caa6a316d3cc462957f0 --- R client/includes/DataAccess/PropertyIdResolver.php M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php M client/includes/WikibaseClient.php R client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactoryTest.php 7 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/02/149002/1 diff --git a/client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php b/client/includes/DataAccess/PropertyIdResolver.php similarity index 97% rename from client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php rename to client/includes/DataAccess/PropertyIdResolver.php index db19fbf..395377b 100644 --- a/client/includes/DataAccess/PropertyParserFunction/PropertyIdResolver.php +++ b/client/includes/DataAccess/PropertyIdResolver.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase\DataAccess\PropertyParserFunction; +namespace Wikibase\DataAccess; use InvalidArgumentException; use Wikibase\DataModel\Entity\Entity; diff --git a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php index 421a3a8..5163b9a 100644 --- a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php +++ b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php @@ -6,6 +6,7 @@ use Language; use Status; use Wikibase\Client\WikibaseClient; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; diff --git a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php index 0dd0152..4428bcc 100644 --- a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php +++ b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php @@ -5,6 +5,7 @@ use Language; use Parser; use ValueFormatters\FormatterOptions; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Lib\OutputFormatSnakFormatterFactory; use Wikibase\Lib\SnakFormatter; diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index 2f249b7..5de423d 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -17,8 +17,8 @@ use ValueFormatters\FormatterOptions; use Wikibase\ClientStore; use Wikibase\Client\Hooks\ParserFunctionRegistrant; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataAccess\PropertyParserFunction\PropertyClaimsRendererFactory; -use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver; use Wikibase\DataAccess\PropertyParserFunction\Runner; use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder; use Wikibase\DataModel\Entity\BasicEntityIdParser; diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php similarity index 90% rename from client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php rename to client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php index 4d59c0d..0de5a8c 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/PropertyIdResolverTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php @@ -1,11 +1,11 @@ ?php -namespace Wikibase\DataAccess\Tests\PropertyParserFunction; +namespace Wikibase\DataAccess\Tests; use DataValues\StringValue; use Language; use Wikibase\Claim; -use Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver; +use Wikibase\DataAccess\PropertyIdResolver; use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\BasicEntityIdParser; use Wikibase\DataModel\Entity\ItemId; @@ -17,12 +17,11 @@ use Wikibase\Test\MockRepository; /** - * @covers Wikibase\DataAccess\PropertyParserFunction\PropertyIdResolver + * @covers Wikibase\DataAccess\PropertyIdResolver * * @group Wikibase * @group WikibaseClient * @group WikibaseDataAccess - * @group
[MediaWiki-commits] [Gerrit] swift: qualify var - change (operations/puppet)
Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/149003 Change subject: swift: qualify var .. swift: qualify var Change-Id: Ib020babe08f6187e6bfce5a09719b8f51685d050 --- M templates/swift/swift-ganglia-report-global-stats.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/149003/1 diff --git a/templates/swift/swift-ganglia-report-global-stats.conf.erb b/templates/swift/swift-ganglia-report-global-stats.conf.erb index 514d044..3d69720 100644 --- a/templates/swift/swift-ganglia-report-global-stats.conf.erb +++ b/templates/swift/swift-ganglia-report-global-stats.conf.erb @@ -1,3 +1,3 @@ # This file is managed by Puppet! -password = %= password % +password = %= @password % -- To view, visit https://gerrit.wikimedia.org/r/149003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib020babe08f6187e6bfce5a09719b8f51685d050 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add @todo in LanguageAwareRenderer regarding PropertyId reso... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149004
Change subject: Add @todo in LanguageAwareRenderer regarding PropertyId
resolving
..
Add @todo in LanguageAwareRenderer regarding PropertyId resolving
Change-Id: I56d4339c81de34294255d3651fafdca258d444eb
---
M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/04/149004/1
diff --git
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
index 5163b9a..6164de1 100644
---
a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
@@ -57,6 +57,7 @@
*/
public function render( EntityId $entityId, $propertyLabelOrId ) {
try {
+ // @todo have the $propertyId resolved before passing
into here
$propertyId =
$this-propertyIdResolver-resolvePropertyId(
$propertyLabelOrId,
$this-language-getCode()
--
To view, visit https://gerrit.wikimedia.org/r/149004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56d4339c81de34294255d3651fafdca258d444eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inject AbstractedRepoApi into views - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Inject AbstractedRepoApi into views
..
Inject AbstractedRepoApi into views
Change-Id: Iac8442d396e98ad529e88b91f063e7e130653d97
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M repo/resources/wikibase.ui.entityViewInit.js
8 files changed, 53 insertions(+), 18 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
WikidataJenkins: Verified
jenkins-bot: Verified
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 7c705fe..a92e69e 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -570,7 +570,6 @@
'dependencies' = array(
'jquery.wikibase.snakview',
'jquery.wikibase.snaklistview',
- 'wikibase.AbstractedRepoApi',
'wikibase.datamodel',
'jquery.wikibase.toolbarcontroller',
),
@@ -589,7 +588,6 @@
'jquery.wikibase.listview',
'jquery.wikibase.snaklistview',
'jquery.wikibase.toolbarcontroller',
- 'wikibase.AbstractedRepoApi',
'wikibase.datamodel'
)
),
@@ -611,7 +609,6 @@
'jquery.wikibase.listview',
'jquery.wikibase.referenceview',
'jquery.wikibase.toolbarcontroller',
- 'wikibase.AbstractedRepoApi',
'wikibase.datamodel',
'wikibase.utilities',
),
@@ -637,7 +634,6 @@
'jquery.wikibase.statementview',
'jquery.wikibase.toolbarcontroller',
'wikibase',
- 'wikibase.AbstractedRepoApi',
'wikibase.datamodel',
'wikibase.RepoApiError',
'wikibase.templates',
@@ -661,7 +657,6 @@
'jquery.wikibase.toolbarcontroller',
'wikibase',
'wikibase.datamodel',
- 'wikibase.AbstractedRepoApi',
),
),
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index c10182e..cbf12b3 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -21,6 +21,7 @@
*
* @option {wikibase.store.EntityStore} entityStore
* @option {wikibase.ValueViewBuilder} valueViewBuilder
+ * @option {wikibase.AbstractedRepoApi} abstractedRepoApi
*/
$.widget( 'wikibase.claimgrouplistview', PARENT, {
/**
@@ -39,13 +40,18 @@
value: null,
entityType: wb.datamodel.Item.type,
entityStore: null,
- valueViewBuilder: null
+ valueViewBuilder: null,
+ abstractedRepoApi: null
},
/**
* @see jQuery.Widget._create
*/
_create: function() {
+ if ( !this.option( 'abstractedRepoApi' ) ) {
+ throw new Error( 'wikibase.claimgrouplistview requires
a wikibase.AbstractedRepoApi' );
+ }
+
PARENT.prototype._create.call( this );
var self = this,
@@ -169,7 +175,8 @@
entityType: self.option(
'entityType' ),
firstClaimIndex: indexOf(
value, self.option( 'value' ) ),
entityStore: self.option(
'entityStore' ),
- valueViewBuilder: self.option(
'valueViewBuilder' )
+ valueViewBuilder: self.option(
'valueViewBuilder' ),
+ abstractedRepoApi: self.option(
'abstractedRepoApi' )
};
}
} )
diff --git
[MediaWiki-commits] [Gerrit] Unify MIME in documentation and equip note with sense - change (mediawiki/core)
Rillke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149005
Change subject: Unify MIME in documentation and equip note with sense
..
Unify MIME in documentation and equip note with sense
Writing MIME as written in Wikipedia and cleaning up a botched
sentence.
Change-Id: I9dfc36d2bf55d72d9374c4075bd6d45eef0415a4
---
M includes/upload/UploadBase.php
1 file changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/149005/1
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 5defd45..acfc367 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -377,11 +377,12 @@
}
/**
-* Verify the mime type.
+* Verify the MIME type.
*
-* @note Only checks that it is not an evil mime. The does it have
-* correct extension given its mime type check is in verifyFile.
-* @param string $mime Representing the mime
+* @note Only checks that it is not a blacklisted MIME type.
+* An accurate file extension is not mandatory here as it is checked
+* in `verifyFile()` that MIME type and file extension correlate.
+* @param string $mime Representing the MIME
* @return mixed True if the file is verified, an array otherwise
*/
protected function verifyMimeType( $mime ) {
@@ -396,7 +397,7 @@
return array( 'filetype-badmime', $mime );
}
- # Check IE type
+ # Check what Internet Explorer would detect
$fp = fopen( $this-mTempPath, 'rb' );
$chunk = fread( $fp, 256 );
fclose( $fp );
@@ -487,7 +488,7 @@
$this-mFileProps = FSFile::getPropsFromPath( $this-mTempPath,
$this-mFinalExtension );
- # check mime type, if desired
+ # check MIME type, if desired
$mime = $this-mFileProps['file-mime'];
$status = $this-verifyMimeType( $mime );
if ( $status !== true ) {
@@ -995,9 +996,9 @@
}
/**
-* Checks if the mime type of the uploaded file matches the file
extension.
+* Checks if the MIME type of the uploaded file matches the file
extension.
*
-* @param string $mime The mime type of the uploaded file
+* @param string $mime The MIME type of the uploaded file
* @param string $extension The filename extension that the file is to
be served with
* @return bool
*/
@@ -1050,7 +1051,7 @@
* positives in some situations.
*
* @param string $file Pathname to the temporary upload file
-* @param string $mime The mime type of the file
+* @param string $mime The MIME type of the file
* @param string $extension The extension of the file
* @return bool True if the file contains something looking like
embedded scripts
*/
--
To view, visit https://gerrit.wikimedia.org/r/149005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dfc36d2bf55d72d9374c4075bd6d45eef0415a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Rillke ril...@wikipedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct DB for optout queries - change (analytics/multimedia)
Gilles has submitted this change and it was merged. Change subject: Use correct DB for optout queries .. Use correct DB for optout queries Change-Id: Ia20ddb4db989df4d78c415d935baae01a522a305 --- M build-optout-tsvs 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Gilles: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/build-optout-tsvs b/build-optout-tsvs index 36be7e0..2012d13 100755 --- a/build-optout-tsvs +++ b/build-optout-tsvs @@ -6,7 +6,7 @@ exit 1 fi -MYSQL_CMD=mysql --defaults-file=~/.my.cnf.relevant log +MYSQL_CMD=mysql --defaults-file=~/.my.cnf.relevant SQL_DIR=$REMOTEUSERHOME/tsvs_sql TSV_DIR=$REMOTEUSERHOME/tsvs_new PUBLIC_DIR=/a/public-datasets/all/multimedia @@ -18,6 +18,6 @@ wikiname=`basename $sqlpath | sed s/.sql//` echo Updating optout counts for $wikiname wiki... tsvpath=$TSV_DIR/mvo_$wikiname.tsv - $MYSQL_CMD $sqlpath $tsvpath + $MYSQL_CMD $wikiname $sqlpath $tsvpath mv -f $tsvpath $PUBLIC_DIR/media-viewer-optout-$wikiname.tsv done -- To view, visit https://gerrit.wikimedia.org/r/148838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia20ddb4db989df4d78c415d935baae01a522a305 Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove czwiki, there is no such thing - change (analytics/multimedia)
Gilles has submitted this change and it was merged. Change subject: Remove czwiki, there is no such thing .. Remove czwiki, there is no such thing Change-Id: I8a74b6f0714664359787983951fd7412e7c49743 --- M generate.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Gilles: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/generate.py b/generate.py index e2f6e9c..6fa6ac3 100755 --- a/generate.py +++ b/generate.py @@ -7,7 +7,6 @@ 'global', 'cawiki', 'commonswiki', -'czwiki', 'dewiki', 'enwiki', 'enwikivoyage', -- To view, visit https://gerrit.wikimedia.org/r/148896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a74b6f0714664359787983951fd7412e7c49743 Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Record optout stats for users with 1+ edits and 100+ edits - change (analytics/multimedia)
Gilles has submitted this change and it was merged. Change subject: Record optout stats for users with 1+ edits and 100+ edits .. Record optout stats for users with 1+ edits and 100+ edits These have been referred to at various places so let's track them. Don't put them in the tsv file for now, the dashboard will be crowded already and this can be changed easily later if needed, but there is no way to get the data later if we don't do it now. Change-Id: Ic80e0c2bef97b28d51f69a74a809ef6c82dd0424 --- M optout/init.sql M optout/template.sql 2 files changed, 12 insertions(+), 3 deletions(-) Approvals: Gilles: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/optout/init.sql b/optout/init.sql index 467cd74..38f0240 100644 --- a/optout/init.sql +++ b/optout/init.sql @@ -4,10 +4,14 @@ day DATE, wikidb VARCHAR(16) COMMENT 'wiki dbname (e.g. commonswiki)', all_touched INT COMMENT 'number of active users per user_touched (user_touched now() - 30 days)', +all_edited INT COMMENT 'number of users who have edited in the last 30 days', all_active INT COMMENT 'number of active users per standard definition (at least 5 edits in last 30 days)', +all_very_active INT COMMENT 'number of very active users per standard definition (at least 100 edits in the last 30 days)', optout_total INT COMMENT 'total number of opted-out users', optout_touched INT COMMENT 'opted-out users who are active per user_touched', -optout_active INT COMMENT 'opted-out users who are active per standard definition' +optout_edited INT COMMENT 'opted-out users who have edited in the last 30 days', +optout_active INT COMMENT 'opted-out users who are active per standard definition', +optout_very_active INT COMMENT 'opted-out users who are very active per standard definition' ); CREATE UNIQUE INDEX mediaviewer_optout_day_wikidb ON mediaviewer_optout (day, wikidb); CREATE INDEX mediaviewer_optout_wikidb ON mediaviewer_optout (wikidb); diff --git a/optout/template.sql b/optout/template.sql index 9a462ee..c0d4520 100644 --- a/optout/template.sql +++ b/optout/template.sql @@ -2,15 +2,20 @@ -- put today's numbers into a temporary table REPLACE INTO -staging.mediaviewer_optout (day, wikidb, all_touched, all_active, optout_total, optout_touched, optout_active) +staging.mediaviewer_optout (day, wikidb, all_touched, all_edited, all_active, all_very_active, +optout_total, optout_touched, optout_edited, optout_active, optout_very_active) SELECT CURDATE() day, '%wikidb%' wikidb, SUM(1) all_touched, +SUM(edits_in_last_30_days 0) all_edited, SUM(edits_in_last_30_days = 5) all_active, +SUM(edits_in_last_30_days = 100) all_very_active, (SELECT COUNT(*) FROM user_properties WHERE up_property = 'multimediaviewer-enable') optout_total, SUM(up_value IS NOT NULL) optout_touched, -SUM(edits_in_last_30_days = 5 AND up_value IS NOT NULL) optout_active +SUM(edits_in_last_30_days 0 AND up_value IS NOT NULL) optout_edited, +SUM(edits_in_last_30_days = 5 AND up_value IS NOT NULL) optout_active, +SUM(edits_in_last_30_days = 100 AND up_value IS NOT NULL) optout_very_active FROM user LEFT JOIN user_properties ON user_id = up_user AND up_property = 'multimediaviewer-enable' -- To view, visit https://gerrit.wikimedia.org/r/148842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic80e0c2bef97b28d51f69a74a809ef6c82dd0424 Gerrit-PatchSet: 2 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero banner image font - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Zero banner image font
..
Zero banner image font
Change-Id: Iee4118be90966e901698c23f6e07975c49274762
---
M wmf-config/mobile-labs.php
M wmf-config/mobile.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index 991e522..adcb071 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -12,8 +12,6 @@
if ( !$wmgZeroPortal ) {
$wgJsonConfigs['JsonZeroConfig']['remote']['url'] =
'http://zero.wikimedia.beta.wmflabs.org/w/api.php';
}
- $wgZeroBannerFont =
'/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf';
- $wgZeroBannerFontSize = '10';
}
}
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index d4772b9..23ebabf 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -45,6 +45,8 @@
// @TODO: which group(s) on all wikies should Zero allow to
flush cache?
$wgGroupPermissions['sysop']['jsonconfig-flush'] = true;
+ $wgZeroBannerFont =
'/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf';
+ $wgZeroBannerFontSize = '10';
}
// Enable loading of desktop-specific resources from MobileFrontend
--
To view, visit https://gerrit.wikimedia.org/r/148948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee4118be90966e901698c23f6e07975c49274762
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide reference dialog when on-wiki link is clicked. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149006
Change subject: Hide reference dialog when on-wiki link is clicked.
..
Hide reference dialog when on-wiki link is clicked.
Bug: 68337
Change-Id: I44e6828adf65f2dc2ceb7ceeb577e09851df4822
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/06/149006/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 8193eca..dc35700 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -326,6 +326,9 @@
linkHandler = new LinkHandler(getActivity(), bridge, title.getSite()) {
@Override
public void onInternalLinkClicked(PageTitle title) {
+if (referenceDialog != null referenceDialog.isShowing()) {
+referenceDialog.dismiss();
+}
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
app.getBus().post(new NewWikiPageNavigationEvent(title,
historyEntry));
}
--
To view, visit https://gerrit.wikimedia.org/r/149006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e6828adf65f2dc2ceb7ceeb577e09851df4822
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add GlobalCssJs role - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add GlobalCssJs role
..
Add GlobalCssJs role
Change-Id: I83602a6594b20da5fa9c9ac157a516f4fc298824
---
A puppet/manifests/roles/globalcssjs.pp
1 file changed, 36 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/roles/globalcssjs.pp
b/puppet/manifests/roles/globalcssjs.pp
new file mode 100644
index 000..23a0ae2
--- /dev/null
+++ b/puppet/manifests/roles/globalcssjs.pp
@@ -0,0 +1,36 @@
+# == Class: role::globalcssjs
+# This role installs the GlobalCssJs extension on top of
+# the CentralAuth extension. It additionally adds a
+# globalcssjstest.wiki.local.wmftest.net which will also
+# load your global scripts.
+#
+class role::globalcssjs {
+require ::role::mediawiki
+include ::role::centralauth
+
+$common_settings = [
+ \$wgResourceLoaderSources['wiki']['apiScript'] =
'http://127.0.0.1:${::forwarded_port}/w/api.php';,
+ \$wgResourceLoaderSources['wiki']['loadScript'] =
'http://127.0.0.1:${::forwarded_port}/w/load.php';,
+ '$wgGlobalCssJsConfig[wiki] = wiki;',
+ '$wgGlobalCssJsConfig[source] = wiki;',
+]
+
+mediawiki::extension { 'GlobalCssJs':
+settings = $common_settings,
+}
+
+multiwiki::wiki{ 'globalcssjstest': }
+
+role::globalcssjs::multiwiki { 'globalcssjstest': }
+}
+
+# == Define: ::role::globalcssjs::multiwiki
+# Configure a multiwiki instance for GlobalCssJs.
+#
+define role::globalcssjs::multiwiki {
+$wiki = $title
+
+multiwiki::extension { ${wiki}:GlobalCssJs:
+settings = $::role::globalcssjs::common_settings,
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/148920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83602a6594b20da5fa9c9ac157a516f4fc298824
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated to latest ZeroBanner - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/149008 Change subject: Updated to latest ZeroBanner .. Updated to latest ZeroBanner Change-Id: I7ced33237aa2fad4ebdd5f0d66d3be8863bf57d2 --- M extensions/ZeroBanner 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/08/149008/1 diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner index 8da3589..d4ce510 16 --- a/extensions/ZeroBanner +++ b/extensions/ZeroBanner -Subproject commit 8da3589a3273a741696c051bfc8bb2fde39cafa1 +Subproject commit d4ce510aec8223f7da516d2dabe2f34102debfc9 -- To view, visit https://gerrit.wikimedia.org/r/149008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ced33237aa2fad4ebdd5f0d66d3be8863bf57d2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf14 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated to latest ZeroBanner - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/149009 Change subject: Updated to latest ZeroBanner .. Updated to latest ZeroBanner Change-Id: I6d23b043e43408a0e83dc0444e47ff7088da0b31 --- M extensions/ZeroBanner 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/149009/1 diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner index 8da3589..d4ce510 16 --- a/extensions/ZeroBanner +++ b/extensions/ZeroBanner -Subproject commit 8da3589a3273a741696c051bfc8bb2fde39cafa1 +Subproject commit d4ce510aec8223f7da516d2dabe2f34102debfc9 -- To view, visit https://gerrit.wikimedia.org/r/149009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d23b043e43408a0e83dc0444e47ff7088da0b31 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf13 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump apc.shm_size to 360M - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Bump apc.shm_size to 360M .. Bump apc.shm_size to 360M Change-Id: I48adb58edcc499ea23cb945ef068740d0e8ed201 --- M modules/mediawiki/files/php/apc.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, but someone else must approve Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/mediawiki/files/php/apc.ini b/modules/mediawiki/files/php/apc.ini index f49792f..863ff64 100644 --- a/modules/mediawiki/files/php/apc.ini +++ b/modules/mediawiki/files/php/apc.ini @@ -3,6 +3,6 @@ apc.gc_ttl=600 ; 120MB should be enough for two copies of MW -apc.shm_size=240M +apc.shm_size=360M apc.ttl=600 apc.slam_defense=80 -- To view, visit https://gerrit.wikimedia.org/r/145397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48adb58edcc499ea23cb945ef068740d0e8ed201 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated to latest ZeroBanner - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/149010 Change subject: Updated to latest ZeroBanner .. Updated to latest ZeroBanner Change-Id: If10ac1b152044b732c1185ab3f6b202b70c814bf --- M extensions/ZeroBanner 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/10/149010/1 diff --git a/extensions/ZeroBanner b/extensions/ZeroBanner index 8da3589..d4ce510 16 --- a/extensions/ZeroBanner +++ b/extensions/ZeroBanner -Subproject commit 8da3589a3273a741696c051bfc8bb2fde39cafa1 +Subproject commit d4ce510aec8223f7da516d2dabe2f34102debfc9 -- To view, visit https://gerrit.wikimedia.org/r/149010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If10ac1b152044b732c1185ab3f6b202b70c814bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf13 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
