[MediaWiki-commits] [Gerrit] Tweak 'destructive' use case in style guide - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Tweak 'destructive' use case in style guide .. Tweak 'destructive' use case in style guide Bug: 71856 Change-Id: Ib69e0496ac768d4385d653073547f9482cd9641a --- M resources/src/mediawiki.ui/components/buttons.less 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less index 2512d49..6ba7bf7 100644 --- a/resources/src/mediawiki.ui/components/buttons.less +++ b/resources/src/mediawiki.ui/components/buttons.less @@ -165,8 +165,7 @@ // Destructive buttons // - // Use destructive buttons for actions which result in the destruction of data. - // e.g. deleting a page. + // Use destructive buttons for actions that remove or limit, such as deleting a page or blocking a user. // This should not be used for cancel buttons. // // Markup: -- To view, visit https://gerrit.wikimedia.org/r/168254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib69e0496ac768d4385d653073547f9482cd9641a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] refactor and extend usability (v 3.0.0) - change (mediawiki...CodeMirror)
jenkins-bot has submitted this change and it was merged. Change subject: refactor and extend usability (v 3.0.0) .. refactor and extend usability (v 3.0.0) * add on/off button to toolbar * add highlighting table, hr , sign ~~~ * update codemirror lib to 4.7 * fix font size Change-Id: Idd5775d6c80a18406aee7b8ab51691f26038764c --- M CodeMirror.hooks.php M CodeMirror.php M resources/ext.CodeMirror.js A resources/images/cm-off.png A resources/images/cm-off.svg A resources/images/cm-on.png A resources/images/cm-on.svg A resources/images/old-cm-off.png A resources/images/old-cm-off.svg A resources/images/old-cm-on.png A resources/images/old-cm-on.svg A resources/lib/codemirror/AUTHORS A resources/lib/codemirror/CONTRIBUTING.md A resources/lib/codemirror/LICENSE A resources/lib/codemirror/README.md A resources/lib/codemirror/addon/comment/comment.js A resources/lib/codemirror/addon/comment/continuecomment.js A resources/lib/codemirror/addon/dialog/dialog.css A resources/lib/codemirror/addon/dialog/dialog.js A resources/lib/codemirror/addon/display/fullscreen.css A resources/lib/codemirror/addon/display/fullscreen.js A resources/lib/codemirror/addon/display/placeholder.js A resources/lib/codemirror/addon/display/rulers.js A resources/lib/codemirror/addon/edit/closebrackets.js A resources/lib/codemirror/addon/edit/closetag.js A resources/lib/codemirror/addon/edit/continuelist.js A resources/lib/codemirror/addon/edit/matchbrackets.js A resources/lib/codemirror/addon/edit/matchtags.js A resources/lib/codemirror/addon/edit/trailingspace.js A resources/lib/codemirror/addon/fold/brace-fold.js A resources/lib/codemirror/addon/fold/comment-fold.js A resources/lib/codemirror/addon/fold/foldcode.js A resources/lib/codemirror/addon/fold/foldgutter.css A resources/lib/codemirror/addon/fold/foldgutter.js A resources/lib/codemirror/addon/fold/indent-fold.js A resources/lib/codemirror/addon/fold/markdown-fold.js A resources/lib/codemirror/addon/fold/xml-fold.js A resources/lib/codemirror/addon/hint/anyword-hint.js A resources/lib/codemirror/addon/hint/css-hint.js A resources/lib/codemirror/addon/hint/html-hint.js A resources/lib/codemirror/addon/hint/javascript-hint.js A resources/lib/codemirror/addon/hint/python-hint.js A resources/lib/codemirror/addon/hint/show-hint.css A resources/lib/codemirror/addon/hint/show-hint.js A resources/lib/codemirror/addon/hint/sql-hint.js A resources/lib/codemirror/addon/hint/xml-hint.js A resources/lib/codemirror/addon/lint/coffeescript-lint.js A resources/lib/codemirror/addon/lint/css-lint.js A resources/lib/codemirror/addon/lint/javascript-lint.js A resources/lib/codemirror/addon/lint/json-lint.js A resources/lib/codemirror/addon/lint/lint.css A resources/lib/codemirror/addon/lint/lint.js A resources/lib/codemirror/addon/lint/yaml-lint.js A resources/lib/codemirror/addon/merge/merge.css A resources/lib/codemirror/addon/merge/merge.js A resources/lib/codemirror/addon/mode/loadmode.js A resources/lib/codemirror/addon/mode/multiplex.js A resources/lib/codemirror/addon/mode/multiplex_test.js A resources/lib/codemirror/addon/mode/overlay.js A resources/lib/codemirror/addon/mode/simple.js A resources/lib/codemirror/addon/runmode/colorize.js A resources/lib/codemirror/addon/runmode/runmode-standalone.js A resources/lib/codemirror/addon/runmode/runmode.js A resources/lib/codemirror/addon/runmode/runmode.node.js A resources/lib/codemirror/addon/scroll/scrollpastend.js A resources/lib/codemirror/addon/search/match-highlighter.js A resources/lib/codemirror/addon/search/search.js A resources/lib/codemirror/addon/search/searchcursor.js A resources/lib/codemirror/addon/selection/mark-selection.js A resources/lib/codemirror/addon/tern/tern.css A resources/lib/codemirror/addon/tern/tern.js A resources/lib/codemirror/addon/tern/worker.js A resources/lib/codemirror/addon/wrap/hardwrap.js A resources/lib/codemirror/keymap/emacs.js A resources/lib/codemirror/keymap/sublime.js A resources/lib/codemirror/keymap/vim.js M resources/lib/codemirror/lib/codemirror.css M resources/lib/codemirror/lib/codemirror.js A resources/lib/codemirror/mode/apl/apl.js A resources/lib/codemirror/mode/apl/index.html A resources/lib/codemirror/mode/asterisk/asterisk.js A resources/lib/codemirror/mode/asterisk/index.html A resources/lib/codemirror/mode/clike/clike.js A resources/lib/codemirror/mode/clike/index.html A resources/lib/codemirror/mode/clike/scala.html A resources/lib/codemirror/mode/clojure/clojure.js A resources/lib/codemirror/mode/clojure/index.html A resources/lib/codemirror/mode/cobol/cobol.js A resources/lib/codemirror/mode/cobol/index.html A resources/lib/codemirror/mode/coffeescript/coffeescript.js A resources/lib/codemirror/mode/coffeescript/index.html A resources/lib/codemirror/mode/commonlisp/commonlisp.js A resources/lib/codemirror/mode/commonlisp/index.html A resources/lib/codemirror/mode/css/css.js A
[MediaWiki-commits] [Gerrit] PermissionManager-ArticleRights - change (mediawiki...BlueSpiceExtensions)
Lilu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168256
Change subject: PermissionManager-ArticleRights
..
PermissionManager-ArticleRights
Changed the logic in BS.PermissionManager.grid.column.PermissionCheck to
support the ArticleRights record types.
Change-Id: Id044d28a103eea8cae7651ac73c44be1b1700f43
---
M
PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/56/168256/1
diff --git
a/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
b/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
index e66a4a3..d577f15 100644
---
a/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
+++
b/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
@@ -7,7 +7,7 @@
var cssPrefix = Ext.baseCSSPrefix;
var cls = [cssPrefix + 'grid-checkcolumn'];
- if (record.get('type') === 2 dataIndex !== 'userCan_Wiki') {
+ if (record.get('type') 1 dataIndex !== 'userCan_Wiki') {
cls = [];
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/168256
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id044d28a103eea8cae7651ac73c44be1b1700f43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Lilu o0lilu0o1...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix issue with options dialog when media viewer has been reo... - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168257
Change subject: Fix issue with options dialog when media viewer has been
reopened
..
Fix issue with options dialog when media viewer has been reopened
- Fixes the bug where the options menu wouldn't open if media
viewer was reopened
- Adds human-readable console messages for the options actions
- Makes the tooltip a tipsy one like all the other buttons
- Fixes the tooltip copy, it was referring to previews, which we
said we wouldn't do anymore, in favour of Media Viewer
Change-Id: I1590f9501cc6c406cc1f466b414062d4d6435c1b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/963
---
M i18n/en.json
M resources/mmv/logging/mmv.logging.ActionLogger.js
M resources/mmv/ui/mmv.ui.canvasButtons.js
3 files changed, 11 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/57/168257/1
diff --git a/i18n/en.json b/i18n/en.json
index 9dbccdc..e7c364b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -114,7 +114,7 @@
multimediaviewer-download-attribution-cta: Show me how,
multimediaviewer-attr-plain: Plain,
multimediaviewer-attr-html: HTML,
- multimediaviewer-options-tooltip: Settings: Disable or enable
previews,
+ multimediaviewer-options-tooltip: Enable or Disable Media Viewer,
multimediaviewer-options-dialog-header: Disable Media Viewer?,
multimediaviewer-options-text-header: Skip this viewing feature for
all files.,
multimediaviewer-options-text-body: You can enable it later through
the file details page.,
diff --git a/resources/mmv/logging/mmv.logging.ActionLogger.js
b/resources/mmv/logging/mmv.logging.ActionLogger.js
index f141617..df3b7e9 100644
--- a/resources/mmv/logging/mmv.logging.ActionLogger.js
+++ b/resources/mmv/logging/mmv.logging.ActionLogger.js
@@ -109,7 +109,9 @@
'embed-select-menu-html-large': 'User switched to the large
thumbnail size on html.',
'use-this-file-close': 'User closed the dialog to use this
file.',
'download-open': 'User opened the dialog to download this
file.',
- 'download-close': 'User closed the dialog to download this
file.'
+ 'download-close': 'User closed the dialog to download this
file.',
+ 'options-open': 'User opened the enable/disable dialog.',
+ 'options-close': 'User either canceled an enable/disable action
or closed a confirmation window.'
};
/**
diff --git a/resources/mmv/ui/mmv.ui.canvasButtons.js
b/resources/mmv/ui/mmv.ui.canvasButtons.js
index a57502c..414951b 100644
--- a/resources/mmv/ui/mmv.ui.canvasButtons.js
+++ b/resources/mmv/ui/mmv.ui.canvasButtons.js
@@ -48,8 +48,12 @@
this.$options = $( 'div' )
.text( ' ' )
- .prop( 'title', mw.message(
'multimediaviewer-options-tooltip' ) )
- .addClass( 'mw-mmv-options-button' );
+ .prop( 'title', mw.message(
'multimediaviewer-options-tooltip' ).text() )
+ .addClass( 'mw-mmv-options-button' )
+ .tipsy( {
+ delayIn: tooltipDelay,
+ gravity: this.correctEW( 'se' )
+ } );
this.$download = $( 'div' )
.addClass( 'mw-mmv-download-button' )
@@ -244,6 +248,7 @@
CBP.unattach = function () {
this.$download.off( 'click.mmv-canvasButtons' ).tipsy( 'hide' );
this.$reuse.off( 'click.mmv-canvasButtons' ).tipsy( 'hide' );
+ this.$options.off( 'click.mmv-canvasButtons' ).tipsy( 'hide' );
this.$close.tipsy( 'hide' );
this.$fullscreen.tipsy( 'hide' );
};
--
To view, visit https://gerrit.wikimedia.org/r/168257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1590f9501cc6c406cc1f466b414062d4d6435c1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved expression - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Improved expression
..
Improved expression
There is no need to make a second check if sth should be added, do it in
the first. Nothing needs to be added if not true
* Added some keys were nothing should happen
Change-Id: I37453f4dc8c452055ce4b5b69b53e43787ccf685
---
M ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
b/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
index a1785f8..7eca493 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
@@ -351,8 +351,8 @@
var inputField = $(
'#bs-extendedsearch-inputfieldtext-specialpage' ),
url,
thread,
- keys = new Array( 13, 17, 18, 20, 27, 32, 37, 38, 39,
40, 112,
- 113, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123 );
+ keys = [ 13, 16, 17, 18, 20, 27, 32, 37, 38, 39, 40,
91, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120,
121, 122, 123 ];
inputField.keydown( function() {
clearTimeout( thread );
@@ -365,9 +365,10 @@
url = wgServer + wgScriptPath +
'?search_scope=textsearch_submit=1q='
+ encodeURIComponent( inputField.val() );
- if ( typeof bsExtendedSearchSearchFiles !== 'undefined'
) {
- url += 'search_files=' + (
bsExtendedSearchSearchFiles ) ? 1 : 0;
+ if ( typeof bsExtendedSearchSearchFiles !== 'undefined'
bsExtendedSearchSearchFiles ) {
+ url += 'search_files=1';
}
+
thread = setTimeout( function() {
ExtendedSearchAjaxManager.ajaxMeANewResultsPlz( url ) }, 300 );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/168083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37453f4dc8c452055ce4b5b69b53e43787ccf685
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@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] Show blog as only active item in TopMenu - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Show blog as only active item in TopMenu
..
Show blog as only active item in TopMenu
This disables the wiki item in topmenu when blog is active. Due to blog
binding to unknown action, topmenu obviously confuses this and thinks
it's on main page. So all active items are reset before blog is set to
active.
Change-Id: I334666b2da654e47d37dd958be03ea997271d776
---
M Blog/Blog.class.php
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Smuggli: Looks good to me, but someone else must approve
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 176ecd9..9a2a2ce 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -117,6 +117,13 @@
public function onBSTopMenuBarCustomizerRegisterNavigationSites(
$aNavigationSites ) {
global $wgScriptPath;
+ // Reset all other active markers if Blog is active
+ if ( BsExtensionManager::isContextActive( 'MW::Blog::ShowBlog'
) ) {
+ for ($i = 0; $i sizeof($aNavigationSites); $i++ ) {
+ $aNavigationSites[$i][active] = false;
+ }
+ }
+
$aNavigationSites[] = array(
'id' = 'nt-blog',
'href' = wfAppendQuery( $wgScriptPath.'/index.php',
array(
--
To view, visit https://gerrit.wikimedia.org/r/168051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I334666b2da654e47d37dd958be03ea997271d776
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: 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] [webstatscollector] Add Makefile - change (analytics/metrics)
QChris has submitted this change and it was merged. Change subject: [webstatscollector] Add Makefile .. [webstatscollector] Add Makefile Change-Id: I3aa71f7a8880c3f9e9890aa91daa6b514aa57dac --- A pageviews/webstatscollector/Makefile M pageviews/webstatscollector/pageview_definition.dot 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved QChris: Verified diff --git a/pageviews/webstatscollector/Makefile b/pageviews/webstatscollector/Makefile new file mode 100644 index 000..7d3e026 --- /dev/null +++ b/pageviews/webstatscollector/Makefile @@ -0,0 +1,11 @@ +DOT_FILES=$(wildcard *.dot) + +GENERATED_PNG_FILES=$(DOT_FILES:%.dot=%.png) + +all: $(GENERATED_PNG_FILES) + +clean: + rm -rf $(GENERATED_PNG_FILES) + +%.png: %.dot + dot -Tpng $ -o $@ \ No newline at end of file diff --git a/pageviews/webstatscollector/pageview_definition.dot b/pageviews/webstatscollector/pageview_definition.dot index a044a59..c7ea645 100644 --- a/pageviews/webstatscollector/pageview_definition.dot +++ b/pageviews/webstatscollector/pageview_definition.dot @@ -1,8 +1,9 @@ /* You can convert this graph to a PNG image with this command: - dot -Tpng pageview_definition.dot -o pageview_definition.png + dot -Tpng pageview_definition.dot -o pageview_definition.png + (or you can just use the Makefile) */ -- To view, visit https://gerrit.wikimedia.org/r/99077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aa71f7a8880c3f9e9890aa91daa6b514aa57dac Gerrit-PatchSet: 2 Gerrit-Project: analytics/metrics 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] Validate UserTuple constructor input - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168258
Change subject: Validate UserTuple constructor input
..
Validate UserTuple constructor input
Working on the LQT import patch bugs surfaced of bad data getting into
the database. This problem has also been seen on ee-flow in spage's
watchlist. Talked about this with matt the other day, easiest fix is to
stop the data when it comes into the UserTuple.
This patch adds exceptions to UserTuple::__construct and a test that
asserts when the exceptions should and should not trigger.
Change-Id: I312b5eee3a6073b469319b6ce8755f8cc3640232
---
M Hooks.php
M autoload.php
M includes/Model/UserTuple.php
A tests/phpunit/Model/UserTupleTest.php
4 files changed, 102 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/58/168258/1
diff --git a/Hooks.php b/Hooks.php
index a698ad3..f406032 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -732,7 +732,8 @@
try {
$result = Container::get( 'formatter.irclineurl'
)-format( $rc );
} catch ( Exception $e ) {
- wfDebugLog( 'Flow', __METHOD__ . ': Failed formatting
rc ' . $rc-getAttribute( 'rc_id' ) );
+ wfDebugLog( 'Flow', __METHOD__ . ': Failed formatting
rc ' . $rc-getAttribute( 'rc_id' )
+ . ': ' . $e-getMessage() );
\MWExceptionHandler::logException( $e );
}
restore_error_handler();
diff --git a/autoload.php b/autoload.php
index 2a2b93f..f357035 100644
--- a/autoload.php
+++ b/autoload.php
@@ -243,6 +243,7 @@
$wgAutoloadClasses['Flow\\Tests\\LocalBufferedBagOStuffTest'] = __DIR__ .
'/tests/phpunit/Data/BagOStuff/LocalBufferedBagOStuffTest.php';
$wgAutoloadClasses['Flow\\Tests\\Model\\PostRevisionTest'] = __DIR__ .
'/tests/phpunit/Model/PostRevisionTest.php';
$wgAutoloadClasses['Flow\\Tests\\Model\\UUIDTest'] = __DIR__ .
'/tests/phpunit/Model/UUIDTest.php';
+$wgAutoloadClasses['Flow\\Tests\\Model\\UserTupleTest'] = __DIR__ .
'/tests/phpunit/Model/UserTupleTest.php';
$wgAutoloadClasses['Flow\\Tests\\NotifiedUsersTest'] = __DIR__ .
'/tests/phpunit/Notifications/NotifiedUsersTest.php';
$wgAutoloadClasses['Flow\\Tests\\PagerTest'] = __DIR__ .
'/tests/phpunit/PagerTest.php';
$wgAutoloadClasses['Flow\\Tests\\Parsoid\\BadImageRemoverTest'] = __DIR__ .
'/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php';
diff --git a/includes/Model/UserTuple.php b/includes/Model/UserTuple.php
index 3cd89f7..eb82597 100644
--- a/includes/Model/UserTuple.php
+++ b/includes/Model/UserTuple.php
@@ -4,17 +4,68 @@
use Flow\Exception\CrossWikiException;
use Flow\Exception\FlowException;
+use Flow\Exception\InvalidDataException;
use User;
+/**
+ * Small value object holds the values necessary to uniquely identify
+ * a user across multiple wiki's.
+ */
class UserTuple {
+ /**
+* @param string The wiki the user belongs to
+*/
public $wiki;
+
+ /**
+* @param integer The id of the user, or 0 for anonymous
+*/
public $id;
+
+ /**
+* @param string The ip of the user, blank string if logged in.
+*/
public $ip;
+ /**
+* @param string $wiki The wiki the user belongs to
+* @param integer|string $id The id of the user, or 0 for anonymous
+* @param string|null $ip The ip of the user, blank string for no ip.
+* null special case pass-through to be removed.
+* @throws InvalidDataException
+*/
public function __construct( $wiki, $id, $ip ) {
+ if ( !is_integer( $id ) ) {
+ if ( ctype_digit( $id ) ) {
+ $id = (int)$id;
+ } else {
+ throw new InvalidDataException( 'User id must
be an integer' );
+ }
+ }
+ if ( $id 0 ) {
+ throw new InvalidDataException( 'User id must be = 0'
);
+ }
+ if ( !$wiki ) {
+ throw new InvalidDataException( 'No wiki provided' );
+ }
+ if ( $id === 0 strlen( $ip ) === 0 ) {
+ if ( $ip === null ) {
+ // allowing $ip === null is a temporary hack
allowing
+ // IRCLineFormatter to operate as it has in the
past. A
+ // followup will be in gerrit to remove this
conditional
+ } else {
+ throw new InvalidDataException( 'User has no id
and no ip' );
+ }
+ }
+ if ( $id !== 0 strlen( $ip ) !== 0 ) {
+ throw new InvalidDataException(
[MediaWiki-commits] [Gerrit] Hygiene: Use real objects instead of mocks - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168259
Change subject: Hygiene: Use real objects instead of mocks
..
Hygiene: Use real objects instead of mocks
The IRCLineUrlFormatter really shouldn't be mocking up a workflow
and revision instance. This patch adjusts the flow of information
so the commit metadata goes from the RC listener to the IRC formatter
before triggering the IRC formatter.
Change-Id: Ide20db4ae1ff89c15a51bea58e654b32b9a88c2a
---
M container.php
M includes/Data/Listener/RecentChangesListener.php
M includes/Formatter/IRCLineUrlFormatter.php
M tests/phpunit/HookTest.php
4 files changed, 139 insertions(+), 153 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/59/168259/1
diff --git a/container.php b/container.php
index b818e5b..355f52c 100644
--- a/container.php
+++ b/container.php
@@ -287,7 +287,8 @@
new Flow\Data\Listener\RecentChangesListener(
$c['flow_actions'],
$c['repository.username'],
- new Flow\Data\Utils\RecentChangeFactory
+ new Flow\Data\Utils\RecentChangeFactory,
+ $c['formatter.irclineurl']
)
);
} );
diff --git a/includes/Data/Listener/RecentChangesListener.php
b/includes/Data/Listener/RecentChangesListener.php
index 2f754fe..2f4d851 100644
--- a/includes/Data/Listener/RecentChangesListener.php
+++ b/includes/Data/Listener/RecentChangesListener.php
@@ -6,10 +6,11 @@
use Flow\Container;
use Flow\Data\LifecycleHandler;
use Flow\Data\Utils\RecentChangeFactory;
-use Flow\Repository\UserNameBatch;
use Flow\FlowActions;
+use Flow\Formatter\IRCLineUrlFormatter;
use Flow\Model\AbstractRevision;
use Flow\Model\Workflow;
+use Flow\Repository\UserNameBatch;
/**
* Inserts mw recentchange rows for flow AbstractRevision instances.
@@ -37,14 +38,26 @@
protected $rcFactory;
/**
+* @var IRCLineUrlFormatter
+*/
+ protected $ircFormatter;
+
+ /**
* @param FlowActions $actions
* @param UserNameBatch $usernames
* @param RecentChangeFactory $rcFactory Creates mw RecentChange
instances
+* @param IRCLineUrlFormatter $ircFormatter
*/
- public function __construct( FlowActions $actions, UserNameBatch
$usernames, RecentChangeFactory $rcFactory ) {
+ public function __construct(
+ FlowActions $actions,
+ UserNameBatch $usernames,
+ RecentChangeFactory $rcFactory,
+ IRCLineUrlFormatter $ircFormatter
+ ) {
$this-actions = $actions;
$this-usernames = $usernames;
$this-rcFactory = $rcFactory;
+ $this-ircFormatter = $ircFormatter;
}
public function onAfterUpdate( $object, array $old, array $new, array
$metadata ) {
@@ -126,6 +139,11 @@
$feeds[$name]['original_formatter'] =
$feeds[$name]['formatter'];
$feeds[$name]['formatter'] = Container::get(
'formatter.irclineurl' );
}
+ // pre-load the irc formatter which will be triggered via hook
+ $this-ircFormatter-associate( $rc, array(
+ 'revision' = $revision
+ ) + $metadata );
+ // run the feeds/irc/etc external notifications
$rc-notifyRCFeeds( $feeds );
}
diff --git a/includes/Formatter/IRCLineUrlFormatter.php
b/includes/Formatter/IRCLineUrlFormatter.php
index d81c7b1..0b70fa1 100644
--- a/includes/Formatter/IRCLineUrlFormatter.php
+++ b/includes/Formatter/IRCLineUrlFormatter.php
@@ -4,35 +4,64 @@
use Flow\Container;
use Flow\Exception\FlowException;
+use Flow\Formatter\RevisionFormatter;
use Flow\Model\Workflow;
+use Flow\RevisionActionPermissions;
+use IContextSource;
use RCFeedFormatter;
use RecentChange;
+use SplObjectStorage;
/**
* Generates URL's to be inserted into the IRC
* recent changes feed.
*/
class IRCLineUrlFormatter extends AbstractFormatter implements RCFeedFormatter
{
+ /**
+* @var SplObjectStorage
+*/
+ protected $data;
+
+ public function __construct( RevisionActionPermissions $permissions,
RevisionFormatter $serializer ) {
+ parent::__construct( $permissions, $serializer );
+ $this-data = new SplObjectStorage;
+ }
+
protected function getHistoryType() {
return 'irc';
+ }
+
+ public function associate( RecentChange $rc, array $metadata ) {
+ $this-data[$rc] = $metadata;
}
/**
* Allows us to set the rc_comment field
*/
public function getLine( array $feed, RecentChange $rc, $actionComment
) {
- /** @var
[MediaWiki-commits] [Gerrit] Add referenceview.isInitialValue test - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has submitted this change and it was merged.
Change subject: Add referenceview.isInitialValue test
..
Add referenceview.isInitialValue test
Change-Id: I918fa19197b69b218939bc1c427010fb30484c8b
---
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
index 13f3017..5125c03 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
@@ -173,4 +173,19 @@
);
} );
+ QUnit.test( 'recognizes initial value', function( assert ) {
+ var $node = createReferenceview( 'testGuid', {
+ value: new wb.datamodel.Reference( new
wb.datamodel.SnakList( [
+ new wb.datamodel.PropertyNoValueSnak(
'P1' )
+ ] ) )
+ } ),
+ referenceview = $node.data( 'referenceview' );
+
+ assert.strictEqual(
+ referenceview.isInitialValue(),
+ true,
+ 'Referenceview has initial value.'
+ );
+ } );
+
} )( jQuery, mediaWiki, wikibase, jQuery.valueview, valueFormatters, QUnit );
--
To view, visit https://gerrit.wikimedia.org/r/168059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I918fa19197b69b218939bc1c427010fb30484c8b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.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] PermissionManager-Bugfixes - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: PermissionManager-Bugfixes
..
PermissionManager-Bugfixes
* Simplifying of TemplateEditor.saveTemplate
* Fixed: Grid gets not updated after template edit
* Fixed: Grid gets not updated after template removal
* Fixed: Tree in template editor gets not updated after template removal
* Fixed performance lag on saving settings with many namespaces shown in the
grid
* Added backup creation of the settings file before saving the new settings
PatchSet 2:
I deactivated the possibility to collapse the right groups in the grid. This
was necessary because ExtJS has a bug, which triggers actions on a row in the
wrong record when any group above that row is collapsed. In ExtJS 5 this bugs
seems to be eliminated but for now, that is the quick and painless solution we
have.
Change-Id: Ib225511e28ace1bd70e6a27b33ff73f8c1aa7ed7
---
M PermissionManager/PermissionManager.class.php
M PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
M PermissionManager/resources/BS.PermissionManager/data/Manager.js
M PermissionManager/resources/BS.PermissionManager/grid/Permissions.js
4 files changed, 93 insertions(+), 17 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/PermissionManager/PermissionManager.class.php
b/PermissionManager/PermissionManager.class.php
index d2c9beb..5b65499 100644
--- a/PermissionManager/PermissionManager.class.php
+++ b/PermissionManager/PermissionManager.class.php
@@ -499,6 +499,8 @@
wfRunHooks('BsNamespacemanageOnSavePermission',
array($aNamespacePermissionLockdown, $aGroupPermissions));
wfRunHooks('BsPermissionManager::writeGroupSettings',
array($aNamespacePermissionLockdown, $aGroupPermissions));
+ self::backupExistingSettings();
+
$sSaveContent = ?php\n;
foreach ($aGroupPermissions as $sGroup = $aPermissions) {
foreach ($aPermissions as $sPermission = $bValue) {
@@ -541,4 +543,21 @@
);
}
}
+
+ /**
+* creates a backup of the current pm-settings.php if it exists.
+*
+* @global string $bsgPermissionManagerGroupSettingsFile
+*/
+ protected static function backupExistingSettings() {
+ global $bsgPermissionManagerGroupSettingsFile;
+
+ if(file_exists($bsgPermissionManagerGroupSettingsFile)) {
+ $timestamp = wfTimestampNow();
+ $backupFilename = pm-settings-backup-{$timestamp}.php;
+ $backupFile =
dirname($bsgPermissionManagerGroupSettingsFile)./{$backupFilename};
+
+ file_put_contents($backupFile,
file_get_contents($bsgPermissionManagerGroupSettingsFile));
+ }
+ }
}
diff --git a/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
b/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
index 26b1694..99e9803 100644
--- a/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
+++ b/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
@@ -36,7 +36,8 @@
},
saveTemplate: function() {
var me = this;
- var record =
Ext.getCmp('bs-template-editor-treepanel').getSelectionModel().getLastSelected();
+ var record = Ext.getCmp('bs-template-editor-treepanel')
+
.getSelectionModel().getLastSelected();
var newRecord = {
id: record.get('id'),
text: record.get('text'),
@@ -71,10 +72,11 @@
me._hasChanged = true;
var dataManager =
Ext.create('BS.PermissionManager.data.Manager');
- var gridRow =
dataManager.buildTemplateForGrid(newRecord);
-
dataManager.addTemplate(newRecord);
+
dataManager.setTemplate(newRecord);
-
Ext.data.StoreManager.lookup('bs-permissionmanager-permission-store').add(gridRow);
+ Ext.data.StoreManager
+
.lookup('bs-permissionmanager-permission-store')
+
.loadRawData(dataManager.buildPermissionData().permissions);
Ext.getCmp('bs-template-editor-treepanel').getSelectionModel().select(
me._treeStore.getNodeById(newRecord.text)
@@ -243,21 +245,43 @@
disabled: true,
[MediaWiki-commits] [Gerrit] Merge branch 'master' into review/lilu/PermissionManager-Art... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168260
Change subject: Merge branch 'master' into
review/lilu/PermissionManager-ArticlePermissions
..
Merge branch 'master' into review/lilu/PermissionManager-ArticlePermissions
Conflicts:
PermissionManager/PermissionManager.class.php
Change-Id: I40f37430b0a756fdf8745baac7ed113f0d7d691b
---
M PermissionManager/PermissionManager.class.php
1 file changed, 0 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/60/168260/1
diff --git a/PermissionManager/PermissionManager.class.php
b/PermissionManager/PermissionManager.class.php
index 411cad3..5b65499 100644
--- a/PermissionManager/PermissionManager.class.php
+++ b/PermissionManager/PermissionManager.class.php
@@ -546,16 +546,6 @@
/**
* creates a backup of the current pm-settings.php if it exists.
- HEAD (6defc9 PermissionManager-ArticleRights)
-*
-* @global string $bsgPermissionManagerGroupSettingsFile
-*/
- protected static function backupExistingSettings() {
- global $bsgPermissionManagerGroupSettingsFile;
-
- if(file_exists($bsgPermissionManagerGroupSettingsFile)) {
- $timestamp = date('YmdHis');
-===
*
* @global string $bsgPermissionManagerGroupSettingsFile
*/
@@ -564,7 +554,6 @@
if(file_exists($bsgPermissionManagerGroupSettingsFile)) {
$timestamp = wfTimestampNow();
- BRANCH (5d9b7d Merge PermissionManager-Bugfixes)
$backupFilename = pm-settings-backup-{$timestamp}.php;
$backupFile =
dirname($bsgPermissionManagerGroupSettingsFile)./{$backupFilename};
--
To view, visit https://gerrit.wikimedia.org/r/168260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40f37430b0a756fdf8745baac7ed113f0d7d691b
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] PermissionManager-ArticleRights - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: PermissionManager-ArticleRights
..
PermissionManager-ArticleRights
Changed the logic in BS.PermissionManager.grid.column.PermissionCheck to
support the ArticleRights record types.
Change-Id: Id044d28a103eea8cae7651ac73c44be1b1700f43
---
M
PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git
a/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
b/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
index e66a4a3..d577f15 100644
---
a/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
+++
b/PermissionManager/resources/BS.PermissionManager/grid/column/PermissionCheck.js
@@ -7,7 +7,7 @@
var cssPrefix = Ext.baseCSSPrefix;
var cls = [cssPrefix + 'grid-checkcolumn'];
- if (record.get('type') === 2 dataIndex !== 'userCan_Wiki') {
+ if (record.get('type') 1 dataIndex !== 'userCan_Wiki') {
cls = [];
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/168256
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id044d28a103eea8cae7651ac73c44be1b1700f43
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Lilu o0lilu0o1...@gmail.com
Gerrit-Reviewer: Lilu o0lilu0o1...@gmail.com
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@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] mediawiki.ui: Add 'background-color: inherit' to match 'colo... - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/168261 Change subject: mediawiki.ui: Add 'background-color: inherit' to match 'color: inherit' .. mediawiki.ui: Add 'background-color: inherit' to match 'color: inherit' I'm torn on whether we should do this, or just remove 'color: inherit'. Bug: 72192 Change-Id: Ie19e0ab03cd2e577a1c4527b083215c92b421a44 --- M resources/src/mediawiki.ui/components/inputs.less 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/61/168261/1 diff --git a/resources/src/mediawiki.ui/components/inputs.less b/resources/src/mediawiki.ui/components/inputs.less index 685ca4d..c01dd36 100644 --- a/resources/src/mediawiki.ui/components/inputs.less +++ b/resources/src/mediawiki.ui/components/inputs.less @@ -38,6 +38,7 @@ border-radius: @borderRadius; // Override user agent stylesheet properties. Instead use parent element. color: inherit; + background-color: inherit; font-family: inherit; font-size: inherit; line-height: inherit; -- To view, visit https://gerrit.wikimedia.org/r/168261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie19e0ab03cd2e577a1c4527b083215c92b421a44 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc updates - change (mediawiki...chameleon)
Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/168262 Change subject: Doc updates .. Doc updates Change-Id: Ibbe7655a3526d1e00e18e3a9de7185f90b6fd766 --- A docs/installation-troubleshooting.md A docs/installation-windows.md 2 files changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon refs/changes/62/168262/1 diff --git a/docs/installation-troubleshooting.md b/docs/installation-troubleshooting.md new file mode 100644 index 000..21c0171 --- /dev/null +++ b/docs/installation-troubleshooting.md @@ -0,0 +1,11 @@ +== Installation Troubleshooting == + +* To actually activate Chameleon as the default skin of your wiki, include + `$wgDefaultSkin]]='chameleon'` in your `LocalSettings.php` +* It is not necessary to install any dependencies anymore. Composer will take + care of that. +* If instead of a proper installation you end up with a `mediawiki` subdirectory + in the `vendor` directory of your MediaWiki installation directory, + * remove that `mediawiki` subdirectory and all its contents from the `vendor` +directory + * run `composer update` from the MediaWiki installation directory again diff --git a/docs/installation-windows.md b/docs/installation-windows.md new file mode 100644 index 000..1d717e0 --- /dev/null +++ b/docs/installation-windows.md @@ -0,0 +1,31 @@ +## Installation on Windows - Step by Step + +Here is a step by step procedure for Windows: + +1. You first need to install Composer. On Windows just [download the +installer][composer-installer] and run it. +2. Open a Windows Explorer window and navigate to the root folder of +your MediaWiki installation. That's the one with the +`LocalSettings.php` file in it. +3. For MediaWiki 1.22 and 1.23 you need to copy the file +`composer.json.example` to `composer.json`. For this, select +`composer.json.example`, press Ctrl+C, then Ctrl+V and then rename +the new file to `composer.json`. +4. Right-click on the new file and select *Use composer here*. A +command line window will open. +5. On the command line run the command +`composer require mediawiki/chameleon-skin:~1.0` +6. If there were no errors, close the command line window. +7. Open `LocalSettings.php` in an editor capable to do UNIX style line +endings (e.g. [Notepad++][] or [Kate][], but *not* the standard Notepad!) +Include `[[Manual:$wgDefaultSkin|$wgDefaultSkin]]='chameleon';` as +the last line. Save the file and close the editor. +8. Open your wiki in a browser. Chameleon should be installed. +9. If not, force reload the page to +[refresh your browser cache][cache-refresh]. (Press Ctrl+F5 on Firefox, +Ctrl+Shift+F5 on Internet Explorer.) + +[composer-installer]: https://getcomposer.org/Composer-Setup.exe +[Notepad++]: http://notepad-plus-plus.org/ +[Kate]:http://kate-editor.org/ +[cache-refresh]: http://www.refreshyourcache.com/en/home/ \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/168262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibbe7655a3526d1e00e18e3a9de7185f90b6fd766 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/chameleon Gerrit-Branch: master Gerrit-Owner: Foxtrott s7ep...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Doc updates - change (mediawiki...chameleon)
Foxtrott has submitted this change and it was merged. Change subject: Doc updates .. Doc updates Change-Id: Ibbe7655a3526d1e00e18e3a9de7185f90b6fd766 --- A docs/installation-troubleshooting.md A docs/installation-windows.md 2 files changed, 42 insertions(+), 0 deletions(-) Approvals: Foxtrott: Verified; Looks good to me, approved diff --git a/docs/installation-troubleshooting.md b/docs/installation-troubleshooting.md new file mode 100644 index 000..21c0171 --- /dev/null +++ b/docs/installation-troubleshooting.md @@ -0,0 +1,11 @@ +== Installation Troubleshooting == + +* To actually activate Chameleon as the default skin of your wiki, include + `$wgDefaultSkin]]='chameleon'` in your `LocalSettings.php` +* It is not necessary to install any dependencies anymore. Composer will take + care of that. +* If instead of a proper installation you end up with a `mediawiki` subdirectory + in the `vendor` directory of your MediaWiki installation directory, + * remove that `mediawiki` subdirectory and all its contents from the `vendor` +directory + * run `composer update` from the MediaWiki installation directory again diff --git a/docs/installation-windows.md b/docs/installation-windows.md new file mode 100644 index 000..1d717e0 --- /dev/null +++ b/docs/installation-windows.md @@ -0,0 +1,31 @@ +## Installation on Windows - Step by Step + +Here is a step by step procedure for Windows: + +1. You first need to install Composer. On Windows just [download the +installer][composer-installer] and run it. +2. Open a Windows Explorer window and navigate to the root folder of +your MediaWiki installation. That's the one with the +`LocalSettings.php` file in it. +3. For MediaWiki 1.22 and 1.23 you need to copy the file +`composer.json.example` to `composer.json`. For this, select +`composer.json.example`, press Ctrl+C, then Ctrl+V and then rename +the new file to `composer.json`. +4. Right-click on the new file and select *Use composer here*. A +command line window will open. +5. On the command line run the command +`composer require mediawiki/chameleon-skin:~1.0` +6. If there were no errors, close the command line window. +7. Open `LocalSettings.php` in an editor capable to do UNIX style line +endings (e.g. [Notepad++][] or [Kate][], but *not* the standard Notepad!) +Include `[[Manual:$wgDefaultSkin|$wgDefaultSkin]]='chameleon';` as +the last line. Save the file and close the editor. +8. Open your wiki in a browser. Chameleon should be installed. +9. If not, force reload the page to +[refresh your browser cache][cache-refresh]. (Press Ctrl+F5 on Firefox, +Ctrl+Shift+F5 on Internet Explorer.) + +[composer-installer]: https://getcomposer.org/Composer-Setup.exe +[Notepad++]: http://notepad-plus-plus.org/ +[Kate]:http://kate-editor.org/ +[cache-refresh]: http://www.refreshyourcache.com/en/home/ \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/168262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibbe7655a3526d1e00e18e3a9de7185f90b6fd766 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/chameleon Gerrit-Branch: master Gerrit-Owner: Foxtrott s7ep...@gmail.com Gerrit-Reviewer: Foxtrott s7ep...@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] Reapplied sitelinkgroupview/sitelinklistview focusing - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Reapplied sitelinkgroupview/sitelinklistview focusing
..
Reapplied sitelinkgroupview/sitelinklistview focusing
Fixed focusing mechanism when starting sitelinkgroupview edit mode. If
possible, the first element
in the viewport will be focused in order to prevent unintended automatic
scrolling.
Change-Id: Ie7b9350fec733d080cc9056a8e6ce56e6e78a755
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
2 files changed, 34 insertions(+), 9 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index 3d1e49e..fd5a7d8 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -404,7 +404,7 @@
btnSave[enable ? 'enable' : 'disable']();
},
- toolbareditgroupedit: function( event, toolbarcontroller ) {
+ edittoolbaredit: function( event, toolbarcontroller ) {
var $sitelinkgroupview = $( event.target ),
sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 7244a31..a68eb5b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -454,17 +454,42 @@
lia = listview.listItemAdapter(),
$items = listview.items();
- if( this.isValid() $items.length ) {
- lia.liInstance( $items.first() ).focus();
+ if( !$items.length ) {
return;
}
- $items.each( function( $item ) {
- var sitelinkview = lia.liInstance( $item );
- if( !sitelinkview.isValid() ) {
- sitelinkview.focus();
- }
- } );
+ /**
+* @param {jQuery} $nodes
+* @return {jQuery}
+*/
+ function findFirstInViewPort( $nodes ) {
+ var $window = $( window );
+ var $foundNode = null;
+
+ $nodes.each( function() {
+ var $node = $( this );
+ if( $node.is( ':visible' )
$node.offset().top $window.scrollTop() ) {
+ $foundNode = $node;
+ }
+ return $foundNode === null;
+ } );
+
+ return $foundNode || $nodes.first();
+ }
+
+ if( !this.isValid() ) {
+ $items = $items.filter( function() {
+ var sitelinkview = lia.liInstance( $( this ) );
+ return !sitelinkview.isValid();
+ } );
+ }
+ $items = findFirstInViewPort( $items );
+
+ if( $items.length ) {
+ setTimeout( function() {
+ lia.liInstance( $items ).focus();
+ }, 10 );
+ }
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/168065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7b9350fec733d080cc9056a8e6ce56e6e78a755
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.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] Introduce uranium as ganglia server - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168263
Change subject: Introduce uranium as ganglia server
..
Introduce uranium as ganglia server
It will replace nickel
Change-Id: I96dd593cb53585720092b82b2d9fcf5f4c0067f7
---
M manifests/network.pp
M manifests/site.pp
2 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/168263/1
diff --git a/manifests/network.pp b/manifests/network.pp
index d6c457d..84aca6e 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -64,7 +64,8 @@
'208.80.153.249',
'10.4.1.120',
'10.4.1.137',
-'208.80.154.150' # nickel.wikimedia.org (ganglia)
+'208.80.154.150', # nickel.wikimedia.org (ganglia)
+'208.80.154.53', # uranium.wikimedia.org (ganglia)
],
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 576a96e..77679f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2953,6 +2953,17 @@
}
}
+node 'uranium.wikimedia.org' {
+$ganglia_aggregator = true
+
+include standard
+include admin
+include ganglia::web
+include misc::monitoring::views
+
+install_certificate{ 'ganglia.wikimedia.org': }
+}
+
node /^wtp10(0[1-9]|1[0-9]|2[0-4])\.eqiad\.wmnet$/ {
$cluster = 'parsoid'
--
To view, visit https://gerrit.wikimedia.org/r/168263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96dd593cb53585720092b82b2d9fcf5f4c0067f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce uranium as ganglia server - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Introduce uranium as ganglia server
..
Introduce uranium as ganglia server
It will replace nickel
Change-Id: I96dd593cb53585720092b82b2d9fcf5f4c0067f7
---
M manifests/network.pp
M manifests/site.pp
2 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/network.pp b/manifests/network.pp
index d6c457d..84aca6e 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -64,7 +64,8 @@
'208.80.153.249',
'10.4.1.120',
'10.4.1.137',
-'208.80.154.150' # nickel.wikimedia.org (ganglia)
+'208.80.154.150', # nickel.wikimedia.org (ganglia)
+'208.80.154.53', # uranium.wikimedia.org (ganglia)
],
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 576a96e..77679f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2953,6 +2953,17 @@
}
}
+node 'uranium.wikimedia.org' {
+$ganglia_aggregator = true
+
+include standard
+include admin
+include ganglia::web
+include misc::monitoring::views
+
+install_certificate{ 'ganglia.wikimedia.org': }
+}
+
node /^wtp10(0[1-9]|1[0-9]|2[0-4])\.eqiad\.wmnet$/ {
$cluster = 'parsoid'
--
To view, visit https://gerrit.wikimedia.org/r/168263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96dd593cb53585720092b82b2d9fcf5f4c0067f7
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: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare repository for running RuboCop after every push to G... - change (mediawiki/vagrant)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/168264 Change subject: Prepare repository for running RuboCop after every push to Gerrit .. Prepare repository for running RuboCop after every push to Gerrit For now ignoring all problems. Bug: 69245 Change-Id: I2998564042cd8970fc8594fb00c09ed7e41ef02a --- A .rubocop.yml A .rubocop_todo.yml M Gemfile 3 files changed, 431 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/64/168264/1 diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 000..cc32da4 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1 @@ +inherit_from: .rubocop_todo.yml diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 000..cded2f4 --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,429 @@ +# This configuration was generated by `rubocop --auto-gen-config` +# on 2014-10-23 12:04:54 +0200 using RuboCop version 0.26.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 96 +Lint/AmbiguousRegexpLiteral: + Enabled: false + +# Offense count: 2 +# Configuration parameters: AllowSafeAssignment. +Lint/AssignmentInCondition: + Enabled: false + +# Offense count: 5 +# Cop supports --auto-correct. +Lint/BlockAlignment: + Enabled: false + +# Offense count: 2 +# Configuration parameters: AlignWith, SupportedStyles. +Lint/DefEndAlignment: + Enabled: false + +# Offense count: 6 +# Cop supports --auto-correct. +Lint/DeprecatedClassMethods: + Enabled: false + +# Offense count: 4 +Lint/HandleExceptions: + Enabled: false + +# Offense count: 2 +Lint/ParenthesesAsGroupedExpression: + Enabled: false + +# Offense count: 4 +Lint/ShadowingOuterLocalVariable: + Enabled: false + +# Offense count: 13 +# Cop supports --auto-correct. +Lint/UnusedBlockArgument: + Enabled: false + +# Offense count: 5 +# Cop supports --auto-correct. +Lint/UnusedMethodArgument: + Enabled: false + +# Offense count: 1 +Lint/Void: + Enabled: false + +# Offense count: 2 +Metrics/BlockNesting: + Max: 4 + +# Offense count: 2 +# Configuration parameters: CountComments. +Metrics/ClassLength: + Max: 113 + +# Offense count: 6 +Metrics/CyclomaticComplexity: + Max: 10 + +# Offense count: 297 +# Configuration parameters: AllowURI, URISchemes. +Metrics/LineLength: + Max: 226 + +# Offense count: 30 +# Configuration parameters: CountComments. +Metrics/MethodLength: + Max: 45 + +# Offense count: 5 +Metrics/PerceivedComplexity: + Max: 15 + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/AccessModifierIndentation: + Enabled: false + +# Offense count: 2 +# Cop supports --auto-correct. +Style/Alias: + Enabled: false + +# Offense count: 12 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/AlignParameters: + Enabled: false + +# Offense count: 12 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/AndOr: + Enabled: false + +# Offense count: 28 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/BarePercentLiterals: + Enabled: false + +# Offense count: 5 +# Cop supports --auto-correct. +Style/Blocks: + Enabled: false + +# Offense count: 3 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/BracesAroundHashParameters: + Enabled: false + +# Offense count: 1 +Style/CaseEquality: + Enabled: false + +# Offense count: 6 +# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep. +Style/CaseIndentation: + Enabled: false + +# Offense count: 2 +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/ClassAndModuleChildren: + Enabled: false + +# Offense count: 3 +# Cop supports --auto-correct. +# Configuration parameters: PreferredMethods. +Style/CollectionMethods: + Enabled: false + +# Offense count: 4 +# Configuration parameters: Keywords. +Style/CommentAnnotation: + Enabled: false + +# Offense count: 7 +# Cop supports --auto-correct. +Style/CommentIndentation: + Enabled: false + +# Offense count: 5 +# Cop supports --auto-correct. +Style/DefWithParentheses: + Enabled: false + +# Offense count: 73 +Style/Documentation: + Enabled: false + +# Offense count: 8 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/DotPosition: + Enabled: false + +# Offense count: 2 +Style/DoubleNegation: + Enabled: false + +# Offense count: 8 +# Cop supports --auto-correct. +# Configuration parameters: AllowAdjacentOneLineDefs. +Style/EmptyLineBetweenDefs: + Enabled: false + +# Offense count: 10
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2014/10/23 - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168265
Change subject: New Wikidata Build - 2014/10/23
..
New Wikidata Build - 2014/10/23
Change-Id: I67324a6c6698f340e1b00df3e2f3afab4c69cf7d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/includes/ChangeHandler.php
M extensions/Wikibase/client/includes/store/ClientStore.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M
extensions/Wikibase/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
M extensions/Wikibase/repo/Wikibase.i18n.alias.php
M vendor/autoload.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
16 files changed, 188 insertions(+), 111 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/65/168265/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 08f920c..bb56579 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413996523;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1414060149;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 6428823..0c0247e 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413996523;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1414060149;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index b1d9768..6081ba4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1205,12 +1205,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 2387d5bc3b4bc51d2292566c52e00d655031b0fe
+reference: 8b0337db4037d8b74f8358fc5aaee70f83b49aac
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2387d5bc3b4bc51d2292566c52e00d655031b0fe;,
-reference: 2387d5bc3b4bc51d2292566c52e00d655031b0fe,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8b0337db4037d8b74f8358fc5aaee70f83b49aac;,
+reference: 8b0337db4037d8b74f8358fc5aaee70f83b49aac,
shasum:
},
require: {
@@ -1276,7 +1276,7 @@
wikibaserepo,
wikidata
],
-time: 2014-10-22 16:29:59
+time: 2014-10-23 09:21:41
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/client/includes/ChangeHandler.php
b/extensions/Wikibase/client/includes/ChangeHandler.php
index 6013b3f..b08c791 100644
--- a/extensions/Wikibase/client/includes/ChangeHandler.php
+++ b/extensions/Wikibase/client/includes/ChangeHandler.php
@@ -110,7 +110,7 @@
EntityChangeFactory $changeFactory = null,
PageUpdater $updater = null,
EntityRevisionLookup $entityRevisionLookup = null,
- ItemUsageIndex $entityUsageIndex = null,
+ ItemUsageIndex $itemUsageIndex = null,
Site $localSite = null,
SiteList $sites = null
) {
@@ -132,8 +132,8 @@
$entityRevisionLookup =
$wikibaseClient-getStore()-getEntityRevisionLookup();
}
- if ( !$entityUsageIndex ) {
- $entityUsageIndex =
$wikibaseClient-getStore()-getItemUsageIndex();
+ if ( !$itemUsageIndex ) {
+ $itemUsageIndex =
$wikibaseClient-getStore()-getItemUsageIndex();
}
if ( $sites === null ) {
@@ -156,7 +156,7 @@
$this-updater = $updater;
$this-entityRevisionLookup = $entityRevisionLookup;
- $this-entityUsageIndex = $entityUsageIndex;
+ $this-itemUsageIndex = $itemUsageIndex;
$this-site = $localSite;
$this-siteId = $localSite-getGlobalId();
@@ -563,7 +563,7 @@
// todo inject!
$referencedPagesFinder = new ReferencedPagesFinder(
- $this-entityUsageIndex,
+ $this-itemUsageIndex,
[MediaWiki-commits] [Gerrit] New deployment branch: wmf/1.25wmf5 - change (mediawiki...Wikidata)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/168266 Change subject: New deployment branch: wmf/1.25wmf5 .. New deployment branch: wmf/1.25wmf5 Change-Id: Ib70e526f92c80c31a60e4b68406502001ea17de8 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.json M composer.lock M extensions/PropertySuggester/PropertySuggester.php M extensions/PropertySuggester/PropertySuggesterHooks.php M extensions/PropertySuggester/README.md M extensions/PropertySuggester/build/travis/before_script.sh M extensions/PropertySuggester/tests/phpunit/PropertySuggester/GetSuggestionsTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/Suggesters/SimpleSuggesterTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/SuggestionGeneratorTest.php M extensions/Wikibase/.jshintignore M extensions/Wikibase/.jshintrc M extensions/Wikibase/.travis.yml M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/i18n/ce.json M extensions/Wikibase/client/i18n/cs.json M extensions/Wikibase/client/i18n/en.json M extensions/Wikibase/client/i18n/hu.json M extensions/Wikibase/client/i18n/hy.json M extensions/Wikibase/client/i18n/ka.json M extensions/Wikibase/client/i18n/lb.json M extensions/Wikibase/client/i18n/qqq.json A extensions/Wikibase/client/i18n/rue.json M extensions/Wikibase/client/i18n/sk.json M extensions/Wikibase/client/i18n/sr-ec.json M extensions/Wikibase/client/i18n/sr-el.json M extensions/Wikibase/client/i18n/uk.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/LangLinkHandler.php M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php M extensions/Wikibase/client/includes/UpdateRepo.php A extensions/Wikibase/client/includes/Usage/EntityUsage.php A extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTracker.php A extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdate.php A extensions/Wikibase/client/includes/Usage/Sql/UsageTableUpdater.php A extensions/Wikibase/client/includes/Usage/Sql/entity_usage.sql A extensions/Wikibase/client/includes/Usage/SubscriptionManager.php A extensions/Wikibase/client/includes/Usage/UsageLookup.php A extensions/Wikibase/client/includes/Usage/UsageTracker.php A extensions/Wikibase/client/includes/Usage/UsageTrackerException.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/includes/hooks/ChangesPageWikibaseFilterHandler.php M extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php M extensions/Wikibase/client/includes/scribunto/WikibaseLuaEntityBindings.php M extensions/Wikibase/client/includes/store/ClientStore.php A extensions/Wikibase/client/includes/store/sql/ConnectionManager.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/resources/Resources.php M extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js A extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js M extensions/Wikibase/client/tests/phpunit/MockClientStore.php M extensions/Wikibase/client/tests/phpunit/MockPageUpdater.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/EntityUsageTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/BaseTemplateAfterPortalHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/ChangesPageWikibaseFilterHandlerTest.php M
[MediaWiki-commits] [Gerrit] WIP Prepare repository for running RuboCop after every push ... - change (VisualEditor/VisualEditor)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/168267 Change subject: WIP Prepare repository for running RuboCop after every push to Gerrit .. WIP Prepare repository for running RuboCop after every push to Gerrit WIP until I figure out what is the problem here: https://github.com/bbatsov/rubocop/issues/1401 For now ignoring all problems. Bug: 69245 Change-Id: I51a0a38d4a1153e7998229e875c2444b0118d2e9 --- A .rubocop.yml A .rubocop_todo.yml A Gemfile A Gemfile.lock 4 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/67/168267/1 diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 000..cc32da4 --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1 @@ +inherit_from: .rubocop_todo.yml diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 000..d92ba4a --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,53 @@ +# This configuration was generated by `rubocop --auto-gen-config` +# on 2014-10-23 12:31:37 +0200 using RuboCop version 0.26.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 2 +# Cop supports --auto-correct. +Lint/UnusedMethodArgument: + Enabled: false + +# Offense count: 1 +# Configuration parameters: AllowURI, URISchemes. +Metrics/LineLength: + Max: 84 + +# Offense count: 5 +Style/Documentation: + Enabled: false + +# Offense count: 1 +# Configuration parameters: Exclude. +Style/FileName: + Enabled: false + +# Offense count: 4 +# Cop supports --auto-correct. +# Configuration parameters: SupportedStyles. +Style/HashSyntax: + EnforcedStyle: hash_rockets + +# Offense count: 4 +# Cop supports --auto-correct. +Style/PerlBackrefs: + Enabled: false + +# Offense count: 4 +# Cop supports --auto-correct. +Style/SpaceAroundOperators: + Enabled: false + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters. +Style/SpaceInsideBlockBraces: + Enabled: true + +# Offense count: 3 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/StringLiterals: + Enabled: false diff --git a/Gemfile b/Gemfile new file mode 100755 index 000..62dbd82 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source https://rubygems.org; + +gem rubocop, :require = false diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000..d2f8141 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: +ast (2.0.0) +astrolabe (1.3.0) + parser (= 2.2.0.pre.3, 3.0) +parser (2.2.0.pre.5) + ast (= 1.1, 3.0) + slop (~ 3.4, = 3.4.5) +powerpack (0.0.9) +rainbow (2.0.0) +rubocop (0.26.1) + astrolabe (~ 1.3) + parser (= 2.2.0.pre.4, 3.0) + powerpack (~ 0.0.6) + rainbow (= 1.99.1, 3.0) + ruby-progressbar (~ 1.4) +ruby-progressbar (1.6.0) +slop (3.6.0) + +PLATFORMS + ruby + +DEPENDENCIES + rubocop -- To view, visit https://gerrit.wikimedia.org/r/168267 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51a0a38d4a1153e7998229e875c2444b0118d2e9 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor 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] Update Wikidata branch to wmf/1.25wmf5 - change (mediawiki...release)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/168268 Change subject: Update Wikidata branch to wmf/1.25wmf5 .. Update Wikidata branch to wmf/1.25wmf5 Change-Id: I06151c9b670c6483ba40c2e1afaa35f124b03705 --- M make-wmf-branch/default.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/68/168268/1 diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 4e1a30c..f1aee38 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -175,7 +175,7 @@ 'CentralNotice' = 'wmf_deploy', // to use instead of the above - 'Wikidata' = 'wmf/1.25wmf3', + 'Wikidata' = 'wmf/1.25wmf5', // For wikitech use only! 'SemanticMediaWiki' = '1.8.x', -- To view, visit https://gerrit.wikimedia.org/r/168268 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06151c9b670c6483ba40c2e1afaa35f124b03705 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release 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] New Wikidata Build - 2014/10/23 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2014/10/23
..
New Wikidata Build - 2014/10/23
Change-Id: I67324a6c6698f340e1b00df3e2f3afab4c69cf7d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/includes/ChangeHandler.php
M extensions/Wikibase/client/includes/store/ClientStore.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M
extensions/Wikibase/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
M extensions/Wikibase/repo/Wikibase.i18n.alias.php
M vendor/autoload.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
16 files changed, 188 insertions(+), 111 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 08f920c..bb56579 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413996523;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1414060149;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 6428823..0c0247e 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413996523;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1414060149;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index b1d9768..6081ba4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1205,12 +1205,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 2387d5bc3b4bc51d2292566c52e00d655031b0fe
+reference: 8b0337db4037d8b74f8358fc5aaee70f83b49aac
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2387d5bc3b4bc51d2292566c52e00d655031b0fe;,
-reference: 2387d5bc3b4bc51d2292566c52e00d655031b0fe,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8b0337db4037d8b74f8358fc5aaee70f83b49aac;,
+reference: 8b0337db4037d8b74f8358fc5aaee70f83b49aac,
shasum:
},
require: {
@@ -1276,7 +1276,7 @@
wikibaserepo,
wikidata
],
-time: 2014-10-22 16:29:59
+time: 2014-10-23 09:21:41
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/client/includes/ChangeHandler.php
b/extensions/Wikibase/client/includes/ChangeHandler.php
index 6013b3f..b08c791 100644
--- a/extensions/Wikibase/client/includes/ChangeHandler.php
+++ b/extensions/Wikibase/client/includes/ChangeHandler.php
@@ -110,7 +110,7 @@
EntityChangeFactory $changeFactory = null,
PageUpdater $updater = null,
EntityRevisionLookup $entityRevisionLookup = null,
- ItemUsageIndex $entityUsageIndex = null,
+ ItemUsageIndex $itemUsageIndex = null,
Site $localSite = null,
SiteList $sites = null
) {
@@ -132,8 +132,8 @@
$entityRevisionLookup =
$wikibaseClient-getStore()-getEntityRevisionLookup();
}
- if ( !$entityUsageIndex ) {
- $entityUsageIndex =
$wikibaseClient-getStore()-getItemUsageIndex();
+ if ( !$itemUsageIndex ) {
+ $itemUsageIndex =
$wikibaseClient-getStore()-getItemUsageIndex();
}
if ( $sites === null ) {
@@ -156,7 +156,7 @@
$this-updater = $updater;
$this-entityRevisionLookup = $entityRevisionLookup;
- $this-entityUsageIndex = $entityUsageIndex;
+ $this-itemUsageIndex = $itemUsageIndex;
$this-site = $localSite;
$this-siteId = $localSite-getGlobalId();
@@ -563,7 +563,7 @@
// todo inject!
$referencedPagesFinder = new ReferencedPagesFinder(
- $this-entityUsageIndex,
+ $this-itemUsageIndex,
$this-namespaceChecker,
[MediaWiki-commits] [Gerrit] [WIP] Add Hiera: namespace with YAML content model - change (mediawiki...OpenStackManager)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168269
Change subject: [WIP] Add Hiera: namespace with YAML content model
..
[WIP] Add Hiera: namespace with YAML content model
- Updates version of Spyc
Change-Id: If26ba0fcb2f58fd1963b97e807aa57e5bbe3d4c7
---
M OpenStackManager.php
M Spyc.php
A includes/YamlContent.php
A includes/YamlContentHandler.php
4 files changed, 1,279 insertions(+), 222 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/69/168269/1
diff --git a/OpenStackManager.php b/OpenStackManager.php
index bf503df..3c5c0b2 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -26,8 +26,19 @@
'descriptionmsg' = 'openstackmanager-desc',
);
+define( 'CONTENT_MODEL_YAML', 'yaml' );
+
define( NS_NOVA_RESOURCE, 498 );
define( NS_NOVA_RESOURCE_TALK, 499 );
+define( 'NS_HIERA', 666 );
+define( 'NS_HIERA_TALK', 667 );
+
+$wgExtraNamespaces[NS_HIERA] = 'Hiera';
+$wgExtraNamespaces[NS_HIERA_TALK] = 'Hiera_Talk';
+$wgContentHandlers[CONTENT_MODEL_YAML] = 'YamlContentHandler';
+$wgNamespaceContentModels[NS_HIERA] = CONTENT_MODEL_YAML;
+
+
$wgExtraNamespaces[NS_NOVA_RESOURCE] = 'Nova_Resource';
$wgExtraNamespaces[NS_NOVA_RESOURCE_TALK] = 'Nova_Resource_Talk';
$wgContentNamespaces[] = NS_NOVA_RESOURCE;
@@ -150,6 +161,8 @@
$wgMessagesDirs['OpenStackManager'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['OpenStackManager'] = $dir .
'OpenStackManager.i18n.php';
$wgExtensionMessagesFiles['OpenStackManagerAlias'] = $dir .
'OpenStackManager.alias.php';
+$wgAutoloadClasses['YamlContent'] = $dir . 'includes/YamlContent.php';
+$wgAutoloadClasses['YamlContentHandler'] = $dir .
'includes/YamlContentHandler.php';
$wgAutoloadClasses['OpenStackNovaInstance'] = $dir .
'nova/OpenStackNovaInstance.php';
$wgAutoloadClasses['OpenStackNovaInstanceType'] = $dir .
'nova/OpenStackNovaInstanceType.php';
$wgAutoloadClasses['OpenStackNovaImage'] = $dir .
'nova/OpenStackNovaImage.php';
diff --git a/Spyc.php b/Spyc.php
index cc6993c..1e161f7 100644
--- a/Spyc.php
+++ b/Spyc.php
@@ -1,248 +1,1147 @@
?php
/**
- * Spyc -- A Simple PHP YAML Class
- *
- * @file
- * @version 0.2.3 -- 2006-02-04
- * @author Chris Wanstrath ch...@ozmm.org
- * @see http://spyc.sourceforge.net/
- * @copyright Copyright 2005-2006 Chris Wanstrath
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
- */
+ * Spyc -- A Simple PHP YAML Class
+ * @version 0.5.1
+ * @author Vlad Andersen vlad.ander...@gmail.com
+ * @author Chris Wanstrath ch...@ozmm.org
+ * @link https://github.com/mustangostang/spyc/
+ * @copyright Copyright 2005-2006 Chris Wanstrath, 2006-2011 Vlad Andersen
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @package Spyc
+ */
+
+if (!function_exists('spyc_load')) {
+ /**
+ * Parses YAML to array.
+ * @param string $string YAML string.
+ * @return array
+ */
+ function spyc_load ($string) {
+return Spyc::YAMLLoadString($string);
+ }
+}
+
+if (!function_exists('spyc_load_file')) {
+ /**
+ * Parses YAML to array.
+ * @param string $file Path to YAML file.
+ * @return array
+ */
+ function spyc_load_file ($file) {
+return Spyc::YAMLLoad($file);
+ }
+}
+
+if (!function_exists('spyc_dump')) {
+ /**
+ * Dumps array to YAML.
+ * @param array $data Array.
+ * @return string
+ */
+ function spyc_dump ($data) {
+return Spyc::YAMLDump($data, false, false, true);
+ }
+}
/**
- * The Simple PHP YAML Class.
- *
- * This class can be used to read a YAML file and convert its contents
- * into a PHP array. It currently supports a very limited subsection of
- * the YAML spec.
- *
- * @ingroup API
- */
+ * The Simple PHP YAML Class.
+ *
+ * This class can be used to read a YAML file and convert its contents
+ * into a PHP array. It currently supports a very limited subsection of
+ * the YAML spec.
+ *
+ * Usage:
+ * code
+ * $Spyc = new Spyc;
+ * $array = $Spyc-load($file);
+ * /code
+ * or:
+ * code
+ * $array = Spyc::YAMLLoad($file);
+ * /code
+ * or:
+ * code
+ * $array = spyc_load_file($file);
+ * /code
+ * @package Spyc
+ */
class Spyc {
- /**
-* Dump YAML from PHP array statically
-*
-* The dump method, when supplied with an array, will do its best
-* to convert the array into friendly YAML. Pretty simple. Feel free
to
-* save the returned string as nothing.yml and pass it around.
-*
-* Oh, and you can decide how big the indent is and what the wordwrap
-* for folding is. Pretty cool -- just pass in 'false' for either if
-* you want to use the default.
-*
-* Indent's default is 2 spaces, wordwrap's default is 40 characters.
And
-* you can turn off wordwrap by passing in 0.
-*
-
[MediaWiki-commits] [Gerrit] WIP Run RuboCop and Ruby syntax check for mediawiki-vagrant - change (integration/config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168270
Change subject: WIP Run RuboCop and Ruby syntax check for mediawiki-vagrant
..
WIP Run RuboCop and Ruby syntax check for mediawiki-vagrant
Bug: 69245
Change-Id: I6cac353f6efd6f9962a69b770ef832049f8bcc2a
---
M jjb/mediawiki-misc.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/70/168270/1
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 48d7d4c..5c5408a 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -64,8 +64,12 @@
- project:
name: 'mediawiki-vagrant'
jobs:
+ - '{name}-bundle-{bundlecommand}':
+ bundlecommand:
+ - rubocop
- '{name}-puppetlint-lenient'
- '{name}-puppetlint-strict'
- '{name}-puppet-validate'
+ - '{name}-ruby1.9.3lint'
- '{name}-erblint-HEAD'
- 'mediawiki-vagrant-puppet-doc'
--
To view, visit https://gerrit.wikimedia.org/r/168270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cac353f6efd6f9962a69b770ef832049f8bcc2a
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Clean up entityChangers tests - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168271
Change subject: Clean up entityChangers tests
..
Clean up entityChangers tests
Main reason for this patch are the somewhat confusing strings in
the tests that look like class names.
Change-Id: I9251b4bf6a85133fcb264ad3528002d958e15d2c
---
M lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
M lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js
14 files changed, 24 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/71/168271/1
diff --git a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
b/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
index f440ff7..91c32a6 100644
--- a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
+++ b/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
@@ -88,11 +88,11 @@
* @param {Object} details Object returned from the API containing
detailed information
* @param {string} [apiAction] API action (e.g. 'save', 'remove') that
may be passed to
*determine a specific message
-* @return {wb.RepoApiError}
+* @return {wikibase.RepoApiError}
*/
wb.RepoApiError.newFromApiResponse = function( details, apiAction ) {
- var detailedMessage = '';
var errorCode = '';
+ var detailedMessage = '';
if ( details.error ) {
errorCode = details.error.code;
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js
index 8a6fe23..b76be71 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js
@@ -12,8 +12,8 @@
*/
var createAliasesview = function( options ) {
options = $.extend( {
- entityId: 'i am an entity id',
- aliasesChanger: 'i am an aliasesChanger',
+ entityId: 'i am an EntityId',
+ aliasesChanger: 'i am an AliasesChanger',
value: {
language: 'en',
aliases: ['a', 'b', 'c']
diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
index 15f37a6..9124ac8 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
@@ -30,7 +30,7 @@
value: value || null,
entityStore: entityStore,
valueViewBuilder: valueViewBuilder,
- entityChangersFactory: 'entityChangersFactory'
+ entityChangersFactory: 'i am an EntityChangersFactory'
};
return $( 'div/' )
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
index 33441db..d70a6cc 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
@@ -13,8 +13,8 @@
*/
var createDescriptionview = function( options, $node ) {
options = $.extend( {
- entityId: 'i am an entity id',
- api: 'i am an api',
+ entityId: 'i am an EntityId',
+ api: 'i am an Api',
value: {
language: 'en',
description: 'test description'
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js
index d811f9b..88f73dc 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js
+++
[MediaWiki-commits] [Gerrit] Style adjustments to the disable panel - change (mediawiki...MultimediaViewer)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168272
Change subject: Style adjustments to the disable panel
..
Style adjustments to the disable panel
Spacing, color, and typography adjustments to the disable/enable panels
Change-Id: I86cfa04353fb500ebe027576a61301e8ef2f0f3b
---
M resources/mmv/ui/img/x_darkgreen.svg
M resources/mmv/ui/mmv.ui.viewingOptions.less
2 files changed, 37 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/72/168272/1
diff --git a/resources/mmv/ui/img/x_darkgreen.svg
b/resources/mmv/ui/img/x_darkgreen.svg
index 8be9978..f491a6b 100644
--- a/resources/mmv/ui/img/x_darkgreen.svg
+++ b/resources/mmv/ui/img/x_darkgreen.svg
@@ -1,5 +1,22 @@
?xml version=1.0 encoding=UTF-8 standalone=no?
-!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
-svg xmlns:dc=http://purl.org/dc/elements/1.1/;
xmlns:cc=http://creativecommons.org/ns#;
xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
xmlns:svg=http://www.w3.org/2000/svg; xmlns=http://www.w3.org/2000/svg;
xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; version=1.1
id=Layer_1 x=0px y=0px viewBox=0 0 612 792 enable-background=new 0 0
612 792 xml:space=preserve inkscape:version=0.48.2 r9819 width=100%
height=100% sodipodi:docname=x_darkgreen.svgmetadata
id=metadata9rdf:RDFcc:Work
rdf:about=dc:formatimage/svg+xml/dc:formatdc:type
rdf:resource=http://purl.org/dc/dcmitype/StillImage//cc:Work/rdf:RDF/metadatadefs
id=defs7/sodipodi:namedview pagecolor=#ff bordercolor=#66
borderopacity=1 objecttolerance=10 gridtolerance=10 guidetolerance=10
inkscape:pageopacity=0 inkscape:pageshadow=2 inkscape:window-width=721
inkscape:window-height=480 id=namedview5 showgrid=false
inkscape:zoom=0.2979798 inkscape:cx=306 inkscape:cy=364.11864
inkscape:window-x=0 inkscape:window-y=0 inkscape:window-maximized=0
inkscape:current-layer=Layer_1/
-polygon fill=#99 points=612,179.2 522.8,90 306,306.8 89.2,90 0,179.2
216.8,396 0,612.8 89.2,702 306,485.2 522.8,702 612,612.8 395.2,396
id=polygon3 style=fill:#0a604c;fill-opacity:1/
-/svg
\ No newline at end of file
+!-- Created with Inkscape (http://www.inkscape.org/) --
+
+svg
+ xmlns:dc=http://purl.org/dc/elements/1.1/;
+ xmlns:cc=http://creativecommons.org/ns#;
+ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg=http://www.w3.org/2000/svg;
+ xmlns=http://www.w3.org/2000/svg;
+ version=1.1
+ width=100%
+ height=100%
+ viewBox=0 0 96 96
+ id=Layer_1
+ xml:space=preservemetadata
+ id=metadata9rdf:RDFcc:Work
+ rdf:about=dc:formatimage/svg+xml/dc:formatdc:type
+ rdf:resource=http://purl.org/dc/dcmitype/StillImage;
/dc:title/dc:title/cc:Work/rdf:RDF/metadatadefs
+ id=defs7 /polygon
+ points=82,0 48,34 14,0 0,14 34,48 0,82 14,96 48,62 82,96 96,82 62,48
96,14
+ id=polygon3
+ style=fill:#0a604c;fill-opacity:1 //svg
\ No newline at end of file
diff --git a/resources/mmv/ui/mmv.ui.viewingOptions.less
b/resources/mmv/ui/mmv.ui.viewingOptions.less
index c943701..ecccfce 100644
--- a/resources/mmv/ui/mmv.ui.viewingOptions.less
+++ b/resources/mmv/ui/mmv.ui.viewingOptions.less
@@ -13,7 +13,7 @@
z-index: 1004;
- padding: 10px;
+ padding: 15px;
.mw-mmv-enable-confirmation-shown {
background-color: #00AF89;
@@ -44,7 +44,10 @@
top: (@offset-top + (@arrow-size / 2 ));
}
- .mw-mmv-options-enable,
+ .mw-mmv-options-enable {
+ height: 170px;
+ }
+
.mw-mmv-options-disable {
height: 150px;
}
@@ -71,8 +74,8 @@
position: absolute;
right: 0;
top: 0;
- width: 20px;
- height: 20px;
+ width: 15px;
+ height: 15px;
cursor: pointer;
opacity: 0.75;
@@ -108,7 +111,7 @@
.mw-mmv-confirmation-close {
/* @embed */
background-image: url(img/x_darkgreen.svg);
- background-size: 20px 20px;
+ background-size: 15px 15px;
background-repeat: no-repeat;
}
}
@@ -179,19 +182,21 @@
}
.mw-mmv-options-text-body {
- font-size: .75em;
- color: #555;
+ font-size: .9em;
+ color: #777;
}
.mw-mmv-options-enable-alert {
position: absolute;
- left: -10px;
- right: -10px;
- top: -10px;
+ left: -15px;
+ right: -15px;
+ top: -15px;
- padding: 10px;
+ padding: 10px 15px;
background-color: #EEE;
+ border-top-right-radius: 3px;
+
[MediaWiki-commits] [Gerrit] Remove pmtpa from deployment - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168273
Change subject: Remove pmtpa from deployment
..
Remove pmtpa from deployment
Change-Id: Ifcb2c1cb2611abe95ede44d43476def6dde9621d
---
M manifests/role/deployment.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/168273/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 8abe908..6fc27e1 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -112,7 +112,6 @@
$deployment_config = {
'parent_dir' = '/srv/deployment',
'servers'= {
-'pmtpa' = 'tin.eqiad.wmnet',
'eqiad' = 'tin.eqiad.wmnet',
},
'redis' = {
--
To view, visit https://gerrit.wikimedia.org/r/168273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcb2c1cb2611abe95ede44d43476def6dde9621d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] LocalisationUpdate needs to support updating skins as ... - change (mediawiki...LocalisationUpdate)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168274
Change subject: [WIP] LocalisationUpdate needs to support updating skins as
well as extensions
..
[WIP] LocalisationUpdate needs to support updating skins as well as extensions
Bug: 67154
Change-Id: I47ef86ea7feb7e2876f8a6a24f1bb74f462cb4e2
---
M LocalisationUpdate.php
M update.php
2 files changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LocalisationUpdate
refs/changes/74/168274/1
diff --git a/LocalisationUpdate.php b/LocalisationUpdate.php
index 53aa5ad..1291aed 100644
--- a/LocalisationUpdate.php
+++ b/LocalisationUpdate.php
@@ -26,6 +26,8 @@
'https://raw.github.com/wikimedia/mediawiki-core/master/%PATH%',
'extension' =
'https://raw.github.com/wikimedia/mediawiki-extensions-%NAME%/master/%PATH%',
+ 'skins' =
+
'https://raw.github.com/wikimedia/mediawiki-skins-%NAME%/master/%PATH%',
);
// Example for local filesystem configuration
diff --git a/update.php b/update.php
index 1f66e73..c2b693f 100644
--- a/update.php
+++ b/update.php
@@ -10,7 +10,7 @@
class LU extends Maintenance {
public function __construct() {
parent::__construct();
- $this-mDescription = 'Fetches translation updates to MediaWiki
and extensions.';
+ $this-mDescription = 'Fetches translation updates to MediaWiki
core, skins and extensions.';
$this-addOption(
'repoid',
'Fetch translations from repositories identified by
this',
--
To view, visit https://gerrit.wikimedia.org/r/168274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47ef86ea7feb7e2876f8a6a24f1bb74f462cb4e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LocalisationUpdate
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prepare use of MediaWikiUIEverywhere - change (mediawiki...GoogleLogin)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168275
Change subject: Prepare use of MediaWikiUIEverywhere
..
Prepare use of MediaWikiUIEverywhere
Set mw-ui-buttonclas according the task of the button
(progressive, destructive or constructive)
Change-Id: Ide2c05e0fa259bb2903dfba3b0f5fb8d94f6c362
---
M includes/specials/SpecialGoogleLogin.php
1 file changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin
refs/changes/75/168275/1
diff --git a/includes/specials/SpecialGoogleLogin.php
b/includes/specials/SpecialGoogleLogin.php
index 3c6ee20..a21233b 100644
--- a/includes/specials/SpecialGoogleLogin.php
+++ b/includes/specials/SpecialGoogleLogin.php
@@ -86,7 +86,7 @@
$tableAttribs = array(
'class' =
'googlelogin-summary'
);
- if ( !$googleIdExists )
$this-createSubmitButton( 'Logout' );
+ if ( !$googleIdExists )
$this-createSubmitButton( 'Logout', 'progressive' );
$out-addHtml(
Html::openelement( 'fieldset' ) .
Html::element(
'legend', null, wfMessage( 'googlelogin-information-title' )-text() ) .
Html::element( 'label',
null, wfMessage( 'googlelogin-information-body' )-text() ) .
@@ -151,7 +151,7 @@
// show the
whole special page, not only a button - bug 67486
$out-redirect(
$this-getPageTitle()-getLocalUrl() );
} else {
-
$this-createSubmitButton( 'Unlink' );
+
$this-createSubmitButton( 'Unlink', 'destructive' );
}
}
} else {
@@ -226,12 +226,20 @@
* @param string $action The action the button will link to
(note: this string is
* the suffix for the Message key for the buttons name)
*/
- private function createSubmitButton( $action ) {
+ private function createSubmitButton( $action, $submitClass =
null ) {
$htmlForm = new HTMLForm(
array(),
$this-getContext(),
'googlelogin-form' . strtolower( $action )
);
+ switch( $submitClass ) {
+ case 'progressive':
+ $htmlForm-setSubmitProgressive();
+ break;
+ case 'destructive':
+ $htmlForm-setSubmitDestructive();
+ break;
+ }
$htmlForm-setSubmitText( wfMessage(
'googlelogin-form-' . strtolower( $action ) )-text() );
$htmlForm-addHiddenField( 'action', $action );
--
To view, visit https://gerrit.wikimedia.org/r/168275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide2c05e0fa259bb2903dfba3b0f5fb8d94f6c362
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-use instance of EntityIdParser in client factory - change (mediawiki...Wikibase)
Adrian Lang has submitted this change and it was merged.
Change subject: Re-use instance of EntityIdParser in client factory
..
Re-use instance of EntityIdParser in client factory
Change-Id: Ifa1fa3fab093f00e5b588558367674b33a8c8c9c
---
M client/includes/WikibaseClient.php
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 39fc7f3..ce14e96 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -82,6 +82,11 @@
private $dataTypeFactory = null;
/**
+* @var EntityIdParser
+*/
+ private $entityIdParser = null;
+
+ /**
* @var LanguageFallbackChainFactory
*/
private $languageFallbackChainFactory = null;
@@ -179,8 +184,12 @@
* @return EntityIdParser
*/
public function getEntityIdParser() {
- //TODO: make the ID builders configurable
- return new DispatchingEntityIdParser(
BasicEntityIdParser::getBuilders() );
+ if ( $this-entityIdParser === null ) {
+ //TODO: make the ID builders configurable
+ $this-entityIdParser = new DispatchingEntityIdParser(
BasicEntityIdParser::getBuilders() );
+ }
+
+ return $this-entityIdParser;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/168120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa1fa3fab093f00e5b588558367674b33a8c8c9c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.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] Make SqlStore::rebuildPropertyInfo non-static - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168276
Change subject: Make SqlStore::rebuildPropertyInfo non-static
..
Make SqlStore::rebuildPropertyInfo non-static
Change-Id: I16babfb8e92b4bc2bdbe0d41e6cb553d5300b151
---
M repo/includes/store/sql/SqlStore.php
1 file changed, 5 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/76/168276/1
diff --git a/repo/includes/store/sql/SqlStore.php
b/repo/includes/store/sql/SqlStore.php
index f33d637..8437b44 100644
--- a/repo/includes/store/sql/SqlStore.php
+++ b/repo/includes/store/sql/SqlStore.php
@@ -258,7 +258,7 @@
// populate the table after creating it
$updater-addExtensionUpdate( array(
- array( __CLASS__, 'rebuildPropertyInfo' )
+ array( $this, 'rebuildPropertyInfo' )
) );
}
}
@@ -269,7 +269,7 @@
*
* @param DatabaseUpdater $updater
*/
- public static function rebuildPropertyInfo( DatabaseUpdater $updater ) {
+ public function rebuildPropertyInfo( DatabaseUpdater $updater ) {
$reporter = new ObservableMessageReporter();
$reporter-registerReporterCallback(
function ( $msg ) use ( $updater ) {
@@ -278,21 +278,12 @@
);
$table = new PropertyInfoTable( false );
- $wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $contentCodec = $wikibaseRepo-getEntityContentDataCodec();
- $useRedirectTargetColumn =
$wikibaseRepo-getSettings()-getSetting( 'useRedirectTargetColumn' );
-
- $wikiPageEntityLookup = new WikiPageEntityRevisionLookup(
- $contentCodec,
- $wikibaseRepo-getEntityIdParser(),
- false
- );
-
- $cachingEntityLookup = new CachingEntityRevisionLookup(
$wikiPageEntityLookup, new \HashBagOStuff() );
+ $wikiPageEntityLookup = $this-getEntityRevisionLookup(
'uncached' );
+ $cachingEntityLookup = new CachingEntityRevisionLookup(
$wikiPageEntityLookup, new HashBagOStuff() );
$entityLookup = new RevisionBasedEntityLookup(
$cachingEntityLookup );
- $builder = new PropertyInfoTableBuilder( $table, $entityLookup,
$useRedirectTargetColumn );
+ $builder = new PropertyInfoTableBuilder( $table, $entityLookup,
$this-useRedirectTargetColumn );
$builder-setReporter( $reporter );
$builder-setUseTransactions( false );
--
To view, visit https://gerrit.wikimedia.org/r/168276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16babfb8e92b4bc2bdbe0d41e6cb553d5300b151
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed Style/BracesAroundHashParameters RuboCop offense - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168277
Change subject: Fixed Style/BracesAroundHashParameters RuboCop offense
..
Fixed Style/BracesAroundHashParameters RuboCop offense
Bug: 63307
Change-Id: I8493db95b21496d0c94a771856885554104fa7a1
---
M .rubocop_todo.yml
M lib/mediawiki_api/client.rb
M spec/client_spec.rb
3 files changed, 9 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/77/168277/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fee2ad7..6e29d00 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -33,12 +33,6 @@
Style/Alias:
Enabled: false
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BracesAroundHashParameters:
- Enabled: false
-
# Offense count: 1
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/ClassAndModuleChildren:
diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index 03784d9..2758cbc 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -80,7 +80,7 @@
end
def get_wikitext(title)
- @conn.get /w/index.php, { action: raw, title: title }
+ @conn.get /w/index.php, action: raw, title: title
end
def list(type, params = {})
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 760e830..4787347 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -150,7 +150,7 @@
it logs in when API returns Success do
stub_request(:post, api_url).
with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 }).
-to_return(body: { login: body_base.merge({ result: Success })
}.to_json )
+to_return(body: { login: body_base.merge(result: Success) }.to_json )
subject.log_in Test, qwe123
expect(subject.logged_in).to be true
@@ -163,14 +163,14 @@
stub_request(:post, api_url).
with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 }).
to_return(
-body: { login: body_base.merge({ result: NeedToken, token: 456
}) }.to_json,
+body: { login: body_base.merge(result: NeedToken, token: 456)
}.to_json,
headers: { Set-Cookie = prefixSession=789; path=/;
domain=localhost; HttpOnly }
)
@success_req = stub_request(:post, api_url).
with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123, lgtoken: 456 }).
with(headers: { Cookie = prefixSession=789 }).
- to_return(body: { login: body_base.merge({ result: Success })
}.to_json )
+ to_return(body: { login: body_base.merge(result: Success)
}.to_json )
end
it logs in do
@@ -191,7 +191,7 @@
before do
stub_request(:post, api_url).
with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 }).
- to_return(body: { login: body_base.merge({ result: EmptyPass })
}.to_json )
+ to_return(body: { login: body_base.merge(result: EmptyPass)
}.to_json )
end
it does not log in do
@@ -281,7 +281,7 @@
it creates an account when API returns Success do
stub_request(:post, api_url).
with(body: { format: json, action: createaccount, name: Test,
password: qwe123 }).
-to_return(body: { createaccount: body_base.merge({ result: Success
}) }.to_json )
+to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json )
expect(subject.create_account(Test, qwe123)).to include(result =
Success)
end
@@ -293,14 +293,14 @@
stub_request(:post, api_url).
with(body: { format: json, action: createaccount, name: Test,
password: qwe123 }).
to_return(
-body: { createaccount: body_base.merge({ result: NeedToken,
token: 456 }) }.to_json,
+body: { createaccount: body_base.merge(result: NeedToken, token:
456) }.to_json,
headers: { Set-Cookie = prefixSession=789; path=/;
domain=localhost; HttpOnly }
)
@success_req = stub_request(:post, api_url).
with(body: { format: json, action: createaccount, name: Test,
password: qwe123, token: 456 }).
with(headers: { Cookie = prefixSession=789 }).
- to_return(body: { createaccount: body_base.merge({ result: Success
}) }.to_json )
+ to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json )
end
it creates an account do
@@ -319,7 +319,7 @@
before do
stub_request(:post, api_url).
with(body: { format: json, action: createaccount, name: Test,
password: qwe123 }).
- to_return(body: { createaccount: body_base.merge({ result:
WhoKnows }) }.to_json )
+ to_return(body: { createaccount: body_base.merge(result:
[MediaWiki-commits] [Gerrit] Fix XSS vulnerability - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168278
Change subject: Fix XSS vulnerability
..
Fix XSS vulnerability
Is a hack atm, would need more considered thought later
Change-Id: Ifa165b73df0a0d6ff6bc90def961d257ccb4c386
---
M quarry/web/static/js/query/view.js
1 file changed, 20 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/78/168278/1
diff --git a/quarry/web/static/js/query/view.js
b/quarry/web/static/js/query/view.js
index a2330d5..9680118 100644
--- a/quarry/web/static/js/query/view.js
+++ b/quarry/web/static/js/query/view.js
@@ -1,5 +1,14 @@
$( function() {
-var editor = CodeMirror.fromTextArea($(#code)[0], {
+function htmlEscape(str) {
+return String(str)
+.replace(//g, 'amp;')
+.replace(//g, 'quot;')
+.replace(/'/g, '#39;')
+.replace(//g, 'lt;')
+.replace(//g, 'gt;');
+}
+
+var editor = CodeMirror.fromTextArea( $(#code)[0], {
mode: text/x-mariadb,
theme: monokai,
readOnly: !vars.can_edit,
@@ -91,7 +100,16 @@
$.get( url ).done( function( data ) {
var columns = [];
$.each( data.headers, function( i, header ) {
-columns.push( { 'title': header } );
+columns.push( {
+'title': htmlEscape( header ),
+'render': function( data, type, row ) {
+if ( typeof data === 'string' ) {
+return htmlEscape( data );
+} else {
+return data;
+}
+}
+} );
} );
var tableContainer = $( nunjucks.render( 'query-resultset.html', {
--
To view, visit https://gerrit.wikimedia.org/r/168278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa165b73df0a0d6ff6bc90def961d257ccb4c386
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] Fixed RuboCop offense Style/Alias - change (mediawiki...api)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/168279 Change subject: Fixed RuboCop offense Style/Alias .. Fixed RuboCop offense Style/Alias Bug: 63307 Change-Id: I97191e9b6449d7220fde84e3367f939e6053fc4d --- M .rubocop_todo.yml M lib/mediawiki_api/client.rb 2 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api refs/changes/79/168279/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6e29d00..78be1d4 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -29,11 +29,6 @@ Max: 13 # Offense count: 1 -# Cop supports --auto-correct. -Style/Alias: - Enabled: false - -# Offense count: 1 # Configuration parameters: EnforcedStyle, SupportedStyles. Style/ClassAndModuleChildren: Enabled: false diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb index 2758cbc..44516db 100644 --- a/lib/mediawiki_api/client.rb +++ b/lib/mediawiki_api/client.rb @@ -11,7 +11,7 @@ attr_accessor :logged_in -alias logged_in? logged_in +alias_method :logged_in?, :logged_in def initialize(url, log = false) @conn = Faraday.new(url: url) do |faraday| -- To view, visit https://gerrit.wikimedia.org/r/168279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97191e9b6449d7220fde84e3367f939e6053fc4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/ruby/api 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] Fix crash during handling of unusual api response - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/168280 Change subject: Fix crash during handling of unusual api response .. Fix crash during handling of unusual api response commit 0658eba in 2010 changed a debugging output such that it always throws an exception because string firmat arguments are not all used in the format string. Change-Id: I3742affd93899176ac261dd8f5958d8ed1967105 --- M pywikibot/data/api.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/80/168280/1 diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 4f46027..9cb5e5c 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1064,8 +1064,8 @@ return if query not in self.data: pywikibot.debug( -u%s: stopped iteration because 'query' not found in api response. -% (self.__class__.__name__, self.resultkey), +u%s: stopped iteration because 'query' not found in api +uresponse. % self.__class__.__name__, _logger) pywikibot.debug(unicode(self.data), _logger) return -- To view, visit https://gerrit.wikimedia.org/r/168280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3742affd93899176ac261dd8f5958d8ed1967105 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed RuboCop offense Style/DotPosition - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168281
Change subject: Fixed RuboCop offense Style/DotPosition
..
Fixed RuboCop offense Style/DotPosition
Bug: 63307
Change-Id: Ib7de913fba73a676f14fc3b0b54a01f5c93e7ecc
---
M .rubocop_todo.yml
M spec/client_spec.rb
M spec/support/request_helpers.rb
3 files changed, 47 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/81/168281/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 78be1d4..696e3d7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -37,12 +37,6 @@
Style/Documentation:
Enabled: false
-# Offense count: 30
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/DotPosition:
- Enabled: false
-
# Offense count: 2
# Cop supports --auto-correct.
Style/LeadingCommentSpace:
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 4787347..84fa10c 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -148,9 +148,9 @@
describe #log_in do
it logs in when API returns Success do
- stub_request(:post, api_url).
-with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 }).
-to_return(body: { login: body_base.merge(result: Success) }.to_json )
+ stub_request(:post, api_url)
+.with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 })
+.to_return(body: { login: body_base.merge(result: Success) }.to_json
)
subject.log_in Test, qwe123
expect(subject.logged_in).to be true
@@ -160,17 +160,17 @@
before do
headers = { Set-Cookie = prefixSession=789; path=/;
domain=localhost; HttpOnly }
-stub_request(:post, api_url).
- with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 }).
- to_return(
+stub_request(:post, api_url)
+ .with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 })
+ .to_return(
body: { login: body_base.merge(result: NeedToken, token: 456)
}.to_json,
headers: { Set-Cookie = prefixSession=789; path=/;
domain=localhost; HttpOnly }
)
-@success_req = stub_request(:post, api_url).
- with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123, lgtoken: 456 }).
- with(headers: { Cookie = prefixSession=789 }).
- to_return(body: { login: body_base.merge(result: Success)
}.to_json )
+@success_req = stub_request(:post, api_url)
+ .with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123, lgtoken: 456 })
+ .with(headers: { Cookie = prefixSession=789 })
+ .to_return(body: { login: body_base.merge(result: Success)
}.to_json )
end
it logs in do
@@ -189,9 +189,9 @@
context when API returns neither Success nor NeedToken do
before do
-stub_request(:post, api_url).
- with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 }).
- to_return(body: { login: body_base.merge(result: EmptyPass)
}.to_json )
+stub_request(:post, api_url)
+ .with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 })
+ .to_return(body: { login: body_base.merge(result: EmptyPass)
}.to_json )
end
it does not log in do
@@ -214,8 +214,8 @@
before do
stub_token_request(:edit)
- @edit_request = stub_action_request(:edit, title: title, text: text).
-to_return(body: response.to_json)
+ @edit_request = stub_action_request(:edit, title: title, text: text)
+.to_return(body: response.to_json)
end
it makes the right request do
@@ -226,11 +226,11 @@
describe #delete_page do
before do
- stub_request(:get, api_url).
-with(query: { format: json, action: tokens, type: delete }).
-to_return(body: { tokens: { deletetoken: t123 } }.to_json )
- @delete_req = stub_request(:post, api_url).
-with(body: { format: json, action: delete, title: Test, reason:
deleting, token: t123 })
+ stub_request(:get, api_url)
+.with(query: { format: json, action: tokens, type: delete })
+.to_return(body: { tokens: { deletetoken: t123 } }.to_json )
+ @delete_req = stub_request(:post, api_url)
+.with(body: { format: json, action: delete, title: Test, reason:
deleting, token: t123 })
end
it deletes a page using a delete token do
@@ -279,9 +279,9 @@
describe #create_account do
it creates an account when API returns Success do
- stub_request(:post, api_url).
-with(body: { format: json, action: createaccount, name: Test,
password: qwe123 }).
-to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json )
+
[MediaWiki-commits] [Gerrit] Export $CLASSPATH from init scripts - change (operations...kafka)
Ottomata has submitted this change and it was merged. Change subject: Export $CLASSPATH from init scripts .. Export $CLASSPATH from init scripts Change-Id: I4c45a7216f38dd522901e610a426a29d51979857 --- M debian/changelog M debian/kafka-mirror.init M debian/kafka-server.kafka.init 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 894cb87..a623c0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +kafka (0.8.1.1-4) precise; urgency=low + + * Export $CLASSPATH from init scripts + + -- Patrick Lucas plu...@yelp.com Wed, 22 Oct 2014 18:17:57 -0700 + kafka (0.8.1.1-3) precise; urgency=low * chown /var/spool/kafka/ in kafka-server.postinst diff --git a/debian/kafka-mirror.init b/debian/kafka-mirror.init index 22e0d67..5c45236 100755 --- a/debian/kafka-mirror.init +++ b/debian/kafka-mirror.init @@ -94,7 +94,7 @@ # Export Kafka environment variables from $DEFAULT file so # /usr/sbin/kafka will recognize them - export KAFKA_CONFIG JMX_PORT KAFKA_JMX_OPTS SCALA_VERSION KAFKA_JVM_PERFORMANCE_OPTS KAFKA_HEAP_OPTS KAFKA_LOG4J_OPTS KAFKA_OPTS + export KAFKA_CONFIG JMX_PORT KAFKA_JMX_OPTS SCALA_VERSION KAFKA_JVM_PERFORMANCE_OPTS KAFKA_HEAP_OPTS KAFKA_LOG4J_OPTS KAFKA_OPTS CLASSPATH # Define the command to run kafka as a daemon diff --git a/debian/kafka-server.kafka.init b/debian/kafka-server.kafka.init index 94e63bf..4218636 100755 --- a/debian/kafka-server.kafka.init +++ b/debian/kafka-server.kafka.init @@ -92,7 +92,7 @@ # Export Kafka environment variables from $DEFAULT file so # /usr/sbin/kafka will recognize them - export KAFKA_CONFIG JMX_PORT KAFKA_JMX_OPTS SCALA_VERSION KAFKA_JVM_PERFORMANCE_OPTS KAFKA_HEAP_OPTS KAFKA_LOG4J_OPTS KAFKA_OPTS + export KAFKA_CONFIG JMX_PORT KAFKA_JMX_OPTS SCALA_VERSION KAFKA_JVM_PERFORMANCE_OPTS KAFKA_HEAP_OPTS KAFKA_LOG4J_OPTS KAFKA_OPTS CLASSPATH # Run as a daemon set +e -- To view, visit https://gerrit.wikimedia.org/r/168230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c45a7216f38dd522901e610a426a29d51979857 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/kafka Gerrit-Branch: master Gerrit-Owner: Plucas plu...@yelp.com 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] Provide a standard way to get the target of a redirect page - change (mediawiki...Scribunto)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168282
Change subject: Provide a standard way to get the target of a redirect page
..
Provide a standard way to get the target of a redirect page
The new Scribunto_LuaTitleLibrary::redirectTarget() method is
used by mw.title objects as read-only attribute 'redirectTarget'.
If the page does not exist or it is not a redirect, the value
of the attribute is `nil`; otherwise, it is the target of the
redirect page, as mw.title object.
This is a proper alternative to parsing wikitext as it is done in:
https://en.wikipedia.org/wiki/Module:Redirect
bug: 66974
Change-Id: Id4d9b0f8c1cd09ebc42c031d4d3fc0c33eea44aa
---
M engines/LuaCommon/TitleLibrary.php
M engines/LuaCommon/lualib/mw.title.lua
M tests/engines/LuaCommon/TitleLibraryTest.php
M tests/engines/LuaCommon/TitleLibraryTests.lua
4 files changed, 50 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/82/168282/1
diff --git a/engines/LuaCommon/TitleLibrary.php
b/engines/LuaCommon/TitleLibrary.php
index 5094a17..a9c374d 100644
--- a/engines/LuaCommon/TitleLibrary.php
+++ b/engines/LuaCommon/TitleLibrary.php
@@ -17,6 +17,7 @@
'fileExists' = array( $this, 'fileExists' ),
'protectionLevels' = array( $this, 'protectionLevels'
),
'cascadingProtection' = array( $this,
'cascadingProtection' ),
+ 'redirectTarget' = array( $this, 'redirectTarget' ),
);
return $this-getEngine()-registerInterface( 'mw.title.lua',
$lib, array(
'thisTitle' = $this-returnTitleToLua(
$this-getTitle() ),
@@ -305,4 +306,31 @@
'restrictions' = array_map(
'Scribunto_LuaTitleLibrary::makeArrayOneBased', $restrictions )
) );
}
+
+ public function redirectTarget( $text ) {
+ $this-checkType( 'redirectTarget', 1, $text, 'string' );
+ $title = Title::newFromText( $text );
+ if ( !$title ) {
+ return array( null );
+ }
+
+ if ( is_callable( array( $this-getParser(),
'fetchCurrentRevisionOfTitle' ) ) ) {
+ $rev = $this-getParser()-fetchCurrentRevisionOfTitle(
$title );
+ } else {
+ $rev = Revision::newFromTitle( $title );
+ }
+ if ( !$rev ) {
+ return array( null );
+ }
+ $content = $rev-getContent();
+ if ( !$content ) {
+ return array( null );
+ }
+
+ $redirTitle = $content ? $content-getRedirectTarget() : null;
+ if ( !$redirTitle ) {
+ return array( null );
+ }
+ return array( $this-returnTitleToLua( $redirTitle ) );
+ }
}
diff --git a/engines/LuaCommon/lualib/mw.title.lua
b/engines/LuaCommon/lualib/mw.title.lua
index bc1caa7..647ec4e 100644
--- a/engines/LuaCommon/lualib/mw.title.lua
+++ b/engines/LuaCommon/lualib/mw.title.lua
@@ -166,6 +166,7 @@
fileExists = true,
protectionLevels = true,
cascadingProtection = true,
+ redirectTarget = true,
}
for k in pairs( data ) do
readOnlyFields[k] = true
@@ -243,6 +244,12 @@
end
return data.cascadingProtection
end
+ if k == 'redirectTarget' then
+ if data.redirectTarget == nil then
+ data.redirectTarget = makeTitleObject(
php.redirectTarget( data.prefixedText ) )
+ end
+ return data.redirectTarget
+ end
return data[k]
end,
diff --git a/tests/engines/LuaCommon/TitleLibraryTest.php
b/tests/engines/LuaCommon/TitleLibraryTest.php
index 02db20b..9867422 100644
--- a/tests/engines/LuaCommon/TitleLibraryTest.php
+++ b/tests/engines/LuaCommon/TitleLibraryTest.php
@@ -49,6 +49,13 @@
'Summary'
);
+ // Page for redirectTarget test
+ $page = WikiPage::factory( Title::newFromText(
'ScribuntoTestRedirect' ) );
+ $page-doEditContent(
+ new WikitextContent( '#REDIRECT
[[ScribuntoTestTarget]]' ),
+ 'Summary'
+ );
+
// Set restrictions for protectionLevels and
cascadingProtection tests
// Since mRestrictionsLoaded is true, they don't count as
expensive
$title = Title::newFromText( 'Main Page' );
diff --git
[MediaWiki-commits] [Gerrit] Add option for extra classpath entries - change (operations...kafka)
Ottomata has submitted this change and it was merged. Change subject: Add option for extra classpath entries .. Add option for extra classpath entries Change-Id: I671527f349c8317e07b1a4ba67ee02d37d9913a4 --- M manifests/defaults.pp M manifests/server.pp M templates/kafka.default.erb 3 files changed, 12 insertions(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/defaults.pp b/manifests/defaults.pp index f8b684a..c64f1ad 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -29,6 +29,7 @@ # Broker Server settings $java_home = undef $java_opts = undef +$classpath = undef $jmx_port= $log_dirs= ['/var/spool/kafka'] $heap_opts = undef diff --git a/manifests/server.pp b/manifests/server.pp index 8a7ed59..57a1cc8 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -34,7 +34,9 @@ # # $java_home- Value for the JAVA_HOME environment variable. Default: undef # -# $java_opts- Extra Java options. Default: undef. +# $java_opts- Extra Java options. Default: undef +# +# $classpath- Extra classpath entries. Default: undef # # $jmx_port - Port on which to expose JMX metrics. Default: # @@ -135,6 +137,7 @@ $java_home = $kafka::defaults::java_home, $java_opts = $kafka::defaults::java_opts, +$classpath = $kafka::defaults::classpath, $jmx_port= $kafka::defaults::jmx_port, $heap_opts = $kafka::defaults::heap_opts, $nofiles_ulimit = $kafka::defaults::nofiles_ulimit, diff --git a/templates/kafka.default.erb b/templates/kafka.default.erb index 56bd507..c13b29e 100644 --- a/templates/kafka.default.erb +++ b/templates/kafka.default.erb @@ -19,6 +19,13 @@ #JAVA_OPTS= % end -% +# Extra classpath entries +% if @classpath -% +CLASSPATH=%= @classpath % +% else -% +#CLASSPATH= +% end -% + KAFKA_NOFILES_ULIMIT=%= @nofiles_ulimit % # The default JMX_PORT for Kafka Brokers is . -- To view, visit https://gerrit.wikimedia.org/r/163890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I671527f349c8317e07b1a4ba67ee02d37d9913a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/kafka Gerrit-Branch: master Gerrit-Owner: Plucas plu...@yelp.com Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: Plucas plu...@yelp.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] Fixed RuboCop offense Style/LeadingCommentSpace - change (mediawiki...api)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/168283 Change subject: Fixed RuboCop offense Style/LeadingCommentSpace .. Fixed RuboCop offense Style/LeadingCommentSpace Bug: 63307 Change-Id: I7ed8a0d559b7527ce5a3492878b32c2a4c32186f --- M .rubocop_todo.yml M Gemfile 2 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api refs/changes/83/168283/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 696e3d7..537cd28 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -39,11 +39,6 @@ # Offense count: 2 # Cop supports --auto-correct. -Style/LeadingCommentSpace: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. # Configuration parameters: PreferredDelimiters. Style/PercentLiteralDelimiters: Enabled: false diff --git a/Gemfile b/Gemfile index 913c323..a44dd4e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ -#ruby=ruby-2.1.2 -#ruby-gemset=mediawiki_api +# ruby=ruby-2.1.2 +# ruby-gemset=mediawiki_api source https://rubygems.org; -- To view, visit https://gerrit.wikimedia.org/r/168283 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ed8a0d559b7527ce5a3492878b32c2a4c32186f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/ruby/api 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] Fixed RuboCop offense Style/SpaceInsideParens - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168286
Change subject: Fixed RuboCop offense Style/SpaceInsideParens
..
Fixed RuboCop offense Style/SpaceInsideParens
Bug: 63307
Change-Id: I297045771bbfdd62894a23d9036d7b103a1c1aad
---
M .rubocop_todo.yml
M spec/client_spec.rb
2 files changed, 9 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/86/168286/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index afb98b6..3debeef 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,11 +41,6 @@
Style/RegexpLiteral:
MaxSlashes: 0
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/SpaceInsideParens:
- Enabled: false
-
# Offense count: 1
# Cop supports --auto-correct.
Style/SpecialGlobalVars:
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 84fa10c..7357839 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -150,7 +150,7 @@
it logs in when API returns Success do
stub_request(:post, api_url)
.with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 })
-.to_return(body: { login: body_base.merge(result: Success) }.to_json
)
+.to_return(body: { login: body_base.merge(result: Success) }.to_json)
subject.log_in Test, qwe123
expect(subject.logged_in).to be true
@@ -170,7 +170,7 @@
@success_req = stub_request(:post, api_url)
.with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123, lgtoken: 456 })
.with(headers: { Cookie = prefixSession=789 })
- .to_return(body: { login: body_base.merge(result: Success)
}.to_json )
+ .to_return(body: { login: body_base.merge(result: Success)
}.to_json)
end
it logs in do
@@ -191,7 +191,7 @@
before do
stub_request(:post, api_url)
.with(body: { format: json, action: login, lgname: Test,
lgpassword: qwe123 })
- .to_return(body: { login: body_base.merge(result: EmptyPass)
}.to_json )
+ .to_return(body: { login: body_base.merge(result: EmptyPass)
}.to_json)
end
it does not log in do
@@ -228,7 +228,7 @@
before do
stub_request(:get, api_url)
.with(query: { format: json, action: tokens, type: delete })
-.to_return(body: { tokens: { deletetoken: t123 } }.to_json )
+.to_return(body: { tokens: { deletetoken: t123 } }.to_json)
@delete_req = stub_request(:post, api_url)
.with(body: { format: json, action: delete, title: Test, reason:
deleting, token: t123 })
end
@@ -281,7 +281,7 @@
it creates an account when API returns Success do
stub_request(:post, api_url)
.with(body: { format: json, action: createaccount, name: Test,
password: qwe123 })
-.to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json )
+.to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json)
expect(subject.create_account(Test, qwe123)).to include(result =
Success)
end
@@ -300,7 +300,7 @@
@success_req = stub_request(:post, api_url)
.with(body: { format: json, action: createaccount, name: Test,
password: qwe123, token: 456 })
.with(headers: { Cookie = prefixSession=789 })
- .to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json )
+ .to_return(body: { createaccount: body_base.merge(result: Success)
}.to_json)
end
it creates an account do
@@ -319,7 +319,7 @@
before do
stub_request(:post, api_url)
.with(body: { format: json, action: createaccount, name: Test,
password: qwe123 })
- .to_return(body: { createaccount: body_base.merge(result:
WhoKnows) }.to_json )
+ .to_return(body: { createaccount: body_base.merge(result:
WhoKnows) }.to_json)
end
it raises error with proper message do
@@ -332,7 +332,7 @@
before do
stub_request(:get, api_url)
.with(query: { format: json, action: tokens, type: watch })
-.to_return(body: { tokens: { watchtoken: t123 } }.to_json )
+.to_return(body: { tokens: { watchtoken: t123 } }.to_json)
@watch_req = stub_request(:post, api_url)
.with(body: { format: json, token: t123, action: watch, titles:
Test })
end
@@ -347,7 +347,7 @@
before do
stub_request(:get, api_url)
.with(query: { format: json, action: tokens, type: watch })
-.to_return(body: { tokens: { watchtoken: t123 } }.to_json )
+.to_return(body: { tokens: { watchtoken: t123 } }.to_json)
@watch_req = stub_request(:post, api_url)
.with(body: { format: json, token: t123, action: watch, titles:
Test, unwatch: true })
end
--
To view, visit https://gerrit.wikimedia.org/r/168286
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Fixed RuboCop offense Style/SpecialGlobalVars - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168287
Change subject: Fixed RuboCop offense Style/SpecialGlobalVars
..
Fixed RuboCop offense Style/SpecialGlobalVars
Bug: 63307
Change-Id: I29fd13d41f237f2ce020a7cbec014840ea76f7e6
---
M .rubocop_todo.yml
M mediawiki_api.gemspec
2 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/87/168287/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3debeef..da95fd1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,11 +41,6 @@
Style/RegexpLiteral:
MaxSlashes: 0
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
- Enabled: false
-
# Offense count: 299
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/mediawiki_api.gemspec b/mediawiki_api.gemspec
index 9064d35..a740113 100644
--- a/mediawiki_api.gemspec
+++ b/mediawiki_api.gemspec
@@ -13,7 +13,7 @@
spec.homepage = https://github.com/wikimedia/mediawiki-ruby-api;
spec.license = GPL-2
- spec.files = `git ls-files`.split($/)
+ spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
spec.test_files= spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = [lib]
--
To view, visit https://gerrit.wikimedia.org/r/168287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29fd13d41f237f2ce020a7cbec014840ea76f7e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
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] Fixed RuboCop offense Style/PercentLiteralDelimiters - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168284
Change subject: Fixed RuboCop offense Style/PercentLiteralDelimiters
..
Fixed RuboCop offense Style/PercentLiteralDelimiters
Bug: 63307
Change-Id: Ic2eaae2eabda80d28dde89d6036c20239430e546
---
M .rubocop_todo.yml
M mediawiki_api.gemspec
2 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/84/168284/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 537cd28..2458f24 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -37,12 +37,6 @@
Style/Documentation:
Enabled: false
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
- Enabled: false
-
# Offense count: 1
Style/RegexpLiteral:
MaxSlashes: 0
diff --git a/mediawiki_api.gemspec b/mediawiki_api.gemspec
index 546b0ed..9064d35 100644
--- a/mediawiki_api.gemspec
+++ b/mediawiki_api.gemspec
@@ -8,8 +8,8 @@
spec.version = MediawikiApi::VERSION
spec.authors = [Amir Aharoni, Chris McMahon, Dan Duvall, Jeff
Hall, Juliusz Gonera, Zeljko Filipin]
spec.email = [amir.ahar...@mail.huji.ac.il,
cmcma...@wikimedia.org, dduv...@wikimedia.org, jh...@wikimedia.org,
jgon...@wikimedia.org, zeljko.fili...@gmail.com]
- spec.summary = %q{A library for interacting with MediaWiki API from
Ruby.}
- spec.description = %q{Uses adapter-agnostic Faraday gem to talk to
MediaWiki API.}
+ spec.summary = %q(A library for interacting with MediaWiki API from
Ruby.)
+ spec.description = %q(Uses adapter-agnostic Faraday gem to talk to
MediaWiki API.)
spec.homepage = https://github.com/wikimedia/mediawiki-ruby-api;
spec.license = GPL-2
--
To view, visit https://gerrit.wikimedia.org/r/168284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2eaae2eabda80d28dde89d6036c20239430e546
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
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] Fixed RuboCop offense Style/SignalException - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168285
Change subject: Fixed RuboCop offense Style/SignalException
..
Fixed RuboCop offense Style/SignalException
Bug: 63307
Change-Id: I37905faabe01dd5c49b17dd5bd16c72d75dba456
---
M .rubocop_todo.yml
M lib/mediawiki_api/client.rb
2 files changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/85/168285/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2458f24..afb98b6 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,12 +41,6 @@
Style/RegexpLiteral:
MaxSlashes: 0
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
- Enabled: false
-
# Offense count: 9
# Cop supports --auto-correct.
Style/SpaceInsideParens:
diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index 44516db..7de96c4 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -37,10 +37,10 @@
response = @conn.send(method, , params.merge(action: name, format:
FORMAT))
- raise HttpError, response.status if response.status = 400
+ fail HttpError, response.status if response.status = 400
if response.headers.include?(mediawiki-api-error)
-raise ApiError, Response.new(response, [error])
+fail ApiError, Response.new(response, [error])
end
Response.new(response, envelope)
@@ -59,7 +59,7 @@
when NeedToken
data = create_account(username, password, data[token])
else
-raise CreateAccountError, data[result]
+fail CreateAccountError, data[result]
end
data
@@ -75,7 +75,7 @@
def edit(params = {})
response = action(:edit, params)
- raise EditError, response if response.data[result] == Failure
+ fail EditError, response if response.data[result] == Failure
response
end
@@ -100,7 +100,7 @@
when NeedToken
data = log_in(username, password, data[token])
else
-raise LoginError, data[result]
+fail LoginError, data[result]
end
data
@@ -155,7 +155,7 @@
response = action(:tokens, type: type, http_method: :get, token_type:
false)
if response.warnings? response.warnings.grep(/Unrecognized value
for parameter 'type'/).any?
- raise TokenError, response.warnings.join(, )
+ fail TokenError, response.warnings.join(, )
end
@tokens[type] = response.data[#{type}token]
--
To view, visit https://gerrit.wikimedia.org/r/168285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37905faabe01dd5c49b17dd5bd16c72d75dba456
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
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] Fixed RuboCop offense Style/StringLiterals - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168288
Change subject: Fixed RuboCop offense Style/StringLiterals
..
Fixed RuboCop offense Style/StringLiterals
Bug: 63307
Change-Id: Ieb701b8d65385357540e978b374666efc80685b4
---
M .rubocop_todo.yml
M Gemfile
M lib/mediawiki_api.rb
M lib/mediawiki_api/client.rb
M lib/mediawiki_api/exceptions.rb
M lib/mediawiki_api/response.rb
M lib/mediawiki_api/version.rb
M mediawiki_api.gemspec
M spec/client_spec.rb
M spec/response_spec.rb
M spec/spec_helper.rb
M spec/support/request_helpers.rb
12 files changed, 203 insertions(+), 209 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/88/168288/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index da95fd1..175dd6f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -41,12 +41,6 @@
Style/RegexpLiteral:
MaxSlashes: 0
-# Offense count: 299
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
- Enabled: false
-
# Offense count: 2
# Cop supports --auto-correct.
Style/UnneededPercentQ:
diff --git a/Gemfile b/Gemfile
index a44dd4e..623bd57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
# ruby=ruby-2.1.2
# ruby-gemset=mediawiki_api
-source https://rubygems.org;
+source 'https://rubygems.org'
# Specify your gem's dependencies in mediawiki_api.gemspec
gemspec
diff --git a/lib/mediawiki_api.rb b/lib/mediawiki_api.rb
index 8d53053..3a67eba 100644
--- a/lib/mediawiki_api.rb
+++ b/lib/mediawiki_api.rb
@@ -1 +1 @@
-require mediawiki_api/client
+require 'mediawiki_api/client'
diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index 7de96c4..c90b5ba 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -1,13 +1,13 @@
-require faraday
-require faraday-cookie_jar
-require json
+require 'faraday'
+require 'faraday-cookie_jar'
+require 'json'
-require mediawiki_api/exceptions
-require mediawiki_api/response
+require 'mediawiki_api/exceptions'
+require 'mediawiki_api/response'
module MediawikiApi
class Client
-FORMAT = json
+FORMAT = 'json'
attr_accessor :logged_in
@@ -35,12 +35,12 @@
params[:token] = get_token(token_type || name) unless token_type == false
params = compile_parameters(params)
- response = @conn.send(method, , params.merge(action: name, format:
FORMAT))
+ response = @conn.send(method, '', params.merge(action: name, format:
FORMAT))
fail HttpError, response.status if response.status = 400
- if response.headers.include?(mediawiki-api-error)
-fail ApiError, Response.new(response, [error])
+ if response.headers.include?('mediawiki-api-error')
+fail ApiError, Response.new(response, ['error'])
end
Response.new(response, envelope)
@@ -52,14 +52,14 @@
data = action(:createaccount, params).data
- case data[result]
- when Success
+ case data['result']
+ when 'Success'
@logged_in = true
@tokens.clear
- when NeedToken
-data = create_account(username, password, data[token])
+ when 'NeedToken'
+data = create_account(username, password, data['token'])
else
-fail CreateAccountError, data[result]
+fail CreateAccountError, data['result']
end
data
@@ -75,12 +75,12 @@
def edit(params = {})
response = action(:edit, params)
- fail EditError, response if response.data[result] == Failure
+ fail EditError, response if response.data['result'] == 'Failure'
response
end
def get_wikitext(title)
- @conn.get /w/index.php, action: raw, title: title
+ @conn.get '/w/index.php', action: 'raw', title: title
end
def list(type, params = {})
@@ -93,14 +93,14 @@
data = action(:login, params).data
- case data[result]
- when Success
+ case data['result']
+ when 'Success'
@logged_in = true
@tokens.clear
- when NeedToken
-data = log_in(username, password, data[token])
+ when 'NeedToken'
+data = log_in(username, password, data['token'])
else
-fail LoginError, data[result]
+fail LoginError, data['result']
end
data
@@ -114,7 +114,7 @@
subquery(:prop, type, params)
end
-def protect_page(title, reason, protections = edit=sysop|move=sysop)
+def protect_page(title, reason, protections = 'edit=sysop|move=sysop')
action(:protect, title: title, reason: reason, protections: protections)
end
@@ -127,8 +127,8 @@
end
def upload_image(filename, path, comment, ignorewarnings)
- file = Faraday::UploadIO.new(path, image/png)
- action(:upload, token_type: edit, filename: filename, file: file,
comment: comment, ignorewarnings: ignorewarnings)
+ file =
[MediaWiki-commits] [Gerrit] Fixed RuboCop offense Style/WordArray - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168290
Change subject: Fixed RuboCop offense Style/WordArray
..
Fixed RuboCop offense Style/WordArray
Bug: 63307
Change-Id: I6b18f3c7d2c6314270bafbd4a6e9b5c30ccbaaa2
---
M .rubocop_todo.yml
M spec/client_spec.rb
M spec/response_spec.rb
3 files changed, 4 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/90/168290/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6154ca6..ca15728 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -40,8 +40,3 @@
# Offense count: 1
Style/RegexpLiteral:
MaxSlashes: 0
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/WordArray:
- MinSize: 2
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 24cd0f9..7a5797f 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -88,7 +88,7 @@
end
context 'array parameters' do
-let(:params) { { foo: ['one', 'two'] } }
+let(:params) { { foo: %w(one two) } }
before do
@request = stub_action_request(action, foo:
'one|two').to_return(response)
diff --git a/spec/response_spec.rb b/spec/response_spec.rb
index 693a081..f431497 100644
--- a/spec/response_spec.rb
+++ b/spec/response_spec.rb
@@ -28,14 +28,14 @@
end
context 'and a multi-level envelope' do
-let(:envelope) { ['query', 'result'] }
+let(:envelope) { %w(query result) }
let(:nested_object) { response_object['query']['result'] }
it { is_expected.to eq(nested_object) }
end
context and a multi-level envelope that doesn't completely match do
-let(:envelope) { ['query', 'something'] }
+let(:envelope) { %w(query something) }
let(:partially_nested_object) { response_object['query'] }
it { is_expected.to eq(partially_nested_object) }
@@ -46,7 +46,7 @@
let(:body) { '[ something ]' }
context 'with any expected envelope' do
-let(:envelope) { ['what', 'ever'] }
+let(:envelope) { %w(what ever) }
it { is_expected.to eq(response_object) }
end
--
To view, visit https://gerrit.wikimedia.org/r/168290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b18f3c7d2c6314270bafbd4a6e9b5c30ccbaaa2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
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] Fixed RuboCop offense Style/UnneededPercentQ - change (mediawiki...api)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/168289 Change subject: Fixed RuboCop offense Style/UnneededPercentQ .. Fixed RuboCop offense Style/UnneededPercentQ Bug: 63307 Change-Id: I49f37330032af1c377ab4772f4e89ae6f0033dd3 --- M .rubocop_todo.yml M mediawiki_api.gemspec 2 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api refs/changes/89/168289/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 175dd6f..6154ca6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -41,11 +41,6 @@ Style/RegexpLiteral: MaxSlashes: 0 -# Offense count: 2 -# Cop supports --auto-correct. -Style/UnneededPercentQ: - Enabled: false - # Offense count: 4 # Cop supports --auto-correct. Style/WordArray: diff --git a/mediawiki_api.gemspec b/mediawiki_api.gemspec index d34e923..801dbcf 100644 --- a/mediawiki_api.gemspec +++ b/mediawiki_api.gemspec @@ -8,8 +8,8 @@ spec.version = MediawikiApi::VERSION spec.authors = ['Amir Aharoni', 'Chris McMahon', 'Dan Duvall', 'Jeff Hall', 'Juliusz Gonera', 'Zeljko Filipin'] spec.email = ['amir.ahar...@mail.huji.ac.il', 'cmcma...@wikimedia.org', 'dduv...@wikimedia.org', 'jh...@wikimedia.org', 'jgon...@wikimedia.org', 'zeljko.fili...@gmail.com'] - spec.summary = %q(A library for interacting with MediaWiki API from Ruby.) - spec.description = %q(Uses adapter-agnostic Faraday gem to talk to MediaWiki API.) + spec.summary = 'A library for interacting with MediaWiki API from Ruby.' + spec.description = 'Uses adapter-agnostic Faraday gem to talk to MediaWiki API.' spec.homepage = 'https://github.com/wikimedia/mediawiki-ruby-api' spec.license = 'GPL-2' -- To view, visit https://gerrit.wikimedia.org/r/168289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49f37330032af1c377ab4772f4e89ae6f0033dd3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/ruby/api 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] Remove all kraken references - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Remove all kraken references
..
Remove all kraken references
The kraken repository (and previously named cluster) have
been deprecated and are no longer supported or used.
Change-Id: I6f2900f2a4643a8fce98b3b637f3dd82ef1d1043
---
D files/ganglia/plugins/kraken_webrequest_loss.py
D files/ganglia/plugins/kraken_webrequest_loss.pyconf
M manifests/misc/monitoring.pp
M manifests/role/analytics.pp
D manifests/role/analytics/kraken.pp
M manifests/role/analytics/refinery.pp
M manifests/role/deployment.pp
M manifests/site.pp
M modules/contint/manifests/packages.pp
9 files changed, 3 insertions(+), 312 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/ganglia/plugins/kraken_webrequest_loss.py
b/files/ganglia/plugins/kraken_webrequest_loss.py
deleted file mode 100644
index 8b966a8..000
--- a/files/ganglia/plugins/kraken_webrequest_loss.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-Python Gmond Module for Kraken Webrequest Loss Percentage.
-Loss percentage per source host data is generated by the packetloss
-Oozie job in Kraken.
-
-:copyright: (c) 2012 Wikimedia Foundation
-:author: Andrew Otto o...@wikimedia.org
-:license: GPL
-
-
-from __future__ import print_function
-
-import logging
-import commands
-
-UPDATE_INTERVAL = 3600 # seconds
-
-# Config for multiple metrics.
-# Currently we only compute a single webrequest loss
-# percentage, but this allows us to add more later.
-metrics = {
-'webrequest_loss_average': {
-'description': 'Average Webrequest Loss Percentage',
-'path':'/wmf/data/webrequest/loss',
-}
-}
-
-def latest_loss_path(metric_name):
-Returns HDFS path to the most recently generated webrequest loss
data.
-logging.debug(latest_loss_path(%s) % metrics[metric_name]['path'])
-return commands.getoutput(/usr/bin/hadoop fs -ls %s | /usr/bin/tail -n 1
| /usr/bin/awk '{print $NF}' % (metrics[metric_name]['path']))
-
-def loss_data(loss_path):
-Returns the output data inside the HDFS loss_path.
-logging.debug(loss_data(%s) % loss_path)
-return commands.getoutput(/usr/bin/hadoop fs -cat %s/part* % (loss_path))
-
-def loss_average(loss_data):
-Parses loss_data for loss percentages and averages them all.
-logging.debug(loss_average(%s) % loss_data)
-percent_sum = 0.0
-loss_lines = loss_data.split(\n)
-for line in loss_lines:
-fields = line.split(\t)
-percent = fields[-1]
-percent_sum += float(percent)
-
-average_percent = (percent_sum / float(len(loss_lines)))
-return average_percent
-
-def metric_handler(name):
-Get value of particular metric; part of Gmond interface
-logging.debug('metric_handler(): %s', name)
-return loss_average(loss_data(latest_loss_path(name)))
-
-def metric_init(params):
-global descriptors
-
-descriptors = []
-for metric_name, metric_config in metrics.items():
-descriptors.append({
-'name': metric_name,
-'call_back': metric_handler,
-'time_max': 3660,
-'value_type': 'float',
-'units': '%',
-'slope': 'both',
-'format': '%f',
-'description': metric_config['description'],
-'groups': 'analytics'
-})
-
-return descriptors
-
-
-def metric_cleanup():
-Teardown; part of Gmond interface
-pass
-
-
-if __name__ == '__main__':
-# When invoked as standalone script, run a self-test by querying each
-# metric descriptor and printing it out.
-logging.basicConfig(level=logging.DEBUG)
-for metric in metric_init({}):
-value = metric['call_back'](metric['name'])
-print(( %s = + metric['format'] ) % ( metric['name'], value ))
diff --git a/files/ganglia/plugins/kraken_webrequest_loss.pyconf
b/files/ganglia/plugins/kraken_webrequest_loss.pyconf
deleted file mode 100644
index 2ea2fea..000
--- a/files/ganglia/plugins/kraken_webrequest_loss.pyconf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Gmond configuration for calculating
-# webrequest data loss stored in HDFS in Kraken.
-
-modules {
- module {
-name = kraken_webrequest_loss
-language = python
- }
-}
-
-collection_group {
- collect_every = 3600
- time_threshold = 3660
-
- metric {
-name = webrequest_loss_average
-title = Average Loss Percentage
-value_threshold = 0
- }
-}
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index b4fa29b..e27147a 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -64,37 +64,6 @@
}
}
-# == Class misc::monitoring::kraken::loss
-# Checks recently generated webrequest loss statistics in
-# Kraken HDFS and sends the average loss percentage to ganglia.
-#
-class misc::monitoring::kraken::loss
[MediaWiki-commits] [Gerrit] Fix wfLogWarning call and interface documentation - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168291
Change subject: Fix wfLogWarning call and interface documentation
..
Fix wfLogWarning call and interface documentation
Change-Id: I087921536907757d35d181e7a326600446b55a62
---
M client/includes/ChangeHandler.php
M client/includes/store/ClientStore.php
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/91/168291/1
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index b08c791..3941fb3 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -396,7 +396,7 @@
$currentRun[] = $change;
// skip any change that failed to process in some way
(bug 49417)
} catch ( \Exception $e ) {
- wfLogWarning( __CLASS__, __METHOD__ . ':' .
$e-getMessage() );
+ wfLogWarning( __METHOD__ . ':' .
$e-getMessage() );
}
}
diff --git a/client/includes/store/ClientStore.php
b/client/includes/store/ClientStore.php
index 5b87f25..acb5bbf 100644
--- a/client/includes/store/ClientStore.php
+++ b/client/includes/store/ClientStore.php
@@ -4,6 +4,7 @@
use Wikibase\Client\Usage\SubscriptionManager;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Client\Usage\UsageLookup;
use Wikibase\Client\Usage\UsageTracker;
@@ -62,7 +63,7 @@
/**
* @since 0.5
*
-* @return EntityLookup
+* @return EntityRevisionLookup
*/
public function getEntityRevisionLookup();
--
To view, visit https://gerrit.wikimedia.org/r/168291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I087921536907757d35d181e7a326600446b55a62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: 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] Fixed RuboCop offense Lint/UselessAssignment - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168292
Change subject: Fixed RuboCop offense Lint/UselessAssignment
..
Fixed RuboCop offense Lint/UselessAssignment
Fixed 2 out of 3 problems, not sure how to fix the remaining one.
Bug: 63307
Change-Id: I89eb92a64a15490e3a5042ec86733bc5884122b9
---
M .rubocop_todo.yml
M spec/client_spec.rb
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/92/168292/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ca15728..1cc5ef4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,7 +5,7 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
-# Offense count: 3
+# Offense count: 1
Lint/UselessAssignment:
Enabled: false
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 7a5797f..44b06d4 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -158,8 +158,6 @@
context 'when API returns NeedToken' do
before do
-headers = { 'Set-Cookie' = 'prefixSession=789; path=/;
domain=localhost; HttpOnly' }
-
stub_request(:post, api_url)
.with(body: { format: 'json', action: 'login', lgname: 'Test',
lgpassword: 'qwe123' })
.to_return(
@@ -288,8 +286,6 @@
context 'when API returns NeedToken' do
before do
-headers = { 'Set-Cookie' = 'prefixSession=789; path=/;
domain=localhost; HttpOnly' }
-
stub_request(:post, api_url)
.with(body: { format: 'json', action: 'createaccount', name: 'Test',
password: 'qwe123' })
.to_return(
--
To view, visit https://gerrit.wikimedia.org/r/168292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89eb92a64a15490e3a5042ec86733bc5884122b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
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] $.wikibase.sitelinklistview: Implemented dynamic input elements - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168293
Change subject: $.wikibase.sitelinklistview: Implemented dynamic input elements
..
$.wikibase.sitelinklistview: Implemented dynamic input elements
Along with the change, the now obsolete add toolbar initialized on
sitelinkgroupview is removed.
Change-Id: I33bddf76ea63d53e41dea3f01514851541d84407
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M repo/resources/wikibase.ui.entityViewInit.js
3 files changed, 118 insertions(+), 96 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/93/168293/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index b4bb0fd..e7f94cd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -417,92 +417,6 @@
}
} );
-$.wikibase.toolbarcontroller.definition( 'addtoolbar', {
- id: 'sitelinkgroupview-sitelinklistview',
- selector: ':' + $.wikibase.sitelinkgroupview.prototype.namespace
- + '-' + $.wikibase.sitelinkgroupview.prototype.widgetName,
- events: {
- sitelinkgroupviewafterstartediting: function( event,
toolbarcontroller ) {
- var $sitelinkgroupview = $( event.target ),
- sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' ),
- $sitelinklistview
=sitelinkgroupview.$sitelinklistview,
- sitelinklistview = $sitelinklistview.data(
'sitelinklistview' );
-
- $sitelinklistview
- .addtoolbar( {
- $container: $( 'span/' ).appendTo(
sitelinklistview.$tfoot.find( 'td' ).last() )
- } )
- .on( 'addtoolbaradd.addtoolbar', function() {
- sitelinklistview.$listview.one(
- 'sitelinkviewafterstartediting',
- function( event ) {
- $( event.target ).data(
'sitelinkview' ).focus();
- }
- );
-
- $sitelinklistview.data( 'sitelinklistview'
).enterNewItem();
-
- // Re-focus add button after having added or
having cancelled adding a link:
- var eventName =
'sitelinklistviewafterstopediting.addtoolbar';
- $sitelinklistview.one( eventName, function(
event ) {
- $sitelinklistview.data( 'addtoolbar'
).focus();
- } );
- } );
-
- if( sitelinklistview.isFull() ) {
- $sitelinklistview.data( 'addtoolbar'
).disable();
- }
- },
- sitelinkgroupviewafterstopediting: function( event,
toolbarcontroller ) {
- var $sitelinkgroupview = $( event.target ),
- sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' ),
- $sitelinklistview =
sitelinkgroupview.$sitelinklistview;
-
- toolbarcontroller.destroyToolbar(
$sitelinklistview.data( 'addtoolbar' ) );
- $sitelinklistview.off( '.addtoolbar' );
- },
- sitelinklistviewafterremove: function( event, toolbarcontroller
) {
- var $sitelinkgroupview = $( event.target ),
- sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' ),
- $sitelinklistview =
sitelinkgroupview.$sitelinklistview,
- sitelinklistview = $sitelinklistview.data(
'sitelinklistview' );
-
- $sitelinklistview.data( 'addtoolbar'
)[sitelinklistview.isFull()
- ? 'disable'
- : 'enable'
- ]();
- },
- sitelinkgroupviewchange: function( event, toolbarcontroller ) {
- var $sitelinkgroupview = $( event.target ),
- sitelinkgroupview = $sitelinkgroupview.data(
'sitelinkgroupview' ),
- $sitelinklistview =
sitelinkgroupview.$sitelinklistview,
- sitelinklistview = $sitelinklistview.data(
'sitelinklistview' ),
- addtoolbar =
[MediaWiki-commits] [Gerrit] Simplify and generalize array handling in SqlUsageTracker - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Simplify and generalize array handling in SqlUsageTracker
..
Simplify and generalize array handling in SqlUsageTracker
Change-Id: I6facbbd6efb8190b885059caadcabf64b748d95f
---
M client/includes/Usage/Sql/SqlUsageTracker.php
M client/includes/Usage/Sql/UsageTableUpdater.php
2 files changed, 27 insertions(+), 28 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/Usage/Sql/SqlUsageTracker.php
b/client/includes/Usage/Sql/SqlUsageTracker.php
index d75d6ee..7319624 100644
--- a/client/includes/Usage/Sql/SqlUsageTracker.php
+++ b/client/includes/Usage/Sql/SqlUsageTracker.php
@@ -316,28 +316,13 @@
__METHOD__
);
- $pages = $this-convertRowsToPageIds( $res );
+ $pages = $this-extractProperty( 'eu_page_id', $res );
$this-releaseConnection( $db );
//TODO: use paging for large page sets!
return new ArrayIterator( $pages );
}
-
- /**
-* @param array|Iterator $rows
-*
-* @return array
-*/
- private function convertRowsToPageIds( $rows ) {
- $pages = array();
- foreach ( $rows as $row ) {
- $pages[] = (int)$row-eu_page_id;
- }
-
- return $pages;
- }
-
/**
* @see UsageTracker::getUnusedEntities
@@ -367,26 +352,40 @@
$this-releaseConnection( $db );
- $unused = $this-stripEntitiesFromList( $res, $entities );
+ $entityIds = $this-extractProperty( 'eu_entity_id', $res );
+ $unused = $this-stripKeysFromList( $entityIds, $entities );
+
return $unused;
}
/**
-* Unsets all keys in $entities that where found as values of
eu_entity_id
-* in $rows.
+* Returns a copy of $arr without all keys that are in $keys.
*
-* @param array|Iterator $rows
-* @param EntityId[] $entities
+* @param string[] $keys
+* @param array $arr
*
* @return array
*/
- private function stripEntitiesFromList( $rows, array $entities ) {
- foreach ( $rows as $row ) {
- $key = $row-eu_entity_id;
- unset( $entities[$key] );
+ private function stripKeysFromList( array $keys, array $arr ) {
+ return array_diff_key( $arr, array_flip( $keys ) );
+ }
+
+ /**
+* Returns an array of values for $key property from the array $arr.
+*
+* @param string $key
+* @param array|Iterator $arr
+*
+* @return array
+*/
+ private function extractProperty( $key, $arr ) {
+ $newArr = array();
+
+ foreach( $arr as $arrItem ) {
+ $newArr[] = $arrItem-$key;
}
- return $entities;
+ return $newArr;
}
}
diff --git a/client/includes/Usage/Sql/UsageTableUpdater.php
b/client/includes/Usage/Sql/UsageTableUpdater.php
index caaf25e..1309c61 100644
--- a/client/includes/Usage/Sql/UsageTableUpdater.php
+++ b/client/includes/Usage/Sql/UsageTableUpdater.php
@@ -99,7 +99,7 @@
/**
* @param int $pageId
-* @param EntityUsage[] $usages Must be keyed by string id
+* @param EntityUsage[] $usages
*
* @return int The number of entries removed
*/
@@ -205,7 +205,7 @@
/**
* @param int $pageId
-* @param EntityUsage[] $usages Must be keyed by string id
+* @param EntityUsage[] $usages
*
* @return int The number of entries added
*/
--
To view, visit https://gerrit.wikimedia.org/r/165193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6facbbd6efb8190b885059caadcabf64b748d95f
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.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] Fix wfLogWarning call and interface documentation - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix wfLogWarning call and interface documentation
..
Fix wfLogWarning call and interface documentation
Change-Id: I087921536907757d35d181e7a326600446b55a62
---
M client/includes/ChangeHandler.php
M client/includes/store/ClientStore.php
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index b08c791..3941fb3 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -396,7 +396,7 @@
$currentRun[] = $change;
// skip any change that failed to process in some way
(bug 49417)
} catch ( \Exception $e ) {
- wfLogWarning( __CLASS__, __METHOD__ . ':' .
$e-getMessage() );
+ wfLogWarning( __METHOD__ . ':' .
$e-getMessage() );
}
}
diff --git a/client/includes/store/ClientStore.php
b/client/includes/store/ClientStore.php
index 5b87f25..acb5bbf 100644
--- a/client/includes/store/ClientStore.php
+++ b/client/includes/store/ClientStore.php
@@ -4,6 +4,7 @@
use Wikibase\Client\Usage\SubscriptionManager;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Client\Usage\UsageLookup;
use Wikibase\Client\Usage\UsageTracker;
@@ -62,7 +63,7 @@
/**
* @since 0.5
*
-* @return EntityLookup
+* @return EntityRevisionLookup
*/
public function getEntityRevisionLookup();
--
To view, visit https://gerrit.wikimedia.org/r/168291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I087921536907757d35d181e7a326600446b55a62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.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] Remove sitelinkview when hitting backspace in first input - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168294
Change subject: Remove sitelinkview when hitting backspace in first input
..
Remove sitelinkview when hitting backspace in first input
Change-Id: I69c3dc959b67f329d988d773a7bc18622e1b0983
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/94/168294/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 0c88975..84fc04a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -148,6 +148,16 @@
event.stopPropagation();
self.setError( error );
} )
+ .on( 'keydown.' + this.widgetName, function( event ) {
+ if( event.keyCode === $.ui.keyCode.BACKSPACE ) {
+ var $sitelinkview = $( event.target ).closest(
':wikibase-sitelinkview' ),
+ sitelinkview = $sitelinkview.data(
'sitelinkview' );
+
+ if( sitelinkview ) {
+ self._removeSitelinkviewIfEmpty(
sitelinkview );
+ }
+ }
+ } )
.on(
[
prefix + 'create.' + this.widgetName,
@@ -201,6 +211,40 @@
},
/**
+* @param {jQuery.wikibase.sitelinkview} sitelinkview
+*/
+ _removeSitelinkviewIfEmpty: function( sitelinkview ) {
+ var $sitelinkview = sitelinkview.element,
+ listview = this.$listview.data( 'listview' ),
+ lia = listview.listItemAdapter(),
+ $items = listview.items(),
+ isLast = $sitelinkview.get( 0 ) === $items.last().get(
0 ),
+ isEmpty = sitelinkview.isEmpty()
+ || sitelinkview.option( 'value' )
!sitelinkview.value();
+
+ if( isEmpty ) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ // Shift focus to previous line or to following line if
there is no previous:
+ $items.each( function( i ) {
+ if( this === $sitelinkview.get( 0 ) ) {
+ if( i 0 ) {
+ lia.liInstance( $items.eq( i -
1 ) ).focus();
+ } else if( $items.length 1 ) {
+ lia.liInstance( $items.eq( i +
1 ) ).focus();
+ }
+ return false;
+ }
+ } );
+
+ if( !isLast ) {
+ listview.removeItem( $sitelinkview );
+ }
+ }
+ },
+
+ /**
* @return {string[]}
*/
_getUnusedAllowedSiteIds: function() {
--
To view, visit https://gerrit.wikimedia.org/r/168294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69c3dc959b67f329d988d773a7bc18622e1b0983
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Require 2 ACKs from kafka brokers for bits caches - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Require 2 ACKs from kafka brokers for bits caches
..
Require 2 ACKs from kafka brokers for bits caches
Bumping to 2 ACKs for mobile and text caches did not cause issues, so
we move forward and also require 2 ACKs for bits caches.
Bug: 69667
Change-Id: I657916fa272e1b7977497e6fece1af7e7c0f533c
---
M manifests/role/cache.pp
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3379b84..7ce83c1 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -519,11 +519,12 @@
# ramping up the number of machines that request more
# ACKs.
#
-# For now, it's only mobile (smallest cluster), and text.
-# That's roughly 30% of requests and covers the production
+# For now, it's only bits, mobile, and text.
+# That's roughly 55% of requests and covers the production
# use of the Analytics cluster.
-# Other cache clusters will follow, if this works well.
+# Upload cache cluster will follow, if this works well.
$topic_request_required_acks = $topic ? {
+'webrequest_bits' = '2',
'webrequest_mobile' = '2',
'webrequest_text' = '2',
default = '1',
--
To view, visit https://gerrit.wikimedia.org/r/167552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I657916fa272e1b7977497e6fece1af7e7c0f533c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Gage jger...@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] Remove incorrect comment. - change (mediawiki...Wikibase)
JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168295
Change subject: Remove incorrect comment.
..
Remove incorrect comment.
Change-Id: I31cc4057407b5a938daaa04635216249079f0e71
---
M lib/tests/phpunit/store/TermIndexTest.php
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/95/168295/1
diff --git a/lib/tests/phpunit/store/TermIndexTest.php
b/lib/tests/phpunit/store/TermIndexTest.php
index 0165d6e..0f75530 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -107,9 +107,6 @@
$this-assertTrue( $lookup-termExists( 'b42', null, 'nl' ) );
}
- /**
-* @fixme: this test is broken (and has been for a long time); will be
fixed in a follow up.
-*/
public function testGetMatchingTerms() {
$lookup = $this-getTermIndex();
--
To view, visit https://gerrit.wikimedia.org/r/168295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I31cc4057407b5a938daaa04635216249079f0e71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rewrite label/description conflict detection. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Rewrite label/description conflict detection.
..
Rewrite label/description conflict detection.
This gets rid of a spurious self-join, and makes label conflict
detection a lot more efficient in general. And it fixes the issue
of mis-reported conflicts.
Bug: 71915
Change-Id: I4a0b9dd5febe641f7bc5910964a158b74b1ef9dd
---
A lib/includes/store/LabelConflictFinder.php
D lib/includes/store/TermCombinationMatchFinder.php
M lib/includes/store/TermIndex.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/store/MockTermIndex.php
M lib/tests/phpunit/store/TermIndexTest.php
M repo/includes/LabelDescriptionDuplicateDetector.php
M repo/includes/Validators/CompositeFingerprintValidator.php
M repo/includes/Validators/FingerprintValidator.php
M repo/includes/Validators/LabelDescriptionUniquenessValidator.php
M repo/includes/Validators/LabelUniquenessValidator.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/LabelDescriptionDuplicateDetectorTest.php
M repo/tests/phpunit/includes/Validators/CompositeFingerprintValidatorTest.php
M
repo/tests/phpunit/includes/Validators/LabelDescriptionUniquenessValidatorTest.php
M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
M repo/tests/phpunit/includes/Validators/TermValidatorFactoryTest.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
18 files changed, 769 insertions(+), 469 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/LabelConflictFinder.php
b/lib/includes/store/LabelConflictFinder.php
new file mode 100644
index 000..cc2357b
--- /dev/null
+++ b/lib/includes/store/LabelConflictFinder.php
@@ -0,0 +1,49 @@
+?php
+
+namespace Wikibase\Lib\Store;
+
+use Wikibase\Term;
+
+/**
+ * Service interface for detecting label conflicts.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+interface LabelConflictFinder {
+
+ /**
+* Returns a list of Terms that conflict with (that is, match) the
given labels.
+* Conflicts are defined to be inside on type of entity and language.
+*
+* @note: implementations must return *some* conflicts if there are
*any* conflicts,
+* but are not required to return *all* conflicts.
+*
+* @param string $entityType The entity type to consider for conflicts.
+* @param string[] $labels The labels to look for, with language codes
as keys.
+*
+* @return Term[]
+*/
+ public function getLabelConflicts( $entityType, array $labels );
+
+ /**
+* Returns a list of Terms that conflict with (that is, match) the
given labels
+* and descriptions. Conflicts are defined to be inside on type of
entity and one language.
+* For a label to be considered a conflict, there must be a conflicting
description on the
+* same entity. From this it follows that labels with no corresponding
description
+* cannot contribute to a conflicts.
+*
+* @note: implementations must return *some* conflicts if there are
*any* conflicts,
+* but are not required to return *all* conflicts.
+*
+* @param string|null $entityType The relevant entity type
+* @param string[] $labels The labels to look for, with language codes
as keys.
+* @param string[] $descriptions The descriptions to consider (if
desired), with language codes as keys.
+*
+* @return Term[]
+*/
+ public function getLabelWithDescriptionConflicts( $entityType, array
$labels, array $descriptions );
+
+}
diff --git a/lib/includes/store/TermCombinationMatchFinder.php
b/lib/includes/store/TermCombinationMatchFinder.php
deleted file mode 100644
index 8af058e..000
--- a/lib/includes/store/TermCombinationMatchFinder.php
+++ /dev/null
@@ -1,41 +0,0 @@
-?php
-
-namespace Wikibase;
-
-use Wikibase\DataModel\Entity\EntityId;
-
-/**
- * Dating service for Terms.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-interface TermCombinationMatchFinder {
-
- /**
-* Takes an array in which each element in array of of Term.
-* These terms can be incomplete so the search is not restrained on
some fields.
-*
-* Looks for terms of a single entity that has a matching term for each
element in one of the array of Term.
-* If a match is found, the terms for that entity are returned complete
with entity id and entity type info.
-* The result is thus either an empty array when no match is found or
an array with Term elements of size
-* equal to the provided array of Term that matched.
-*
-* $termType and $entityType can be provided as default
[MediaWiki-commits] [Gerrit] Create new SVG icons library - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Create new SVG icons library
..
Create new SVG icons library
In preparation for using mw-ui-icon in alpha
Change-Id: Id155a3f2e6ac80d0a30d1d35902a871e85db9722
---
M includes/Resources.php
A less/iconsNew.less
A less/images/icons/FIXME.txt
A less/images/icons/bell.png
A less/images/icons/bell.svg
A less/images/icons/blue-triangle.png
A less/images/icons/blue-triangle.svg
A less/images/icons/contents-ltr.png
A less/images/icons/contents-ltr.svg
A less/images/icons/editSourceNormal.svg
A less/images/icons/editToggle.svg
A less/images/icons/editVeNormal.svg
A less/images/icons/gray-triangle.png
A less/images/icons/gray-triangle.svg
A less/images/icons/hamburger.png
A less/images/icons/hamburger.svg
A less/images/icons/userAnonymous.png
A less/images/icons/userAnonymous.svg
A less/images/icons/userNormal.png
A less/images/icons/userNormal.svg
M less/minerva.less/minerva.mixins.less
21 files changed, 260 insertions(+), 0 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 516cad5..192b7e5 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -124,6 +124,13 @@
'position' = 'top',
),
+ 'skins.minerva.icons.styles' = $wgMFMobileResourceBoilerplate + array(
+ 'styles' = array(
+ 'less/iconsNew.less',
+ ),
+ 'position' = 'top',
+ ),
+
// Important: This module is loaded on both mobile and desktop skin
'mobile.head' = $wgMFMobileResourceBoilerplate + array(
'dependencies' = array(
diff --git a/less/iconsNew.less b/less/iconsNew.less
new file mode 100644
index 000..7a6da03
--- /dev/null
+++ b/less/iconsNew.less
@@ -0,0 +1,178 @@
+// FIXME: This file should be shared across repositories
+@import minerva.variables;
+@import minerva.mixins;
+@import mediawiki.mixins;
+
+// FIXME: BEGIN: Find svg versions of all of these and add to icons folder
+// UI set
+.mw-ui-icon-talk {
+ .m-background-image('images/pagemenu/talk.png');
+}
+
+.mw-ui-icon-watch {
+ .m-background-image('images/watch.png');
+}
+
+.mw-ui-icon-edit {
+ .m-background-image('images/pagemenu/edit-locked.png');
+}
+
+.mw-ui-icon-edit-enabled {
+ .m-background-image('images/pagemenu/edit.png');
+}
+
+.mw-ui-icon-arrow-down {
+ .m-background-image('images/show.png');
+}
+
+.mw-ui-icon-arrow-up {
+ .m-background-image('images/hide.png');
+}
+
+.mw-ui-icon-watched {
+ .m-background-image('images/watched.png');
+}
+
+// Menu set
+.mw-ui-icon-home {
+ .m-background-image('images/menu/home.png');
+}
+
+.mw-ui-icon-random {
+ .m-background-image('images/menu/random.png');
+}
+
+.mw-ui-icon-watchlist {
+ .m-background-image('images/menu/watchlist.png');
+}
+
+.mw-ui-icon-uploads {
+ .m-background-image('images/menu/uploads.png');
+}
+
+.mw-ui-icon-nearby {
+ .m-background-image('images/menu/nearby.png');
+}
+
+.mw-ui-icon-settings {
+ .m-background-image('images/menu/settings.png');
+}
+
+.mw-ui-icon-secondary-logout {
+ .m-background-image('images/menu/loginout.png');
+}
+
+.mw-ui-icon-profile {
+ .m-background-image('images/menu/user.png');
+}
+
+// FIXME: This should use mw-ui-icon-anonymous in some clever way since they
are essentially the same icon
+.mw-ui-icon-anonymous-white {
+ .m-background-image('images/menu/anon.png');
+}
+
+// overlay set
+
+.mw-ui-icon-cancel {
+ .m-background-image('images/cancel.png');
+}
+
+.mw-ui-icon-clear {
+ .m-background-image('images/clear.png');
+}
+
+
+// Uploads set
+.mw-ui-icon-addimage {
+ .m-background-image('images/pagemenu/upload-locked.png');
+}
+
+.mw-ui-icon-addimage-enabled {
+ .m-background-image('images/pagemenu/upload.png');
+}
+
+.mw-ui-icon-photo {
+ .m-background-image('images/camera.png');
+}
+
+.mw-ui-icon-previous {
+ .m-background-image('modules/images/uploads/chevronLeft.png');
+}
+
+.mw-ui-icon-next {
+ .m-background-image('modules/images/uploads/chevronRight.png');
+}
+
+// Diffs set
+.mw-ui-icon-bytesadded {
+ .m-background-image('special/images/positive.png');
+}
+
+.mw-ui-icon-bytesremoved {
+ .m-background-image('special/images/negative.png');
+}
+
+.mw-ui-icon-bytesneutral {
+ .m-background-image('special/images/neutral.png');
+}
+
+.mw-ui-icon-back {
+ .m-background-image('images/back-ltr.png');
+}
+// FIXME: END
+
+.mw-ui-icon-toc {
+ .m-background-image-svg-quick( 'images/icons/contents-ltr' );
+}
+
+.mw-ui-icon-cleanup {
+ .m-background-image-svg-quick( 'images/icons/blue-triangle' );
+}
+
+.mw-ui-icon-cleanup-gray {
+ .m-background-image-svg-quick( 'images/icons/gray-triangle' );
+}
+
+.mw-ui-icon-mainmenu {
+
[MediaWiki-commits] [Gerrit] Policy Enforcer should not remove user-submitted projects - change (phabricator/extensions)
Rush has submitted this change and it was merged.
Change subject: Policy Enforcer should not remove user-submitted projects
..
Policy Enforcer should not remove user-submitted projects
Don't remove projects when adding a security project.
Change-Id: Ie61853d4fb9661339704ff34d1e4fcf71ae3365b
---
M SecurityPolicyEnforcerAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Rush: Verified; Looks good to me, approved
20after4: Verified; Looks good to me, approved
diff --git a/SecurityPolicyEnforcerAction.php b/SecurityPolicyEnforcerAction.php
index 833b0bc..fde9f61 100644
--- a/SecurityPolicyEnforcerAction.php
+++ b/SecurityPolicyEnforcerAction.php
@@ -191,7 +191,7 @@
$new_project_phids = array_diff($project_phids, $project_phids_orig);
// if we added a project, record the change
- if (count($project_phids_orig) $project_count) {
+ if (count($new_project_phids)) {
$transactions[] = id(new ManiphestTransaction())
-setTransactionType(PhabricatorTransactions::TYPE_EDGE)
-setMetadataValue(
--
To view, visit https://gerrit.wikimedia.org/r/168141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie61853d4fb9661339704ff34d1e4fcf71ae3365b
Gerrit-PatchSet: 2
Gerrit-Project: phabricator/extensions
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Include ApiMain construction in api.php try-catch block - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Include ApiMain construction in api.php try-catch block
..
API: Include ApiMain construction in api.php try-catch block
If the User language is accessed from ApiMain::__construct on a request
via OAuth and the authorization headers weren't valid, the
UsageException was not being handled.
Further, the code setting $wgLang in that constructor should be using
the language just set on the local context, not the main request
context.
Bug: 72384
Change-Id: I90900dc4a8aea22c67c0c05b38128d5dbb044f07
---
M api.php
M includes/api/ApiMain.php
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api.php b/api.php
index 2a6a095..7974f15 100644
--- a/api.php
+++ b/api.php
@@ -62,14 +62,14 @@
// In a perfect world this wouldn't be necessary
$wgTitle = Title::makeTitle( NS_MAIN, 'API' );
-/* Construct an ApiMain with the arguments passed via the URL. What we get back
- * is some form of an ApiMain, possibly even one that produces an error
message,
- * but we don't care here, as that is handled by the ctor.
- */
-$processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI );
-
-// Last chance hook before executing the API
try {
+ /* Construct an ApiMain with the arguments passed via the URL. What we
get back
+* is some form of an ApiMain, possibly even one that produces an error
message,
+* but we don't care here, as that is handled by the ctor.
+*/
+ $processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI
);
+
+ // Last chance hook before executing the API
wfRunHooks( 'ApiBeforeMain', array( $processor ) );
if ( !$processor instanceof ApiMain ) {
throw new MWException( 'ApiBeforMain hook set $processor to a
non-ApiMain class' );
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index c9e898c..bf26eee 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -197,7 +197,8 @@
$this-getContext()-setLanguage( $code );
if ( !$this-mInternalMode ) {
global $wgLang;
- $wgLang = RequestContext::getMain()-getLanguage();
+ $wgLang = $this-getContext()-getLanguage();
+ RequestContext::getMain()-setLanguage( $wgLang );
}
$config = $this-getConfig();
--
To view, visit https://gerrit.wikimedia.org/r/168193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90900dc4a8aea22c67c0c05b38128d5dbb044f07
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Reedy re...@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] API: Include ApiMain construction in api.php try-catch block - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168296
Change subject: API: Include ApiMain construction in api.php try-catch block
..
API: Include ApiMain construction in api.php try-catch block
If the User language is accessed from ApiMain::__construct on a request
via OAuth and the authorization headers weren't valid, the
UsageException was not being handled.
Further, the code setting $wgLang in that constructor should be using
the language just set on the local context, not the main request
context.
Bug: 72384
Change-Id: I90900dc4a8aea22c67c0c05b38128d5dbb044f07
---
M api.php
M includes/api/ApiMain.php
2 files changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/96/168296/1
diff --git a/api.php b/api.php
index 2a6a095..7974f15 100644
--- a/api.php
+++ b/api.php
@@ -62,14 +62,14 @@
// In a perfect world this wouldn't be necessary
$wgTitle = Title::makeTitle( NS_MAIN, 'API' );
-/* Construct an ApiMain with the arguments passed via the URL. What we get back
- * is some form of an ApiMain, possibly even one that produces an error
message,
- * but we don't care here, as that is handled by the ctor.
- */
-$processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI );
-
-// Last chance hook before executing the API
try {
+ /* Construct an ApiMain with the arguments passed via the URL. What we
get back
+* is some form of an ApiMain, possibly even one that produces an error
message,
+* but we don't care here, as that is handled by the ctor.
+*/
+ $processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI
);
+
+ // Last chance hook before executing the API
wfRunHooks( 'ApiBeforeMain', array( $processor ) );
if ( !$processor instanceof ApiMain ) {
throw new MWException( 'ApiBeforMain hook set $processor to a
non-ApiMain class' );
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index a759c11..120e3fa 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -197,7 +197,8 @@
$this-getContext()-setLanguage( $code );
if ( !$this-mInternalMode ) {
global $wgLang;
- $wgLang = RequestContext::getMain()-getLanguage();
+ $wgLang = $this-getContext()-getLanguage();
+ RequestContext::getMain()-setLanguage( $wgLang );
}
$config = $this-getConfig();
--
To view, visit https://gerrit.wikimedia.org/r/168296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90900dc4a8aea22c67c0c05b38128d5dbb044f07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf4
Gerrit-Owner: Anomie bjor...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding dns entries for elastic1020-1031 - change (operations/dns)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168297
Change subject: Adding dns entries for elastic1020-1031
..
Adding dns entries for elastic1020-1031
Change-Id: I507b9602a15afd083e3395abadb1bd851c88461b
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 118 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/97/168297/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 58d3f87..dfea539 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1050,6 +1050,18 @@
41 1H IN PTR elastic1019.eqiad.wmnet.
42 1H IN PTR ocg1002.eqiad.wmnet.
43 1H IN PTR ocg1003.eqiad.wmnet.
+44 1H IN PTR elastic1020.eqiad.wmnet.
+45 1H IN PTR elastic1021.eqiad.wmnet.
+46 1H IN PTR elastic1022.eqiad.wmnet.
+47 1H IN PTR elastic1023.eqiad.wmnet.
+48 1H IN PTR elastic1024.eqiad.wmnet.
+49 1H IN PTR elastic1025.eqiad.wmnet.
+50 1H IN PTR elastic1026.eqiad.wmnet.
+51 1H IN PTR elastic1027.eqiad.wmnet.
+52 1H IN PTR elastic1028.eqiad.wmnet.
+53 1H IN PTR elastic1029.eqiad.wmnet.
+54 1H IN PTR elastic1030.eqiad.wmnet.
+55 1H IN PTR elastic1031.eqiad.wmnet.
$ORIGIN 49.64.{{ zonename }}.
1 1H IN PTR vl1020-eth3.lvs1001.wikimedia.org.
@@ -2219,27 +2231,53 @@
23 1H IN PTR WMF3153.mgmt.eqiad.wmnet.
24 1H IN PTR search1024.mgmt.eqiad.wmnet.
24 1H IN PTR WMF3152.mgmt.eqiad.wmnet.
-60 1H IN PTR elastic1017.mgmt.eqiad.wmnet.
-61 1H IN PTR elastic1018.mgmt.eqiad.wmnet.
-62 1H IN PTR elastic1019.mgmt.eqiad.wmnet.
-100 1H IN PTR searchidx1001.mgmt.eqiad.wmnet.
-100 1H IN PTR WMF3151.mgmt.eqiad.wmnet.
-101 1H IN PTR elastic1001.mgmt.eqiad.wmnet.
-102 1H IN PTR elastic1002.mgmt.eqiad.wmnet.
-103 1H IN PTR elastic1003.mgmt.eqiad.wmnet.
-104 1H IN PTR elastic1004.mgmt.eqiad.wmnet.
-105 1H IN PTR elastic1005.mgmt.eqiad.wmnet.
-106 1H IN PTR elastic1006.mgmt.eqiad.wmnet.
-107 1H IN PTR elastic1007.mgmt.eqiad.wmnet.
-108 1H IN PTR elastic1008.mgmt.eqiad.wmnet.
-109 1H IN PTR elastic1009.mgmt.eqiad.wmnet.
-110 1H IN PTR elastic1010.mgmt.eqiad.wmnet.
-111 1H IN PTR elastic1011.mgmt.eqiad.wmnet.
-112 1H IN PTR elastic1012.mgmt.eqiad.wmnet.
-113 1H IN PTR elastic1013.mgmt.eqiad.wmnet.
-114 1H IN PTR elastic1014.mgmt.eqiad.wmnet.
-115 1H IN PTR elastic1015.mgmt.eqiad.wmnet.
-116 1H IN PTR elastic1016.mgmt.eqiad.wmnet.
+
+60 1H IN PTR elastic1017.mgmt.eqiad.wmnet.
+61 1H IN PTR elastic1018.mgmt.eqiad.wmnet.
+62 1H IN PTR elastic1019.mgmt.eqiad.wmnet.
+63 1H IN PTR elastic1020.mgmt.eqiad.wmnet.
+63 1H IN PTR WMF4599.mgmt.eqiad.wmnet.
+64 1H IN PTR elastic1021.mgmt.eqiad.wmnet.
+64 1H IN PTR WMF4600.mgmt.eqiad.wmnet.
+65 1H IN PTR elastic1022.mgmt.eqiad.wmnet.
+65 1H IN PTR WMF4601.mgmt.eqiad.wmnet.
+66 1H IN PTR elastic1023.mgmt.eqiad.wmnet.
+66 1H IN PTR WMF4602.mgmt.eqiad.wmnet.
+67 1H IN PTR elastic1024.mgmt.eqiad.wmnet.
+67 1H IN PTR WMF4603.mgmt.eqiad.wmnet.
+68 1H IN PTR elastic1025.mgmt.eqiad.wmnet.
+68 1H IN PTR WMF4604.mgmt.eqiad.wmnet.
+69 1H IN PTR elastic1026.mgmt.eqiad.wmnet.
+69 1H IN PTR WMF4605.mgmt.eqiad.wmnet.
+70 1H IN PTR elastic1027.mgmt.eqiad.wmnet.
+70 1H IN PTR WMF4606.mgmt.eqiad.wmnet.
+71 1H IN PTR elastic1028.mgmt.eqiad.wmnet.
+71 1H IN PTR WMF4607.mgmt.eqiad.wmnet.
+72 1H IN PTR elastic1029.mgmt.eqiad.wmnet.
+72 1H IN PTR WMF4608.mgmt.eqiad.wmnet.
+73 1H IN PTR elastic1030.mgmt.eqiad.wmnet.
+73 1H IN PTR WMF4609.mgmt.eqiad.wmnet.
+74 1H IN PTR elastic1031.mgmt.eqiad.wmnet.
+74 1H IN PTR WMF4610.mgmt.eqiad.wmnet.
+
+100 1H IN PTR searchidx1001.mgmt.eqiad.wmnet.
+100 1H IN PTR WMF3151.mgmt.eqiad.wmnet.
+101 1H IN PTR elastic1001.mgmt.eqiad.wmnet.
+102 1H IN PTR elastic1002.mgmt.eqiad.wmnet.
+103 1H IN PTR elastic1003.mgmt.eqiad.wmnet.
+104 1H IN PTR elastic1004.mgmt.eqiad.wmnet.
+105 1H IN PTR elastic1005.mgmt.eqiad.wmnet.
+106 1H IN PTR elastic1006.mgmt.eqiad.wmnet.
+107 1H IN PTR elastic1007.mgmt.eqiad.wmnet.
+108 1H
[MediaWiki-commits] [Gerrit] Adjust style of the Disable panel - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Adjust style of the Disable panel
..
Adjust style of the Disable panel
Spacing, color, and typography adjustments to the disable/enable panels
Change-Id: I86cfa04353fb500ebe027576a61301e8ef2f0f3b
---
M resources/mmv/ui/img/x_darkgreen.svg
M resources/mmv/ui/mmv.ui.viewingOptions.less
2 files changed, 37 insertions(+), 15 deletions(-)
Approvals:
Gilles: Looks good to me, approved
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/ui/img/x_darkgreen.svg
b/resources/mmv/ui/img/x_darkgreen.svg
index 8be9978..f491a6b 100644
--- a/resources/mmv/ui/img/x_darkgreen.svg
+++ b/resources/mmv/ui/img/x_darkgreen.svg
@@ -1,5 +1,22 @@
?xml version=1.0 encoding=UTF-8 standalone=no?
-!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
-svg xmlns:dc=http://purl.org/dc/elements/1.1/;
xmlns:cc=http://creativecommons.org/ns#;
xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
xmlns:svg=http://www.w3.org/2000/svg; xmlns=http://www.w3.org/2000/svg;
xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; version=1.1
id=Layer_1 x=0px y=0px viewBox=0 0 612 792 enable-background=new 0 0
612 792 xml:space=preserve inkscape:version=0.48.2 r9819 width=100%
height=100% sodipodi:docname=x_darkgreen.svgmetadata
id=metadata9rdf:RDFcc:Work
rdf:about=dc:formatimage/svg+xml/dc:formatdc:type
rdf:resource=http://purl.org/dc/dcmitype/StillImage//cc:Work/rdf:RDF/metadatadefs
id=defs7/sodipodi:namedview pagecolor=#ff bordercolor=#66
borderopacity=1 objecttolerance=10 gridtolerance=10 guidetolerance=10
inkscape:pageopacity=0 inkscape:pageshadow=2 inkscape:window-width=721
inkscape:window-height=480 id=namedview5 showgrid=false
inkscape:zoom=0.2979798 inkscape:cx=306 inkscape:cy=364.11864
inkscape:window-x=0 inkscape:window-y=0 inkscape:window-maximized=0
inkscape:current-layer=Layer_1/
-polygon fill=#99 points=612,179.2 522.8,90 306,306.8 89.2,90 0,179.2
216.8,396 0,612.8 89.2,702 306,485.2 522.8,702 612,612.8 395.2,396
id=polygon3 style=fill:#0a604c;fill-opacity:1/
-/svg
\ No newline at end of file
+!-- Created with Inkscape (http://www.inkscape.org/) --
+
+svg
+ xmlns:dc=http://purl.org/dc/elements/1.1/;
+ xmlns:cc=http://creativecommons.org/ns#;
+ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg=http://www.w3.org/2000/svg;
+ xmlns=http://www.w3.org/2000/svg;
+ version=1.1
+ width=100%
+ height=100%
+ viewBox=0 0 96 96
+ id=Layer_1
+ xml:space=preservemetadata
+ id=metadata9rdf:RDFcc:Work
+ rdf:about=dc:formatimage/svg+xml/dc:formatdc:type
+ rdf:resource=http://purl.org/dc/dcmitype/StillImage;
/dc:title/dc:title/cc:Work/rdf:RDF/metadatadefs
+ id=defs7 /polygon
+ points=82,0 48,34 14,0 0,14 34,48 0,82 14,96 48,62 82,96 96,82 62,48
96,14
+ id=polygon3
+ style=fill:#0a604c;fill-opacity:1 //svg
\ No newline at end of file
diff --git a/resources/mmv/ui/mmv.ui.viewingOptions.less
b/resources/mmv/ui/mmv.ui.viewingOptions.less
index c943701..ecccfce 100644
--- a/resources/mmv/ui/mmv.ui.viewingOptions.less
+++ b/resources/mmv/ui/mmv.ui.viewingOptions.less
@@ -13,7 +13,7 @@
z-index: 1004;
- padding: 10px;
+ padding: 15px;
.mw-mmv-enable-confirmation-shown {
background-color: #00AF89;
@@ -44,7 +44,10 @@
top: (@offset-top + (@arrow-size / 2 ));
}
- .mw-mmv-options-enable,
+ .mw-mmv-options-enable {
+ height: 170px;
+ }
+
.mw-mmv-options-disable {
height: 150px;
}
@@ -71,8 +74,8 @@
position: absolute;
right: 0;
top: 0;
- width: 20px;
- height: 20px;
+ width: 15px;
+ height: 15px;
cursor: pointer;
opacity: 0.75;
@@ -108,7 +111,7 @@
.mw-mmv-confirmation-close {
/* @embed */
background-image: url(img/x_darkgreen.svg);
- background-size: 20px 20px;
+ background-size: 15px 15px;
background-repeat: no-repeat;
}
}
@@ -179,19 +182,21 @@
}
.mw-mmv-options-text-body {
- font-size: .75em;
- color: #555;
+ font-size: .9em;
+ color: #777;
}
.mw-mmv-options-enable-alert {
position: absolute;
- left: -10px;
- right: -10px;
- top: -10px;
+ left: -15px;
+ right: -15px;
+ top: -15px;
- padding: 10px;
+ padding: 10px 15px;
background-color: #EEE;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 3px;
[MediaWiki-commits] [Gerrit] Fix issue with options dialog when media viewer has been reo... - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix issue with options dialog when media viewer has been
reopened
..
Fix issue with options dialog when media viewer has been reopened
- Fixes the bug where the options menu wouldn't open if media
viewer was reopened
- Adds human-readable console messages for the options actions
- Makes the tooltip a tipsy one like all the other buttons
- Fixes the tooltip copy, it was referring to previews, which we
said we wouldn't do anymore, in favour of Media Viewer
Change-Id: I1590f9501cc6c406cc1f466b414062d4d6435c1b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/963
---
M i18n/en.json
M resources/mmv/logging/mmv.logging.ActionLogger.js
M resources/mmv/ui/mmv.ui.canvasButtons.js
M tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js
M tests/qunit/mmv/provider/mmv.provider.UserInfo.test.js
5 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 9dbccdc..3e90779 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -114,7 +114,7 @@
multimediaviewer-download-attribution-cta: Show me how,
multimediaviewer-attr-plain: Plain,
multimediaviewer-attr-html: HTML,
- multimediaviewer-options-tooltip: Settings: Disable or enable
previews,
+ multimediaviewer-options-tooltip: Enable or disable Media Viewer,
multimediaviewer-options-dialog-header: Disable Media Viewer?,
multimediaviewer-options-text-header: Skip this viewing feature for
all files.,
multimediaviewer-options-text-body: You can enable it later through
the file details page.,
diff --git a/resources/mmv/logging/mmv.logging.ActionLogger.js
b/resources/mmv/logging/mmv.logging.ActionLogger.js
index f141617..df3b7e9 100644
--- a/resources/mmv/logging/mmv.logging.ActionLogger.js
+++ b/resources/mmv/logging/mmv.logging.ActionLogger.js
@@ -109,7 +109,9 @@
'embed-select-menu-html-large': 'User switched to the large
thumbnail size on html.',
'use-this-file-close': 'User closed the dialog to use this
file.',
'download-open': 'User opened the dialog to download this
file.',
- 'download-close': 'User closed the dialog to download this
file.'
+ 'download-close': 'User closed the dialog to download this
file.',
+ 'options-open': 'User opened the enable/disable dialog.',
+ 'options-close': 'User either canceled an enable/disable action
or closed a confirmation window.'
};
/**
diff --git a/resources/mmv/ui/mmv.ui.canvasButtons.js
b/resources/mmv/ui/mmv.ui.canvasButtons.js
index a57502c..414951b 100644
--- a/resources/mmv/ui/mmv.ui.canvasButtons.js
+++ b/resources/mmv/ui/mmv.ui.canvasButtons.js
@@ -48,8 +48,12 @@
this.$options = $( 'div' )
.text( ' ' )
- .prop( 'title', mw.message(
'multimediaviewer-options-tooltip' ) )
- .addClass( 'mw-mmv-options-button' );
+ .prop( 'title', mw.message(
'multimediaviewer-options-tooltip' ).text() )
+ .addClass( 'mw-mmv-options-button' )
+ .tipsy( {
+ delayIn: tooltipDelay,
+ gravity: this.correctEW( 'se' )
+ } );
this.$download = $( 'div' )
.addClass( 'mw-mmv-download-button' )
@@ -244,6 +248,7 @@
CBP.unattach = function () {
this.$download.off( 'click.mmv-canvasButtons' ).tipsy( 'hide' );
this.$reuse.off( 'click.mmv-canvasButtons' ).tipsy( 'hide' );
+ this.$options.off( 'click.mmv-canvasButtons' ).tipsy( 'hide' );
this.$close.tipsy( 'hide' );
this.$fullscreen.tipsy( 'hide' );
};
diff --git a/tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js
b/tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js
index f2fbfe4..9cd849c 100644
--- a/tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js
+++ b/tests/qunit/mmv/logging/mmv.logging.DurationLogger.test.js
@@ -119,7 +119,7 @@
this.sandbox.stub( mw.loader, 'using' );
- mw.loader.using.withArgs( [ 'ext.eventLogging',
'schema.MultimediaViewerDuration' ] )['throws']( 'EventLogging is missing' );
+ mw.loader.using.withArgs( [ 'ext.eventLogging',
'schema.MultimediaViewerDuration' ] ).throwsException( 'EventLogging is
missing' );
promise = durationLogger.loadDependencies();
@@ -129,7 +129,7 @@
mw.loader.using.restore();
this.sandbox.stub( mw.loader, 'using' );
- mw.loader.using.withArgs( [ 'ext.eventLogging',
[MediaWiki-commits] [Gerrit] Adding dns entries for elastic1020-1031 - change (operations/dns)
Cmjohnson has submitted this change and it was merged.
Change subject: Adding dns entries for elastic1020-1031
..
Adding dns entries for elastic1020-1031
Change-Id: I507b9602a15afd083e3395abadb1bd851c88461b
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 118 insertions(+), 44 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 58d3f87..dfea539 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1050,6 +1050,18 @@
41 1H IN PTR elastic1019.eqiad.wmnet.
42 1H IN PTR ocg1002.eqiad.wmnet.
43 1H IN PTR ocg1003.eqiad.wmnet.
+44 1H IN PTR elastic1020.eqiad.wmnet.
+45 1H IN PTR elastic1021.eqiad.wmnet.
+46 1H IN PTR elastic1022.eqiad.wmnet.
+47 1H IN PTR elastic1023.eqiad.wmnet.
+48 1H IN PTR elastic1024.eqiad.wmnet.
+49 1H IN PTR elastic1025.eqiad.wmnet.
+50 1H IN PTR elastic1026.eqiad.wmnet.
+51 1H IN PTR elastic1027.eqiad.wmnet.
+52 1H IN PTR elastic1028.eqiad.wmnet.
+53 1H IN PTR elastic1029.eqiad.wmnet.
+54 1H IN PTR elastic1030.eqiad.wmnet.
+55 1H IN PTR elastic1031.eqiad.wmnet.
$ORIGIN 49.64.{{ zonename }}.
1 1H IN PTR vl1020-eth3.lvs1001.wikimedia.org.
@@ -2219,27 +2231,53 @@
23 1H IN PTR WMF3153.mgmt.eqiad.wmnet.
24 1H IN PTR search1024.mgmt.eqiad.wmnet.
24 1H IN PTR WMF3152.mgmt.eqiad.wmnet.
-60 1H IN PTR elastic1017.mgmt.eqiad.wmnet.
-61 1H IN PTR elastic1018.mgmt.eqiad.wmnet.
-62 1H IN PTR elastic1019.mgmt.eqiad.wmnet.
-100 1H IN PTR searchidx1001.mgmt.eqiad.wmnet.
-100 1H IN PTR WMF3151.mgmt.eqiad.wmnet.
-101 1H IN PTR elastic1001.mgmt.eqiad.wmnet.
-102 1H IN PTR elastic1002.mgmt.eqiad.wmnet.
-103 1H IN PTR elastic1003.mgmt.eqiad.wmnet.
-104 1H IN PTR elastic1004.mgmt.eqiad.wmnet.
-105 1H IN PTR elastic1005.mgmt.eqiad.wmnet.
-106 1H IN PTR elastic1006.mgmt.eqiad.wmnet.
-107 1H IN PTR elastic1007.mgmt.eqiad.wmnet.
-108 1H IN PTR elastic1008.mgmt.eqiad.wmnet.
-109 1H IN PTR elastic1009.mgmt.eqiad.wmnet.
-110 1H IN PTR elastic1010.mgmt.eqiad.wmnet.
-111 1H IN PTR elastic1011.mgmt.eqiad.wmnet.
-112 1H IN PTR elastic1012.mgmt.eqiad.wmnet.
-113 1H IN PTR elastic1013.mgmt.eqiad.wmnet.
-114 1H IN PTR elastic1014.mgmt.eqiad.wmnet.
-115 1H IN PTR elastic1015.mgmt.eqiad.wmnet.
-116 1H IN PTR elastic1016.mgmt.eqiad.wmnet.
+
+60 1H IN PTR elastic1017.mgmt.eqiad.wmnet.
+61 1H IN PTR elastic1018.mgmt.eqiad.wmnet.
+62 1H IN PTR elastic1019.mgmt.eqiad.wmnet.
+63 1H IN PTR elastic1020.mgmt.eqiad.wmnet.
+63 1H IN PTR WMF4599.mgmt.eqiad.wmnet.
+64 1H IN PTR elastic1021.mgmt.eqiad.wmnet.
+64 1H IN PTR WMF4600.mgmt.eqiad.wmnet.
+65 1H IN PTR elastic1022.mgmt.eqiad.wmnet.
+65 1H IN PTR WMF4601.mgmt.eqiad.wmnet.
+66 1H IN PTR elastic1023.mgmt.eqiad.wmnet.
+66 1H IN PTR WMF4602.mgmt.eqiad.wmnet.
+67 1H IN PTR elastic1024.mgmt.eqiad.wmnet.
+67 1H IN PTR WMF4603.mgmt.eqiad.wmnet.
+68 1H IN PTR elastic1025.mgmt.eqiad.wmnet.
+68 1H IN PTR WMF4604.mgmt.eqiad.wmnet.
+69 1H IN PTR elastic1026.mgmt.eqiad.wmnet.
+69 1H IN PTR WMF4605.mgmt.eqiad.wmnet.
+70 1H IN PTR elastic1027.mgmt.eqiad.wmnet.
+70 1H IN PTR WMF4606.mgmt.eqiad.wmnet.
+71 1H IN PTR elastic1028.mgmt.eqiad.wmnet.
+71 1H IN PTR WMF4607.mgmt.eqiad.wmnet.
+72 1H IN PTR elastic1029.mgmt.eqiad.wmnet.
+72 1H IN PTR WMF4608.mgmt.eqiad.wmnet.
+73 1H IN PTR elastic1030.mgmt.eqiad.wmnet.
+73 1H IN PTR WMF4609.mgmt.eqiad.wmnet.
+74 1H IN PTR elastic1031.mgmt.eqiad.wmnet.
+74 1H IN PTR WMF4610.mgmt.eqiad.wmnet.
+
+100 1H IN PTR searchidx1001.mgmt.eqiad.wmnet.
+100 1H IN PTR WMF3151.mgmt.eqiad.wmnet.
+101 1H IN PTR elastic1001.mgmt.eqiad.wmnet.
+102 1H IN PTR elastic1002.mgmt.eqiad.wmnet.
+103 1H IN PTR elastic1003.mgmt.eqiad.wmnet.
+104 1H IN PTR elastic1004.mgmt.eqiad.wmnet.
+105 1H IN PTR elastic1005.mgmt.eqiad.wmnet.
+106 1H IN PTR elastic1006.mgmt.eqiad.wmnet.
+107 1H IN PTR elastic1007.mgmt.eqiad.wmnet.
+108 1H IN PTR
[MediaWiki-commits] [Gerrit] Turn off Special:HideBanners filter - change (operations/puppet)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168298
Change subject: Turn off Special:HideBanners filter
..
Turn off Special:HideBanners filter
No longer needed now that old cookie JS is gone.
Change-Id: I331063c3e268557f24811ac11abab8933901f191
---
M templates/udp2log/filters.erbium.erb
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/168298/1
diff --git a/templates/udp2log/filters.erbium.erb
b/templates/udp2log/filters.erbium.erb
index 1d3cd33..44f9785 100644
--- a/templates/udp2log/filters.erbium.erb
+++ b/templates/udp2log/filters.erbium.erb
@@ -13,9 +13,6 @@
pipe 100 /usr/bin/udp-filter -F '\t' -p Special:RecordImpression %=
@template_variables['fundraising_log_directory']
%/logs/bannerImpressions-sampled100.tsv.log
pipe 100 /usr/bin/udp-filter -F '\t' -p Special:BannerRandom %=
@template_variables['fundraising_log_directory']
%/logs/bannerRequests-sampled100.tsv.log
-## RT 8060
-pipe 100 /usr/bin/udp-filter -F '\t' -d meta.wikimedia.org -p
Special:HideBanners %= @template_variables['fundraising_log_directory']
%/logs/hideBanners-sampled100.tsv.log
-
### API Usage
pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %=
scope.lookupvar('role::logging::udp2log::erbium::webrequest_log_directory')
%/api-usage.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/168298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I331063c3e268557f24811ac11abab8933901f191
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rewrite of NamespaceNuker - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168299
Change subject: Rewrite of NamespaceNuker
..
Rewrite of NamespaceNuker
All options of NamespaceNuker did not work or not correctly. I Rewrote the code
of it because it is much easier to use MediaWiki. The benefit is that many
steps are done by MediaWiki and there is no need that we do them.
* Fixed bug with not correctly shown message in remove dialog
Change-Id: I65c5a3ec7440563a3373fa1f572b33f312befa50
---
M NamespaceManager/NamespaceManager.class.php
M NamespaceManager/NamespaceManager.setup.php
D NamespaceManager/NamespaceNuker.php
M NamespaceManager/i18n/de.json
M NamespaceManager/i18n/en.json
M NamespaceManager/i18n/qqq.json
M NamespaceManager/includes/NamespaceNuker.php
M NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
M NamespaceManager/resources/BS.NamespaceManager/Panel.js
9 files changed, 147 insertions(+), 517 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/99/168299/1
diff --git a/NamespaceManager/NamespaceManager.class.php
b/NamespaceManager/NamespaceManager.class.php
index a942d35..af120a3 100644
--- a/NamespaceManager/NamespaceManager.class.php
+++ b/NamespaceManager/NamespaceManager.class.php
@@ -29,11 +29,11 @@
'searched' = false
);
- public static $aSortConditions = array(
+ public static $aSortConditions = array(
'sort' = '',
'dir' = ''
);
-
+
public $aSortHelper = array(
'negative' = 0,
'positive' = 0
@@ -55,7 +55,7 @@
EXTINFO::STATUS = 'default',
EXTINFO::PACKAGE = 'default',
EXTINFO::URL = 'http://www.hallowelt.biz',
- EXTINFO::DEPS = array(
+ EXTINFO::DEPS = array(
'bluespice' = '2.22.0',
'WikiAdmin' = '2.22.0',
'Preferences' = '2.22.0'
@@ -85,19 +85,19 @@
$this-setHook(
'NamespaceManager::writeNamespaceConfiguration',
'onWriteNamespaceConfiguration', true );
//CR, RBV: This is suposed to return all constants! Not just
system NS.
- //At the moment the implementation relies on an hardcoded
mapping,
+ //At the moment the implementation relies on an hardcoded
mapping,
//which is bad. We need to change this and make it more generic!
$GLOBALS['bsSystemNamespaces'] =
BsNamespaceHelper::getMwNamespaceConstants();
wfProfileOut( 'BS::'.__METHOD__ );
}
-
+
/**
* Add the sql file to database by executing the update.php
* @global type $wgDBtype
* @global array $wgExtNewTables
* @param DatabaseUpdater $du
- * @return boolean
+ * @return boolean
*/
public static function getSchemaUpdates( $updater ) {
global $wgExtPGNewFields, $wgDBtype;
@@ -150,7 +150,7 @@
} else {
$updater-addExtensionField(
'bs_namespacemanager_backup_page',
- 'page_content_model',
+ 'page_content_model',
$dir .
'bs_namespacemanager_backup_page.patch.sql'
);
$updater-addExtensionField(
@@ -171,7 +171,7 @@
/**
* returns if NS is empty or not
* @param type $iNamespaceId
-* @return boolean
+* @return boolean
*/
public function isNamespaceEmpty( $iNamespaceId ) {
if ( BsCore::checkAccessAdmission( 'wikiadmin' ) === false )
return true;
@@ -195,10 +195,10 @@
$this-getOutput()-addModules(
'ext.bluespice.namespaceManager' );
BsExtensionManager::setContext( 'MW::NamespaceManagerShow' );
$aMetaFields = array(
- array(
- 'name' = 'id',
- 'type' = 'int',
- 'sortable' = true,
+ array(
+ 'name' = 'id',
+ 'type' = 'int',
+ 'sortable' = true,
'label' = wfMessage(
'bs-namespacemanager-label-id' )-plain()
),
array(
@@ -210,7 +210,7 @@
wfRunHooks( 'NamespaceManager::getMetaFields', array(
$aMetaFields ) );
$this-getOutput()-addJsConfigVars('bsNamespaceManagerMetaFields',
$aMetaFields);
-
+
return 'div
[MediaWiki-commits] [Gerrit] API: Fix ApiFormatFeedWrapper - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Fix ApiFormatFeedWrapper
..
API: Fix ApiFormatFeedWrapper
With recent changes to the API, directly outputting text from execute()
in ApiFormatBase subclasses doesn't work anymore. Adjust
ApiFormatFeedWrapper for this new situation, and also handle headers in
initPrinter() where that belongs.
Bug: 72359
Change-Id: I4e4a2386858da6d87169deabaca763eeeacefbe9
(cherry picked from commit e80638ccff7ac1cb2976902f4b8c54e45849e9e5)
---
M includes/api/ApiFormatFeedWrapper.php
1 file changed, 24 insertions(+), 0 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiFormatFeedWrapper.php
b/includes/api/ApiFormatFeedWrapper.php
index 9260006..3f53ed4 100644
--- a/includes/api/ApiFormatFeedWrapper.php
+++ b/includes/api/ApiFormatFeedWrapper.php
@@ -82,17 +82,41 @@
* $result['_feed'] - an instance of one of the $wgFeedClasses classes
* $result['_feeditems'] - an array of FeedItem instances
*/
+ public function initPrinter( $unused = false ) {
+ parent::initPrinter( $unused );
+
+ if ( $this-isDisabled() ) {
+ return;
+ }
+
+ $data = $this-getResultData();
+ if ( isset( $data['_feed'] ) isset( $data['_feeditems'] ) ) {
+ $data['_feed']-httpHeaders();
+ } else {
+ // Error has occurred, print something useful
+ ApiBase::dieDebug( __METHOD__, 'Invalid feed
class/item' );
+ }
+ }
+
+ /**
+* This class expects the result data to be in a custom format set by
self::setResult()
+* $result['_feed'] - an instance of one of the $wgFeedClasses classes
+* $result['_feeditems'] - an array of FeedItem instances
+*/
public function execute() {
$data = $this-getResultData();
if ( isset( $data['_feed'] ) isset( $data['_feeditems'] ) ) {
$feed = $data['_feed'];
$items = $data['_feeditems'];
+ // execute() needs to pass strings to $this-printText,
not produce output itself.
+ ob_start();
$feed-outHeader();
foreach ( $items as $item ) {
$feed-outItem( $item );
}
$feed-outFooter();
+ $this-printText( ob_get_clean() );
} else {
// Error has occurred, print something useful
ApiBase::dieDebug( __METHOD__, 'Invalid feed
class/item' );
--
To view, visit https://gerrit.wikimedia.org/r/168128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e4a2386858da6d87169deabaca763eeeacefbe9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf4
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@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] New deployment branch: wmf/1.25wmf5 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New deployment branch: wmf/1.25wmf5 .. New deployment branch: wmf/1.25wmf5 Change-Id: Ib70e526f92c80c31a60e4b68406502001ea17de8 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.json M composer.lock M extensions/PropertySuggester/PropertySuggester.php M extensions/PropertySuggester/PropertySuggesterHooks.php M extensions/PropertySuggester/README.md M extensions/PropertySuggester/build/travis/before_script.sh M extensions/PropertySuggester/tests/phpunit/PropertySuggester/GetSuggestionsTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/Suggesters/SimpleSuggesterTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/SuggestionGeneratorTest.php M extensions/Wikibase/.jshintignore M extensions/Wikibase/.jshintrc M extensions/Wikibase/.travis.yml M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/i18n/ce.json M extensions/Wikibase/client/i18n/cs.json M extensions/Wikibase/client/i18n/en.json M extensions/Wikibase/client/i18n/hu.json M extensions/Wikibase/client/i18n/hy.json M extensions/Wikibase/client/i18n/ka.json M extensions/Wikibase/client/i18n/lb.json M extensions/Wikibase/client/i18n/qqq.json A extensions/Wikibase/client/i18n/rue.json M extensions/Wikibase/client/i18n/sk.json M extensions/Wikibase/client/i18n/sr-ec.json M extensions/Wikibase/client/i18n/sr-el.json M extensions/Wikibase/client/i18n/uk.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/LangLinkHandler.php M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php M extensions/Wikibase/client/includes/UpdateRepo.php A extensions/Wikibase/client/includes/Usage/EntityUsage.php A extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTracker.php A extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdate.php A extensions/Wikibase/client/includes/Usage/Sql/UsageTableUpdater.php A extensions/Wikibase/client/includes/Usage/Sql/entity_usage.sql A extensions/Wikibase/client/includes/Usage/SubscriptionManager.php A extensions/Wikibase/client/includes/Usage/UsageLookup.php A extensions/Wikibase/client/includes/Usage/UsageTracker.php A extensions/Wikibase/client/includes/Usage/UsageTrackerException.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/includes/hooks/ChangesPageWikibaseFilterHandler.php M extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php M extensions/Wikibase/client/includes/scribunto/WikibaseLuaEntityBindings.php M extensions/Wikibase/client/includes/store/ClientStore.php A extensions/Wikibase/client/includes/store/sql/ConnectionManager.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/resources/Resources.php M extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js A extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js M extensions/Wikibase/client/tests/phpunit/MockClientStore.php M extensions/Wikibase/client/tests/phpunit/MockPageUpdater.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/EntityUsageTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/SqlUsageTrackerTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/Sql/UsageTableUpdaterTest.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageLookupContractTester.php A extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/BaseTemplateAfterPortalHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/ChangesPageWikibaseFilterHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php M
[MediaWiki-commits] [Gerrit] Introduce entityChangers - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce entityChangers
..
Introduce entityChangers
The changers wrap RepoApi and RevisionStore for the various views.
They make the views independent of the means and intricacies of persisting
a change to an Item or Property.
Api usage in labelview, descriptionview and sitelinklistview needs to be
adapted as well.
Change-Id: Iab57c239f2477cf71198b7a94d05d231fdf2dfbf
---
M client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
M lib/resources/Resources.php
A lib/resources/entityChangers/AliasesChanger.js
A lib/resources/entityChangers/ClaimsChanger.js
A lib/resources/entityChangers/EntityChangersFactory.js
A lib/resources/entityChangers/ReferencesChanger.js
A lib/resources/entityChangers/namespace.js
A lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
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.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/resources.php
M lib/resources/wikibase.RepoApi/resources.php
D lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js
M lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
A lib/tests/qunit/entityChangers/AliasesChanger.tests.js
A lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
A lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
A lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.aliasesview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
M lib/tests/qunit/jquery.wikibase/resources.php
M lib/tests/qunit/resources.php
M lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js
M repo/resources/Resources.php
M repo/resources/wikibase.ui.entityViewInit.js
41 files changed, 1,208 insertions(+), 389 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
index 39b5aeb..008d35b 100644
--- a/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
+++ b/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js
@@ -582,7 +582,7 @@
*/
_onError: function( errorCode, errorInfo ) {
var error = ( errorInfo )
- ? wb.RepoApiError.newFromApiResponse( errorCode,
errorInfo )
+ ? wb.RepoApiError.newFromApiResponse( errorInfo )
: errorCode;
var $elem = $( '#wbclient-linkItem-page' );
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 8a0b162..547cc12 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -163,6 +163,7 @@
$modules = array_merge(
$modules,
include( __DIR__ . '/api/resources.php' ),
+ include( __DIR__ . '/entityChangers/resources.php' ),
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/jquery.wikibase/resources.php' ),
diff --git a/lib/resources/entityChangers/AliasesChanger.js
b/lib/resources/entityChangers/AliasesChanger.js
new file mode 100644
index 000..8a0466a
--- /dev/null
+++ b/lib/resources/entityChangers/AliasesChanger.js
@@ -0,0 +1,112 @@
+/**
+ * @licence GNU GPL v2+
+ * @author Adrian Lang adrian.l...@wikimedia.de
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+var MODULE = wb.entityChangers;
+
+/**
+ * @constructor
+ * @since 0.5
+ *
+ * @param {wikibase.RepoApi} api
+ * @param {wikibase.RevisionStore} revisionStore
+ * @param {wikibase.datamodel.Entity} entity
+ */
+var SELF = MODULE.AliasesChanger = function( api, revisionStore,
[MediaWiki-commits] [Gerrit] Hygiene: Use icon in cleanup overlay - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use icon in cleanup overlay
..
Hygiene: Use icon in cleanup overlay
Change-Id: I4cfc454dd2a3d9aa79ee67cacd86b5f9b77039eb
---
M javascripts/modules/issues/CleanupOverlay.js
M templates/modules/issues/cleanup.hogan
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/issues/CleanupOverlay.js
b/javascripts/modules/issues/CleanupOverlay.js
index d694b24..f082be9 100644
--- a/javascripts/modules/issues/CleanupOverlay.js
+++ b/javascripts/modules/issues/CleanupOverlay.js
@@ -1,5 +1,8 @@
( function( M ) {
var Overlay = M.require( 'Overlay' ),
+ Icon = M.require( 'Icon' ),
+ icon = new Icon( { name: 'cleanup-gray', additionalClassNames:
'issue-notice', hasText: true } ),
+
/**
* @class CleanupOverlay
* @extends Overlay
@@ -8,6 +11,9 @@
templatePartials: {
content: M.template.get( 'modules/issues/cleanup.hogan'
)
},
+ defaults: {
+ className: icon.getClassName()
+ },
initialize: function( options ) {
options.heading = 'strong' + options.headingText +
'/strong';
Overlay.prototype.initialize.call( this, options );
diff --git a/templates/modules/issues/cleanup.hogan
b/templates/modules/issues/cleanup.hogan
index 95a60c3..6b69691 100644
--- a/templates/modules/issues/cleanup.hogan
+++ b/templates/modules/issues/cleanup.hogan
@@ -1,7 +1,7 @@
ul class=cleanup
{{#issues}}
li
- div class=issue-notice icon icon-text
+ div class={{className}}
{{#icon}}img src={{icon}} {{/icon}}
{{{text}}}
/div
--
To view, visit https://gerrit.wikimedia.org/r/168137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4cfc454dd2a3d9aa79ee67cacd86b5f9b77039eb
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RecordImpression log should not depend on qs order - change (operations/puppet)
Jgreen has submitted this change and it was merged. Change subject: RecordImpression log should not depend on qs order .. RecordImpression log should not depend on qs order A CentralNotice deployment changed the order of querystring params being sent to Special:RecordImpression. We should sample from all requests to that page regardless of querystring order. Change-Id: I74592f7926eb5a9a59031473b48c60b9fd558b49 --- M templates/udp2log/filters.erbium.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: AndyRussG: Looks good to me, but someone else must approve Jgreen: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/udp2log/filters.erbium.erb b/templates/udp2log/filters.erbium.erb index 68e5d63..1d3cd33 100644 --- a/templates/udp2log/filters.erbium.erb +++ b/templates/udp2log/filters.erbium.erb @@ -10,7 +10,7 @@ pipe 1 /usr/bin/udp-filter -F '\t' -d wikimediafoundation.org,donate.wikimedia.org %= @template_variables['fundraising_log_directory'] %/logs/landingpages.tsv.log ## Banner Impressions -pipe 100 /usr/bin/udp-filter -F '\t' -p Special:RecordImpression\?banner=,Special:RecordImpression\?result= %= @template_variables['fundraising_log_directory'] %/logs/bannerImpressions-sampled100.tsv.log +pipe 100 /usr/bin/udp-filter -F '\t' -p Special:RecordImpression %= @template_variables['fundraising_log_directory'] %/logs/bannerImpressions-sampled100.tsv.log pipe 100 /usr/bin/udp-filter -F '\t' -p Special:BannerRandom %= @template_variables['fundraising_log_directory'] %/logs/bannerRequests-sampled100.tsv.log ## RT 8060 -- To view, visit https://gerrit.wikimedia.org/r/168186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74592f7926eb5a9a59031473b48c60b9fd558b49 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Jgreen jgr...@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] Turn off Special:HideBanners filter - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: Turn off Special:HideBanners filter
..
Turn off Special:HideBanners filter
No longer needed now that old cookie JS is gone.
Change-Id: I331063c3e268557f24811ac11abab8933901f191
---
M templates/udp2log/filters.erbium.erb
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Jgreen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/udp2log/filters.erbium.erb
b/templates/udp2log/filters.erbium.erb
index 1d3cd33..44f9785 100644
--- a/templates/udp2log/filters.erbium.erb
+++ b/templates/udp2log/filters.erbium.erb
@@ -13,9 +13,6 @@
pipe 100 /usr/bin/udp-filter -F '\t' -p Special:RecordImpression %=
@template_variables['fundraising_log_directory']
%/logs/bannerImpressions-sampled100.tsv.log
pipe 100 /usr/bin/udp-filter -F '\t' -p Special:BannerRandom %=
@template_variables['fundraising_log_directory']
%/logs/bannerRequests-sampled100.tsv.log
-## RT 8060
-pipe 100 /usr/bin/udp-filter -F '\t' -d meta.wikimedia.org -p
Special:HideBanners %= @template_variables['fundraising_log_directory']
%/logs/hideBanners-sampled100.tsv.log
-
### API Usage
pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %=
scope.lookupvar('role::logging::udp2log::erbium::webrequest_log_directory')
%/api-usage.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/168298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I331063c3e268557f24811ac11abab8933901f191
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@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] Update hamburger icon for RTL. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/168300 Change subject: Update hamburger icon for RTL. .. Update hamburger icon for RTL. RTL drawables were still using the old icon, which looks weird. Change-Id: I1ab320b362498b7590db3c64e18337dcb86f7b4c --- M wikipedia/res/drawable-ldrtl-hdpi/ic_drawer.png D wikipedia/res/drawable-ldrtl-ldpi/ic_drawer.png M wikipedia/res/drawable-ldrtl-mdpi/ic_drawer.png M wikipedia/res/drawable-ldrtl-xhdpi/ic_drawer.png M wikipedia/res/drawable-ldrtl-xxhdpi/ic_drawer.png 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/00/168300/1 diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_drawer.png b/wikipedia/res/drawable-ldrtl-hdpi/ic_drawer.png index 666b955..0a3064a 100644 --- a/wikipedia/res/drawable-ldrtl-hdpi/ic_drawer.png +++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_drawer.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_drawer.png b/wikipedia/res/drawable-ldrtl-ldpi/ic_drawer.png deleted file mode 100644 index 6178c24..000 --- a/wikipedia/res/drawable-ldrtl-ldpi/ic_drawer.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_drawer.png b/wikipedia/res/drawable-ldrtl-mdpi/ic_drawer.png index dab3bfa..6c5518b 100644 --- a/wikipedia/res/drawable-ldrtl-mdpi/ic_drawer.png +++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_drawer.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_drawer.png b/wikipedia/res/drawable-ldrtl-xhdpi/ic_drawer.png index 0afac37..4d909ff 100644 --- a/wikipedia/res/drawable-ldrtl-xhdpi/ic_drawer.png +++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_drawer.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_drawer.png b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_drawer.png index 723c865..1d2fcfa 100644 --- a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_drawer.png +++ b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_drawer.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/168300 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ab320b362498b7590db3c64e18337dcb86f7b4c 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] API: Include ApiMain construction in api.php try-catch block - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Include ApiMain construction in api.php try-catch block
..
API: Include ApiMain construction in api.php try-catch block
If the User language is accessed from ApiMain::__construct on a request
via OAuth and the authorization headers weren't valid, the
UsageException was not being handled.
Further, the code setting $wgLang in that constructor should be using
the language just set on the local context, not the main request
context.
Bug: 72384
Change-Id: I90900dc4a8aea22c67c0c05b38128d5dbb044f07
---
M api.php
M includes/api/ApiMain.php
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api.php b/api.php
index 2a6a095..7974f15 100644
--- a/api.php
+++ b/api.php
@@ -62,14 +62,14 @@
// In a perfect world this wouldn't be necessary
$wgTitle = Title::makeTitle( NS_MAIN, 'API' );
-/* Construct an ApiMain with the arguments passed via the URL. What we get back
- * is some form of an ApiMain, possibly even one that produces an error
message,
- * but we don't care here, as that is handled by the ctor.
- */
-$processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI );
-
-// Last chance hook before executing the API
try {
+ /* Construct an ApiMain with the arguments passed via the URL. What we
get back
+* is some form of an ApiMain, possibly even one that produces an error
message,
+* but we don't care here, as that is handled by the ctor.
+*/
+ $processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI
);
+
+ // Last chance hook before executing the API
wfRunHooks( 'ApiBeforeMain', array( $processor ) );
if ( !$processor instanceof ApiMain ) {
throw new MWException( 'ApiBeforMain hook set $processor to a
non-ApiMain class' );
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index a759c11..120e3fa 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -197,7 +197,8 @@
$this-getContext()-setLanguage( $code );
if ( !$this-mInternalMode ) {
global $wgLang;
- $wgLang = RequestContext::getMain()-getLanguage();
+ $wgLang = $this-getContext()-getLanguage();
+ RequestContext::getMain()-setLanguage( $wgLang );
}
$config = $this-getConfig();
--
To view, visit https://gerrit.wikimedia.org/r/168296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90900dc4a8aea22c67c0c05b38128d5dbb044f07
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf4
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@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] tweak fundraising banner log rotation, no longer collecting ... - change (operations/puppet)
Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168301
Change subject: tweak fundraising banner log rotation, no longer collecting
banner 'hide' hits
..
tweak fundraising banner log rotation, no longer collecting banner 'hide' hits
Change-Id: I1495f1d934603f25c4a965b6bf76b4dbd15086c3
---
M files/misc/scripts/rotate_fundraising_logs
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/168301/1
diff --git a/files/misc/scripts/rotate_fundraising_logs
b/files/misc/scripts/rotate_fundraising_logs
index e7f6e1f..a47c970 100755
--- a/files/misc/scripts/rotate_fundraising_logs
+++ b/files/misc/scripts/rotate_fundraising_logs
@@ -16,7 +16,7 @@
my $buffer_days = 3; # days
to retain buffered logs
# list of log files (sans extension) to rotate
-my @logs_to_process = qw(bannerImpressions-sampled100.tsv landingpages.tsv
bannerRequests-sampled100.tsv hideBanners-sampled100.tsv);
+my @logs_to_process =
('bannerImpressions-sampled100.tsv','landingpages.tsv','bannerRequests-sampled100.tsv');
# keep the buffer_dir collated by year
my $year = `/bin/date +%Y`;
--
To view, visit https://gerrit.wikimedia.org/r/168301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1495f1d934603f25c4a965b6bf76b4dbd15086c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tweak fundraising banner log rotation, no longer collecting ... - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: tweak fundraising banner log rotation, no longer collecting
banner 'hide' hits
..
tweak fundraising banner log rotation, no longer collecting banner 'hide' hits
Change-Id: I1495f1d934603f25c4a965b6bf76b4dbd15086c3
---
M files/misc/scripts/rotate_fundraising_logs
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/rotate_fundraising_logs
b/files/misc/scripts/rotate_fundraising_logs
index e7f6e1f..a47c970 100755
--- a/files/misc/scripts/rotate_fundraising_logs
+++ b/files/misc/scripts/rotate_fundraising_logs
@@ -16,7 +16,7 @@
my $buffer_days = 3; # days
to retain buffered logs
# list of log files (sans extension) to rotate
-my @logs_to_process = qw(bannerImpressions-sampled100.tsv landingpages.tsv
bannerRequests-sampled100.tsv hideBanners-sampled100.tsv);
+my @logs_to_process =
('bannerImpressions-sampled100.tsv','landingpages.tsv','bannerRequests-sampled100.tsv');
# keep the buffer_dir collated by year
my $year = `/bin/date +%Y`;
--
To view, visit https://gerrit.wikimedia.org/r/168301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1495f1d934603f25c4a965b6bf76b4dbd15086c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@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] Support protocol-relative URLs in the whitelist - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Support protocol-relative URLs in the whitelist
..
Support protocol-relative URLs in the whitelist
Bug: 61556
Change-Id: Icac9f8357ac08db0cf2f5be562e9ed1f8f13eba3
---
M Captcha.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, approved
CSteipp: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Captcha.php b/Captcha.php
index 995feb4..968a7a8 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -403,7 +403,7 @@
// return '/' . str_replace( '/', '\/',
preg_replace('|\\\*/|', '/', $regex) ) . '/Si';
$regexes = array();
$regexStart = array(
- 'normal' = '/^https?:\/\/+[a-z0-9_\-.]*(?:',
+ 'normal' =
'/^(?:https?:)?\/\/+[a-z0-9_\-.]*(?:',
'noprotocol' = '/^(?:',
);
$regexEnd = array(
--
To view, visit https://gerrit.wikimedia.org/r/168074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icac9f8357ac08db0cf2f5be562e9ed1f8f13eba3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@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] Make ganglia::web trusty aware and puppetized - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168302
Change subject: Make ganglia::web trusty aware and puppetized
..
Make ganglia::web trusty aware and puppetized
ganglia web was actually unpuppetized on nickel. While trying not to
touch the existing installation at all cleanup and introduce trusty
support for ganglia web while using the distribution's package and
configuring it. Steps are:
* Add a conf_production.php file that only get's populated on trusty
* Install distribution package (only on trusty)
* Clean up package declarations
* Clean up labs
Still a long way to go though before this class is up to standards
Change-Id: I1d39b8a1b04001382a8a3989c4ff7d6d780d56ff
---
A files/ganglia/conf_production.php
M manifests/ganglia.pp
2 files changed, 495 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/168302/1
diff --git a/files/ganglia/conf_production.php
b/files/ganglia/conf_production.php
new file mode 100644
index 000..ee705bf
--- /dev/null
+++ b/files/ganglia/conf_production.php
@@ -0,0 +1,436 @@
+?php
+
+##
+# IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
+#
+# Please DO NOT edit this file. This file should be left as is. If you
+# need to change any of the variables override them in conf.php.
+##
+#
+# Gmetad-webfrontend version. Used to check for updates.
+#
+$conf['gweb_root'] = dirname(__FILE__);
+$conf['gweb_confdir'] = /var/lib/ganglia-web;
+
+include_once $conf['gweb_root'] . /version.php;
+
+#
+# 'readonly': No authentication is required. All users may view all
resources. No edits are allowed.
+# 'enabled': Guest users may view public clusters. Login is required to make
changes.
+# An administrator must configure an authentication scheme and ACL
rules.
+# 'disabled': Guest users may perform any actions, including edits. No
authentication is required.
+$conf['auth_system'] = 'readonly';
+
+#
+# The name of the directory in ./templates which contains the
+# templates that you want to use. Templates are like a skin for the
+# site that can alter its look and feel.
+#
+$conf['template_name'] = default;
+
+#
+# If you installed gmetad in a directory other than the default
+# make sure you change it here.
+#
+
+# Where gmetad stores the rrd archives.
+$conf['gmetad_root'] = /mnt/ganglia_tmp;
+$conf['rrds'] = ${conf['gmetad_root']}/rrds.pmtpa;
+
+# Where Dwoo (PHP templating engine) store compiled templates
+$conf['dwoo_compiled_dir'] = ${conf['gweb_confdir']}/dwoo/compiled;
+$conf['dwoo_cache_dir'] = ${conf['gweb_confdir']}/dwoo/cache;
+
+# Where to store web-based configuration
+$conf['views_dir'] = $conf['gweb_confdir'] . '/conf';
+$conf['conf_dir'] = $conf['gweb_confdir'] . '/conf';
+
+# Where to find filter configuration files, if not set filtering
+# will be disabled
+#$conf['filter_dir'] = ${conf['gweb_confdir']}/filters;
+
+# Leave this alone if rrdtool is installed in $conf['gmetad_root'],
+# otherwise, change it if it is installed elsewhere (like /usr/bin)
+$conf['rrdtool'] = /usr/bin/rrdtool;
+
+# Render graphs with rrdtool's --slope-mode option
+$conf['rrdtool_slope_mode'] = true;
+
+# If rrdcached is being used, this argument must specify the
+# socket to use.
+#
+# ganglia-web only requires, and should use, the low-privilege socket
+# created with the -L option to rrdcached. gmetad requires, and must use,
+# the fully privileged socket created with the -l option to rrdcached.
+$conf['rrdcached_socket'] = ;
+
+# Location for modular-graph files.
+$conf['graphdir']= $conf['gweb_root'] . '/graph.d';
+
+# Display statistical values on RRD graphs; i.e.: average, min, max
+$conf['graphreport_stats'] = true;
+$conf['graphreport_stat_items'] = array(now, min, avg, max);
+
+#
+# If you want to grab data from a different ganglia source specify it here.
+# Although, it would be strange to alter the IP since the Round-Robin
+# databases need to be local to be read.
+#
+$conf['ganglia_ip'] = 127.0.0.1;
+$conf['ganglia_port'] = 8654;
+
+#
+# The maximum number of dynamic graphs to display. If you set this
+# to 0 (the default) all graphs will be shown. This option is
+# helpful if you are viewing the web pages from a browser with a
+# small pipe.
+#
+$conf['max_graphs'] = 0;
+
+#
+# In the Cluster View this sets the default number of columns used to
+# display the host grid below the summary graphs.
+#
+$conf['hostcols'] = 4;
+
+#
+# In the Host View this sets the default number of columns used to
+# display the metric grid below the summary graphs.
+#
+$conf['metriccols'] = 2;
+
+#
+# Turn on and off the Grid Snapshot. Now that we have a
+# hierarchical snapshot (per-cluster instead of per-node) on
+# the meta page this makes
[MediaWiki-commits] [Gerrit] Tweak OAuth lib to respect x-forwarded-proto - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168303
Change subject: Tweak OAuth lib to respect x-forwarded-proto
..
Tweak OAuth lib to respect x-forwarded-proto
Dash's OAuth token requests are signed with an https url, but when
Drupal get them it tries to verify the signature with an http url
because nginx is doing the SSL termination. This patch makes
Drupal verify with an https url if x-forwarded-proto is https.
Change-Id: I6fd058ff8122ced25eb6aa6c0a03d020c78bf897
---
M sites/all/modules/contrib/oauth/lib/OAuth.php
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/03/168303/1
diff --git a/sites/all/modules/contrib/oauth/lib/OAuth.php
b/sites/all/modules/contrib/oauth/lib/OAuth.php
index 00ea0d5..2341ed7 100644
--- a/sites/all/modules/contrib/oauth/lib/OAuth.php
+++ b/sites/all/modules/contrib/oauth/lib/OAuth.php
@@ -265,9 +265,10 @@
* attempt to build up a request from what was passed to the server
*/
public static function from_request($http_method=NULL, $http_url=NULL,
$parameters=NULL) {
-$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != on)
- ? 'http'
- : 'https';
+$local_https = isset($_SERVER['HTTPS']) $_SERVER['HTTPS'] == 'on';
+$forwarded_https = isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
+$scheme = ($local_https || $forwarded_https) ? 'https' : 'http';
+
$http_url = ($http_url) ? $http_url : $scheme .
'://' . $_SERVER['SERVER_NAME'] .
':' .
--
To view, visit https://gerrit.wikimedia.org/r/168303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fd058ff8122ced25eb6aa6c0a03d020c78bf897
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added the beta hostname to local_domains to make exim use mw... - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: Added the beta hostname to local_domains to make exim use
mw_verp_api
..
Added the beta hostname to local_domains to make exim use mw_verp_api
The bounce needs to get HTTP POSTed to the webserver ( currently running
on mediawiki-verp in labs ) which will not happen until mediaiwki-verp.
wmflabs.org is there in the local_domains list. This patch adds the hostname
to the local_domains, and make sure only labs is affected
Change-Id: I0600d323c80743ce01d284740efd4fc6217739e5
---
M manifests/role/mail.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
Objections:
Giuseppe Lavagetto: There's a problem with this change, please improve
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 08f87aa..65e1d0d 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -32,6 +32,12 @@
]
$verp_post_connect_server = 'mediawiki-verp.wmflabs.org'
$verp_bounce_post_url =
'http://mediawiki-verp.wmflabs.org/w/api.php'
+$local_domains = [
+'+system_domains',
+'+wikimedia_domains',
+'+legacy_mailman_domains',
+'mediawiki-verp.wmflabs.org'
+]
}
'production': {
# currently not used as bouncehandler extension is not yet
installed in production
@@ -39,6 +45,11 @@
$verp_domains = [ ]
$verp_post_connect_server = 'login.wikimedia.org'
$verp_bounce_post_url =
appservers.svc.${::mw_primary}.wmnet/w/api.php
+$local_domains = [
+'+system_domains',
+'+wikimedia_domains',
+'+legacy_mailman_domains'
+]
}
default: {
fail('unknown realm, should be labs or production')
@@ -46,11 +57,7 @@
}
class { 'exim::roled':
-local_domains = [
-'+system_domains',
-'+wikimedia_domains',
-'+legacy_mailman_domains',
-],
+local_domains= $local_domains,
enable_mail_relay= 'primary',
enable_external_mail = true,
mediawiki_relay = true,
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index a9bce3a..1fd9bb9 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -43,7 +43,7 @@
% end -%
domainlist system_domains = @
-domainlist local_domains = %= local_domains.join( : ) %
+domainlist local_domains = %= @local_domains.join( : ) %
domainlist wikimedia_domains = lsearch;CONFDIR/wikimedia_domains
domainlist verp_domains = %= @verp_domains.join( : ) %
% if enable_mail_relay != false %
--
To view, visit https://gerrit.wikimedia.org/r/168175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0600d323c80743ce01d284740efd4fc6217739e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Adjusted boosts - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168304
Change subject: Adjusted boosts
..
Adjusted boosts
The boosting was way to high so text founds did not have a real relevance.
Put direct match, text and title fields with WordDelimiterFilterFactory on same
level.
Change-Id: I4a066d91126cdacccd272150ebcdbf62e2e7b73e
---
M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/04/168304/1
diff --git a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
index 3b03bb9..efb91e3 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
@@ -321,16 +321,16 @@
$this-aOptions['scope'] = $scope;
$aSearchTitle = array(
- 'titleWord:(' . $this-aOptions['searchStringOrig'] .
')^50',
- 'titleWord:(' . $this-aOptions['searchStringOrig'] .
')^10',
- 'titleReverse:(' .
$this-aOptions['searchStringWildcarded'] . ')^1',
- 'redirects:(' . $this-aOptions['searchStringOrig'] .
')^0.1'
+ 'titleWord:(' . $this-aOptions['searchStringOrig'] .
')^2',
+ 'titleWord:(' . $this-aOptions['searchStringOrig'] .
')^2',
+ 'titleReverse:(' .
$this-aOptions['searchStringWildcarded'] . ')',
+ 'redirects:(' . $this-aOptions['searchStringOrig'] .
')'
);
$aSearchText = array(
'textWord:(' . $this-aOptions['searchStringOrig']
.')^2',
- 'textReverse:(' .
$this-aOptions['searchStringWildcarded'] . ')^0.1',
- 'sections:(' . $this-aOptions['searchStringOrig'] .
')^0.1'
+ 'textReverse:(' .
$this-aOptions['searchStringWildcarded'] . ')',
+ 'sections:(' . $this-aOptions['searchStringOrig'] . ')'
);
$sSearchStringTitle = implode( ' OR ', $aSearchTitle );
--
To view, visit https://gerrit.wikimedia.org/r/168304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a066d91126cdacccd272150ebcdbf62e2e7b73e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
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] Test PhantomJS localStorage handling - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168305
Change subject: Test PhantomJS localStorage handling
..
Test PhantomJS localStorage handling
Change-Id: I9985c83698811ff9e8a895baae51ba9aa021bf59
---
A tests/browser/features/mmv.phantomjs.feature
A tests/browser/features/step_definitions/mmv_phantomjs_steps.rb
2 files changed, 21 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/05/168305/1
diff --git a/tests/browser/features/mmv.phantomjs.feature
b/tests/browser/features/mmv.phantomjs.feature
new file mode 100644
index 000..764f71a
--- /dev/null
+++ b/tests/browser/features/mmv.phantomjs.feature
@@ -0,0 +1,7 @@
+Feature: Phantomjs
+
+ Scenario: In which we set a localStorage variable
+When I set foo
+
+ Scenario: Om which the variable should not be set but still is
+Then foo is not set
diff --git a/tests/browser/features/step_definitions/mmv_phantomjs_steps.rb
b/tests/browser/features/step_definitions/mmv_phantomjs_steps.rb
new file mode 100644
index 000..17d6e5a
--- /dev/null
+++ b/tests/browser/features/step_definitions/mmv_phantomjs_steps.rb
@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+When /^I set foo$/ do
+ on(E2ETestPage) do |page|
+#print page.execute_script try { localStorage.setItem( 'foo', 1 ); }
catch( e ) { return e; }
+page.execute_script localStorage.setItem( 'foo', 1 );
+ end
+end
+
+Then /^foo is not set$/ do
+ on(E2ETestPage) do |page|
+page.execute_script(return localStorage.getItem('foo') ? 1 : 0;).should
be(1)
+ end
+end
--
To view, visit https://gerrit.wikimedia.org/r/168305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9985c83698811ff9e8a895baae51ba9aa021bf59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] less panic - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: less panic
..
less panic
Change-Id: I9ebe229441d027def35202a6fc8741466a50363d
---
M sites/all/modules/thank_you/generators/RenderTranslatedPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
index b83eecd..1c92ef5 100644
--- a/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
+++ b/sites/all/modules/thank_you/generators/RenderTranslatedPage.php
@@ -81,7 +81,7 @@
continue;
}
} catch ( TranslationException $ex ) {
- watchdog( 'make-thank-you', $lang --
{$ex-getMessage()}, null, WATCHDOG_ERROR );
+ watchdog( 'make-thank-you', $lang --
{$ex-getMessage()}, null, WATCHDOG_INFO );
} catch ( CiviMailingInsertException $ex ) {
watchdog( 'make-thank-you', Could not insert
CiviMail Mailing for $lang -- {$ex-getMessage()}, null, WATCHDOG_ERROR );
}
--
To view, visit https://gerrit.wikimedia.org/r/165874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ebe229441d027def35202a6fc8741466a50363d
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@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] Introduce DescriptionsChanger - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has submitted this change and it was merged.
Change subject: Introduce DescriptionsChanger
..
Introduce DescriptionsChanger
Change-Id: I2f8c59c3e5721fa9eded6a3fbdfaa5b6348b75ff
---
A lib/resources/entityChangers/DescriptionsChanger.js
M lib/resources/entityChangers/EntityChangersFactory.js
M lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/resources.php
A lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
M lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js
13 files changed, 226 insertions(+), 34 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/entityChangers/DescriptionsChanger.js
b/lib/resources/entityChangers/DescriptionsChanger.js
new file mode 100644
index 000..e39118b
--- /dev/null
+++ b/lib/resources/entityChangers/DescriptionsChanger.js
@@ -0,0 +1,74 @@
+/**
+ * @licence GNU GPL v2+
+ * @author Adrian Lang adrian.l...@wikimedia.de
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+ var MODULE = wb.entityChangers;
+ /**
+* @param {wikibase.RepoApi}
+* @param {wikibase.RevisionStore}
+* @param {wikibase.datamodel.Entity}
+*/
+ var SELF = MODULE.DescriptionsChanger = function( api, revisionStore,
entity ) {
+ this._api = api;
+ this._revisionStore = revisionStore;
+ this._entity = entity;
+ };
+
+ $.extend( SELF.prototype, {
+ /**
+* @type {wikibase.datamodel.Entity}
+*/
+ _entity: null,
+
+ /**
+* @type {wikibase.RevisionStore}
+*/
+ _revisionStore: null,
+
+ /**
+* @type {wikibase.RepoApi}
+*/
+ _api: null,
+
+ /**
+* @param {string} description
+* @param {string} language
+* @return {jQuery.Promise}
+* Resolved parameters:
+* - {string} The saved description
+* Rejected parameters:
+* - {wikibase.RepoApiError}
+*/
+ setDescription: function( description, language ) {
+ var self = this;
+ var deferred = $.Deferred();
+
+ this._api.setDescription(
+ this._entity.getId(),
+ this._revisionStore.getDescriptionRevision(),
+ description,
+ language
+ )
+ .done( function( result ) {
+ var savedDescription =
result.entity.descriptions[language].value;
+
+ // Update revision store:
+ self._revisionStore.setDescriptionRevision(
result.entity.lastrevid );
+
+ // FIXME: Maybe check API's return value?
+
+ // FIXME: Introduce Item.setDescriptions
+
+ deferred.resolve( savedDescription );
+ } )
+ .fail( function( errorCode, error ) {
+ deferred.reject(
wb.RepoApiError.newFromApiResponse( error, 'save' ) );
+ } );
+
+ return deferred.promise();
+ }
+ } );
+} ( wikibase, jQuery ) );
diff --git a/lib/resources/entityChangers/EntityChangersFactory.js
b/lib/resources/entityChangers/EntityChangersFactory.js
index 79694a5..5a8554e 100644
--- a/lib/resources/entityChangers/EntityChangersFactory.js
+++ b/lib/resources/entityChangers/EntityChangersFactory.js
@@ -52,6 +52,13 @@
},
/**
+* @return {wikibase.entityChangers.DescriptionsChanger}
+*/
+ getDescriptionsChanger: function() {
+ return new MODULE.DescriptionsChanger( this._api,
this._revisionStore, this._entity );
+ },
+
+ /**
* @return {wikibase.entityChangers.ReferencesChanger}
*/
getReferencesChanger: function() {
diff --git a/lib/resources/entityChangers/resources.php
b/lib/resources/entityChangers/resources.php
index b0c7b43..abbe2ec 100644
---
[MediaWiki-commits] [Gerrit] Tool Labs: Gridengine puppetization, III - change (operations/puppet)
coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168306
Change subject: Tool Labs: Gridengine puppetization, III
..
Tool Labs: Gridengine puppetization, III
This phase adds the host-unrestricted node config for the new
compute::dedicated node type. It also now places nodes in the
proper hostgroups and queues.
Change-Id: I9931a2603e74b814529aa9f639036a442b64c7b8
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/hostgroups.pp
M modules/toollabs/manifests/master.pp
A modules/toollabs/manifests/node/compute/dedicated.pp
M modules/toollabs/manifests/node/web/lighttpd.pp
M modules/toollabs/manifests/node/web/tomcat.pp
A modules/toollabs/manifests/queues.pp
A modules/toollabs/templates/gridengine/host-unrestricted.erb
8 files changed, 83 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/168306/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index c8f542c..d41710b 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -16,7 +16,7 @@
class compute inherits role::labs::tools::common {
include toollabs::compute
-system::role { 'role::labs::tools::common': description = 'Tool Labs
compute node' }
+system::role { 'role::labs::tools::compute': description = 'Tool Labs
compute node' }
}
class master inherits role::labs::tools::common {
diff --git a/modules/toollabs/manifests/hostgroups.pp
b/modules/toollabs/manifests/hostgroups.pp
index f5a0db9..d5cece1 100644
--- a/modules/toollabs/manifests/hostgroups.pp
+++ b/modules/toollabs/manifests/hostgroups.pp
@@ -12,7 +12,7 @@
gridengine::join { hostgroups-${::fqdn}:
sourcedir = ${toollabs::collectors}/hostgroups,
-list = $goups,
+list = $groups,
}
}
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index 6ebec76..0344100 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -21,6 +21,18 @@
store = ${toollabs::collectors}/hostgroups,
}
+gridengine::collectors::queues { 'webgrid-lighttpd':
+store = ${toollabs::collectors}/queues,
+}
+
+gridengine::collectors::queues { 'webgrid-tomcat':
+store = ${toollabs::collectors}/queues,
+}
+
+gridengine::collectors::queues { 'webgrid-generic':
+store = ${toollabs::collectors}/queues,
+}
+
#
# These things are done on toollabs::master because they
# need to be done exactly once per project (they live on the
diff --git a/modules/toollabs/manifests/node/compute/dedicated.pp
b/modules/toollabs/manifests/node/compute/dedicated.pp
new file mode 100644
index 000..7b7b9a2
--- /dev/null
+++ b/modules/toollabs/manifests/node/compute/dedicated.pp
@@ -0,0 +1,42 @@
+# Class: toollabs::node::compute::general
+#
+# This configures the compute node as a general node dedicated to a tool
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+class toollabs::node::compute::dedicated {
+
+if $::node_dedicated_tool {
+
+system::role { 'toollabs::node::compute::dedicated':
+description = Computation node dedicated to
${::instanceproject}.${::node_dedicated_tool},
+}
+
+class { 'toollabs::queues': queues = [ $::node_dedicated_tool ] }
+
+# Having the collector in the instance means that, for the time
+# being, dedicated queues can have just the one one in them.
+
+gridengine::collectors::queues { $::node_dedicated_tool:
+store = ${toollabs::collectors}/queues,
+}
+
+} else {
+
+system::role { 'toollabs::node::compute::dedicated':
+description = Unassigned dedicated computation node,
+}
+
+}
+
+class { 'gridengine::exec_host':
+config = template('toollabs/gridengine/host-unrestricted.erb'),
+}
+
+}
diff --git a/modules/toollabs/manifests/node/web/lighttpd.pp
b/modules/toollabs/manifests/node/web/lighttpd.pp
index 4507151..f12bc54 100644
--- a/modules/toollabs/manifests/node/web/lighttpd.pp
+++ b/modules/toollabs/manifests/node/web/lighttpd.pp
@@ -24,6 +24,8 @@
require = File['/var/run/lighttpd'],
}
+class { 'toollabs::queues': queues = [ 'webgrid-lighttpd' ] }
+
file { '/var/run/lighttpd':
ensure = directory,
owner = 'www-data',
@@ -48,3 +50,4 @@
}
}
+
diff --git a/modules/toollabs/manifests/node/web/tomcat.pp
b/modules/toollabs/manifests/node/web/tomcat.pp
index 9848efc..c16ddff 100644
--- a/modules/toollabs/manifests/node/web/tomcat.pp
+++ b/modules/toollabs/manifests/node/web/tomcat.pp
@@ -16,6 +16,9 @@
ensure = latest,
}
+# For now, the tomcat nodes double as the generic webserver nodes
+class { 'toollabs::queues': queues = [ 'webgrid-tomcat',
[MediaWiki-commits] [Gerrit] Version 1.2.4 (October 23, 2014) - change (mediawiki...WikEdDiff)
Cacycle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168307
Change subject: Version 1.2.4 (October 23, 2014)
..
Version 1.2.4 (October 23, 2014)
Bug fix:
- Fixed word/chunk counts for unique token detection
Improvements:
- Disabled unlinking for simple texts with only short linked block lengths
(i.e. test cases)
Change-Id: I34092cbe8e18bd16d3f4db311528c147166f973b
---
M README.txt
M WikEdDiff.body.php
M WikEdDiff.php
3 files changed, 55 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikEdDiff
refs/changes/07/168307/1
diff --git a/README.txt b/README.txt
index 2ed0889..c3dc91b 100644
--- a/README.txt
+++ b/README.txt
@@ -77,6 +77,18 @@
+Version 1.2.4 (October 23, 2014)
+
+Bug fix:
+
+- Fixed word/chunk counts for unique token detection
+
+Improvements:
+
+- Disabled unlinking for simple texts with only short linked block lengths
(i.e. test cases)
+
+
+
Version 1.2.3 (October 21, 2014)
Bug fix:
diff --git a/WikEdDiff.body.php b/WikEdDiff.body.php
index d44ddb2..cbc01c4 100644
--- a/WikEdDiff.body.php
+++ b/WikEdDiff.body.php
@@ -1,7 +1,7 @@
?php
/**
- * @version 1.2.3
- * @date October 21, 2014
+ * @version 1.2.4
+ * @date October 23, 2014
*
* wikEdDiff: inline-style difference engine with block move support
*
@@ -55,6 +55,7 @@
*= htmlCodeHTML code fragments used for creating the output
* - newText new text
* - oldText old text
+ * - maxWords word count of longest linked block
* - html diff html
* - errorflag: result has not passed unit tests
* - bordersDown[]linked region borders downwards, [new index, old
index]
@@ -94,7 +95,7 @@
* = blockStart first block index
* = blockEnd last block index
* = unique contains unique linked token
- * = maxWords word count of longest block
+ * = maxWords word count of longest linked block
* = wordsword count
* = charschar count
* = fixednot moved from original position
@@ -153,7 +154,7 @@
global $wgContLang, $wgOut;
- // load js and css
+ // Load js and css
$wgOut-addModules( 'ext.wikEdDiff' );
$wikEdDiff = new WikEdDiff();
@@ -342,6 +343,9 @@
/** @var array $blocks Block data (consecutive text tokens) in new text
order */
protected $blocks = array();
+ /** @var int maxWords Maximal detected word count of all linked blocks
*/
+ protected $maxWords = 0;
+
/** @var array $groups Section blocks that are consecutive in old text
order */
protected $groups = array();
@@ -470,7 +474,7 @@
'\/?[^\[\]\{\}\n]+|' . // html
'\[\[[^\[\]\|\n]+\]\]\||' . // [[wiki
link|
'\{\{[^\{\}\|\n]+\||' . //
{{template|
-
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // url
+
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // link
// Split into words, multi-char markup, and
chars
'word' =
@@ -517,7 +521,7 @@
'\/?[^\[\]\{\}\n]+|' . // html
'\[\[[^\[\]\|\n]+\]\]\||' . // [[wiki link|
'\{\{[^\{\}\|\n]+\||' . // {{template|
-
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // url
+
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // link
// RegExp detecting blank-only and single-char blocks
'blankBlock' = '/^([^\t\S]+|[^\t])$/u',
@@ -1348,14 +1352,14 @@
$this-time( $level . ( $recursionLevel ) );
}
- // get object symbols table and linked region borders
+ // Get object symbols table and linked region borders
if ( $recursionLevel === 0 $repeating === false ) {
$symbols = $this-symbols;
$bordersDown = $this-bordersDown;
$bordersUp = $this-bordersUp;
}
- // create empty local symbols table and linked region borders
arrays
+ // Create empty local symbols table and linked region borders
arrays
else {
$symbols = array(
[MediaWiki-commits] [Gerrit] Version 1.2.4 (October 23, 2014) - change (mediawiki...WikEdDiff)
Cacycle has submitted this change and it was merged.
Change subject: Version 1.2.4 (October 23, 2014)
..
Version 1.2.4 (October 23, 2014)
Bug fix:
- Fixed word/chunk counts for unique token detection
Improvements:
- Disabled unlinking for simple texts with only short linked block lengths
(i.e. test cases)
Change-Id: I34092cbe8e18bd16d3f4db311528c147166f973b
---
M README.txt
M WikEdDiff.body.php
M WikEdDiff.php
3 files changed, 55 insertions(+), 33 deletions(-)
Approvals:
Cacycle: Verified; Looks good to me, approved
diff --git a/README.txt b/README.txt
index 2ed0889..c3dc91b 100644
--- a/README.txt
+++ b/README.txt
@@ -77,6 +77,18 @@
+Version 1.2.4 (October 23, 2014)
+
+Bug fix:
+
+- Fixed word/chunk counts for unique token detection
+
+Improvements:
+
+- Disabled unlinking for simple texts with only short linked block lengths
(i.e. test cases)
+
+
+
Version 1.2.3 (October 21, 2014)
Bug fix:
diff --git a/WikEdDiff.body.php b/WikEdDiff.body.php
index d44ddb2..cbc01c4 100644
--- a/WikEdDiff.body.php
+++ b/WikEdDiff.body.php
@@ -1,7 +1,7 @@
?php
/**
- * @version 1.2.3
- * @date October 21, 2014
+ * @version 1.2.4
+ * @date October 23, 2014
*
* wikEdDiff: inline-style difference engine with block move support
*
@@ -55,6 +55,7 @@
*= htmlCodeHTML code fragments used for creating the output
* - newText new text
* - oldText old text
+ * - maxWords word count of longest linked block
* - html diff html
* - errorflag: result has not passed unit tests
* - bordersDown[]linked region borders downwards, [new index, old
index]
@@ -94,7 +95,7 @@
* = blockStart first block index
* = blockEnd last block index
* = unique contains unique linked token
- * = maxWords word count of longest block
+ * = maxWords word count of longest linked block
* = wordsword count
* = charschar count
* = fixednot moved from original position
@@ -153,7 +154,7 @@
global $wgContLang, $wgOut;
- // load js and css
+ // Load js and css
$wgOut-addModules( 'ext.wikEdDiff' );
$wikEdDiff = new WikEdDiff();
@@ -342,6 +343,9 @@
/** @var array $blocks Block data (consecutive text tokens) in new text
order */
protected $blocks = array();
+ /** @var int maxWords Maximal detected word count of all linked blocks
*/
+ protected $maxWords = 0;
+
/** @var array $groups Section blocks that are consecutive in old text
order */
protected $groups = array();
@@ -470,7 +474,7 @@
'\/?[^\[\]\{\}\n]+|' . // html
'\[\[[^\[\]\|\n]+\]\]\||' . // [[wiki
link|
'\{\{[^\{\}\|\n]+\||' . //
{{template|
-
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // url
+
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // link
// Split into words, multi-char markup, and
chars
'word' =
@@ -517,7 +521,7 @@
'\/?[^\[\]\{\}\n]+|' . // html
'\[\[[^\[\]\|\n]+\]\]\||' . // [[wiki link|
'\{\{[^\{\}\|\n]+\||' . // {{template|
-
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // url
+
'\b((https?:|)\/\/)[^\x{00}-\x{20}\s\\[\]\x{7f}]+/u', // link
// RegExp detecting blank-only and single-char blocks
'blankBlock' = '/^([^\t\S]+|[^\t])$/u',
@@ -1348,14 +1352,14 @@
$this-time( $level . ( $recursionLevel ) );
}
- // get object symbols table and linked region borders
+ // Get object symbols table and linked region borders
if ( $recursionLevel === 0 $repeating === false ) {
$symbols = $this-symbols;
$bordersDown = $this-bordersDown;
$bordersUp = $this-bordersUp;
}
- // create empty local symbols table and linked region borders
arrays
+ // Create empty local symbols table and linked region borders
arrays
else {
$symbols = array(
'token' = array(),
@@ -1366,7 +1370,7 @@
[MediaWiki-commits] [Gerrit] phab update php post_max_size to 10MB - change (operations/puppet)
Rush has uploaded a new change for review. https://gerrit.wikimedia.org/r/168308 Change subject: phab update php post_max_size to 10MB .. phab update php post_max_size to 10MB Matching bugzilla upload size allowment Change-Id: Idc78aaaebf4f1961e75af3e9ae477d0845a79633 --- M modules/phabricator/data/fixed_settings.yaml M modules/phabricator/templates/trusty_php.ini.erb 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/168308/1 diff --git a/modules/phabricator/data/fixed_settings.yaml b/modules/phabricator/data/fixed_settings.yaml index 4106683..e4512b1 100644 --- a/modules/phabricator/data/fixed_settings.yaml +++ b/modules/phabricator/data/fixed_settings.yaml @@ -126,6 +126,7 @@ # https://secure.phabricator.com/book/phabricator/article/configuring_file_storage/ # Needs to match php.ini upload_max_filesize +# Needs to match php.ini post_max_size for conduit storage.mysql-engine.max-size: 1000 storage.upload-size-limit: 10M diff --git a/modules/phabricator/templates/trusty_php.ini.erb b/modules/phabricator/templates/trusty_php.ini.erb index 1bed305..cd9f98b 100644 --- a/modules/phabricator/templates/trusty_php.ini.erb +++ b/modules/phabricator/templates/trusty_php.ini.erb @@ -670,7 +670,7 @@ ; Its value may be 0 to disable the limit. It is ignored if POST data reading ; is disabled through enable_post_data_reading. ; http://php.net/post-max-size -post_max_size = 8M +post_max_size = 10M ; Automatically add files before PHP document. ; http://php.net/auto-prepend-file -- To view, visit https://gerrit.wikimedia.org/r/168308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc78aaaebf4f1961e75af3e9ae477d0845a79633 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce LabelsChanger - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has submitted this change and it was merged.
Change subject: Introduce LabelsChanger
..
Introduce LabelsChanger
Change-Id: Ibf2cf0b69b97041020f13e311d8b4132691bbd16
---
M lib/resources/entityChangers/EntityChangersFactory.js
A lib/resources/entityChangers/LabelsChanger.js
M lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M lib/resources/jquery.wikibase/resources.php
A lib/tests/qunit/entityChangers/LabelsChanger.tests.js
M lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js
15 files changed, 231 insertions(+), 54 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/entityChangers/EntityChangersFactory.js
b/lib/resources/entityChangers/EntityChangersFactory.js
index 5a8554e..29b7cdd 100644
--- a/lib/resources/entityChangers/EntityChangersFactory.js
+++ b/lib/resources/entityChangers/EntityChangersFactory.js
@@ -59,6 +59,13 @@
},
/**
+* @return {wikibase.entityChangers.LabelsChanger}
+*/
+ getLabelsChanger: function() {
+ return new MODULE.LabelsChanger( this._api,
this._revisionStore, this._entity );
+ },
+
+ /**
* @return {wikibase.entityChangers.ReferencesChanger}
*/
getReferencesChanger: function() {
diff --git a/lib/resources/entityChangers/LabelsChanger.js
b/lib/resources/entityChangers/LabelsChanger.js
new file mode 100644
index 000..f044897
--- /dev/null
+++ b/lib/resources/entityChangers/LabelsChanger.js
@@ -0,0 +1,74 @@
+/**
+ * @licence GNU GPL v2+
+ * @author Adrian Lang adrian.l...@wikimedia.de
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+ var MODULE = wb.entityChangers;
+ /**
+* @param {wikibase.RepoApi}
+* @param {wikibase.RevisionStore}
+* @param {wikibase.datamodel.Entity}
+*/
+ var SELF = MODULE.LabelsChanger = function( api, revisionStore, entity
) {
+ this._api = api;
+ this._revisionStore = revisionStore;
+ this._entity = entity;
+ };
+
+ $.extend( SELF.prototype, {
+ /**
+* @type {wikibase.datamodel.Entity}
+*/
+ _entity: null,
+
+ /**
+* @type {wikibase.RevisionStore}
+*/
+ _revisionStore: null,
+
+ /**
+* @type {wikibase.RepoApi}
+*/
+ _api: null,
+
+ /**
+* @param {string} label
+* @param {string} language
+* @return {jQuery.Promise}
+* Resolved parameters:
+* - {string} The saved label
+* Rejected parameters:
+* - {wikibase.RepoApiError}
+*/
+ setLabel: function( label, language ) {
+ var self = this;
+ var deferred = $.Deferred();
+
+ this._api.setLabel(
+ this._entity.getId(),
+ this._revisionStore.getLabelRevision(),
+ label,
+ language
+ )
+ .done( function( result ) {
+ var savedLabel =
result.entity.labels[language].value;
+
+ // Update revision store:
+ self._revisionStore.setLabelRevision(
result.entity.lastrevid );
+
+ // FIXME: Maybe check API's return value?
+
+ // FIXME: Introduce Item.setLabels
+
+ deferred.resolve( savedLabel );
+ } )
+ .fail( function( errorCode, error ) {
+ deferred.reject(
wb.RepoApiError.newFromApiResponse( error, 'save' ) );
+ } );
+
+ return deferred.promise();
+ }
+ } );
+} ( wikibase, jQuery ) );
diff --git a/lib/resources/entityChangers/resources.php
b/lib/resources/entityChangers/resources.php
index abbe2ec..fde4c58 100644
---
[MediaWiki-commits] [Gerrit] WIP Fixed RuboCop offense Metrics/LineLength - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168310
Change subject: WIP Fixed RuboCop offense Metrics/LineLength
..
WIP Fixed RuboCop offense Metrics/LineLength
Bug: 63307
Change-Id: Ie5d6b68242c8ddb88d416c52a795e886c1d155eb
---
M .rubocop_todo.yml
M lib/mediawiki_api/client.rb
M mediawiki_api.gemspec
M spec/client_spec.rb
M spec/support/request_helpers.rb
5 files changed, 73 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/10/168310/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index df26c12..8bc4506 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -18,11 +18,6 @@
Metrics/CyclomaticComplexity:
Max: 7
-# Offense count: 53
-# Configuration parameters: AllowURI.
-Metrics/LineLength:
- Max: 182
-
# Offense count: 3
# Configuration parameters: CountComments.
Metrics/MethodLength:
diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb
index c90b5ba..b052dde 100644
--- a/lib/mediawiki_api/client.rb
+++ b/lib/mediawiki_api/client.rb
@@ -35,7 +35,8 @@
params[:token] = get_token(token_type || name) unless token_type == false
params = compile_parameters(params)
- response = @conn.send(method, '', params.merge(action: name, format:
FORMAT))
+ response = @conn.send(
+method, '', params.merge(action: name, format: FORMAT))
fail HttpError, response.status if response.status = 400
@@ -128,7 +129,9 @@
def upload_image(filename, path, comment, ignorewarnings)
file = Faraday::UploadIO.new(path, 'image/png')
- action(:upload, token_type: 'edit', filename: filename, file: file,
comment: comment, ignorewarnings: ignorewarnings)
+ action(
+:upload, token_type: 'edit', filename: filename, file: file,
+comment: comment, ignorewarnings: ignorewarnings)
end
def watch_page(title)
@@ -152,9 +155,11 @@
def get_token(type)
unless @tokens.include?(type)
-response = action(:tokens, type: type, http_method: :get, token_type:
false)
+response = action(
+ :tokens, type: type, http_method: :get, token_type: false)
-if response.warnings? response.warnings.grep(/Unrecognized value
for parameter 'type'/).any?
+if response.warnings? response.warnings.grep(
+ /Unrecognized value for parameter 'type'/).any?
fail TokenError, response.warnings.join(', ')
end
@@ -165,7 +170,8 @@
end
def subquery(type, subtype, params = {})
- query(params.merge(type.to_sym = subtype, :envelope = ['query',
subtype]))
+ query(params.merge(
+type.to_sym = subtype, :envelope = ['query', subtype]))
end
end
end
diff --git a/mediawiki_api.gemspec b/mediawiki_api.gemspec
index 801dbcf..f4c294a 100644
--- a/mediawiki_api.gemspec
+++ b/mediawiki_api.gemspec
@@ -6,10 +6,16 @@
Gem::Specification.new do |spec|
spec.name = 'mediawiki_api'
spec.version = MediawikiApi::VERSION
- spec.authors = ['Amir Aharoni', 'Chris McMahon', 'Dan Duvall', 'Jeff
Hall', 'Juliusz Gonera', 'Zeljko Filipin']
- spec.email = ['amir.ahar...@mail.huji.ac.il',
'cmcma...@wikimedia.org', 'dduv...@wikimedia.org', 'jh...@wikimedia.org',
'jgon...@wikimedia.org', 'zeljko.fili...@gmail.com']
+ spec.authors =
+['Amir Aharoni', 'Chris McMahon', 'Dan Duvall', 'Jeff Hall',
+ 'Juliusz Gonera', 'Zeljko Filipin']
+ spec.email =
+['amir.ahar...@mail.huji.ac.il', 'cmcma...@wikimedia.org',
+ 'dduv...@wikimedia.org', 'jh...@wikimedia.org', 'jgon...@wikimedia.org',
+ 'zeljko.fili...@gmail.com']
spec.summary = 'A library for interacting with MediaWiki API from
Ruby.'
- spec.description = 'Uses adapter-agnostic Faraday gem to talk to MediaWiki
API.'
+ spec.description =
+'Uses adapter-agnostic Faraday gem to talk to MediaWiki API.'
spec.homepage = 'https://github.com/wikimedia/mediawiki-ruby-api'
spec.license = 'GPL-2'
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 44b06d4..d55af8f 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -18,7 +18,10 @@
let(:token_type) { action }
let(:params) { {} }
-let(:response) { { status: response_status, headers: response_headers,
body: response_body.to_json } }
+let(:response) do
+ { status: response_status, headers: response_headers,
+body: response_body.to_json }
+end
let(:response_status) { 200 }
let(:response_headers) { nil }
let(:response_body) { { 'something' = {} } }
@@ -27,7 +30,8 @@
before do
@token_request = stub_token_request(token_type, token_warning)
- @request = stub_api_request(:post, action: action, token:
mock_token).to_return(response)
+ @request = stub_api_request(:post, action: action, token: mock_token)
+
[MediaWiki-commits] [Gerrit] phab update php post_max_size to 10MB - change (operations/puppet)
Rush has submitted this change and it was merged. Change subject: phab update php post_max_size to 10MB .. phab update php post_max_size to 10MB Matching bugzilla upload size allowment Change-Id: Idc78aaaebf4f1961e75af3e9ae477d0845a79633 --- M modules/phabricator/data/fixed_settings.yaml M modules/phabricator/templates/trusty_php.ini.erb 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/phabricator/data/fixed_settings.yaml b/modules/phabricator/data/fixed_settings.yaml index 4106683..e4512b1 100644 --- a/modules/phabricator/data/fixed_settings.yaml +++ b/modules/phabricator/data/fixed_settings.yaml @@ -126,6 +126,7 @@ # https://secure.phabricator.com/book/phabricator/article/configuring_file_storage/ # Needs to match php.ini upload_max_filesize +# Needs to match php.ini post_max_size for conduit storage.mysql-engine.max-size: 1000 storage.upload-size-limit: 10M diff --git a/modules/phabricator/templates/trusty_php.ini.erb b/modules/phabricator/templates/trusty_php.ini.erb index 1bed305..cd9f98b 100644 --- a/modules/phabricator/templates/trusty_php.ini.erb +++ b/modules/phabricator/templates/trusty_php.ini.erb @@ -670,7 +670,7 @@ ; Its value may be 0 to disable the limit. It is ignored if POST data reading ; is disabled through enable_post_data_reading. ; http://php.net/post-max-size -post_max_size = 8M +post_max_size = 10M ; Automatically add files before PHP document. ; http://php.net/auto-prepend-file -- To view, visit https://gerrit.wikimedia.org/r/168308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc78aaaebf4f1961e75af3e9ae477d0845a79633 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush r...@wikimedia.org Gerrit-Reviewer: Rush r...@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] Fixed RuboCop offense Style/ClassAndModuleChildren - change (mediawiki...api)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168309
Change subject: Fixed RuboCop offense Style/ClassAndModuleChildren
..
Fixed RuboCop offense Style/ClassAndModuleChildren
$ bundle exec rubocop
Inspecting 11 files
..C
Offenses:
spec/support/request_helpers.rb:1:8: C: Use nested module/class
definitions instead of compact style.
module MediawikiApi::RequestHelpers
11 files inspected, 1 offense detected
Bug: 63307
Change-Id: Id4858bf4402526563757aaa7a3257e68918487f2
---
M .rubocop_todo.yml
M spec/support/request_helpers.rb
2 files changed, 26 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/ruby/api
refs/changes/09/168309/1
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1cc5ef4..df26c12 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -28,11 +28,6 @@
Metrics/MethodLength:
Max: 13
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
- Enabled: false
-
# Offense count: 6
Style/Documentation:
Enabled: false
diff --git a/spec/support/request_helpers.rb b/spec/support/request_helpers.rb
index d986cd1..5b3e413 100644
--- a/spec/support/request_helpers.rb
+++ b/spec/support/request_helpers.rb
@@ -1,34 +1,36 @@
-module MediawikiApi::RequestHelpers
- def api_url
-'http://localhost/api.php'
- end
+module MediawikiApi
+ module RequestHelpers
+def api_url
+ 'http://localhost/api.php'
+end
- def index_url
-'http://localhost/w/index.php'
- end
+def index_url
+ 'http://localhost/w/index.php'
+end
- def mock_token
-'token123'
- end
+def mock_token
+ 'token123'
+end
- def stub_api_request(method, params)
-params = params.each.with_object({}) { |(k, v), p| p[k] = v.to_s }
+def stub_api_request(method, params)
+ params = params.each.with_object({}) { |(k, v), p| p[k] = v.to_s }
-stub_request(method, api_url)
- .with((method == :post ? :body : :query) = params.merge(format: 'json'))
- end
+ stub_request(method, api_url)
+.with((method == :post ? :body : :query) = params.merge(format:
'json'))
+end
- def stub_action_request(action, params = {})
-method = params.delete(:http_method) || :post
+def stub_action_request(action, params = {})
+ method = params.delete(:http_method) || :post
-stub_api_request(method, params.merge(action: action, token: mock_token))
- end
+ stub_api_request(method, params.merge(action: action, token: mock_token))
+end
- def stub_token_request(type, warning = nil)
-response = { tokens: { #{type}token = mock_token } }
-response[:warnings] = { type = { '*' = [warning] } } unless warning.nil?
+def stub_token_request(type, warning = nil)
+ response = { tokens: { #{type}token = mock_token } }
+ response[:warnings] = { type = { '*' = [warning] } } unless
warning.nil?
-stub_api_request(:get, action: 'tokens', type: type)
- .to_return(body: response.to_json)
+ stub_api_request(:get, action: 'tokens', type: type)
+.to_return(body: response.to_json)
+end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/168309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4858bf4402526563757aaa7a3257e68918487f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ruby/api
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] Fix tests under MySQL (skip self-join on terms table). - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168311
Change subject: Fix tests under MySQL (skip self-join on terms table).
..
Fix tests under MySQL (skip self-join on terms table).
Change-Id: I4675324997a02a00384edbdff7f46047e30d9d71
---
M lib/includes/store/sql/TermSqlIndex.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/11/168311/1
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index 586316f..ec9e931 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -960,6 +960,13 @@
$dbr = $this-getReadDb();
+ // FIXME: MySQL doesn't support self-joins on temporary tables,
+ //so skip this check during unit tests on MySQL!
+ if ( defined( 'MW_PHPUNIT_TEST' ) $dbr-getType() ===
'mysql' ) {
+ $this-releaseConnection( $dbr );
+ wfProfileOut( __METHOD__ );
+ return array();
+ }
$where = array();
$where['L.term_entity_type'] = $entityType;
--
To view, visit https://gerrit.wikimedia.org/r/168311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4675324997a02a00384edbdff7f46047e30d9d71
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] Add ImageMetrics extension - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add ImageMetrics extension .. Add ImageMetrics extension Bug: 70402 Change-Id: I4242ab5aaf29813aed8a7a9f857f743175caa9b4 --- M wmf-config/InitialiseSettings.php M wmf-config/extension-list M wmf-config/extension-list-labs 3 files changed, 2 insertions(+), 1 deletion(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 6fa2300..14b0070 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11573,6 +11573,7 @@ 'wmgUseImageMetrics' = array( 'default' = false, + 'testwiki' = true, ), 'wmgImageMetricsSamplingFactor' = array( diff --git a/wmf-config/extension-list b/wmf-config/extension-list index b8319c5..741619a 100644 --- a/wmf-config/extension-list +++ b/wmf-config/extension-list @@ -53,6 +53,7 @@ $IP/extensions/GuidedTour/GuidedTour.php $IP/extensions/GWToolset/GWToolset.php $IP/extensions/ImageMap/ImageMap.php +$IP/extensions/ImageMetrics/ImageMetrics.php $IP/extensions/InputBox/InputBox.php $IP/extensions/Insider/Insider.php $IP/extensions/intersection/DynamicPageList.php diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs index 6cb4eac..e76b982 100644 --- a/wmf-config/extension-list-labs +++ b/wmf-config/extension-list-labs @@ -3,6 +3,5 @@ $IP/extensions/ContentTranslation/ContentTranslation.php $IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php $IP/extensions/GlobalCssJs/GlobalCssJs.php -$IP/extensions/ImageMetrics/ImageMetrics.php $IP/skins/MonoBook/MonoBook.php $IP/skins/Vector/Vector.php -- To view, visit https://gerrit.wikimedia.org/r/167727 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4242ab5aaf29813aed8a7a9f857f743175caa9b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gergő Tisza gti...@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] Add ImageMetrics submodule - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add ImageMetrics submodule .. Add ImageMetrics submodule Bug: 70402 Change-Id: I28588bb63aab355c53ac73e475b1ffe2697646c3 --- M .gitmodules A extensions/ImageMetrics 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules index dde060d..47f9bde 100644 --- a/.gitmodules +++ b/.gitmodules @@ -478,3 +478,6 @@ [submodule vendor] path = vendor url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git +[submodule extensions/ImageMetrics] + path = extensions/ImageMetrics + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ImageMetrics.git diff --git a/extensions/ImageMetrics b/extensions/ImageMetrics new file mode 16 index 000..2ec9643 --- /dev/null +++ b/extensions/ImageMetrics +Subproject commit 2ec9643f7fd687e9262dcfe727b01ccb95d9bc92 -- To view, visit https://gerrit.wikimedia.org/r/167723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28588bb63aab355c53ac73e475b1ffe2697646c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf3 Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gergő Tisza gti...@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] Add ImageMetrics submodule - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add ImageMetrics submodule .. Add ImageMetrics submodule Bug: 70402 Change-Id: I7718f8cba4079cedea187f3ad7a2e00a360c3c77 --- M .gitmodules A extensions/ImageMetrics 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules index dde060d..47f9bde 100644 --- a/.gitmodules +++ b/.gitmodules @@ -478,3 +478,6 @@ [submodule vendor] path = vendor url = https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git +[submodule extensions/ImageMetrics] + path = extensions/ImageMetrics + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ImageMetrics.git diff --git a/extensions/ImageMetrics b/extensions/ImageMetrics new file mode 16 index 000..2ec9643 --- /dev/null +++ b/extensions/ImageMetrics +Subproject commit 2ec9643f7fd687e9262dcfe727b01ccb95d9bc92 -- To view, visit https://gerrit.wikimedia.org/r/167724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7718f8cba4079cedea187f3ad7a2e00a360c3c77 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf4 Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
