[MediaWiki-commits] [Gerrit] Re-enable NTP on restbase, the smearing option (-x) has be... - change (operations/puppet)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/222073 Change subject: Re-enable NTP on restbase, the smearing option (-x) has been configured via salt .. Re-enable NTP on restbase, the smearing option (-x) has been configured via salt Change-Id: I6ce00578f0277aea6847f3d616ef37c4b7f44da2 --- M hieradata/hosts/restbase1001.yaml M hieradata/hosts/restbase1002.yaml M hieradata/hosts/restbase1003.yaml M hieradata/hosts/restbase1004.yaml M hieradata/hosts/restbase1005.yaml M hieradata/hosts/restbase1006.yaml M hieradata/hosts/restbase1007.yaml M hieradata/hosts/restbase1008.yaml M hieradata/hosts/restbase1009.yaml 9 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/222073/1 diff --git a/hieradata/hosts/restbase1001.yaml b/hieradata/hosts/restbase1001.yaml index df3f920..0a2e858 100644 --- a/hieradata/hosts/restbase1001.yaml +++ b/hieradata/hosts/restbase1001.yaml @@ -1 +1,2 @@ cassandra::rack: 'a' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1002.yaml b/hieradata/hosts/restbase1002.yaml index df3f920..0a2e858 100644 --- a/hieradata/hosts/restbase1002.yaml +++ b/hieradata/hosts/restbase1002.yaml @@ -1 +1,2 @@ cassandra::rack: 'a' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1003.yaml b/hieradata/hosts/restbase1003.yaml index 422643c..6aab03b 100644 --- a/hieradata/hosts/restbase1003.yaml +++ b/hieradata/hosts/restbase1003.yaml @@ -1 +1,2 @@ cassandra::rack: 'b' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1004.yaml b/hieradata/hosts/restbase1004.yaml index 422643c..6aab03b 100644 --- a/hieradata/hosts/restbase1004.yaml +++ b/hieradata/hosts/restbase1004.yaml @@ -1 +1,2 @@ cassandra::rack: 'b' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1005.yaml b/hieradata/hosts/restbase1005.yaml index acb9034..bfd66a1 100644 --- a/hieradata/hosts/restbase1005.yaml +++ b/hieradata/hosts/restbase1005.yaml @@ -1 +1,2 @@ cassandra::rack: 'd' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1006.yaml b/hieradata/hosts/restbase1006.yaml index acb9034..bfd66a1 100644 --- a/hieradata/hosts/restbase1006.yaml +++ b/hieradata/hosts/restbase1006.yaml @@ -1 +1,2 @@ cassandra::rack: 'd' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1007.yaml b/hieradata/hosts/restbase1007.yaml index df3f920..0a2e858 100644 --- a/hieradata/hosts/restbase1007.yaml +++ b/hieradata/hosts/restbase1007.yaml @@ -1 +1,2 @@ cassandra::rack: 'a' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1008.yaml b/hieradata/hosts/restbase1008.yaml index 422643c..6aab03b 100644 --- a/hieradata/hosts/restbase1008.yaml +++ b/hieradata/hosts/restbase1008.yaml @@ -1 +1,2 @@ cassandra::rack: 'b' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1009.yaml b/hieradata/hosts/restbase1009.yaml index acb9034..bfd66a1 100644 --- a/hieradata/hosts/restbase1009.yaml +++ b/hieradata/hosts/restbase1009.yaml @@ -1 +1,2 @@ cassandra::rack: 'd' +ntp::daemon::ensure: present -- To view, visit https://gerrit.wikimedia.org/r/222073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ce00578f0277aea6847f3d616ef37c4b7f44da2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix minor bug in range checker - change (mediawiki...WikibaseQualityConstraints)
Jonaskeutel has uploaded a new change for review. https://gerrit.wikimedia.org/r/222072 Change subject: fix minor bug in range checker .. fix minor bug in range checker parameter min and max now get passed to checkResult Change-Id: Iac02d117c44247f7172c219018cf39807c3ee662 --- M includes/ConstraintCheck/Checker/RangeChecker.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/72/222072/1 diff --git a/includes/ConstraintCheck/Checker/RangeChecker.php b/includes/ConstraintCheck/Checker/RangeChecker.php index a2bc7e5..1d4d9e1 100755 --- a/includes/ConstraintCheck/Checker/RangeChecker.php +++ b/includes/ConstraintCheck/Checker/RangeChecker.php @@ -77,8 +77,8 @@ if ( array_key_exists( 'minimum_quantity', $constraintParameters ) array_key_exists( 'maximum_quantity', $constraintParameters ) !array_key_exists( 'minimum_date', $constraintParameters ) !array_key_exists( 'maximum_date', $constraintParameters ) ) { $min = $constraintParameters['minimum_quantity']; $max = $constraintParameters['maximum_quantity']; - $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'] ); - $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'] ); + $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'], true ); + $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'], true ); } else { $message = wfMessage( wbqc-violation-message-range-parameters-needed )-params( 'quantity', 'minimum_quantity and maximum_quantity' )-escaped(); } @@ -86,8 +86,8 @@ if ( !array_key_exists( 'minimum_quantity', $constraintParameters ) !array_key_exists( 'maximum_quantity', $constraintParameters ) array_key_exists( 'minimum_date', $constraintParameters ) array_key_exists( 'maximum_date', $constraintParameters ) ) { $min = $constraintParameters['minimum_date']; $max = $constraintParameters['maximum_date']; - $parameters['minimum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_date'] ); - $parameters['maximum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_date'] ); + $parameters['minimum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_date'], true ); + $parameters['maximum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_date'], true ); } else { $message = wfMessage( wbqc-violation-message-range-parameters-needed )-params( 'time', 'minimum_date and maximum_date' )-escaped(); } -- To view, visit https://gerrit.wikimedia.org/r/222072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac02d117c44247f7172c219018cf39807c3ee662 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cross language search using MessageCollection - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review. https://gerrit.wikimedia.org/r/222074 Change subject: Cross language search using MessageCollection .. Cross language search using MessageCollection Steps: 1. Used filtered query to search for a string in a source language. Suppose source language is finnish, search for 'Aloita', it returns all finnish messages with 'Aloita'. 2. Create message definitions for all message keys found in step 1. 3. Filter to get all the translated messages in the selected target language. By default target language=source language. 4. Use makeFacets() to build language and group facets. This patch uses MessageCollection, alternate way to achieve the same without MessageCollection is described in https://gerrit.wikimedia.org/r/#/c/218859/ Change-Id: I0cd190a87c19318a79a124318183ca4d4d8a07b7 --- M specials/SpecialSearchTranslations.php M ttmserver/ElasticSearchTTMServer.php 2 files changed, 122 insertions(+), 48 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/74/222074/1 diff --git a/specials/SpecialSearchTranslations.php b/specials/SpecialSearchTranslations.php index 37b2344..1ef394c 100644 --- a/specials/SpecialSearchTranslations.php +++ b/specials/SpecialSearchTranslations.php @@ -80,6 +80,11 @@ return; } + if ( $opts-getValue( 'language' ) === '' ) { + $language = $this-getLanguage()-getCode(); + $opts-add( 'language', $language ); + } + try { $resultset = $server-search( $queryString, $opts, $this-hl ); } catch ( TTMServerException $e ) { @@ -87,7 +92,36 @@ throw new ErrorPageError( 'tux-sst-solr-offline-title', 'tux-sst-solr-offline-body' ); } + $messages = $documents = $terms = array(); + $language = $opts-getValue( 'language' ); + foreach ( $resultset-getResults() as $document ) { + $data = $document-getData(); + $localid = explode( ':', $data['localid'] ); + $namespace = strtoupper( NS_ . $localid[0] ); + $key = implode( ':', array( constant( $namespace ), $localid[1] ) ); + $messages[$key] = $data['content']; + $terms[] = $data['localid']; + } + + + $definitions = new MessageDefinitions( $messages ); + $collection = MessageCollection::newFromDefinitions( $definitions, $language ); + $collection-filter( 'translated', false ); + + $off = $collection-slice( $opts-getValue('offset'), $this-limit ); + $collection-loadTranslations(); + + foreach ( $collection-keys() as $mkey = $title ) { + $documents[$mkey]['title'] = $title; + $documents[$mkey]['definition'] = $messages[$mkey]; + $documents[$mkey]['translation'] = $collection[$mkey]-translation(); + } + // Part 1: facets + if ( method_exists( $server, 'makeFacets' ) ) { + $resultset = $server-makeFacets( $terms, $opts ); + } + $facets = $server-getFacets( $resultset ); $total = $server-getTotalHits( $resultset ); $facetHtml = ''; @@ -111,39 +145,37 @@ // Part 2: results $resultsHtml = ''; - $documents = $server-getDocuments( $resultset ); - foreach ( $documents as $document ) { - $text = $document['content']; + foreach ( $documents as $mkey = $values ) { + $text = $documents[$mkey]['translation']; $text = TranslateUtils::convertWhiteSpaceToHTML( $text ); list( $pre, $post ) = $this-hl; $text = str_replace( $pre, 'strong class=tux-highlight', $text ); $text = str_replace( $post, '/strong', $text ); - $title = Title::newFromText( $document['localid'] . '/' . $document['language'] ); - if ( !$title ) { + if ( !$documents[$mkey]['title'] ) { // Should not ever happen but who knows... continue; } $resultAttribs = array( 'class' = 'row tux-message', - 'data-title' = $title-getPrefixedText(), - 'data-language' = $document['language'], + 'data-title' = $documents[$mkey]['title']-getPrefixedText(), +
[MediaWiki-commits] [Gerrit] add missing i18n for wbqc-desc - change (mediawiki...WikibaseQualityConstraints)
Jonaskeutel has uploaded a new change for review. https://gerrit.wikimedia.org/r/222075 Change subject: add missing i18n for wbqc-desc .. add missing i18n for wbqc-desc Change-Id: I7918cb660e3799af3a299aa62e2ff424d4e9977b --- M i18n/en.json M i18n/qqq.json 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/75/222075/1 diff --git a/i18n/en.json b/i18n/en.json index 0bc8341..ff8927c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3,6 +3,7 @@ authors: BP2014N1 }, wbqc-constraintreport: Constraint report, + wbqc-desc: Checks constraints on both items and properties and displays the results on a special page, wbqc-constraintreport-explanation-part-one: This special page performs constraint checks on every entity you want. The entities are fetched from the live system so every constraint violation you fix there will be instantly removed from this list., wbqc-constraintreport-explanation-part-two: The constraints are parsed from the property talk pages once a week, so if you add/delete/modify a constraint it might take up to a week until this gets taken into account by this constraint report. There is currently work in progress to migrate the constraints to statements on properties, enabling this special page to do live-checks., wbqc-constraintreport-form-section: Check constraints for entity, diff --git a/i18n/qqq.json b/i18n/qqq.json index a9bb93f..64ac154 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -6,6 +6,7 @@ ] }, wbqc-constraintreport: {{doc-special|ConstraintReport}}, + wbqc-desc: {{desc|name=Wikibase Quality Constraints|url=https://www.mediawiki.org/wiki/Extension:WikibaseQualityConstraints}};, wbqc-constraintreport-explanation-part-one: Explanation (part one), what this special page does and how it gets its data., wbqc-constraintreport-explanation-part-two: Explanation (part two), what this special page does and how it gets its data., wbqc-constraintreport-form-section: Header of the section of the entity id form., -- To view, visit https://gerrit.wikimedia.org/r/222075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7918cb660e3799af3a299aa62e2ff424d4e9977b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move GEM_HOME under $HOME - change (integration/config)
Hello Zfilipin, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/222076 to review the following change. Change subject: Move GEM_HOME under $HOME .. Move GEM_HOME under $HOME The matrix jobs have each configurations under the same workspace and end up not sharing the per instance gem cache defined as: export GEM_HOME=$WORKSPACE/../gems/2.0.0 Need to make it non relative somehow and point to the root of all workspaces. Bug: T101707 Signed-off-by: Željko Filipin zeljko.fili...@gmail.com Change-Id: I0e9c3b1ddb1bfefe2b20202073981b9dbf72b61d --- M jjb/macro-browsertests.yaml M jjb/ruby-jobs.yaml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/76/222076/1 diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml index 34334c5..7de1948 100644 --- a/jjb/macro-browsertests.yaml +++ b/jjb/macro-browsertests.yaml @@ -57,7 +57,7 @@ # Shared cache of gems to avoid hitting rubygems all the time # See https://github.com/bundler/bundler/issues/2856 - export GEM_HOME=$WORKSPACE/../gems/2.0.0 + export GEM_HOME=$HOME/.gem/2.0.0 # Attempt to figure out MediaWiki branch being used and fetch it out # if the extension has the same branch diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml index 824eb7e..c89d28d 100644 --- a/jjb/ruby-jobs.yaml +++ b/jjb/ruby-jobs.yaml @@ -16,7 +16,7 @@ # Shared cache of gems to avoid hitting rubygems all the time # See https://github.com/bundler/bundler/issues/2856 - export GEM_HOME=$WORKSPACE/../gems/2.0.0 + export GEM_HOME=$HOME/.gem/2.0.0 # Install bundler if [ '{bundler-version}' != '' ]; then -- To view, visit https://gerrit.wikimedia.org/r/222076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e9c3b1ddb1bfefe2b20202073981b9dbf72b61d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add missing i18n for wbqc-desc - change (mediawiki...WikibaseQualityConstraints)
jenkins-bot has submitted this change and it was merged. Change subject: add missing i18n for wbqc-desc .. add missing i18n for wbqc-desc Change-Id: I7918cb660e3799af3a299aa62e2ff424d4e9977b --- M i18n/en.json M i18n/qqq.json 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 0bc8341..ff8927c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3,6 +3,7 @@ authors: BP2014N1 }, wbqc-constraintreport: Constraint report, + wbqc-desc: Checks constraints on both items and properties and displays the results on a special page, wbqc-constraintreport-explanation-part-one: This special page performs constraint checks on every entity you want. The entities are fetched from the live system so every constraint violation you fix there will be instantly removed from this list., wbqc-constraintreport-explanation-part-two: The constraints are parsed from the property talk pages once a week, so if you add/delete/modify a constraint it might take up to a week until this gets taken into account by this constraint report. There is currently work in progress to migrate the constraints to statements on properties, enabling this special page to do live-checks., wbqc-constraintreport-form-section: Check constraints for entity, diff --git a/i18n/qqq.json b/i18n/qqq.json index a9bb93f..64ac154 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -6,6 +6,7 @@ ] }, wbqc-constraintreport: {{doc-special|ConstraintReport}}, + wbqc-desc: {{desc|name=Wikibase Quality Constraints|url=https://www.mediawiki.org/wiki/Extension:WikibaseQualityConstraints}};, wbqc-constraintreport-explanation-part-one: Explanation (part one), what this special page does and how it gets its data., wbqc-constraintreport-explanation-part-two: Explanation (part two), what this special page does and how it gets its data., wbqc-constraintreport-form-section: Header of the section of the entity id form., -- To view, visit https://gerrit.wikimedia.org/r/222075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7918cb660e3799af3a299aa62e2ff424d4e9977b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.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 minor bug in range checker - change (mediawiki...WikibaseQualityConstraints)
jenkins-bot has submitted this change and it was merged. Change subject: fix minor bug in range checker .. fix minor bug in range checker parameter min and max now get passed to checkResult Change-Id: Iac02d117c44247f7172c219018cf39807c3ee662 --- M includes/ConstraintCheck/Checker/RangeChecker.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ConstraintCheck/Checker/RangeChecker.php b/includes/ConstraintCheck/Checker/RangeChecker.php index a2bc7e5..1d4d9e1 100755 --- a/includes/ConstraintCheck/Checker/RangeChecker.php +++ b/includes/ConstraintCheck/Checker/RangeChecker.php @@ -77,8 +77,8 @@ if ( array_key_exists( 'minimum_quantity', $constraintParameters ) array_key_exists( 'maximum_quantity', $constraintParameters ) !array_key_exists( 'minimum_date', $constraintParameters ) !array_key_exists( 'maximum_date', $constraintParameters ) ) { $min = $constraintParameters['minimum_quantity']; $max = $constraintParameters['maximum_quantity']; - $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'] ); - $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'] ); + $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'], true ); + $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'], true ); } else { $message = wfMessage( wbqc-violation-message-range-parameters-needed )-params( 'quantity', 'minimum_quantity and maximum_quantity' )-escaped(); } @@ -86,8 +86,8 @@ if ( !array_key_exists( 'minimum_quantity', $constraintParameters ) !array_key_exists( 'maximum_quantity', $constraintParameters ) array_key_exists( 'minimum_date', $constraintParameters ) array_key_exists( 'maximum_date', $constraintParameters ) ) { $min = $constraintParameters['minimum_date']; $max = $constraintParameters['maximum_date']; - $parameters['minimum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_date'] ); - $parameters['maximum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_date'] ); + $parameters['minimum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_date'], true ); + $parameters['maximum_date'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_date'], true ); } else { $message = wfMessage( wbqc-violation-message-range-parameters-needed )-params( 'time', 'minimum_date and maximum_date' )-escaped(); } -- To view, visit https://gerrit.wikimedia.org/r/222072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac02d117c44247f7172c219018cf39807c3ee662 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.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] Re-enable NTP on restbase, the smearing option (-x) has be... - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged. Change subject: Re-enable NTP on restbase, the smearing option (-x) has been configured via salt .. Re-enable NTP on restbase, the smearing option (-x) has been configured via salt Change-Id: I6ce00578f0277aea6847f3d616ef37c4b7f44da2 --- M hieradata/hosts/restbase1001.yaml M hieradata/hosts/restbase1002.yaml M hieradata/hosts/restbase1003.yaml M hieradata/hosts/restbase1004.yaml M hieradata/hosts/restbase1005.yaml M hieradata/hosts/restbase1006.yaml M hieradata/hosts/restbase1007.yaml M hieradata/hosts/restbase1008.yaml M hieradata/hosts/restbase1009.yaml 9 files changed, 9 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved Alexandros Kosiaris: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/hosts/restbase1001.yaml b/hieradata/hosts/restbase1001.yaml index df3f920..0a2e858 100644 --- a/hieradata/hosts/restbase1001.yaml +++ b/hieradata/hosts/restbase1001.yaml @@ -1 +1,2 @@ cassandra::rack: 'a' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1002.yaml b/hieradata/hosts/restbase1002.yaml index df3f920..0a2e858 100644 --- a/hieradata/hosts/restbase1002.yaml +++ b/hieradata/hosts/restbase1002.yaml @@ -1 +1,2 @@ cassandra::rack: 'a' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1003.yaml b/hieradata/hosts/restbase1003.yaml index 422643c..6aab03b 100644 --- a/hieradata/hosts/restbase1003.yaml +++ b/hieradata/hosts/restbase1003.yaml @@ -1 +1,2 @@ cassandra::rack: 'b' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1004.yaml b/hieradata/hosts/restbase1004.yaml index 422643c..6aab03b 100644 --- a/hieradata/hosts/restbase1004.yaml +++ b/hieradata/hosts/restbase1004.yaml @@ -1 +1,2 @@ cassandra::rack: 'b' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1005.yaml b/hieradata/hosts/restbase1005.yaml index acb9034..bfd66a1 100644 --- a/hieradata/hosts/restbase1005.yaml +++ b/hieradata/hosts/restbase1005.yaml @@ -1 +1,2 @@ cassandra::rack: 'd' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1006.yaml b/hieradata/hosts/restbase1006.yaml index acb9034..bfd66a1 100644 --- a/hieradata/hosts/restbase1006.yaml +++ b/hieradata/hosts/restbase1006.yaml @@ -1 +1,2 @@ cassandra::rack: 'd' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1007.yaml b/hieradata/hosts/restbase1007.yaml index df3f920..0a2e858 100644 --- a/hieradata/hosts/restbase1007.yaml +++ b/hieradata/hosts/restbase1007.yaml @@ -1 +1,2 @@ cassandra::rack: 'a' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1008.yaml b/hieradata/hosts/restbase1008.yaml index 422643c..6aab03b 100644 --- a/hieradata/hosts/restbase1008.yaml +++ b/hieradata/hosts/restbase1008.yaml @@ -1 +1,2 @@ cassandra::rack: 'b' +ntp::daemon::ensure: present diff --git a/hieradata/hosts/restbase1009.yaml b/hieradata/hosts/restbase1009.yaml index acb9034..bfd66a1 100644 --- a/hieradata/hosts/restbase1009.yaml +++ b/hieradata/hosts/restbase1009.yaml @@ -1 +1,2 @@ cassandra::rack: 'd' +ntp::daemon::ensure: present -- To view, visit https://gerrit.wikimedia.org/r/222073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ce00578f0277aea6847f3d616ef37c4b7f44da2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Muehlenhoff mmuhlenh...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace Claims with StatementList in Api\SetClaim - change (mediawiki...Wikibase)
Bene has uploaded a new change for review. https://gerrit.wikimedia.org/r/222078 Change subject: Replace Claims with StatementList in Api\SetClaim .. Replace Claims with StatementList in Api\SetClaim Change-Id: I676cbf68d97ed7a47810fa04452fb5a53e99e760 --- M repo/includes/api/SetClaim.php 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/78/222078/1 diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php index da51806..343c847 100644 --- a/repo/includes/api/SetClaim.php +++ b/repo/includes/api/SetClaim.php @@ -14,9 +14,9 @@ use Wikibase\ChangeOp\StatementChangeOpFactory; use Wikibase\ClaimSummaryBuilder; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Statement\StatementGuidParsingException; +use Wikibase\DataModel\Statement\StatementListHolder; use Wikibase\Lib\Serializers\SerializerFactory; use Wikibase\Repo\Diff\ClaimDiffer; use Wikibase\Repo\WikibaseRepo; @@ -99,15 +99,17 @@ * @todo this summary builder is ugly and summary stuff needs to be refactored */ private function getSummary( array $params, Claim $claim, Entity $entity ) { + if ( !( $entity instanceof StatementListHolder ) ) { + throw new InvalidArgumentException( '$entity must be a StatementListHolder' ); + } + $claimSummaryBuilder = new ClaimSummaryBuilder( $this-getModuleName(), new ClaimDiffer( new OrderedListDiffer( new ComparableComparer() ) ) ); - $claims = new Claims( $entity-getClaims() ); - $summary = $claimSummaryBuilder-buildClaimSummary( - $claims-getClaimWithGuid( $claim-getGuid() ), + $entity-getStatements()-getFirstStatementWithGuid( $claim-getGuid() ), $claim ); -- To view, visit https://gerrit.wikimedia.org/r/222078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I676cbf68d97ed7a47810fa04452fb5a53e99e760 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use system default location for cafile when using php fopen. - change (mediawiki/core)
Brian Wolff has uploaded a new change for review. https://gerrit.wikimedia.org/r/222079 Change subject: Use system default location for cafile when using php fopen. .. Use system default location for cafile when using php fopen. If not set, php appears to just use no CA's, and just explode. Still won't work on windows. Only possible downside is if some future of PHP actually makes fopen ssl wrapper sane, and this overrides a sane default behaviour. Bug: T75203 Change-Id: I07736c150fe0783e09d297395ed25adf335edbd3 --- M includes/HttpFunctions.php 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/79/222079/1 diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 825cd06..240fa14 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -915,12 +915,29 @@ $options['ssl']['CN_match'] = $this-parsedUrl['host']; } - if ( is_dir( $this-caInfo ) ) { - $options['ssl']['capath'] = $this-caInfo; - } elseif ( is_file( $this-caInfo ) ) { - $options['ssl']['cafile'] = $this-caInfo; - } elseif ( $this-caInfo ) { - throw new MWException( Invalid CA info passed: {$this-caInfo} ); + if ( $this-caInfo ) { + $certLocations = array( $this-caInfo ); + } else { + // Default locations, based on + // https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/ + // PHP doesn't seem to have sane defaults, so we set ourselves. + $certLocations = array( + '/etc/pki/tls/certs/ca-bundle.crt', # Fedora et al + '/etc/ssl/certs', # Debian et al + '/etc/pki/tls/certs/ca-bundle.trust.crt', + '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem', + '/System/Library/OpenSSL', # OSX + ); + } + + foreach( $certLocations as $cert ) { + if ( is_dir( $cert ) ) { + $options['ssl']['capath'] = $cert; + break; + } elseif ( is_file( $cert ) ) { + $options['ssl']['cafile'] = $cert; + break; + } } $context = stream_context_create( $options ); -- To view, visit https://gerrit.wikimedia.org/r/222079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07736c150fe0783e09d297395ed25adf335edbd3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff bawolff...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rename UpdateTable script and fix it for production - change (mediawiki...WikibaseQualityExternalValidation)
jenkins-bot has submitted this change and it was merged. Change subject: rename UpdateTable script and fix it for production .. rename UpdateTable script and fix it for production Change-Id: I828bb23cc258605cbcf9406d0e3ebaea8e7692b2 --- M README.md M composer.json R includes/UpdateExternalData/CsvImportSettings.php R includes/UpdateExternalData/ExternalDataImporter.php R maintenance/UpdateExternalData.php R tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php R tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php R tests/phpunit/UpdateExternalData/testdata/dump_information.csv R tests/phpunit/UpdateExternalData/testdata/external_values.csv 9 files changed, 26 insertions(+), 23 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 982371b..b17f1d1 --- a/README.md +++ b/README.md @@ -53,4 +53,4 @@ * Last but not least, you need to fill the tables that contain external data - for that you need the [dump converter script](https://github.com/WikidataQuality/DumpConverter). Follow the instruction in the README to create a tar file (that contains a number of csv files). -Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateTable.php --tar-file path_to_tar_file`. \ No newline at end of file +Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateExternalData.php --tar-file path_to_tar_file`. \ No newline at end of file diff --git a/composer.json b/composer.json index 041e4d6..ab0713a 100755 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ }, classmap: [ WikibaseQualityExternalValidationHooks.php, - maintenance/UpdateTable.php + maintenance/UpdateExternalData.php ] } } diff --git a/includes/UpdateTable/CsvImportSettings.php b/includes/UpdateExternalData/CsvImportSettings.php similarity index 92% rename from includes/UpdateTable/CsvImportSettings.php rename to includes/UpdateExternalData/CsvImportSettings.php index a6ed844..afe7ad0 100755 --- a/includes/UpdateTable/CsvImportSettings.php +++ b/includes/UpdateExternalData/CsvImportSettings.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\UpdateTable; +namespace WikibaseQuality\ExternalValidation\UpdateExternalData; use Wikimedia\Assert\Assert; @@ -10,7 +10,7 @@ * * Settings for importing data from csv files to a db table using a ExternalDataImporter * - * @package WikibaseQuality\ExternalValidation\UpdateTable + * @package WikibaseQuality\ExternalValidation\UpdateExternalData * @author BP2014N1 * @licence GNU GPL v2+ */ diff --git a/includes/UpdateTable/ExternalDataImporter.php b/includes/UpdateExternalData/ExternalDataImporter.php similarity index 96% rename from includes/UpdateTable/ExternalDataImporter.php rename to includes/UpdateExternalData/ExternalDataImporter.php index 69b571d..46f2c73 100755 --- a/includes/UpdateTable/ExternalDataImporter.php +++ b/includes/UpdateExternalData/ExternalDataImporter.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\UpdateTable; +namespace WikibaseQuality\ExternalValidation\UpdateExternalData; use DateTime; use DateTimeZone; @@ -16,7 +16,7 @@ /** * Class ExternalDataImporter * - * @package WikibaseQuality\ExternalValidation\UpdateTable + * @package WikibaseQuality\ExternalValidation\UpdateExternalData * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateExternalData.php similarity index 76% rename from maintenance/UpdateTable.php rename to maintenance/UpdateExternalData.php index ce5b304..fdf7f1c 100755 --- a/maintenance/UpdateTable.php +++ b/maintenance/UpdateExternalData.php @@ -4,11 +4,17 @@ use Maintenance; use WikibaseQuality\ExternalValidation\ExternalValidationServices; -use WikibaseQuality\ExternalValidation\UpdateTable\CsvImportSettings; -use WikibaseQuality\ExternalValidation\UpdateTable\ExternalDataImporter; +use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings; +use WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter; + +if( !class_exists( '\Maintenance' ) ) { + $basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH ) : __DIR__ . + /../../..; + require_once $basePath . /maintenance/Maintenance.php; +} /** - * Class UpdateTable + * Class UpdateExternalData * * Maintenance script that evokes updates of wbqev_external_data, wbqev_dump_information, wbqev_identifier_properties * Input data is taken from tar file, which can be generated by DumpConverter tool. @@ -17,7 +23,7 @@ * @author BP2014N1 * @license GNU GPL v2+ */ -class UpdateTable extends Maintenance { +class
[MediaWiki-commits] [Gerrit] Move GEM_HOME under $HOME - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Move GEM_HOME under $HOME .. Move GEM_HOME under $HOME The matrix jobs have each configurations under the same workspace and end up not sharing the per instance gem cache defined as: export GEM_HOME=$WORKSPACE/../gems/2.0.0 Need to make it non relative somehow and point to the root of all workspaces. Bug: T101707 Signed-off-by: Željko Filipin zeljko.fili...@gmail.com Change-Id: I0e9c3b1ddb1bfefe2b20202073981b9dbf72b61d --- M jjb/macro-browsertests.yaml M jjb/ruby-jobs.yaml 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml index 34334c5..7de1948 100644 --- a/jjb/macro-browsertests.yaml +++ b/jjb/macro-browsertests.yaml @@ -57,7 +57,7 @@ # Shared cache of gems to avoid hitting rubygems all the time # See https://github.com/bundler/bundler/issues/2856 - export GEM_HOME=$WORKSPACE/../gems/2.0.0 + export GEM_HOME=$HOME/.gem/2.0.0 # Attempt to figure out MediaWiki branch being used and fetch it out # if the extension has the same branch diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml index 824eb7e..c89d28d 100644 --- a/jjb/ruby-jobs.yaml +++ b/jjb/ruby-jobs.yaml @@ -16,7 +16,7 @@ # Shared cache of gems to avoid hitting rubygems all the time # See https://github.com/bundler/bundler/issues/2856 - export GEM_HOME=$WORKSPACE/../gems/2.0.0 + export GEM_HOME=$HOME/.gem/2.0.0 # Install bundler if [ '{bundler-version}' != '' ]; then -- To view, visit https://gerrit.wikimedia.org/r/222076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e9c3b1ddb1bfefe2b20202073981b9dbf72b61d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Owner spelling in a message - change (mediawiki...Gather)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/222081 Change subject: Owner spelling in a message .. Owner spelling in a message Change-Id: Ib82dc99ea69cb215a995717c93e184a6287da89d --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/81/222081/1 diff --git a/i18n/en.json b/i18n/en.json index d8a2b84..7b56611 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -157,7 +157,7 @@ apihelp-query+lists-paramvalue-mode-review: Show all lists that need review (requires the codegather-hidelist/code userright), apihelp-query+lists-paramvalue-prop-label: Title of the list, apihelp-query+lists-paramvalue-prop-description: Description of the list, - apihelp-query+lists-paramvalue-prop-public: Several visibility-related properties: dldtperm/dtddsamppublic/samp or sampprivate/samp (set by owner), private is only visible to owner/dddtperm_override/dtddsamphidden/samp or sampapproved/samp (or not present), can be set by a moderator/dddtflagged/dtddthe list got enough flags to qualify for moderator attention/dddthidden/dtddthe list is hidden and only visible to the owenr and moderators (due to flags or explicit moderator choice)/dd/dl, + apihelp-query+lists-paramvalue-prop-public: Several visibility-related properties: dldtperm/dtddsamppublic/samp or sampprivate/samp (set by owner), private is only visible to owner/dddtperm_override/dtddsamphidden/samp or sampapproved/samp (or not present), can be set by a moderator/dddtflagged/dtddthe list got enough flags to qualify for moderator attention/dddthidden/dtddthe list is hidden and only visible to the owner and moderators (due to flags or explicit moderator choice)/dd/dl, apihelp-query+lists-paramvalue-prop-review: Is the list temporarily hidden and waiting for moderator review?, apihelp-query+lists-paramvalue-prop-image: Lead image, apihelp-query+lists-paramvalue-prop-count: Number of items in the list, -- To view, visit https://gerrit.wikimedia.org/r/222081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib82dc99ea69cb215a995717c93e184a6287da89d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Definition list in apihelp using wiki markup - change (mediawiki...Gather)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/222082 Change subject: Definition list in apihelp using wiki markup .. Definition list in apihelp using wiki markup This is how it is usually done in apihelp. Change-Id: Ibe55354050971ad572e915cf8bf0c0659974344a --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/82/222082/1 diff --git a/i18n/en.json b/i18n/en.json index 7b56611..45b740b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -157,7 +157,7 @@ apihelp-query+lists-paramvalue-mode-review: Show all lists that need review (requires the codegather-hidelist/code userright), apihelp-query+lists-paramvalue-prop-label: Title of the list, apihelp-query+lists-paramvalue-prop-description: Description of the list, - apihelp-query+lists-paramvalue-prop-public: Several visibility-related properties: dldtperm/dtddsamppublic/samp or sampprivate/samp (set by owner), private is only visible to owner/dddtperm_override/dtddsamphidden/samp or sampapproved/samp (or not present), can be set by a moderator/dddtflagged/dtddthe list got enough flags to qualify for moderator attention/dddthidden/dtddthe list is hidden and only visible to the owner and moderators (due to flags or explicit moderator choice)/dd/dl, + apihelp-query+lists-paramvalue-prop-public: Several visibility-related properties:\n;perm:samppublic/samp or sampprivate/samp (set by owner), sampprivate/samp is only visible to owner.\n;perm_override:samphidden/samp or sampapproved/samp (or not present), can be set by a moderator.\n;flagged:The list got enough flags to qualify for moderator attention.\n;hidden:The list is hidden and only visible to the owner and moderators (due to flags or explicit moderator choice)., apihelp-query+lists-paramvalue-prop-review: Is the list temporarily hidden and waiting for moderator review?, apihelp-query+lists-paramvalue-prop-image: Lead image, apihelp-query+lists-paramvalue-prop-count: Number of items in the list, -- To view, visit https://gerrit.wikimedia.org/r/222082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe55354050971ad572e915cf8bf0c0659974344a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed ComparativeValueParser test namespace - change (mediawiki...WikibaseQualityExternalValidation)
Soeren.oldag has uploaded a new change for review. https://gerrit.wikimedia.org/r/222083 Change subject: Renamed ComparativeValueParser test namespace .. Renamed ComparativeValueParser test namespace Change-Id: I8b326ad9432a75e01d97f65e6aa47d1265c15a93 --- R tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php R tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php R tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php R tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation refs/changes/83/222083/1 diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php b/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php similarity index 95% rename from tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php rename to tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php index df7f2c7..7902313 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use WikibaseQuality\ExternalValidation\CrossCheck\ValueParser\ComparativeValueParserFactory; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php similarity index 93% rename from tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php rename to tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php index 4f25811..6c6043d 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use DataValues\MonolingualTextValue; use DataValues\MultilingualTextValue; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php b/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php similarity index 91% rename from tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php rename to tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php index fb32239..1b24ba9 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use WikibaseQuality\ExternalValidation\CrossCheck\ValueParser\StringValueParser; use DataValues\StringValue; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php b/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php similarity index 93% rename from tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php rename to tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php index 2bbe743..e671623 100755 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php +++ b/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use DataValues\DataValue; use ValueParsers\ValueParser; -- To view, visit https://gerrit.wikimedia.org/r/222083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b326ad9432a75e01d97f65e6aa47d1265c15a93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Resolved further hints from code review from Daniel (see cha... - change (mediawiki...WikibaseQualityExternalValidation)
Dominic.sauer has submitted this change and it was merged. Change subject: Resolved further hints from code review from Daniel (see change 219243). .. Resolved further hints from code review from Daniel (see change 219243). Change-Id: I8f2288c5d8060a5b6bcbe65e622b504a868b3b31 --- M composer.json D includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeStringValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeValueParserFactory.php D includes/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParser.php M includes/CrossCheck/Comparer/DataValueComparer.php M includes/CrossCheck/Comparer/DataValueComparerFactory.php M includes/CrossCheck/Comparer/QuantityValueComparer.php M includes/CrossCheck/Comparer/StringComparer.php M includes/CrossCheck/CrossChecker.php A includes/CrossCheck/ValueParser/ComparativeValueParser.php A includes/CrossCheck/ValueParser/ComparativeValueParserFactory.php A includes/CrossCheck/ValueParser/MultilingualTextValueParser.php A includes/CrossCheck/ValueParser/StringValueParser.php M includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php M includes/ExternalValidationServices.php M includes/UpdateExternalData/ExternalDataImporter.php M specials/SpecialExternalDbs.php D tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php D tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php A tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php A tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php A tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php A tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php M tests/phpunit/ExternalValidationServicesTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php 39 files changed, 660 insertions(+), 1,088 deletions(-) Approvals: Dominic.sauer: Looks good to me, approved diff --git a/composer.json b/composer.json index ab0713a..e047d0c 100755 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ wikibase/data-model: ~3.0, serialization/serialization: 3.*,=3.2.1, wikibase/data-model-serialization: ~1.3, - wikimedia/assert: ~0.2.2 + wikimedia/assert: ~0.2.2 }, require-dev: { phpunit/phpunit: ~3.7,=3.7.37, diff --git a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php b/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php deleted file mode 100644 index 210e5da..000 --- a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php +++ /dev/null @@ -1,70 +0,0 @@ -?php - -namespace WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser; - -use InvalidArgumentException; -use DataValues\DataValue; -use ValueParsers\ParserOptions; -use ValueParsers\ValueParser; -use Wikibase\Repo\ValueParserFactory; -use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; - -/** - * Class BasicComparativeValueParser - * @package WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser - * @author BP2014N1 - * @license GNU GPL v2+ - */ -class BasicComparativeValueParser implements ComparativeValueParser { - - /** -* @var ValueParserFactory -*/ - private $valueParserFactory; - - /** -* @var array -*/ - private $conversionTypeMapping; - - /** -* @param ValueParserFactory $valueParserFactory -* @param array $conversionTypeMapping -*/ - public function __construct( ValueParserFactory $valueParserFactory, array $conversionTypeMapping ) { - $this-valueParserFactory = $valueParserFactory; - $this-conversionTypeMapping = $conversionTypeMapping; - } - - /** -
[MediaWiki-commits] [Gerrit] Beta: Test Restbase in ContentTranslation - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/222084 Change subject: Beta: Test Restbase in ContentTranslation .. Beta: Test Restbase in ContentTranslation Change-Id: I0a6d41abc8aa66fcd38baead776cdf51bf9cd855 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/84/222084/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index da27d21..21bcb04 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -63,6 +63,7 @@ cxserver::logstash_host: deployment-logstash1.deployment-prep.eqiad.wmflabs cxserver::apertium: http://apertium-beta.wmflabs.org cxserver::proxy: http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080 +cxserver::restbase: http://10.68.17.189/@lang.wikipedia.org/v1/page/html/@title cxserver::yandex_url: 'https://translate.yandex.net' cxserver::registry: source: -- To view, visit https://gerrit.wikimedia.org/r/222084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a6d41abc8aa66fcd38baead776cdf51bf9cd855 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added support to ignore file extension - change (mediawiki...UploadWizard)
Zhuyifei1999 has uploaded a new change for review. https://gerrit.wikimedia.org/r/222085 Change subject: Added support to ignore file extension .. Added support to ignore file extension * When $wgCheckFileExtensions is false, set mw.UploadWizard.config.fileExtensions to null * Ignore extension checks if mw.UploadWizard.config.fileExtensions is null Bug: T103224 Change-Id: Ie6399be863df542e513dfe4f8d33c3a1afa67e75 --- M UploadWizard.config.php M resources/mw.UploadWizardUpload.js 2 files changed, 88 insertions(+), 86 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/85/222085/1 diff --git a/UploadWizard.config.php b/UploadWizard.config.php index 8943a2a..c608dee 100644 --- a/UploadWizard.config.php +++ b/UploadWizard.config.php @@ -83,7 +83,7 @@ 'campaignCTACampaignTemplate' = 'uploadCampaign:$1', // File extensions acceptable in this wiki - 'fileExtensions' = $wgFileExtensions, + 'fileExtensions' = $wgCheckFileExtensions ? $wgFileExtensions : null, // Flickr details // Flickr API is SSL-only as of June 27th, 2014: http://code.flickr.net/2014/04/30/flickr-api-going-ssl-only-on-june-27th-2014/ diff --git a/resources/mw.UploadWizardUpload.js b/resources/mw.UploadWizardUpload.js index c8bb168..b950606 100644 --- a/resources/mw.UploadWizardUpload.js +++ b/resources/mw.UploadWizardUpload.js @@ -442,108 +442,110 @@ this.setTitle( basename ); // Check if extension is acceptable - extension = this.title.getExtension(); - if ( mw.isEmpty( extension ) ) { - this.fileNameErr( 'noext', null ); - } else { - if ( $.inArray( extension.toLowerCase(), mw.UploadWizard.config.fileExtensions ) === -1 ) { + if (mw.UploadWizard.config.fileExtensions !== null) { + extension = this.title.getExtension(); + if ( mw.isEmpty( extension ) ) { + this.fileNameErr( 'noext', null ); + return; + } else if ( $.inArray( extension.toLowerCase(), mw.UploadWizard.config.fileExtensions ) === -1 ) { this.fileNameErr( 'ext', extension ); - } else { - // Split this into a separate case, if the error above got ignored, - // we want to still trudge forward. - // if the JavaScript FileReader is available, extract more info via fileAPI - if ( mw.fileApi.isAvailable() ) { + return; + } + } else { + // Split this into a separate case, if the error above got ignored, + // we want to still trudge forward. + // if the JavaScript FileReader is available, extract more info via fileAPI + if ( mw.fileApi.isAvailable() ) { - // An UploadWizardUpload object already exists (us) when we add a file. - // So, when multiple files are provided (via select multiple), add the first file to this UploadWizardUpload - // and create new UploadWizardUpload objects and corresponding interfaces for the rest. + // An UploadWizardUpload object already exists (us) when we add a file. + // So, when multiple files are provided (via select multiple), add the first file to this UploadWizardUpload + // and create new UploadWizardUpload objects and corresponding interfaces for the rest. - this.file = files[0]; + this.file = files[0]; - // If chunked uploading is enabled, we can transfer any file that MediaWiki - // will accept. Otherwise we're bound by PHP's limits. - // NOTE: Because we don't know until runtime if the browser supports chunked - // uploading, we can't determine this server-side. - if ( mw.UploadWizard.config.enableChunked mw.fileApi.isFormDataAvailable() ) { - actualMaxSize = mw.UploadWizard.config.maxMwUploadSize; - } else { - actualMaxSize = Math.min( - mw.UploadWizard.config.maxMwUploadSize, -
[MediaWiki-commits] [Gerrit] Adoptions for renaming of WikibaseQualityFactory. - change (mediawiki...WikibaseQualityConstraints)
jenkins-bot has submitted this change and it was merged. Change subject: Adoptions for renaming of WikibaseQualityFactory. .. Adoptions for renaming of WikibaseQualityFactory. Change-Id: I923dc1288916255ff90503f034a19056f881cdd0 --- M specials/SpecialConstraintReport.php M tests/phpunit/Specials/SpecialConstraintReportTest.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jonaskeutel: Looks good to me, approved jenkins-bot: Verified diff --git a/specials/SpecialConstraintReport.php b/specials/SpecialConstraintReport.php index 007f1a3..a876482 100644 --- a/specials/SpecialConstraintReport.php +++ b/specials/SpecialConstraintReport.php @@ -40,7 +40,7 @@ use WikibaseQuality\Html\HtmlTableCellBuilder; use WikibaseQuality\Html\HtmlTableHeaderBuilder; use WikibaseQuality\Violations\ViolationStore; -use WikibaseQuality\WikibaseQualityFactory; +use WikibaseQuality\WikibaseQualityServices; /** @@ -115,7 +115,7 @@ private $violationStore; public static function newFromGlobalState() { - $wikibaseQuality = WikibaseQualityFactory::getDefaultInstance(); + $wikibaseQuality = WikibaseQualityServices::getDefaultInstance(); $constraintReportFactory = ConstraintReportFactory::getDefaultInstance(); $wikibaseRepo = WikibaseRepo::getDefaultInstance(); diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php b/tests/phpunit/Specials/SpecialConstraintReportTest.php index f54ca32..2157e4e 100644 --- a/tests/phpunit/Specials/SpecialConstraintReportTest.php +++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php @@ -14,7 +14,7 @@ use Wikibase\DataModel\Entity\EntityId; use WikibaseQuality\ConstraintReport\ConstraintReportFactory; use WikibaseQuality\ConstraintReport\Specials\SpecialConstraintReport; -use WikibaseQuality\WikibaseQualityFactory; +use WikibaseQuality\WikibaseQualityServices; /** @@ -68,7 +68,7 @@ } protected function newSpecialPage() { - $wikibaseQuality = WikibaseQualityFactory::getDefaultInstance(); + $wikibaseQuality = WikibaseQualityServices::getDefaultInstance(); $constraintReportFactory = ConstraintReportFactory::getDefaultInstance(); $wikibaseRepo = WikibaseRepo::getDefaultInstance(); -- To view, visit https://gerrit.wikimedia.org/r/221635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I923dc1288916255ff90503f034a19056f881cdd0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Jonaskeutel jonas.keu...@student.hpi.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.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 parameter bug in diffWithinRangeChecker - change (mediawiki...WikibaseQualityConstraints)
Jonaskeutel has uploaded a new change for review. https://gerrit.wikimedia.org/r/222080 Change subject: fix parameter bug in diffWithinRangeChecker .. fix parameter bug in diffWithinRangeChecker Change-Id: If3c6a96670f7c4004e427af63441dfe4f387121c --- M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/80/222080/1 diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php index ec5f1cd..7ff899f 100755 --- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php +++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php @@ -82,8 +82,8 @@ if ( $property array_key_exists( 'minimum_quantity', $constraintParameters ) array_key_exists( 'maximum_quantity', $constraintParameters ) ) { $min = $constraintParameters['minimum_quantity']; $max = $constraintParameters['maximum_quantity']; - $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'] ); - $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'] ); + $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'], true ); + $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'], true ); } else { $message = wfMessage( wbqc-violation-message-parameter-needed )-params( $constraint-getConstraintTypeName(), 'property, minimum_quantity and maximum_quantity' )-escaped(); } -- To view, visit https://gerrit.wikimedia.org/r/222080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3c6a96670f7c4004e427af63441dfe4f387121c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cope with derived method call from base constructor - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Cope with derived method call from base constructor .. Cope with derived method call from base constructor In ve.ce.ContentBranchNode's constructor, set this.rendered before the call to the parent constructor (i.e. ve.ce.BranchNode's), because that calls ve.ce.ContentBranchNode#renderContents . TODO: Work out how we should be doing this in general. Change-Id: I90ed05c4134a029c4743ab25cc1abfbb44074938 --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 45a93e8..b8220b8 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -16,14 +16,16 @@ * @param {Object} [config] Configuration options */ ve.ce.ContentBranchNode = function VeCeContentBranchNode( model, config ) { + // Properties + this.lastTransaction = null; + // Parent constructor calls renderContents, so this must be set first + this.rendered = this.rendered; + this.unicornAnnotations = null; + this.unicorns = null; + // Parent constructor ve.ce.BranchNode.call( this, model, config ); - // Properties - this.lastTransaction = null; - this.rendered = false; - this.unicornAnnotations = null; - this.unicorns = null; this.onClickHandler = this.onClick.bind( this ); // Events @@ -358,6 +360,7 @@ // However we have to normalize to cope with consecutive text nodes. We can't normalize // the attached version, because that would close IMEs. As an optimization, don't perform // this checking if this node has never rendered before. + if ( this.rendered ) { oldWrapper = this.$element[0].cloneNode( true ); newWrapper = this.$element[0].cloneNode( false ); -- To view, visit https://gerrit.wikimedia.org/r/221884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90ed05c4134a029c4743ab25cc1abfbb44074938 Gerrit-PatchSet: 7 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Divec da...@troi.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Divec da...@troi.org Gerrit-Reviewer: Esanders esand...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Trevor Parscal tpars...@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] fix parameter bug in diffWithinRangeChecker - change (mediawiki...WikibaseQualityConstraints)
jenkins-bot has submitted this change and it was merged. Change subject: fix parameter bug in diffWithinRangeChecker .. fix parameter bug in diffWithinRangeChecker Change-Id: If3c6a96670f7c4004e427af63441dfe4f387121c --- M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php index ec5f1cd..7ff899f 100755 --- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php +++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php @@ -82,8 +82,8 @@ if ( $property array_key_exists( 'minimum_quantity', $constraintParameters ) array_key_exists( 'maximum_quantity', $constraintParameters ) ) { $min = $constraintParameters['minimum_quantity']; $max = $constraintParameters['maximum_quantity']; - $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'] ); - $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'] ); + $parameters['minimum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['minimum_quantity'], true ); + $parameters['maximum_quantity'] = $this-constraintParameterParser-parseSingleParameter( $constraintParameters['maximum_quantity'], true ); } else { $message = wfMessage( wbqc-violation-message-parameter-needed )-params( $constraint-getConstraintTypeName(), 'property, minimum_quantity and maximum_quantity' )-escaped(); } -- To view, visit https://gerrit.wikimedia.org/r/222080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If3c6a96670f7c4004e427af63441dfe4f387121c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: v1 Gerrit-Owner: Jonaskeutel jonas.keu...@student.hpi.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.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] Resolved further hints from code review from Daniel (see cha... - change (mediawiki...WikibaseQualityExternalValidation)
jenkins-bot has submitted this change and it was merged. Change subject: Resolved further hints from code review from Daniel (see change 219243). .. Resolved further hints from code review from Daniel (see change 219243). Change-Id: I7b5c2692bf95afecf84f30b8db04c28ae84912cd --- M composer.json D includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeStringValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeValueParser.php D includes/CrossCheck/ComparativeValueParser/ComparativeValueParserFactory.php D includes/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParser.php M includes/CrossCheck/Comparer/DataValueComparer.php M includes/CrossCheck/Comparer/DataValueComparerFactory.php M includes/CrossCheck/Comparer/QuantityValueComparer.php M includes/CrossCheck/Comparer/StringComparer.php M includes/CrossCheck/CrossChecker.php A includes/CrossCheck/ValueParser/ComparativeValueParser.php A includes/CrossCheck/ValueParser/ComparativeValueParserFactory.php A includes/CrossCheck/ValueParser/MultilingualTextValueParser.php A includes/CrossCheck/ValueParser/StringValueParser.php M includes/DumpMetaInformation/SqlDumpMetaInformationRepo.php M includes/ExternalValidationServices.php M includes/UpdateTable/ExternalDataImporter.php M specials/SpecialCrossCheck.php D tests/phpunit/CrossCheck/ComparativeValueParser/BasicComparativeValueParserTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeMultilingualTextValueParserTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeStringValueParserTest.php M tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php D tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserTestBase.php D tests/phpunit/CrossCheck/ComparativeValueParser/DispatchingComparativeValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php A tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php M tests/phpunit/CrossCheck/Comparer/DataValueComparerFactoryTest.php M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php M tests/phpunit/CrossCheck/CrossCheckerTest.php M tests/phpunit/ExternalValidationServicesTest.php M tests/phpunit/Specials/SpecialCrossCheckTest.php 38 files changed, 805 insertions(+), 1,219 deletions(-) Approvals: Dominic.sauer: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index b4699a6..f03a304 100755 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ wikibase/data-model: ~3.0, serialization/serialization: 3.*,=3.2.1, wikibase/data-model-serialization: ~1.3, - wikimedia/assert: ~0.2.2 + wikimedia/assert: ~0.2.2 }, require-dev: { phpunit/phpunit: ~3.7,=3.7.37|~4.5, diff --git a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php b/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php deleted file mode 100644 index 210e5da..000 --- a/includes/CrossCheck/ComparativeValueParser/BasicComparativeValueParser.php +++ /dev/null @@ -1,70 +0,0 @@ -?php - -namespace WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser; - -use InvalidArgumentException; -use DataValues\DataValue; -use ValueParsers\ParserOptions; -use ValueParsers\ValueParser; -use Wikibase\Repo\ValueParserFactory; -use WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation; - -/** - * Class BasicComparativeValueParser - * @package WikibaseQuality\ExternalValidation\CrossCheck\ComparativeValueParser - * @author BP2014N1 - * @license GNU GPL v2+ - */ -class BasicComparativeValueParser implements ComparativeValueParser { - - /** -* @var ValueParserFactory -*/ - private $valueParserFactory; - - /** -* @var array -*/ - private $conversionTypeMapping; - - /** -* @param ValueParserFactory $valueParserFactory -* @param array $conversionTypeMapping -*/ - public function __construct( ValueParserFactory $valueParserFactory, array $conversionTypeMapping ) { - $this-valueParserFactory = $valueParserFactory; - $this-conversionTypeMapping = $conversionTypeMapping; - } - - /** -* @see
[MediaWiki-commits] [Gerrit] Renamed ComparativeValueParser test namespace - change (mediawiki...WikibaseQualityExternalValidation)
jenkins-bot has submitted this change and it was merged. Change subject: Renamed ComparativeValueParser test namespace .. Renamed ComparativeValueParser test namespace Change-Id: I8b326ad9432a75e01d97f65e6aa47d1265c15a93 --- R tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php R tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php R tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php R tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php b/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php similarity index 95% rename from tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php rename to tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php index df7f2c7..7902313 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/ComparativeValueParserFactoryTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/ComparativeValueParserFactoryTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use WikibaseQuality\ExternalValidation\CrossCheck\ValueParser\ComparativeValueParserFactory; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php similarity index 93% rename from tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php rename to tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php index 4f25811..6c6043d 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/MultilingualTextValueParserTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use DataValues\MonolingualTextValue; use DataValues\MultilingualTextValue; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php b/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php similarity index 91% rename from tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php rename to tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php index fb32239..1b24ba9 100644 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/StringValueParserTest.php +++ b/tests/phpunit/CrossCheck/ValueParser/StringValueParserTest.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use WikibaseQuality\ExternalValidation\CrossCheck\ValueParser\StringValueParser; use DataValues\StringValue; diff --git a/tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php b/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php similarity index 93% rename from tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php rename to tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php index 2bbe743..e671623 100755 --- a/tests/phpunit/CrossCheck/ComparativeValueParser/ValueParserTestBase.php +++ b/tests/phpunit/CrossCheck/ValueParser/ValueParserTestBase.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ComparativeValueParser; +namespace WikibaseQuality\ExternalValidation\Tests\CrossCheck\ValueParser; use DataValues\DataValue; use ValueParsers\ValueParser; -- To view, visit https://gerrit.wikimedia.org/r/222083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b326ad9432a75e01d97f65e6aa47d1265c15a93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.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] rename UpdateTable script and fix it for production - change (mediawiki...WikibaseQualityExternalValidation)
jenkins-bot has submitted this change and it was merged. Change subject: rename UpdateTable script and fix it for production .. rename UpdateTable script and fix it for production Change-Id: I828bb23cc258605cbcf9406d0e3ebaea8e7692b2 --- M README.md M composer.json R includes/UpdateExternalData/CsvImportSettings.php R includes/UpdateExternalData/ExternalDataImporter.php R maintenance/UpdateExternalData.php R tests/phpunit/UpdateExternalData/CsvImportSettingsTest.php R tests/phpunit/UpdateExternalData/UpdateExternalDataTest.php R tests/phpunit/UpdateExternalData/testdata/dump_information.csv R tests/phpunit/UpdateExternalData/testdata/external_values.csv 9 files changed, 26 insertions(+), 21 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 982371b..b17f1d1 --- a/README.md +++ b/README.md @@ -53,4 +53,4 @@ * Last but not least, you need to fill the tables that contain external data - for that you need the [dump converter script](https://github.com/WikidataQuality/DumpConverter). Follow the instruction in the README to create a tar file (that contains a number of csv files). -Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateTable.php --tar-file path_to_tar_file`. \ No newline at end of file +Run `php maintenance/runScript.php extensions/ExternalValidation/maintenance/UpdateExternalData.php --tar-file path_to_tar_file`. \ No newline at end of file diff --git a/composer.json b/composer.json index f03a304..2ba479b 100755 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ }, classmap: [ WikibaseQualityExternalValidationHooks.php, - maintenance/UpdateTable.php + maintenance/UpdateExternalData.php ] } } diff --git a/includes/UpdateTable/CsvImportSettings.php b/includes/UpdateExternalData/CsvImportSettings.php similarity index 92% rename from includes/UpdateTable/CsvImportSettings.php rename to includes/UpdateExternalData/CsvImportSettings.php index 19b2865..a91c803 100755 --- a/includes/UpdateTable/CsvImportSettings.php +++ b/includes/UpdateExternalData/CsvImportSettings.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\UpdateTable; +namespace WikibaseQuality\ExternalValidation\UpdateExternalData; use InvalidArgumentException; use Wikimedia\Assert\Assert; @@ -11,7 +11,7 @@ * * Settings for importing data from csv files to a db table using a ExternalDataImporter * - * @package WikibaseQuality\ExternalValidation\UpdateTable + * @package WikibaseQuality\ExternalValidation\UpdateExternalData * @author BP2014N1 * @licence GNU GPL v2+ */ diff --git a/includes/UpdateTable/ExternalDataImporter.php b/includes/UpdateExternalData/ExternalDataImporter.php similarity index 96% rename from includes/UpdateTable/ExternalDataImporter.php rename to includes/UpdateExternalData/ExternalDataImporter.php index b4de222..2f8971a 100755 --- a/includes/UpdateTable/ExternalDataImporter.php +++ b/includes/UpdateExternalData/ExternalDataImporter.php @@ -1,6 +1,6 @@ ?php -namespace WikibaseQuality\ExternalValidation\UpdateTable; +namespace WikibaseQuality\ExternalValidation\UpdateExternalData; use PharData; use Wikibase\DataModel\Entity\ItemId; @@ -14,7 +14,7 @@ /** * Class ExternalDataImporter * - * @package WikibaseQuality\ExternalValidation\UpdateTable + * @package WikibaseQuality\ExternalValidation\UpdateExternalData * @author BP2014N1 * @license GNU GPL v2+ */ diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateExternalData.php similarity index 76% rename from maintenance/UpdateTable.php rename to maintenance/UpdateExternalData.php index 4977525..eac7d1f 100755 --- a/maintenance/UpdateTable.php +++ b/maintenance/UpdateExternalData.php @@ -4,12 +4,18 @@ use Maintenance; use WikibaseQuality\ExternalValidation\ExternalValidationServices; -use WikibaseQuality\ExternalValidation\UpdateTable\CsvImportSettings; -use WikibaseQuality\ExternalValidation\UpdateTable\ExternalDataImporter; +use WikibaseQuality\ExternalValidation\UpdateExternalData\CsvImportSettings; +use WikibaseQuality\ExternalValidation\UpdateExternalData\ExternalDataImporter; + +if( !class_exists( '\Maintenance' ) ) { + $basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH ) : __DIR__ . + /../../..; + require_once $basePath . /maintenance/Maintenance.php; +} /** - * Class UpdateTable + * Class UpdateExternalData * * Maintenance script that evokes updates of wbqev_external_data, wbqev_dump_information, wbqev_identifier_properties * Input data is taken from tar file, which can be generated by DumpConverter tool. @@ -18,7 +24,7 @@ * @author BP2014N1 * @license GNU GPL v2+ */ -class
[MediaWiki-commits] [Gerrit] Hygiene: Refactor main menu code to avoid two points of crea... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Refactor main menu code to avoid two points of creation .. Hygiene: Refactor main menu code to avoid two points of creation Change-Id: I2590e5a0009aada60399fd4a713a7bce39ade101 --- M resources/mobile.head/init.js M resources/mobile.mainMenu/MainMenu.js M resources/mobile.startup/init.js 3 files changed, 29 insertions(+), 17 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/mobile.head/init.js b/resources/mobile.head/init.js index d9c6b37..d0df854 100644 --- a/resources/mobile.head/init.js +++ b/resources/mobile.head/init.js @@ -1,7 +1,10 @@ ( function ( M, $ ) { var time = M.require( 'modules/lastEdited/time' ), MainMenu = M.require( 'MainMenu' ), - mainMenu = new MainMenu(); + mainMenu = new MainMenu( { + // FIXME: remove #mw-mf-main-menu-button when cache clears + activator: '#mw-mf-main-menu-button, .header .main-menu-button' + } ); /** * Initialisation function for last modified module. @@ -77,17 +80,11 @@ } // bind events + M.define( 'mainMenu', mainMenu ); M.on( 'history-link-loaded', initHistoryLink ); M.on( 'header-loaded', function () { - // Render MainMenu when needed - // FIXME: remove #mw-mf-main-menu-button when cache clears - $( '#mw-mf-main-menu-button, .header .main-menu-button' ) - .on( 'click', function ( ev ) { - mainMenu.openNavigationDrawer(); - ev.preventDefault(); - // Stop propagation, otherwise the Skin will close the open menus on page center click - ev.stopPropagation(); - } ); + // Now we have a main menu button register it. + mainMenu.registerClickEvents(); // FIXME: Remove when cache cleared (https://phabricator.wikimedia.org/T98498) $( '.header a' ).each( function () { diff --git a/resources/mobile.mainMenu/MainMenu.js b/resources/mobile.mainMenu/MainMenu.js index 666977c..f9f85ae 100644 --- a/resources/mobile.mainMenu/MainMenu.js +++ b/resources/mobile.mainMenu/MainMenu.js @@ -15,13 +15,22 @@ /** @inheritdoc */ template: mw.template.get( 'mobile.mainMenu', 'menu.hogan' ), + /** +* @cfg {Object} defaults Default options hash. +* @cfg {String} defaults.activator selector for element that when clicked can open or close the menu +*/ + defaults: { + activator: undefined + }, + /** @inheritdoc **/ initialize: function ( options ) { this.defaults = this._handleCachedMenuData( mw.config.get( 'wgMFMenuData' ) || {} ); - View.prototype.initialize.apply( this, options ); + this.activator = options.activator; + View.prototype.initialize.call( this, options ); }, // FIXME: [CACHE] Remove when cache clears. @@ -77,17 +86,23 @@ * Remove the nearby menu entry if the browser doesn't support geo location */ postRender: function () { - var self = this; - if ( !browser.supportsGeoLocation() ) { this.$el.find( '.nearby' ).parent().remove(); } // FIXME: Remove when cache clears https://phabricator.wikimedia.org/T102868 this.$el.addClass( 'view-border-box' ); + this.registerClickEvents(); + }, + + /** +* Registers events for opening and closing the main menu +*/ + registerClickEvents: function () { + var self = this; + // Listen to the main menu button clicks - // FIXME: remove #mw-mf-main-menu-button when cache clears - $( '#mw-mf-main-menu-button, .header .main-menu-button' ) + $( this.activator ) .off( 'click' ) .on( 'click', function ( ev ) { if ( self.isOpen() ) { diff --git a/resources/mobile.startup/init.js b/resources/mobile.startup/init.js index 814dca6..d49e4f5 100644 --- a/resources/mobile.startup/init.js +++ b/resources/mobile.startup/init.js @@ -11,14 +11,14 @@
[MediaWiki-commits] [Gerrit] Introducing bromine.eqiad.wmnet - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/222149 Change subject: Introducing bromine.eqiad.wmnet .. Introducing bromine.eqiad.wmnet static web serving VM on the ganeti01.svc.eqiad.wmnet cluster Bug: T103604 Change-Id: Ib94b9ff428a8ff0eb058e04a958498edbbbf262e --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/49/222149/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index a21bea8..d4710b0 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -822,6 +822,7 @@ 178 1H IN PTR restbase1008.eqiad.wmnet. 179 1H IN PTR planet1001.eqiad.wmnet. ; VM on the ganeti01.svc.eqiad.wmnet cluster 180 1H IN PTR conf1002.eqiad.wmnet. +181 1H IN PTR bromine.eqiad.wmmet. ; VM on the ganeti01.svc.eqiad.wmnet cluster 201 1H IN PTR d-i-test.eqiad.wmnet. ; VM on the ganeti01.svc.eqiad.wmnet cluster diff --git a/templates/wmnet b/templates/wmnet index 0bf52fe..b59daf0 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -724,6 +724,7 @@ stat10011H IN A10.64.21.101 stat10021H IN A10.64.5.102 stat10031H IN A10.64.36.103 +bromine 1H IN A10.64.32.181 ; VM on the ganeti01.svc.eqiad.wmnet cluster strontium 1H IN A10.64.0.164 puppet 1H IN CNAMEpalladium.eqiad.wmnet. tantalum1H IN A10.64.0.26 -- To view, visit https://gerrit.wikimedia.org/r/222149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib94b9ff428a8ff0eb058e04a958498edbbbf262e Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master 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] Switch out hamburger icon asset - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/222150 Change subject: Switch out hamburger icon asset .. Switch out hamburger icon asset As requested by @khammerstein Change-Id: I83dcd6054517f6a6bf75a729c74ced5f4c964209 --- M images/icons/hamburger.svg 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/50/222150/1 diff --git a/images/icons/hamburger.svg b/images/icons/hamburger.svg index 60e068a..c5c176f 100644 --- a/images/icons/hamburger.svg +++ b/images/icons/hamburger.svg @@ -1,4 +1,17 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -svg xmlns=http://www.w3.org/2000/svg; width=48 height=48 viewBox=0 0 48 48 -path d=M46 5.432v7.133c0 .242-.148.435-.328.435H2.328C2.153 13 2 12.803 2 12.565V5.432C2 5.198 2.153 5 2.328 5h43.344c.18 0 .328.198.328.432zm0 30v7.133c0 .242-.148.435-.328.435H2.328C2.153 43 2 42.803 2 42.565v-7.133c0-.234.153-.432.328-.432h43.344c.18 0 .328.198.328.432zm0-15v7.133c0 .242-.148.435-.328.435H2.328C2.153 28 2 27.803 2 27.565v-7.133c0-.234.153-.432.328-.432h43.344c.18 0 .328.198.328.432z fill=#565656/ -/svg +?xml version=1.0 encoding=utf-8? +!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -- +!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; +svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px +viewBox=0 0 24 24 enable-background=new 0 0 24 24 xml:space=preserve +g + g transform=matrix(1 0 0 -1 0 1638) + path fill=#676767 d=M23,1617H1v3h22V1617z/ + /g + g transform=matrix(1 0 0 -1 0 1638) + path fill=#676767 d=M23,1624H1v3h22V1624z/ + /g + g transform=matrix(1 0 0 -1 0 1638) + path fill=#676767 d=M23,1631H1v3h22V1631z/ + /g +/g +/svg -- To view, visit https://gerrit.wikimedia.org/r/222150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83dcd6054517f6a6bf75a729c74ced5f4c964209 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove API formats that are removed in core - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/222154 Change subject: Remove API formats that are removed in core .. Remove API formats that are removed in core Change-Id: I4c9e64875be509906021255d70b90688f2e5ddf3 (cherry picked from commit 6aede4971b954505d6ce02a4f42a3408e46c3e26) --- M repo/tests/phpunit/includes/api/GetEntitiesTest.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/54/222154/1 diff --git a/repo/tests/phpunit/includes/api/GetEntitiesTest.php b/repo/tests/phpunit/includes/api/GetEntitiesTest.php index 5433a89..1ce8376 100644 --- a/repo/tests/phpunit/includes/api/GetEntitiesTest.php +++ b/repo/tests/phpunit/includes/api/GetEntitiesTest.php @@ -124,12 +124,10 @@ protected static $goodFormats = array( 'json', 'php', - 'wddx', 'xml', 'yaml', 'txt', 'dbg', - 'dump' ); /** -- To view, visit https://gerrit.wikimedia.org/r/222154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c9e64875be509906021255d70b90688f2e5ddf3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf12 Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Addshore addshorew...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show toast error icon - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/222155 Change subject: Show toast error icon .. Show toast error icon Restore asset lost in move to resources folder Bug: T103613 Change-Id: I6f9882aca4467b1d5879623a925b59e71234784b --- A resources/mobile.toast/images/error.png 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/55/222155/1 diff --git a/resources/mobile.toast/images/error.png b/resources/mobile.toast/images/error.png new file mode 100644 index 000..b2d26f0 --- /dev/null +++ b/resources/mobile.toast/images/error.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/222155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f9882aca4467b1d5879623a925b59e71234784b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppetmaster: fix puppet.conf for new CA cert - change (operations/puppet)
Gage has submitted this change and it was merged. Change subject: puppetmaster: fix puppet.conf for new CA cert .. puppetmaster: fix puppet.conf for new CA cert certname now takes the default value and X509v3 Subject Alternative Name becomes DNS:puppet, therefore hostcert and hostprivkey use default values and do not need explicit definitions ref: step #18, https://wikitech.wikimedia.org/wiki/Puppet_CA_replacement#Procedure Change-Id: I515804c0477f14c9fd911537b4c959275163ddfe --- M modules/puppetmaster/templates/master.conf.erb 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Gage: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/puppetmaster/templates/master.conf.erb b/modules/puppetmaster/templates/master.conf.erb index 77a9c88..bdd8bcf 100644 --- a/modules/puppetmaster/templates/master.conf.erb +++ b/modules/puppetmaster/templates/master.conf.erb @@ -1,6 +1,5 @@ [master] -certname = %= scope.lookupvar('puppetmaster::server_name') % templatedir = /etc/puppet/templates modulepath = /etc/puppet/private/modules:/etc/puppet/modules @@ -15,5 +14,3 @@ ssl_client_header = SSL_CLIENT_S_DN ssl_client_verify_header = SSL_CLIENT_VERIFY %- end -% -hostcert = /var/lib/puppet/server/ssl/certs/%= @fqdn %.pem -hostprivkey = /var/lib/puppet/server/ssl/private_keys/%= @fqdn %.pem -- To view, visit https://gerrit.wikimedia.org/r/222151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I515804c0477f14c9fd911537b4c959275163ddfe Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gage jger...@wikimedia.org Gerrit-Reviewer: Gage jger...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove API formats that are removed in core - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove API formats that are removed in core .. Remove API formats that are removed in core Change-Id: I4c9e64875be509906021255d70b90688f2e5ddf3 (cherry picked from commit 6aede4971b954505d6ce02a4f42a3408e46c3e26) --- M repo/tests/phpunit/includes/api/GetEntitiesTest.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/api/GetEntitiesTest.php b/repo/tests/phpunit/includes/api/GetEntitiesTest.php index 5433a89..1ce8376 100644 --- a/repo/tests/phpunit/includes/api/GetEntitiesTest.php +++ b/repo/tests/phpunit/includes/api/GetEntitiesTest.php @@ -124,12 +124,10 @@ protected static $goodFormats = array( 'json', 'php', - 'wddx', 'xml', 'yaml', 'txt', 'dbg', - 'dump' ); /** -- To view, visit https://gerrit.wikimedia.org/r/222154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c9e64875be509906021255d70b90688f2e5ddf3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf12 Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Addshore addshorew...@gmail.com 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] Add a Prioritizer tool to oojs - change (oojs/core)
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/222157 Change subject: Add a Prioritizer tool to oojs .. Add a Prioritizer tool to oojs Add a prioritizer tool to oojs, to handle a queue of multiple promise in rapid succession. The prioritizer will always dump the previous promises and keep only the latest one. This is especially useful for cases where promises are added in rapid succession, such as in ooui's InputWidget validation method. Change-Id: I953220e87c5f2180a6db443da236dff139e34f55 --- M Gruntfile.js A src/Prioritizer.js A tests/unit/Prioritizer.test.js 3 files changed, 114 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/57/222157/1 diff --git a/Gruntfile.js b/Gruntfile.js index 9f48722..54e8e8c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -39,6 +39,7 @@ 'src/EventEmitter.js', 'src/Registry.js', 'src/Factory.js', + 'src/Prioritizer.js', 'src/export.js', 'src/outro.js.txt' ] @@ -55,6 +56,7 @@ 'src/EventEmitter.js', 'src/Registry.js', 'src/Factory.js', + 'src/Prioritizer.js', 'src/export.js', 'src/outro.js.txt' ] diff --git a/src/Prioritizer.js b/src/Prioritizer.js new file mode 100644 index 000..d2f0ff9 --- /dev/null +++ b/src/Prioritizer.js @@ -0,0 +1,63 @@ +/** + * Prioritizes promises + * + * @class + * @mixins OO.EventEmitter + * + * @constructor + */ +oo.Prioritizer = function () { + // Mixin constructors + oo.EventEmitter.call( this ); + + // Properties + this.promise = null; +}; + +/* Setup */ + +oo.initClass( oo.Prioritizer ); +oo.mixinClass( oo.Prioritizer, oo.EventEmitter ); + +/* Events */ + +/** + * @event The priority promise has been resolved + */ + +/** + * @event The priority promise has been rejected + */ + +/** + * @event The priority promise has been reprioritized + * @param {jQuery.Promise} promise Promise is being reprioritized + */ + +/* Methods */ + +/** + * Replaces the priority promise with a new one. + * + * @param {jQuery.Promise} promise Promise to prioritize + */ +oo.Prioritizer.prototype.prioritize = function ( promise ) { + var prioritizer = this; + + if ( this.promise ) { + this.emit( 'abort', this.promise ); + } + this.promise = promise; + promise.then( + function () { + if ( prioritizer.promise === promise ) { + prioritizer.emit.apply( prioritizer, [ 'done' ].concat( arguments ) ); + } + }, + function () { + if ( prioritizer.promise === promise ) { + prioritizer.emit.apply( prioritizer, [ 'fail' ].concat( arguments ) ); + } + } + ); +}; diff --git a/tests/unit/Prioritizer.test.js b/tests/unit/Prioritizer.test.js new file mode 100644 index 000..f5d0286 --- /dev/null +++ b/tests/unit/Prioritizer.test.js @@ -0,0 +1,49 @@ +/*global Promise, window */ +( function ( oo ) { + QUnit.module( 'Prioritizer' ); + + // Don't run this test if the environment doesn't + // recognize 'Promise'. This happens in PhantomJS, + // so the test will only run in chrome and firefox + // tests. + if ( typeof Promise === 'undefined' ) { + return; + } + + QUnit.test( 'prioritize', 1, function ( assert ) { + var i, testRunner, + numPromises = 5, + done = assert.async(), + Tester = function Tester() { + // Properties + this.prioritizer = new oo.Prioritizer(); + + // Events + this.prioritizer.connect( this, { + done: 'onPrioritizerDone' + } ); + }; + + Tester.prototype.prioritize = function ( value ) { + var promise = new Promise( function ( resolve ) { + window.setTimeout( function () { + resolve( value ); + }, 0 ); + } ); + + this.prioritizer.prioritize( promise ); +
[MediaWiki-commits] [Gerrit] Update Wikibase data model - change (mediawiki...Wikidata)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/222158 Change subject: Update Wikibase data model .. Update Wikibase data model Plus minor changes relating tests. Change-Id: I15bc8a6c6f4e6cd7648f375dde5b01b8cc632359 --- M composer.lock M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php M vendor/composer/autoload_psr4.php M vendor/composer/installed.json M vendor/wikibase/data-model/.travis.yml M vendor/wikibase/data-model/README.md M vendor/wikibase/data-model/RELEASE-NOTES.md M vendor/wikibase/data-model/WikibaseDataModel.php M vendor/wikibase/data-model/src/LegacyIdInterpreter.php M vendor/wikibase/data-model/src/Snak/SnakList.php M vendor/wikibase/data-model/tests/unit/ByPropertyIdArrayTest.php M vendor/wikibase/data-model/tests/unit/Claim/ClaimsTest.php M vendor/wikibase/data-model/tests/unit/Snak/SnakListTest.php 14 files changed, 336 insertions(+), 351 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/58/222158/1 diff --git a/composer.lock b/composer.lock index 9e7629f..85c9fff 100644 --- a/composer.lock +++ b/composer.lock @@ -909,7 +909,7 @@ source: { type: git, url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;, -reference: 4d28f74a8d0076446b6071753fada9ac78ad9d29 +reference: a8ac5b55d83d5fc23eccae2bb021617381b96714 }, require: { php: =5.3.0, @@ -954,20 +954,20 @@ support: { issues: https://phabricator.wikimedia.org/project/profile/1202/; }, -time: 2015-06-23 22:59:54 +time: 2015-07-01 11:09:28 }, { name: wikibase/data-model, -version: 3.0.0, +version: 3.0.1, source: { type: git, url: https://github.com/wmde/WikibaseDataModel.git;, -reference: b8c5c74a9a842836685ef317625212c391644fa8 +reference: 94942755d15f814bfd0da39a33cc170154aece11 }, dist: { type: zip, -url: https://api.github.com/repos/wmde/WikibaseDataModel/zipball/b8c5c74a9a842836685ef317625212c391644fa8;, -reference: b8c5c74a9a842836685ef317625212c391644fa8, +url: https://api.github.com/repos/wmde/WikibaseDataModel/zipball/94942755d15f814bfd0da39a33cc170154aece11;, +reference: 94942755d15f814bfd0da39a33cc170154aece11, shasum: }, require: { @@ -1014,7 +1014,7 @@ wikibase, wikidata ], -time: 2015-06-06 10:55:38 +time: 2015-07-01 17:54:17 }, { name: wikibase/data-model-javascript, @@ -1234,7 +1234,7 @@ source: { type: git, url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;, -reference: 6c877b930d068c0c11e2ee82907ca7409b6dd4ef +reference: 0e6c3c95ab49c449d35b3228691c885062f766bb }, require: { php: =5.3.0, @@ -1277,7 +1277,7 @@ support: { issues: https://phabricator.wikimedia.org/project/profile/989/; }, -time: 2015-06-22 08:31:58 +time: 2015-06-30 17:53:04 }, { name: wikibase/serialization-javascript, @@ -1326,12 +1326,12 @@ source: { type: git, url: https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -reference: 7adfc0cb855e99249fcbc92727104c0ccb88aaa2 +reference: d4c3ef8e5f10e8fb416909eb526c7ef2053765a5 }, dist: { type: zip, -url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7adfc0cb855e99249fcbc92727104c0ccb88aaa2;, -reference: 7adfc0cb855e99249fcbc92727104c0ccb88aaa2, +url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d4c3ef8e5f10e8fb416909eb526c7ef2053765a5;, +reference: d4c3ef8e5f10e8fb416909eb526c7ef2053765a5, shasum: }, require: { @@ -1399,7 +1399,7 @@ wikibaserepo, wikidata ], -time: 2015-07-01 14:37:12 +time: 2015-07-01 18:17:58 }, { name: wikibase/wikimedia-badges, diff --git a/extensions/Wikibase/build/travis/install.sh b/extensions/Wikibase/build/travis/install.sh index 2ab6361..495d345 100755 --- a/extensions/Wikibase/build/travis/install.sh +++
[MediaWiki-commits] [Gerrit] Update Wikibase data model - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikibase data model .. Update Wikibase data model Plus minor changes relating tests. Change-Id: I15bc8a6c6f4e6cd7648f375dde5b01b8cc632359 --- M composer.lock M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/repo/tests/phpunit/includes/api/GetEntitiesTest.php M vendor/composer/autoload_psr4.php M vendor/composer/installed.json M vendor/wikibase/data-model/.travis.yml M vendor/wikibase/data-model/README.md M vendor/wikibase/data-model/RELEASE-NOTES.md M vendor/wikibase/data-model/WikibaseDataModel.php M vendor/wikibase/data-model/src/LegacyIdInterpreter.php M vendor/wikibase/data-model/src/Snak/SnakList.php M vendor/wikibase/data-model/tests/unit/ByPropertyIdArrayTest.php M vendor/wikibase/data-model/tests/unit/Claim/ClaimsTest.php M vendor/wikibase/data-model/tests/unit/Snak/SnakListTest.php 14 files changed, 336 insertions(+), 351 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index 9e7629f..85c9fff 100644 --- a/composer.lock +++ b/composer.lock @@ -909,7 +909,7 @@ source: { type: git, url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;, -reference: 4d28f74a8d0076446b6071753fada9ac78ad9d29 +reference: a8ac5b55d83d5fc23eccae2bb021617381b96714 }, require: { php: =5.3.0, @@ -954,20 +954,20 @@ support: { issues: https://phabricator.wikimedia.org/project/profile/1202/; }, -time: 2015-06-23 22:59:54 +time: 2015-07-01 11:09:28 }, { name: wikibase/data-model, -version: 3.0.0, +version: 3.0.1, source: { type: git, url: https://github.com/wmde/WikibaseDataModel.git;, -reference: b8c5c74a9a842836685ef317625212c391644fa8 +reference: 94942755d15f814bfd0da39a33cc170154aece11 }, dist: { type: zip, -url: https://api.github.com/repos/wmde/WikibaseDataModel/zipball/b8c5c74a9a842836685ef317625212c391644fa8;, -reference: b8c5c74a9a842836685ef317625212c391644fa8, +url: https://api.github.com/repos/wmde/WikibaseDataModel/zipball/94942755d15f814bfd0da39a33cc170154aece11;, +reference: 94942755d15f814bfd0da39a33cc170154aece11, shasum: }, require: { @@ -1014,7 +1014,7 @@ wikibase, wikidata ], -time: 2015-06-06 10:55:38 +time: 2015-07-01 17:54:17 }, { name: wikibase/data-model-javascript, @@ -1234,7 +1234,7 @@ source: { type: git, url: https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality;, -reference: 6c877b930d068c0c11e2ee82907ca7409b6dd4ef +reference: 0e6c3c95ab49c449d35b3228691c885062f766bb }, require: { php: =5.3.0, @@ -1277,7 +1277,7 @@ support: { issues: https://phabricator.wikimedia.org/project/profile/989/; }, -time: 2015-06-22 08:31:58 +time: 2015-06-30 17:53:04 }, { name: wikibase/serialization-javascript, @@ -1326,12 +1326,12 @@ source: { type: git, url: https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -reference: 7adfc0cb855e99249fcbc92727104c0ccb88aaa2 +reference: d4c3ef8e5f10e8fb416909eb526c7ef2053765a5 }, dist: { type: zip, -url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7adfc0cb855e99249fcbc92727104c0ccb88aaa2;, -reference: 7adfc0cb855e99249fcbc92727104c0ccb88aaa2, +url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d4c3ef8e5f10e8fb416909eb526c7ef2053765a5;, +reference: d4c3ef8e5f10e8fb416909eb526c7ef2053765a5, shasum: }, require: { @@ -1399,7 +1399,7 @@ wikibaserepo, wikidata ], -time: 2015-07-01 14:37:12 +time: 2015-07-01 18:17:58 }, { name: wikibase/wikimedia-badges, diff --git a/extensions/Wikibase/build/travis/install.sh b/extensions/Wikibase/build/travis/install.sh index 2ab6361..495d345 100755 --- a/extensions/Wikibase/build/travis/install.sh +++ b/extensions/Wikibase/build/travis/install.sh @@ -21,6 +21,7 @@ cd
[MediaWiki-commits] [Gerrit] Track geo feature usage - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: Track geo feature usage .. Track geo feature usage Bug: T103017 Change-Id: Ifbc4ebaeb992e417dbe00da198987b0e83cb9a03 --- M WikimediaEvents.php M WikimediaEventsHooks.php A modules/ext.wikimediaEvents.geoFeatures.js 3 files changed, 124 insertions(+), 1 deletion(-) Approvals: Yurik: Looks good to me, approved Jdouglas: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/WikimediaEvents.php b/WikimediaEvents.php index edfe94a..c486d96 100644 --- a/WikimediaEvents.php +++ b/WikimediaEvents.php @@ -40,6 +40,11 @@ */ $wgWMEStatsdBaseUri = false; +/** + * @var bool: Whether geo/maps features specific to large Wikipedias should be tracked + */ +$wgWMETrackGeoFeatures = false; + // Messages $wgMessagesDirs['WikimediaEvents'] = __DIR__ . '/i18n'; @@ -122,6 +127,20 @@ 'mediawiki.user', ), ), + 'schema.GeoFeatures' = array( + 'class'= 'ResourceLoaderSchemaModule', + 'schema' = 'GeoFeatures', + 'revision' = 12518424, + ), + 'ext.wikimediaEvents.geoFeatures' = array( + 'scripts' = array( + 'ext.wikimediaEvents.geoFeatures.js', + ), + 'localBasePath' = __DIR__ . '/modules', + 'remoteExtPath' = 'WikimediaEvents/modules', + 'targets' = array( 'desktop', 'mobile' ), + 'dependencies' = array( 'schema.GeoFeatures' ), + ), ); // Autoloader diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php index d784cdc..8a4f9f4 100644 --- a/WikimediaEventsHooks.php +++ b/WikimediaEventsHooks.php @@ -16,11 +16,15 @@ public static function onBeforePageDisplay( $out, $skin ) { $out-addModules( 'ext.wikimediaEvents' ); - global $wgWMEStatsdBaseUri; + global $wgWMEStatsdBaseUri, $wgWMETrackGeoFeatures; if ( $wgWMEStatsdBaseUri !== false ) { $out-addModules( 'ext.wikimediaEvents.statsd' ); } + if ( $wgWMETrackGeoFeatures ) { + $out-addModules( 'ext.wikimediaEvents.geoFeatures' ); + } + $user = $out-getUser(); if ( $user-isLoggedIn() ) { $out-addModules( 'ext.wikimediaEvents.loggedin' ); diff --git a/modules/ext.wikimediaEvents.geoFeatures.js b/modules/ext.wikimediaEvents.geoFeatures.js new file mode 100644 index 000..557bf61 --- /dev/null +++ b/modules/ext.wikimediaEvents.geoFeatures.js @@ -0,0 +1,100 @@ +/** + * Track geo/mapping feature usage + * @see https://phabricator.wikimedia.org/T103017 + * @see https://meta.wikimedia.org/wiki/Schema:GeoFeatures + */ +( function( $, mw ) { + // Override hide() to track it + var oldHide = $.fn.hide; + $.fn.hide = function() { + $( this ).trigger( 'hide' ); + return oldHide.apply( this, arguments ); + }; + + /** +* Checks whether given element is part of a title (primary) coordinate +* +* @param {jQuery} $el +* @returns {bool} +*/ + function isTitleCoordinate( $el ) { + return $el.is( '#coordinates *' ); + } + + /** +* Returns an unique token identifying current user +* Code borrowed from WikiGrok +* +* @returns {string} +*/ + function getToken() { + var cookieName = 'GeoFeaturesUser', + token = mw.cookie.get( cookieName ); + + if ( token ) { + return token; + } + + token = mw.user.generateRandomSessionId(); + + mw.cookie.set( cookieName, token, { + expires: 90 * 24 * 3600 + } ); + + return token; + } + + /** +* Sends tracking information +* +* @param {string} feature Feature name +* @param {string} action Action performed +* @param {bool} titleCoordinate Whether feature is used with the title coordinate +* @param {string|undefined} [url] URL to follow once event has been logged +*/ + function track( feature, action, titleCoordinate, url ) { + mw.eventLog.logEvent( 'GeoFeatures', { + 'feature': feature, + 'action': action, + 'titleCoordinate': titleCoordinate, + 'userToken': getToken() + } ); + // If the event was caused by a click on a link, follow this link after a delay to give + // the event time to be logged + if ( url ) { + setTimeout( +
[MediaWiki-commits] [Gerrit] Remove API formats that are removed in core - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove API formats that are removed in core .. Remove API formats that are removed in core Change-Id: I4c9e64875be509906021255d70b90688f2e5ddf3 --- M repo/tests/phpunit/includes/api/GetEntitiesTest.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/api/GetEntitiesTest.php b/repo/tests/phpunit/includes/api/GetEntitiesTest.php index 5433a89..1ce8376 100644 --- a/repo/tests/phpunit/includes/api/GetEntitiesTest.php +++ b/repo/tests/phpunit/includes/api/GetEntitiesTest.php @@ -124,12 +124,10 @@ protected static $goodFormats = array( 'json', 'php', - 'wddx', 'xml', 'yaml', 'txt', 'dbg', - 'dump' ); /** -- To view, visit https://gerrit.wikimedia.org/r/222139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c9e64875be509906021255d70b90688f2e5ddf3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com 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] Make ferm list into an actual list. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Make ferm list into an actual list. .. Make ferm list into an actual list. Change-Id: I9b0ce893a20e8f18dcf46bedf679a8e4f3c56801 --- M modules/openstack/manifests/controller_firewall.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/manifests/controller_firewall.pp b/modules/openstack/manifests/controller_firewall.pp index 0a9c1ed..8490998 100644 --- a/modules/openstack/manifests/controller_firewall.pp +++ b/modules/openstack/manifests/controller_firewall.pp @@ -72,10 +72,10 @@ # services provided to Labs instances ferm::rule { 'puppetmaster': -rule = saddr ${labs_vms} ${monitoring} proto tcp dport 8140 ACCEPT;, +rule = saddr (${labs_vms} ${monitoring}) proto tcp dport 8140 ACCEPT;, } ferm::rule { 'salt': -rule = saddr ${labs_vms} ${monitoring} proto tcp dport (4505 4506) ACCEPT;, +rule = saddr (${labs_vms} ${monitoring}) proto tcp dport (4505 4506) ACCEPT;, } # mysql access from iron -- To view, visit https://gerrit.wikimedia.org/r/222141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b0ce893a20e8f18dcf46bedf679a8e4f3c56801 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@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] Restore overall monthly downloads, without a graph - change (analytics/limn-extdist-data)
Milimetric has submitted this change and it was merged. Change subject: Restore overall monthly downloads, without a graph .. Restore overall monthly downloads, without a graph Change-Id: I187f94cc2aedb8dec305b7f132f5542a76ae8275 --- M extdist/config.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Milimetric: Verified; Looks good to me, approved diff --git a/extdist/config.yaml b/extdist/config.yaml index f3cd277..72fc702 100644 --- a/extdist/config.yaml +++ b/extdist/config.yaml @@ -27,3 +27,7 @@ frequency: daily timeboxed: true starts: 2015-07-01 + +downloads: +title: This can not be shown in a graph +frequency: daily -- To view, visit https://gerrit.wikimedia.org/r/222144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I187f94cc2aedb8dec305b7f132f5542a76ae8275 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-extdist-data Gerrit-Branch: master Gerrit-Owner: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Milimetric dandree...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Gather flagging on labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable Gather flagging on labs .. Enable Gather flagging on labs Bug: T97704 Change-Id: Id2f6185b68fa340bc35ae8aade0da39052992eaa --- M wmf-config/InitialiseSettings-labs.php M wmf-config/mobile-labs.php 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index a303f57..2bd741b 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -334,6 +334,11 @@ ), ), + // T97704 + 'wmgGatherAutohideFlagLimit' = array( + 'default' = 3, + ), + 'wmgWikiGrokDebug' = array( 'default' = true, ), diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php index ddd91a5..f77f28b 100644 --- a/wmf-config/mobile-labs.php +++ b/wmf-config/mobile-labs.php @@ -27,5 +27,6 @@ $wgWikiBasePropertyConfig = $wmgWikiBasePropertyConfig; $wgMFInfoboxConfig = $wmgMFInfoboxConfig; +$wgGatherAutohideFlagLimit = $wmgGatherAutohideFlagLimit; $wgMFIsBrowseEnabled = $wmgMFIsBrowseEnabled; $wgMFBrowseTags = $wmgMFBrowseTags; -- To view, visit https://gerrit.wikimedia.org/r/221754 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2f6185b68fa340bc35ae8aade0da39052992eaa Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@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] Restore overall monthly downloads, without a graph - change (analytics/limn-extdist-data)
Milimetric has uploaded a new change for review. https://gerrit.wikimedia.org/r/222144 Change subject: Restore overall monthly downloads, without a graph .. Restore overall monthly downloads, without a graph Change-Id: I187f94cc2aedb8dec305b7f132f5542a76ae8275 --- M extdist/config.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-extdist-data refs/changes/44/222144/1 diff --git a/extdist/config.yaml b/extdist/config.yaml index f3cd277..72fc702 100644 --- a/extdist/config.yaml +++ b/extdist/config.yaml @@ -27,3 +27,7 @@ frequency: daily timeboxed: true starts: 2015-07-01 + +downloads: +title: This can not be shown in a graph +frequency: daily -- To view, visit https://gerrit.wikimedia.org/r/222144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I187f94cc2aedb8dec305b7f132f5542a76ae8275 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-extdist-data Gerrit-Branch: master Gerrit-Owner: Milimetric dandree...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add option to show traditional oneline watchlist - change (labs...crosswatch)
Sitic has submitted this change and it was merged. Change subject: Add option to show traditional oneline watchlist .. Add option to show traditional oneline watchlist Was wished by many users who don't like the two lines layout. Change-Id: I5265ebe4ecedf7621dc4b2ee6b700f2763c8ac85 --- M frontend/src/app/index.css M frontend/src/components/settings/settings.html M frontend/src/components/watchlist/edit.directive.js A frontend/src/components/watchlist/edit_oneline.directive.html R frontend/src/components/watchlist/edit_twolines.directive.html M frontend/src/components/watchlist/entry.directive.html M frontend/src/components/watchlist/watchlist.html M frontend/src/i18n/locale-en.json 8 files changed, 62 insertions(+), 15 deletions(-) Approvals: Sitic: Verified; Looks good to me, approved diff --git a/frontend/src/app/index.css b/frontend/src/app/index.css index f8efe72..6434707 100644 --- a/frontend/src/app/index.css +++ b/frontend/src/app/index.css @@ -107,6 +107,9 @@ max-width: 1200px; } +.watchlist-list-item-oneline { + min-height: 32px; +} watchlist-entry { overflow: hidden; width: 100%; @@ -117,9 +120,7 @@ } watchlist-entry .left { - float: left; - width: 125px; - overflow: hidden; + min-width: 8em; } watchlist-entry a.project { diff --git a/frontend/src/components/settings/settings.html b/frontend/src/components/settings/settings.html index 54bb943..c40abcd 100644 --- a/frontend/src/components/settings/settings.html +++ b/frontend/src/components/settings/settings.html @@ -65,6 +65,10 @@ md-checkbox ng-model=ctrl.config.lastrevonly ng-change=ctrl.resetWatchlist()/md-checkbox /md-list-item md-list-item +p translate=ONELINE/p +md-checkbox ng-model=ctrl.config.oneline ng-change=ctrl.saveConfig()/md-checkbox + /md-list-item + md-list-item p translate=FLAGS/p md-checkbox ng-model=ctrl.config.flagsenable ng-change=ctrl.saveConfig()/md-checkbox /md-list-item diff --git a/frontend/src/components/watchlist/edit.directive.js b/frontend/src/components/watchlist/edit.directive.js index 6ce2eb2..56247df 100644 --- a/frontend/src/components/watchlist/edit.directive.js +++ b/frontend/src/components/watchlist/edit.directive.js @@ -6,7 +6,9 @@ var directive = { link: link, scope: true, -templateUrl: 'components/watchlist/edit.directive.html', +templateUrl: function(elem, attr){ + return 'components/watchlist/edit_' + attr.type + '.directive.html'; +}, restrict: 'E' }; return directive; diff --git a/frontend/src/components/watchlist/edit_oneline.directive.html b/frontend/src/components/watchlist/edit_oneline.directive.html new file mode 100644 index 000..91a9b97 --- /dev/null +++ b/frontend/src/components/watchlist/edit_oneline.directive.html @@ -0,0 +1,16 @@ +span class=newpage ng-if=::event.new translate=NEWPAGE_FLAG/span +span class=minoredit ng-if=::event.minor translate=MINOREDIT_FLAG/span +span class=botedit ng-if=::event.bot translate=BOTEDIT_FLAG/span +a dir=ltr href={{::event.projecturl}}/w/index.php?oldid={{::event.old_revid}}diff={{::event.revid}} + ng-class=::event.titlestyle target=_blank{{::event.title}}/a +span ng-if=event.clicked + (a stop-event href={{::event.projecturl}}/w/index.php?title={{::event.title | urlEncode}}action=history target=_blank translate=HISTORY/a) +/span +span am-time-ago=event.timestamp/span +span class=mw-changeslist-separator. ./span +span dir=ltr ng-class=::event.bytestyle({{::event.bytes}})/span +span class=mw-changeslist-separator. ./span +span + user/user + span ng-if=::event.parsedcomment class=comment(span ng-bind-html=::event.parsedcomment/span)/span +/span diff --git a/frontend/src/components/watchlist/edit.directive.html b/frontend/src/components/watchlist/edit_twolines.directive.html similarity index 100% rename from frontend/src/components/watchlist/edit.directive.html rename to frontend/src/components/watchlist/edit_twolines.directive.html diff --git a/frontend/src/components/watchlist/entry.directive.html b/frontend/src/components/watchlist/entry.directive.html index 83e99f3..2de1f20 100644 --- a/frontend/src/components/watchlist/entry.directive.html +++ b/frontend/src/components/watchlist/entry.directive.html @@ -1,15 +1,38 @@ -div class=left - div am-time-ago=event.timestamp/div - a href={{::event.projecturl}}/wiki/Special:Watchlist class=project - title={{::event.project}} target=_blank +div ng-if=ctrl.config.oneline layout=row + div class=left +a href={{::event.projecturl}}/wiki/Special:Watchlist class=project + title={{::event.project}} target=_blank span ng-if=::event.projectlang span ng-if=!ctrl.config.flagsenable || !ctrl.flagurl(event.projectlang){{::event.projectlangname}}#32;/span img
[MediaWiki-commits] [Gerrit] Only variables may be passed by reference - change (oojs/ui)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/222145 Change subject: Only variables may be passed by reference .. Only variables may be passed by reference Change-Id: I0d8f22f8d97c8ef3f72b3c58f4dd79e962d9f35e --- M php/Element.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/45/222145/1 diff --git a/php/Element.php b/php/Element.php index 14d2159..7a8cee1 100644 --- a/php/Element.php +++ b/php/Element.php @@ -248,7 +248,8 @@ array_walk_recursive( $config, $replaceElements ); // Set '_' last to ensure that subclasses can't accidentally step on it. // Strip all namespaces from the class name - $config['_'] = end( explode( '\\', get_class( $this ) ) ); + $exploded = explode( '\\', get_class( $this ) ); + $config['_'] = end( $exploded ); return $config; } -- To view, visit https://gerrit.wikimedia.org/r/222145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d8f22f8d97c8ef3f72b3c58f4dd79e962d9f35e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Refactor PageActionOverlay as PointerOverlay - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Refactor PageActionOverlay as PointerOverlay .. Hygiene: Refactor PageActionOverlay as PointerOverlay Changes: * Document pointer overlay * Allow appendToElement to be passed as an option (this will allow us in future to append to things outside content) * Now extends Overlay rather than ContentOverlay since we want to use pointers in the left navigation menu Change-Id: I4db95647d7d97d50f3d9afb48aaa0223feda2074 --- M includes/Resources.php R resources/mobile.contentOverlays/PointerOverlay.hogan R resources/mobile.contentOverlays/PointerOverlay.js M resources/mobile.contentOverlays/tutorials.less M resources/mobile.newusers/init.js M resources/skins.minerva.tablet.beta.styles/common.less 6 files changed, 43 insertions(+), 21 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 31d9b04..4f305b0 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1026,10 +1026,10 @@ 'resources/mobile.contentOverlays/tutorials.less', ), 'scripts' = array( - 'resources/mobile.contentOverlays/PageActionOverlay.js', + 'resources/mobile.contentOverlays/PointerOverlay.js', ), 'templates' = array( - 'PageActionOverlay.hogan' = 'resources/mobile.contentOverlays/PageActionOverlay.hogan', + 'PointerOverlay.hogan' = 'resources/mobile.contentOverlays/PointerOverlay.hogan', ), ), diff --git a/resources/mobile.contentOverlays/PageActionOverlay.hogan b/resources/mobile.contentOverlays/PointerOverlay.hogan similarity index 100% rename from resources/mobile.contentOverlays/PageActionOverlay.hogan rename to resources/mobile.contentOverlays/PointerOverlay.hogan diff --git a/resources/mobile.contentOverlays/PageActionOverlay.js b/resources/mobile.contentOverlays/PointerOverlay.js similarity index 60% rename from resources/mobile.contentOverlays/PageActionOverlay.js rename to resources/mobile.contentOverlays/PointerOverlay.js index 9c3b806..e64f92c 100644 --- a/resources/mobile.contentOverlays/PageActionOverlay.js +++ b/resources/mobile.contentOverlays/PointerOverlay.js @@ -1,25 +1,49 @@ ( function ( M, $ ) { - var ContentOverlay = M.require( 'ContentOverlay' ), - context = M.require( 'context' ), - PageActionOverlay; + var PointerOverlay, + Overlay = M.require( 'Overlay' ); /** * Page overlay prompting a user for given action -* @class PageActionOverlay -* @extends ContentOverlay +* @class PointerOverlay +* @extends Overlay */ - PageActionOverlay = ContentOverlay.extend( { - className: 'overlay content-overlay tutorial-overlay', - template: mw.template.get( 'mobile.contentOverlays', 'PageActionOverlay.hogan' ), + PointerOverlay = Overlay.extend( { + className: 'overlay pointer-overlay tutorial-overlay', + /** +* @inheritdoc +*/ + fullScreen: false, + /** +* @inheritdoc +*/ + closeOnContentTap: true, + template: mw.template.get( 'mobile.contentOverlays', 'PointerOverlay.hogan' ), /** * @inheritdoc * @cfg {Object} defaults Default options hash. * @cfg {Skin} defaults.skin class +* @cfg {String} defaults.summary Message describing thing being pointed to. * @cfg {String} defaults.cancelMsg Cancel message. +* @cfg {String} defaults.appendToElement Where pointer overlay should be appended to. +* @cfg {String} defaults.target jQuery selector to point tutorial at +* @cfg {String} [defaults.confirmMsg] Label for a confirm message. */ defaults: { skin: undefined, - cancelMsg: mw.msg( 'cancel' ) + summary: undefined, + cancelMsg: mw.msg( 'cancel' ), + appendToElement: undefined, + target: undefined, + confirmMsg: undefined + }, + /** +* @inheritdoc +*/ + initialize: function ( options ) { + // FIXME: This should not have a default fallback. This is a non-optional parameter. + // Remove when all existing uses in Gather have been updated. + this.appendToElement = options.appendToElement ||
[MediaWiki-commits] [Gerrit] switch analytics and analytics_kafka to ganglia_new - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/222153 Change subject: switch analytics and analytics_kafka to ganglia_new .. switch analytics and analytics_kafka to ganglia_new Change-Id: Ia2972064d46e1dea74014873f1c6f64da9f9e18f --- M hieradata/common.yaml M hieradata/regex.yaml M manifests/site.pp 3 files changed, 3 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/222153/1 diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 18b0310..c0087df 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -127,10 +127,7 @@ name: Analytics cluster id: 32 sites: - eqiad: -- analytics1013.eqiad.wmnet -- analytics1014.eqiad.wmnet -- analytics1019.eqiad.wmnet + eqiad: [] memcached: name: Memcached id: 33 @@ -203,10 +200,7 @@ name: Analytics Kafka cluster id: 45 sites: - eqiad: -- analytics1012.eqiad.wmnet -- analytics1018.eqiad.wmnet -- analytics1022.eqiad.wmnet + eqiad: [] sca: name: Service Cluster A id: 46 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 8f13104..b3b6686 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -1,7 +1,3 @@ -analytics: - __regex: !ruby/regexp /^analytics10[0-9][0-9]\.eqiad\.wmnet$/ - ganglia_class: old - logstash: __regex: !ruby/regexp /^logstash100[0-9]\.eqiad\.wmnet$/ ganglia_class: old diff --git a/manifests/site.pp b/manifests/site.pp index df7e197..19eb446 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -120,12 +120,7 @@ # hostname - /datacenter/rack/row id is correct. This is # used for Hadoop network topology awareness. node /analytics10(11|1[3-7]|19|2[089]|3[0-9]|4[01]).eqiad.wmnet/ { -# analytics1013 is a Ganglia aggregator for Row A -# analytics1014 is a Ganglia aggregator for Row C -# analytics1019 is a Ganglia aggregator for Row D -if $::hostname =~ /^analytics101[349]$/ { -$ganglia_aggregator = true -} + role analytics::hadoop::worker, analytics::impala::worker include standard @@ -133,13 +128,6 @@ # analytics1012, analytics1018, analytics1021 and analytics1022 are Kafka Brokers. node /analytics10(12|18|21|22)\.eqiad\.wmnet/ { -# one ganglia aggregator per ganglia 'cluster' per row. -if ($::hostname == 'analytics1012' or # Row A -$::hostname == 'analytics1018' or # Row D -$::hostname == 'analytics1022')# Row C -{ -$ganglia_aggregator = true -} # Kafka brokers are routed via IPv6 so that # other DCs can address without public IPv4 -- To view, visit https://gerrit.wikimedia.org/r/222153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2972064d46e1dea74014873f1c6f64da9f9e18f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove use of module group 'other' from special page modules - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Remove use of module group 'other' from special page modules .. Remove use of module group 'other' from special page modules Follows-up 58339381. Change-Id: Ic102ca535784518bb84991b60440c1d82a975587 --- M MobileFrontend.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/MobileFrontend.php b/MobileFrontend.php index 00e1623..dde7cc2 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -206,7 +206,6 @@ */ $wgMFMobileSpecialPageResourceBoilerplate = $wgMFResourceBoilerplate + array( 'targets' = 'mobile', - 'group' = 'other', ); /** -- To view, visit https://gerrit.wikimedia.org/r/222040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic102ca535784518bb84991b60440c1d82a975587 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: BarryTheBrowserTestBot jdlrobson+ba...@gmail.com Gerrit-Reviewer: Jdlrobson jrob...@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 Wikidata, fix DataModel's SnakList - change (mediawiki/core)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/222159 Change subject: Update Wikidata, fix DataModel's SnakList .. Update Wikidata, fix DataModel's SnakList + minor test only changes. Change-Id: Iec4c25a6b46e19139e43a29d7e16e8467ace97af --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/59/222159/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index 380e229..ed18402 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 380e22941103613985f69e0de52b4cab1ae77053 +Subproject commit ed184025da150f67401122d7f2ec224e6b9eb39d -- To view, visit https://gerrit.wikimedia.org/r/222159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec4c25a6b46e19139e43a29d7e16e8467ace97af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf12 Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MediaWiki theme: Add support for frameless primary buttons - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: MediaWiki theme: Add support for frameless primary buttons .. MediaWiki theme: Add support for frameless primary buttons Also fix frameless button support in toolbars (both primary and non-primary). Bug: T103403 Change-Id: I26b540dd22a975c9b0c139e9dc748da6a2313958 --- M demos/pages/toolbars.js M demos/pages/widgets.js M src/themes/apex/tools.less M src/themes/mediawiki/MediaWikiTheme.js M src/themes/mediawiki/elements.less M src/themes/mediawiki/tools.less 6 files changed, 68 insertions(+), 20 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js index 550d812..4a58a33 100644 --- a/demos/pages/toolbars.js +++ b/demos/pages/toolbars.js @@ -1,5 +1,5 @@ OO.ui.Demo.static.pages.toolbars = function ( demo ) { - var i, toolGroups, saveButton, actionButton, actionButtonDisabled, PopupTool, ToolGroupTool, + var i, toolGroups, saveButton, deleteButton, actionButton, actionButtonDisabled, PopupTool, ToolGroupTool, $demo = demo.$element, $containers = $(), toolFactories = [], @@ -217,14 +217,15 @@ } ] ); - saveButton = new OO.ui.ButtonWidget( { label: 'Save', flags: [ 'progressive', 'primary' ] } ); + saveButton = new OO.ui.ButtonWidget( { label: 'Save', framed: false, flags: [ 'progressive', 'primary' ] } ); + deleteButton = new OO.ui.ButtonWidget( { label: 'Delete', framed: false, flags: [ 'destructive' ] } ); actionButton = new OO.ui.ButtonWidget( { label: 'Action' } ); actionButtonDisabled = new OO.ui.ButtonWidget( { label: 'Disabled', disabled: true } ); toolbars[ 1 ].$actions .append( actionButton.$element, actionButtonDisabled.$element ); toolbars[ 3 ].$actions - .append( toolbars[ 2 ].$element, saveButton.$element ); + .append( toolbars[ 2 ].$element, deleteButton.$element, saveButton.$element ); for ( i = 0; i toolbars.length; i++ ) { toolbars[ i ].emit( 'updateState' ); diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index 5c0843c..d4880b5 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -418,6 +418,18 @@ new OO.ui.FieldLayout( new OO.ui.ButtonWidget( { framed: false, + flags: [ 'progressive', 'primary' ], + icon: 'check', + label: 'Primary' + } ), + { + label: 'ButtonWidget (frameless, primary, progressive)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonWidget( { + framed: false, flags: [ 'warning' ], icon: 'alert', label: 'Warning' diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less index 913bb51..ca78a57 100644 --- a/src/themes/apex/tools.less +++ b/src/themes/apex/tools.less @@ -12,16 +12,29 @@ } -actions { -.oo-ui-buttonElement { +.oo-ui-buttonElement-framed, +.oo-ui-buttonElement-framed:last-child { margin-top: 0.4em; margin-bottom: 0.4em; - } - -.oo-ui-buttonElement:last-child { margin-right: 0.5em; } + +.oo-ui-buttonElement-frameless, +.oo-ui-buttonElement-frameless:last-child { + .oo-ui-labelElement { + margin: 0; +.oo-ui-buttonElement-button { + margin: 0; + padding: 1.1953125em 0.3125em; +.oo-ui-labelElement-label { + margin: 0 1em; + } + } + } + } } + -shadow { .oo-ui-background-image('@{oo-ui-default-image-path}/toolbar-shadow.png'); bottom: -9px; diff --git a/src/themes/mediawiki/MediaWikiTheme.js
[MediaWiki-commits] [Gerrit] protected function handleDuplicate - change (wikimedia...crm)
Cdentinger has uploaded a new change for review. https://gerrit.wikimedia.org/r/222148 Change subject: protected function handleDuplicate .. protected function handleDuplicate Change-Id: I5b0eae13e85148b5cd6d5f23f80c886e31a74e20 --- M sites/all/modules/offline2civicrm/ChecksFile.php M sites/all/modules/offline2civicrm/SquareFile.php 2 files changed, 32 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/48/222148/1 diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php b/sites/all/modules/offline2civicrm/ChecksFile.php index b9c7d6c..f347b90 100644 --- a/sites/all/modules/offline2civicrm/ChecksFile.php +++ b/sites/all/modules/offline2civicrm/ChecksFile.php @@ -66,14 +66,11 @@ // check to see if we have already processed this check if ( $existing = wmf_civicrm_get_contributions_from_gateway_id( $msg['gateway'], $msg['gateway_txn_id'] ) ){ -if ( $msg['gateway'] === 'square' $msg['gateway_status_raw'] === 'Refunded' ) { -// square updates the existing row with the Refunded status and resends -wmf_civicrm_mark_refund( $existing[0]['id'], 'refund', true ); -} -else { - // otherwise, move on - watchdog( 'offline2civicrm', 'Contribution matches existing contribution (id: @id), skipping it.', array( '@id' = $existing[0]['id'] ), WATCHDOG_INFO ); - $num_duplicates++; +$skipped = $this-handleDuplicate( $existing ); +if ( $skipped ) { +$num_duplicates++; +} else { +$num_successful++; } continue; } @@ -151,6 +148,11 @@ return $msg; } +protected function handleDuplicate ( $duplicate ) { +watchdog( 'offline2civicrm', 'Contribution matches existing contribution (id: @id), skipping it.', array( '@id' = $duplicate[0]['id'] ), WATCHDOG_INFO ); +return true; // true means this was a duplicate and i skipped it +} + protected function setDefaults( $msg ) { foreach ( $this-getDefaultValues() as $key = $defaultValue ) { if ( empty( $msg[$key] ) ) { diff --git a/sites/all/modules/offline2civicrm/SquareFile.php b/sites/all/modules/offline2civicrm/SquareFile.php index a6a9a90..daac6cc 100644 --- a/sites/all/modules/offline2civicrm/SquareFile.php +++ b/sites/all/modules/offline2civicrm/SquareFile.php @@ -55,7 +55,10 @@ $msg['contribution_type'] = 'cash'; $msg['gross'] = ltrim( $msg['gross'], '$' ); -$msg['net'] = ltrim( $msg['net'], '$' ); + +if ( array_key_exists('net', $msg) ) { +$msg['net'] = ltrim( $msg['net'], '$' ); +} list($msg['first_name'], $msg['last_name']) = wmf_civicrm_janky_split_name( $msg['full_name'] ); @@ -79,4 +82,22 @@ $this-refundLastTransaction = false; } } + +protected function handleDuplicate( $duplicate ) { +if ( $this-refundLastTransaction ) { +// square updates the existing row with the Refunded status and resends +wmf_civicrm_mark_refund( +$duplicate[0]['id'], +'refund', +true +); +watchdog( 'offline2civicrm', 'Refunding contribution @id', array( +'@id' = $duplicate[0]['id'], +), WATCHDOG_INFO ); + +$this-refundLastTransaction = false; +return false; // false means this was a refund not a duplicate +} +} + } -- To view, visit https://gerrit.wikimedia.org/r/222148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b0eae13e85148b5cd6d5f23f80c886e31a74e20 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Cdentinger cdentin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppetmaster: fix puppet.conf for new CA cert - change (operations/puppet)
Gage has uploaded a new change for review. https://gerrit.wikimedia.org/r/222151 Change subject: puppetmaster: fix puppet.conf for new CA cert .. puppetmaster: fix puppet.conf for new CA cert certname now takes the default value and X509v3 Subject Alternative Name becomes DNS:puppet ref: step #18, https://wikitech.wikimedia.org/wiki/Puppet_CA_replacement#Procedure Change-Id: I515804c0477f14c9fd911537b4c959275163ddfe --- M modules/puppetmaster/templates/master.conf.erb 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/222151/1 diff --git a/modules/puppetmaster/templates/master.conf.erb b/modules/puppetmaster/templates/master.conf.erb index 77a9c88..bdd8bcf 100644 --- a/modules/puppetmaster/templates/master.conf.erb +++ b/modules/puppetmaster/templates/master.conf.erb @@ -1,6 +1,5 @@ [master] -certname = %= scope.lookupvar('puppetmaster::server_name') % templatedir = /etc/puppet/templates modulepath = /etc/puppet/private/modules:/etc/puppet/modules @@ -15,5 +14,3 @@ ssl_client_header = SSL_CLIENT_S_DN ssl_client_verify_header = SSL_CLIENT_VERIFY %- end -% -hostcert = /var/lib/puppet/server/ssl/certs/%= @fqdn %.pem -hostprivkey = /var/lib/puppet/server/ssl/private_keys/%= @fqdn %.pem -- To view, visit https://gerrit.wikimedia.org/r/222151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I515804c0477f14c9fd911537b4c959275163ddfe Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gage jger...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround a composer merge plugin issue we hit on travis - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/222152 Change subject: Workaround a composer merge plugin issue we hit on travis .. Workaround a composer merge plugin issue we hit on travis Due to https://github.com/wikimedia/composer-merge-plugin/issues/41 we fail to properly build an autoloader for core, which makes our tests fail. Running composer dump-autoload after the actual installation fixes the autoloader. Change-Id: If1875cbddae7d59bc5af653787d78c03b294306b (cherry picked from commit ac1ee63d76ff3f70f530d7aacb8b7b94f49a3d88) --- M build/travis/install.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/52/222152/1 diff --git a/build/travis/install.sh b/build/travis/install.sh index 2ab6361..495d345 100755 --- a/build/travis/install.sh +++ b/build/travis/install.sh @@ -21,6 +21,7 @@ cd phase3 composer self-update composer install +composer dump-autoload -o # Workaround https://github.com/wikimedia/composer-merge-plugin/issues/41 mysql -e 'create database its_a_mw;' php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin -- To view, visit https://gerrit.wikimedia.org/r/222152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1875cbddae7d59bc5af653787d78c03b294306b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf12 Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround a composer merge plugin issue we hit on travis - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Workaround a composer merge plugin issue we hit on travis .. Workaround a composer merge plugin issue we hit on travis Due to https://github.com/wikimedia/composer-merge-plugin/issues/41 we fail to properly build an autoloader for core, which makes our tests fail. Running composer dump-autoload after the actual installation fixes the autoloader. Change-Id: If1875cbddae7d59bc5af653787d78c03b294306b (cherry picked from commit ac1ee63d76ff3f70f530d7aacb8b7b94f49a3d88) --- M build/travis/install.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/build/travis/install.sh b/build/travis/install.sh index 2ab6361..495d345 100755 --- a/build/travis/install.sh +++ b/build/travis/install.sh @@ -21,6 +21,7 @@ cd phase3 composer self-update composer install +composer dump-autoload -o # Workaround https://github.com/wikimedia/composer-merge-plugin/issues/41 mysql -e 'create database its_a_mw;' php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin -- To view, visit https://gerrit.wikimedia.org/r/222152 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1875cbddae7d59bc5af653787d78c03b294306b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf12 Gerrit-Owner: Hoo man h...@online.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] Tag v0.11.7 - change (oojs/ui)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/222156 Change subject: Tag v0.11.7 .. Tag v0.11.7 Change-Id: I421ed61b7454b4c94ce3f061a9b8a858a9a5db5f --- M History.md M README.md M package.json 3 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/222156/1 diff --git a/History.md b/History.md index bac6382..86287ce 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,19 @@ # OOjs UI Release History +## v0.11.7 / 2015-07-01 +* Element.php: Strip all namespaces from infused PHP widgets (Kunal Mehta) +* OptionWidget: Explicitly set aria-selected to 'false' on init (Bartosz Dziewoński) + +* MediaWiki theme: Add support for frameless primary buttons (Ed Sanders) +* MediaWiki theme: Align and center the advanced icon (Roan Kattouw) +* MediaWiki, Apex themes: Fix styling for frameless process dialog actions (Ed Sanders) + +* Element.php: Add test case to verify class name in infused widgets (Kunal Mehta) +* Element.php: Only variables may be passed by reference (Kunal Mehta) +* Theme.php: Actually make abstract in PHP (Kunal Mehta) +* Theme.php: Add missing doc comments (Kunal Mehta) +* documentation: Use bold in comments instead of h4 (Ed Sanders) + ## v0.11.6 / 2015-06-23 * NumberInputWidget: Don't use `Math.sign()` (Brad Jorsch) * SelectWidget: Fix invalid escape sequence '`\s`' (Roan Kattouw) diff --git a/README.md b/README.md index e537752..8969947 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ $ git checkout -B release -t origin/master # Ensure tests pass -$ npm install npm test +$ npm install composer update npm test # Avoid using npm version patch because that creates # both a commit and a tag, and we shouldn't tag until after diff --git a/package.json b/package.json index 7e54ce5..4ea4c75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { name: oojs-ui, - version: 0.11.6, + version: 0.11.7, description: User interface classes built on the OOjs framework., keywords: [ oojs-plugin, -- To view, visit https://gerrit.wikimedia.org/r/222156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I421ed61b7454b4c94ce3f061a9b8a858a9a5db5f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change label from cancel to dismiss for PointerOverlay - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Change label from cancel to dismiss for PointerOverlay .. Change label from cancel to dismiss for PointerOverlay As requested by Kaity. Change-Id: Ia571251ba670a5b7b1b7da13037e8412fce40e08 --- M i18n/en.json M i18n/qqq.json M includes/Resources.php M resources/mobile.contentOverlays/PointerOverlay.js 4 files changed, 4 insertions(+), 2 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 88ee6ee..72dde4e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -87,6 +87,7 @@ mobile-frontend-donate-photo-first-upload-success: Success! Thanks for your first contribution!, mobile-frontend-donate-photo-upload-success: Success! Your image can now be used on {{SITENAME}}!, mobile-frontend-drawer-cancel: Cancel, + mobile-frontend-pointer-dismiss: Dismiss, mobile-frontend-edit-login-action: strongHelp improve {{SITENAME}}./strongbr /Log in to edit., mobile-frontend-edit-signup-action: strongHelp improve {{SITENAME}}./strongbr /Sign up to edit., mobile-frontend-editor-abusefilter-disallow: This edit cannot be saved because we have detected an issue., diff --git a/i18n/qqq.json b/i18n/qqq.json index 81877e9..6cb3c5b 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -82,6 +82,7 @@ mobile-frontend-donate-photo-first-upload-success: On upload page - notification shown after a successful upload when it is the first upload by that user, mobile-frontend-donate-photo-upload-success: On upload page - notification shown after a successful upload, mobile-frontend-drawer-cancel: Not visible, but the text label for the cancel button inside a navigation overlay\n{{Identical|Cancel}}, + mobile-frontend-pointer-dismiss: Label of button that dismisses overlay pointing at a particular new feature., mobile-frontend-edit-login-action: Call to action that follows {{msg-mw|mobile-frontend-edit-login}} asking them to login., mobile-frontend-edit-signup-action: Call to action that follows {{msg-mw|mobile-frontend-edit-login}} asking them to sign up., mobile-frontend-editor-abusefilter-disallow: A message telling their user that their edit has been disallowed by AbuseFilter., diff --git a/includes/Resources.php b/includes/Resources.php index 6178ed6..03d7a65 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -1020,7 +1020,7 @@ ), 'messages' = array( // PageActionOverlay.js - 'cancel', + 'mobile-frontend-pointer-dismiss', ), 'styles' = array( 'resources/mobile.contentOverlays/tutorials.less', diff --git a/resources/mobile.contentOverlays/PointerOverlay.js b/resources/mobile.contentOverlays/PointerOverlay.js index e64f92c..8199f61 100644 --- a/resources/mobile.contentOverlays/PointerOverlay.js +++ b/resources/mobile.contentOverlays/PointerOverlay.js @@ -31,7 +31,7 @@ defaults: { skin: undefined, summary: undefined, - cancelMsg: mw.msg( 'cancel' ), + cancelMsg: mw.msg( 'mobile-frontend-pointer-dismiss' ), appendToElement: undefined, target: undefined, confirmMsg: undefined -- To view, visit https://gerrit.wikimedia.org/r/222018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia571251ba670a5b7b1b7da13037e8412fce40e08 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: BarryTheBrowserTestBot jdlrobson+ba...@gmail.com Gerrit-Reviewer: Bmansurov bmansu...@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 more_info_links partial for mustache forms - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/222160 Change subject: Add more_info_links partial for mustache forms .. Add more_info_links partial for mustache forms Bug: T101234 Change-Id: I1ff30466dcd9c5a6be291884c4ba4ba195494373 --- M gateway_forms/mustache/index.html.mustache A gateway_forms/mustache/more_info_links.html.mustache 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/60/222160/1 diff --git a/gateway_forms/mustache/index.html.mustache b/gateway_forms/mustache/index.html.mustache index 99fca4e..ac4eb7f 100644 --- a/gateway_forms/mustache/index.html.mustache +++ b/gateway_forms/mustache/index.html.mustache @@ -63,7 +63,7 @@ table tr td - !-- TODO: moreinfolinks -- +{{ more_info_links }} /td td{{{ verisign_logo }}}/td /tr diff --git a/gateway_forms/mustache/more_info_links.html.mustache b/gateway_forms/mustache/more_info_links.html.mustache new file mode 100644 index 000..53f120b --- /dev/null +++ b/gateway_forms/mustache/more_info_links.html.mustache @@ -0,0 +1,6 @@ + ul id=moreinfolinks + lia target=_blank href=https://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Problems_donatingamp;basic=trueamp;country={{ country }}amp;language={{ language }}amp;uselang={{ language }}{{ l10n donate_interface-problemsdonating }}/a/li + lia target=_blank href=https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=trueamp;landing_page=Ways_to_Giveamp;language={{ language }}amp;uselang={{ language }}amp;country={{ country }}{{ l10n donate_interface-otherways-short }}/a/li + lia target=_blank href=https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=trueamp;landing_page=FAQamp;language={{ language }}amp;uselang={{ language }}amp;country={{ country }}{{ l10n donate_interface-faqs }}/a/li + lia target=_blank href=https://wikimediafoundation.org/wiki/Special:LandingCheck?basic=trueamp;landing_page=Tax_Deductibilityamp;language={{ language }}amp;uselang={{ language }}amp;country={{ country }}{{ l10n donate_interface-tax-info }}/a/li + /ul -- To view, visit https://gerrit.wikimedia.org/r/222160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ff30466dcd9c5a6be291884c4ba4ba195494373 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface 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] Fix regex - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/222161 Change subject: Fix regex .. Fix regex Change-Id: I083deca21a3c1636a72f6e828a21aa33e7a2a652 --- M groups/Pywikibot/Suggester.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/61/222161/1 diff --git a/groups/Pywikibot/Suggester.php b/groups/Pywikibot/Suggester.php index ef5c221..d90d7fa 100644 --- a/groups/Pywikibot/Suggester.php +++ b/groups/Pywikibot/Suggester.php @@ -9,7 +9,7 @@ public function getInsertables( $text ) { // %(title)s $matches = array(); - preg_match_all( '\%\([^)]+\)[diouxXeEfFgGcrs]/U', $text, $matches, PREG_SET_ORDER ); + preg_match_all( '/\%\([^)]+\)[diouxXeEfFgGcrs]/U', $text, $matches, PREG_SET_ORDER ); $insertables = array_map( function( $match ) { return new Insertable( $match[0], $match[0] ); }, $matches ); -- To view, visit https://gerrit.wikimedia.org/r/222161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I083deca21a3c1636a72f6e828a21aa33e7a2a652 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Account for unset visiting watchers - change (mediawiki/core)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/222101 Change subject: Account for unset visiting watchers .. Account for unset visiting watchers Now with `|| $user-isAllowed( 'unwatchedpages' )` we can enter line 337 without having any count to show. Change-Id: I6826e1c59899d2c8cbbc6d079874d0d583f8783a --- M includes/actions/InfoAction.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/01/222101/1 diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index 6d43ec5..3fb31e3 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -328,7 +328,8 @@ $this-msg( 'pageinfo-watchers' ), $lang-formatNum( $pageCounts['watchers'] ) ); - if ( $config-get( 'ShowUpdatedMarker' ) ) { + if ( $config-get( 'ShowUpdatedMarker' ) + isset( $pageCounts['visitingWatchers'] ) ) { $minToDisclose = $config-get( 'UnwatchedPageSecret' ); if ( $pageCounts['visitingWatchers'] $minToDisclose || $user-isAllowed( 'unwatchedpages' ) ) { -- To view, visit https://gerrit.wikimedia.org/r/222101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6826e1c59899d2c8cbbc6d079874d0d583f8783a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Polish up mathoid jobs - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Polish up mathoid jobs .. Polish up mathoid jobs Debian glue is of no use since we no more deploy Mathoid via a Debian package but instead use the source/deploy repositories model. Delete mathoid debian glue job Make source repo to trigger the standard 'npm' job Craft a job for deploy Signed-off-by: Marko Obrovac marko.obro...@gmail.com Change-Id: Ied9888fa7508fd3406f6f0206c04d04d6d71e639 --- M jjb/mediawiki-misc.yaml M jjb/mediawiki-services.yaml M zuul/layout.yaml 3 files changed, 14 insertions(+), 9 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml index e57e4cb..aa1a236 100644 --- a/jjb/mediawiki-misc.yaml +++ b/jjb/mediawiki-misc.yaml @@ -45,13 +45,6 @@ - '{name}-bundle-yard-publish' - project: -# mediawiki/services/mathoid.git -name: 'mathoidsvc' -jobs: - - '{name}-debian-glue': - distribution: trusty - -- project: name: 'mediawiki-vagrant' jobs: - '{name}-puppetlint-lenient' diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml index ae0d741..dde8595 100644 --- a/jjb/mediawiki-services.yaml +++ b/jjb/mediawiki-services.yaml @@ -6,3 +6,10 @@ - deploy # mediawiki/services/cxserver/deploy jobs: - '{name}-{repository}-npm' + +- project: +name: 'mathoid' +repository: + - deploy +jobs: + - '{name}-{repository}-npm' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 67c7629..2e083fc 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6553,8 +6553,13 @@ - name: npm - name: mediawiki/services/mathoid -test: - - mathoidsvc-debian-glue +template: + - name: npm + + - name: mediawiki/services/mathoid/deploy +experimental: + - mathoid-deploy-npm + - name: mediawiki/services/parsoid check: -- To view, visit https://gerrit.wikimedia.org/r/222100 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied9888fa7508fd3406f6f0206c04d04d6d71e639 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Mobrovac mobro...@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] etcd::ssl: do not restart the server upon changes - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: etcd::ssl: do not restart the server upon changes .. etcd::ssl: do not restart the server upon changes Restarts of etcd should be limited to cases where we change disruptively the configuration - a change of the underlying certificates isn't (etcd will still serve the same data from the same cluster) and automatic restarts are scary to say the least. Disable them from now on, until we use intra-cluster SSL certificates. Change-Id: Ib1a9cc9efe81ff7a8da66adfa5f5c4075226cf11 --- M modules/etcd/manifests/ssl.pp 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/etcd/manifests/ssl.pp b/modules/etcd/manifests/ssl.pp index c13f8cc..c034ee9 100644 --- a/modules/etcd/manifests/ssl.pp +++ b/modules/etcd/manifests/ssl.pp @@ -34,7 +34,6 @@ group = 'etcd', mode = '0400', source = ${ssldir}/certs/ca.pem, -notify = Service['etcd'], } file { '/var/lib/etcd/ssl/certs/cert.pem': @@ -44,7 +43,6 @@ mode= '0400', source = ${ssldir}/certs/${puppet_cert_name}.pem, require = File['/var/lib/etcd/ssl/certs/ca.pem'], -notify = Service['etcd'], } file { '/var/lib/etcd/ssl/private_keys': @@ -60,6 +58,5 @@ group = 'etcd', mode = '0400', source = ${ssldir}/private_keys/${puppet_cert_name}.pem, -notify = Service['etcd'], } } -- To view, visit https://gerrit.wikimedia.org/r/222102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1a9cc9efe81ff7a8da66adfa5f5c4075226cf11 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify API to return 'users' along with 'pages' - change (mediawiki...SmiteSpam)
jenkins-bot has submitted this change and it was merged. Change subject: Modify API to return 'users' along with 'pages' .. Modify API to return 'users' along with 'pages' Instead of returning the Special:Contributions link for each page, the API now only returns the creator's username. A separate JSON object is returned with the key being the username and the value being the link. The special page's JS has also been changed to account for this. Change-Id: I37980ef5921a1aa23c61fcb05e6bb82742d0ce3a --- M api/SmiteSpamApiQuery.php M static/js/ext.smitespam.retriever.js 2 files changed, 20 insertions(+), 17 deletions(-) Approvals: Polybuildr: Looks good to me, approved jenkins-bot: Verified diff --git a/api/SmiteSpamApiQuery.php b/api/SmiteSpamApiQuery.php index ecc997d..ba0bcaa 100644 --- a/api/SmiteSpamApiQuery.php +++ b/api/SmiteSpamApiQuery.php @@ -16,7 +16,8 @@ $ss = new SmiteSpamAnalyzer(); $spamPages = $ss-run( $offset, $limit ); - $data = array(); + $pages = array(); + $users = array(); foreach ( $spamPages as $page ) { $title = $page-getTitle(); @@ -32,18 +33,18 @@ if ( $oldestRevision ) { $creator = $oldestRevision-getUserText( Revision::RAW ); if ( $creator ) { - $user = Linker::link( - SpecialPage::getTitleFor( 'Contributions', $creator ), - Sanitizer::escapeHtmlAllowEntities( $creator ), - array( 'target' = '_blank' ) - ); + if ( !isset( $users[$creator] ) ) { + $users[$creator] = Linker::link( + SpecialPage::getTitleFor( 'Contributions', $creator ), + Sanitizer::escapeHtmlAllowEntities( $creator ), + array( 'target' = '_blank' ) + ); + } + } else { + $creator = '-'; } - else { - $user = '-'; - } - } - else { - $user = '-'; + } else { + $creator = '-'; } if ( $page-spamProbability = 0.5 ) { @@ -64,10 +65,10 @@ $previewText .= '...'; } - $data[] = array( + $pages[] = array( 'id' = $page-getID(), 'link' = $titleLink, - 'creator-link' = $user, + 'creator' = $creator, 'spam-probability-value' = $page-spamProbability, 'spam-probability-text' = $spamProbability, 'preview' = $previewText @@ -79,7 +80,8 @@ null, $this-getModuleName(), array ( - 'pages' = $data + 'pages' = $pages, + 'users' = $users, ) ); return true; } diff --git a/static/js/ext.smitespam.retriever.js b/static/js/ext.smitespam.retriever.js index 880bf00..b438b72 100644 --- a/static/js/ext.smitespam.retriever.js +++ b/static/js/ext.smitespam.retriever.js @@ -35,6 +35,7 @@ var queryPageSize = mw.config.get( 'queryPageSize' ); var displayPageSize = mw.config.get( 'displayPageSize' ); var results = []; + var users = {}; results.push( [] ); var editToken, deleteIndex = 0; @@ -62,7 +63,7 @@ function processResponse( data ) { var receivedPages = data.smitespamanalyze.pages; - + $.extend( users, data.smitespamanalyze.users ); while ( receivedPages.length ) { var remaining = displayPageSize - results[results.length - 1].length; var toAppend = receivedPages.slice( 0, remaining ); @@ -148,7 +149,7 @@ var $row = $( 'tr' ).attr( 'id', 'result-row-page-' + page.id ); $( 'td/td' ).html( page.link ).appendTo( $row );
[MediaWiki-commits] [Gerrit] varnish: always generate the dynamic directors lists - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/222117 Change subject: varnish: always generate the dynamic directors lists .. varnish: always generate the dynamic directors lists We just don't include them into the varnish configuration if varnish::dynamic_directors is true. This way, we can control their generation and correctness across the cluster. Also: remove spurious inclusion of role::cache::base and fix the definition of $directors_list for backend instances. Change-Id: Ic177d31f3661a2adfc2c165e7232314e1e420dac --- M modules/varnish/manifests/common/directors.pp M modules/varnish/manifests/instance.pp M modules/varnish/templates/vcl/wikimedia.vcl.erb 3 files changed, 22 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/222117/1 diff --git a/modules/varnish/manifests/common/directors.pp b/modules/varnish/manifests/common/directors.pp index 20a72b6..2fad859 100644 --- a/modules/varnish/manifests/common/directors.pp +++ b/modules/varnish/manifests/common/directors.pp @@ -14,7 +14,7 @@ $director_list = $instance ? { 'frontend' = keys($directors), -'backend' = $directors[$::mw_primary], +'backend' = keys($directors), default= undef } diff --git a/modules/varnish/manifests/instance.pp b/modules/varnish/manifests/instance.pp index 6886b2e..c7e71bd 100644 --- a/modules/varnish/manifests/instance.pp +++ b/modules/varnish/manifests/instance.pp @@ -53,33 +53,31 @@ } # Write the dynamic directors configuration, if we need it -if $dynamic_directors { -require role::cache::base -if $name == '' { -$inst = 'backend' -} else { -$inst = $name -} +if $name == '' { +$inst = 'backend' +} else { +$inst = $name +} -if inline_template(%= @directors.map{|k,v| v['dynamic'] }.include?('yes') %) == true { -$use_dynamic_directors = true -} else { -$use_dynamic_directors = false -} +if inline_template(%= @directors.map{|k,v| v['dynamic'] }.include?('yes') %) == true { +$use_dynamic_directors = true +} else { +$use_dynamic_directors = false +} -if $use_dynamic_directors { -varnish::common::directors { $vcl: -instance = $inst, -directors = $directors, -extraopts = $extraopts, -before= [ - File[/etc/varnish/wikimedia_${vcl}.vcl], - Service[varnish${instancesuffix}] - ], -} +if $use_dynamic_directors { +varnish::common::directors { $vcl: +instance = $inst, +directors = $directors, +extraopts = $extraopts, +before= [ + File[/etc/varnish/wikimedia_${vcl}.vcl], + Service[varnish${instancesuffix}] + ], } } + file { /etc/varnish/wikimedia_${vcl}.vcl: owner = 'root', group = 'root', diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb b/modules/varnish/templates/vcl/wikimedia.vcl.erb index ff72356..859828f 100644 --- a/modules/varnish/templates/vcl/wikimedia.vcl.erb +++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb @@ -151,7 +151,7 @@ # 'backends' = [ backend1, backend2 ], # } # } -if @use_dynamic_directors -% +if @use_dynamic_directors and @dynamic_directors -% include directors.%= @inst %.vcl; % end -% -- To view, visit https://gerrit.wikimedia.org/r/222117 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic177d31f3661a2adfc2c165e7232314e1e420dac Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove alias uniqueness constraints - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove alias uniqueness constraints .. Remove alias uniqueness constraints This should be reverted when T104393 is fixed. Bug: T104393 Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee --- M repo/includes/Validators/LabelUniquenessValidator.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php 3 files changed, 10 insertions(+), 3 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/Validators/LabelUniquenessValidator.php b/repo/includes/Validators/LabelUniquenessValidator.php index d7edfc2..6f3644c 100644 --- a/repo/includes/Validators/LabelUniquenessValidator.php +++ b/repo/includes/Validators/LabelUniquenessValidator.php @@ -44,7 +44,8 @@ return $this-duplicateDetector-detectLabelConflicts( $entity-getType(), $entity-getFingerprint()-getLabels()-toTextArray(), - $entity-getFingerprint()-getAliasGroups()-toTextArray(), + // insert again when T104393 is resolved + null, //$entity-getFingerprint()-getAliasGroups()-toTextArray(), $entity-getId() ); } @@ -83,7 +84,8 @@ return $this-duplicateDetector-detectLabelConflicts( $entityId-getEntityType(), $labels, - $aliases, + // insert again when T104393 is resolved + null, //$aliases, $entityId ); } diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php index 789629e..4d8e436 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php @@ -351,6 +351,10 @@ } } + if ( $aliases === null ) { + return Result::newSuccess(); + } + foreach ( $aliases as $lang = $texts ) { if ( in_array( 'DUPE', $texts ) ) { return Result::newError( array( diff --git a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php index 66aeb3f..9b9cd92 100644 --- a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php +++ b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php @@ -119,7 +119,8 @@ return array( 'conflicting label' = array( $dupeLabelFingerprint, 'label-conflict' ), - 'conflicting alias' = array( $dupeAliasFingerprint, 'label-conflict' ), + // insert again when T104393 is resolved + // 'conflicting alias' = array( $dupeAliasFingerprint, 'label-conflict' ), ); } -- To view, visit https://gerrit.wikimedia.org/r/222113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.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] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...deploy)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222107 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy refs/changes/07/222107/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/222107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid/deploy Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wrapping for code block - change (mediawiki...Blueprint)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/222108 Change subject: Add wrapping for code block .. Add wrapping for code block Bug: T103985 Change-Id: Ie9342d0fd3506f98d0871c251cd6b3e17bf061d3 --- M resources/master.less 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint refs/changes/08/222108/1 diff --git a/resources/master.less b/resources/master.less index 5a6479c..ef03845 100644 --- a/resources/master.less +++ b/resources/master.less @@ -40,6 +40,12 @@ line-height: 1.5; } +/* From Vector, for T103985 */ +pre,.mw-code { + /* Wrap lines in overflow. T2260, T103780 */ + white-space: pre-wrap; +} + #content { margin-top: 50px; } -- To view, visit https://gerrit.wikimedia.org/r/222108 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9342d0fd3506f98d0871c251cd6b3e17bf061d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Blueprint Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support poem translations - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Support poem translations .. Support poem translations Adapt the poem (mw:Extension/poem) from the source article to the target article. Editing the poem text is not supported. If there is MT, the translation will be used for target article. Testplan: Translate an article with poem in it. Example: https://en.wikipedia.org/wiki/Puja_%28Hinduism%29 After translating, ensure that translation has poem with content in it. Bug: T100385 Change-Id: I98d29f889b9afd4497898a2edbfce5366e5e719e --- M extension.json A modules/tools/ext.cx.tools.poem.js 2 files changed, 44 insertions(+), 0 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 0d09ca0..9c3d7f8 100644 --- a/extension.json +++ b/extension.json @@ -372,6 +372,7 @@ ext.cx.tools.dictionary, ext.cx.tools.formatter, ext.cx.tools.gallery, + ext.cx.tools.poem, ext.cx.tools.images, ext.cx.tools.instructions, ext.cx.tools.link, @@ -543,6 +544,11 @@ tools/ext.cx.tools.gallery.js ] }, + ext.cx.tools.poem: { + scripts: [ + tools/ext.cx.tools.poem.js + ] + }, ext.cx.tools.categories: { scripts: [ tools/ext.cx.tools.categories.js diff --git a/modules/tools/ext.cx.tools.poem.js b/modules/tools/ext.cx.tools.poem.js new file mode 100644 index 000..54fba4f --- /dev/null +++ b/modules/tools/ext.cx.tools.poem.js @@ -0,0 +1,38 @@ +/** + * ContentTranslation Tools + * A tool that allows editors to translate pages from one language + * to another with the help of machine translation and other translation tools + * + * @file + * @ingroup Extensions + * @copyright See AUTHORS.txt + * @license GPL-2.0+ + */ +( function ( $, mw ) { + 'use strict'; + + function adaptPoem( $section ) { + var $sourceSection, poemData, $poem; + + $sourceSection = mw.cx.getSourceSection( $section.data( 'source' ) ); + if ( $section.is( '[typeof*=mw:Extension/poem]' ) ) { + $poem = $sourceSection; + } else { + $poem = $sourceSection.find( '[typeof*=mw:Extension/poem]' ); + } + if ( !$poem.length ) { + return; + } + poemData = $poem.data( 'mw' ); + // TODO: Note that we are not retaining markup here. + poemData.body.extsrc = $poem.text().replace( /br\s*\/?/mg, '\n' ); + // Copy the data-mw to target section. + $section.find( '[typeof*=mw:Extension/poem]' ).attr( 'data-mw', JSON.stringify( poemData ) ); + // Make the poem readonly. We can only adapt them. Not allowing edits. + $section.find( 'p' ).attr( 'contenteditable', false ); + } + + $( function () { + mw.hook( 'mw.cx.translation.postMT' ).add( adaptPoem ); + } ); +}( jQuery, mediaWiki ) ); -- To view, visit https://gerrit.wikimedia.org/r/220076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98d29f889b9afd4497898a2edbfce5366e5e719e Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Delete cxserver-source-npm (we use 'npm') - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Delete cxserver-source-npm (we use 'npm') .. Delete cxserver-source-npm (we use 'npm') The job has been phased out in favor of the generic 'npm' job. Change-Id: I610523ff2c7d8c0d575f28a1ff73ff8d85af596a --- M jjb/mediawiki-services.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml index dde8595..31f8743 100644 --- a/jjb/mediawiki-services.yaml +++ b/jjb/mediawiki-services.yaml @@ -2,7 +2,6 @@ # mediawiki/services/cxserver.git name: 'cxserver' repository: - - source # mediawiki/services/cxserver - deploy # mediawiki/services/cxserver/deploy jobs: - '{name}-{repository}-npm' -- To view, visit https://gerrit.wikimedia.org/r/222112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I610523ff2c7d8c0d575f28a1ff73ff8d85af596a Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Better error message via api when content model does not all... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Better error message via api when content model does not allow editing .. Better error message via api when content model does not allow editing Change-Id: I699b4f5fd2eac8dfc4c54922474f939262bc803d --- M includes/api/ApiEditPage.php M tests/phpunit/includes/api/ApiEditPageTest.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Anomie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index e70b8f0..b623849 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -96,9 +96,11 @@ $contentHandler = ContentHandler::getForModelID( $params['contentmodel'] ); } + $name = $titleObj-getPrefixedDBkey(); + $model = $contentHandler-getModelID(); if ( $contentHandler-supportsDirectApiEditing() === false ) { $this-dieUsage( - 'Direct editing via API is not supported for this content type.', + Direct editing via API is not supported for content model $model used by $name, 'no-direct-editing' ); } @@ -110,8 +112,6 @@ $contentFormat = $params['contentformat']; if ( !$contentHandler-isSupportedFormat( $contentFormat ) ) { - $name = $titleObj-getPrefixedDBkey(); - $model = $contentHandler-getModelID(); $this-dieUsage( The requested format $contentFormat is not supported for content model . $model used by $name, 'badformat' ); diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index fa528da..e006bf7 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -475,7 +475,7 @@ public function testCheckDirectApiEditingDisallowed_forNonTextContent() { $this-setExpectedException( 'UsageException', - 'Direct editing via API is not supported for this content type.' + 'Direct editing via API is not supported for content model testing used by Dummy:ApiEditPageTest_nonTextPageEdit' ); $this-doApiRequestWithToken( array( -- To view, visit https://gerrit.wikimedia.org/r/219487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I699b4f5fd2eac8dfc4c54922474f939262bc803d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Tpt thoma...@hotmail.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate jshint/jsonlint/jslint jobs to wmflabs - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222115 Change subject: Migrate jshint/jsonlint/jslint jobs to wmflabs .. Migrate jshint/jsonlint/jslint jobs to wmflabs The Jenkins label 'hasSlaveScripts' was used when labs slaves did not have the integration/jenkins.git scripts or missed some dependencies. Replace 'hasSlaveScripts' with 'contintLabsSlave' for jshint, jsonlint and all the -jslint jobs. The jsonlint and jslint jobs are still tied to Precise since they use a PHP based linter, seems safer to keep them under Zend PHP 5.3 which is on Precise (Trusty would yield HHVM). Migrate jshint to Trusty though. Bug: T101966 Change-Id: If8144f3537a2b9f22ffe9d1dbffaaad7cf7198fe --- M jjb/job-templates.yaml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/15/222115/1 diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index 0925048..9c6bbf9 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -16,7 +16,7 @@ # below. - job-template: name: '{name}-jslint' -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuPrecise defaults: use-remote-zuul-no-submodules concurrent: true triggers: @@ -27,7 +27,7 @@ - job: name: 'jshint' -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuTrusty defaults: use-remote-zuul-shallow-clone concurrent: true triggers: @@ -37,7 +37,7 @@ - job: name: 'jsonlint' -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuPrecise defaults: use-remote-zuul-shallow-clone concurrent: true triggers: -- To view, visit https://gerrit.wikimedia.org/r/222115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8144f3537a2b9f22ffe9d1dbffaaad7cf7198fe Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ntpd on ulsfo and esams - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Enable ntpd on ulsfo and esams .. Enable ntpd on ulsfo and esams Use hiera to enable ntp again after the leap second on esams and ulsfo Change-Id: Ie6be81f2b4daac51300f5f58ec1e255dab4d3680 --- A hieradata/esams/ntp/daemon.yaml A hieradata/ulsfo/ntp/daemon.yaml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, but someone else must approve Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/esams/ntp/daemon.yaml b/hieradata/esams/ntp/daemon.yaml new file mode 100644 index 000..bdc8eba --- /dev/null +++ b/hieradata/esams/ntp/daemon.yaml @@ -0,0 +1 @@ +ensure: present diff --git a/hieradata/ulsfo/ntp/daemon.yaml b/hieradata/ulsfo/ntp/daemon.yaml new file mode 100644 index 000..bdc8eba --- /dev/null +++ b/hieradata/ulsfo/ntp/daemon.yaml @@ -0,0 +1 @@ +ensure: present -- To view, visit https://gerrit.wikimedia.org/r/222118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6be81f2b4daac51300f5f58ec1e255dab4d3680 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: Muehlenhoff mmuhlenh...@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] Fix perl script permissions and shebang - change (mediawiki...Math)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/222111 Change subject: Fix perl script permissions and shebang .. Fix perl script permissions and shebang Bug: 104050 Change-Id: I19767efd410f04deb7ac6b122427d630735d778a --- M texvccheck/test.pl 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/11/222111/1 diff --git a/texvccheck/test.pl b/texvccheck/test.pl old mode 100644 new mode 100755 index 343ee56..898032d --- a/texvccheck/test.pl +++ b/texvccheck/test.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#! /usr/bin/perl my $texvc = `texvc '\\sin(x)+{}{}\\cos(x)^2 newcommand'`; if (substr($result,0,1) eq +) { print good; @@ -6,4 +6,4 @@ print bad; } print $result; -my $ = `tex2svg '\\sin(x)+{}{}\\cos(x)^2 newcommand'`; \ No newline at end of file +my $ = `tex2svg '\\sin(x)+{}{}\\cos(x)^2 newcommand'`; -- To view, visit https://gerrit.wikimedia.org/r/222111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19767efd410f04deb7ac6b122427d630735d778a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a link from CX dashboard to CXStats - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/222120 Change subject: Add a link from CX dashboard to CXStats .. Add a link from CX dashboard to CXStats TODO BEFORE MERGING: ADD ICON Bug: T104173 Change-Id: Ia87562cef406735ad835ecfc588fec62b2b199c9 --- M extension.json M i18n/en.json M i18n/qqq.json M modules/dashboard/ext.cx.dashboard.js M modules/dashboard/styles/ext.cx.dashboard.less 5 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/20/222120/1 diff --git a/extension.json b/extension.json index 9c3d7f8..a43dd33 100644 --- a/extension.json +++ b/extension.json @@ -190,6 +190,7 @@ cx-create-new-translation, cx-dashboard-sidebar-title, cx-dashboard-sidebar-information, + cx-dashboard-sidebar-stats, cx-dashboard-sidebar-feedback ] }, diff --git a/i18n/en.json b/i18n/en.json index 9bf3d3b..ad4ede5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -100,6 +100,7 @@ cx-publish-captcha-title: Security question, cx-dashboard-sidebar-title: {{GENDER:|Need}} help with translations?, cx-dashboard-sidebar-information: Know more about this feature, + cx-dashboard-sidebar-stats: Translation statistics, cx-dashboard-sidebar-feedback: Give us feedback, cx-translation-filter-all-translations: All translations, cx-translation-filter-published-translations: Published, diff --git a/i18n/qqq.json b/i18n/qqq.json index 7a03aa7..95f179d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -105,6 +105,7 @@ cx-publish-captcha-title: Title of captcha form while publishing the translation, cx-dashboard-sidebar-title: Title of the sidebar of the dashboard widget, cx-dashboard-sidebar-information: Shown in sidebar menu in the Content Translation dashboard. Opens a new tab with information about Content Translation., + cx-dashboard-sidebar-stats: Shown in sidebar menu in the Content Translation dashboard. Opens a new tab with Special:ContentTranslationStats in the same wiki., cx-dashboard-sidebar-feedback: Shown in sidebar menu in the Content Translation dashboard. Opens a new tab with a page to allow user feedback, cx-translation-filter-all-translations: Shown in translation filter in Content Translation dashboard. Selects all translations by the current translator.\n{{Identical|All translations}}, cx-translation-filter-published-translations: Shown in translation filter in Content Translation dashboard. Selects all published translations by the current translator., diff --git a/modules/dashboard/ext.cx.dashboard.js b/modules/dashboard/ext.cx.dashboard.js index 254cb8b..467da96 100644 --- a/modules/dashboard/ext.cx.dashboard.js +++ b/modules/dashboard/ext.cx.dashboard.js @@ -47,6 +47,11 @@ label: mw.msg( 'cx-dashboard-sidebar-information' ) }, { + class: 'cx-sidebar__link cx-sidebar__link--stats', + href: mw.util.getUrl( 'Special:ContentTranslationStats' ), + label: mw.msg( 'cx-dashboard-sidebar-stats' ) + }, + { class: 'cx-sidebar__link cx-sidebar__link--feedback', href: 'https://www.mediawiki.org/wiki/Talk:Content_translation', label: mw.msg( 'cx-dashboard-sidebar-feedback' ) diff --git a/modules/dashboard/styles/ext.cx.dashboard.less b/modules/dashboard/styles/ext.cx.dashboard.less index 8341a45..6223915 100644 --- a/modules/dashboard/styles/ext.cx.dashboard.less +++ b/modules/dashboard/styles/ext.cx.dashboard.less @@ -68,6 +68,10 @@ .background-image-svg('../images/cx-information.svg', '../images/cx-information.png'); } + .cx-sidebar__link--stats { + .background-image-svg('../images/cx-stats.svg', '../images/cx-stats.png'); + } + .cx-sidebar__link--feedback { .background-image-svg('../images/cx-discuss.svg', '../images/cx-discuss.png'); } -- To view, visit https://gerrit.wikimedia.org/r/222120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia87562cef406735ad835ecfc588fec62b2b199c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Migrate jshint/jsonlint/jslint jobs to wmflabs - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate jshint/jsonlint/jslint jobs to wmflabs .. Migrate jshint/jsonlint/jslint jobs to wmflabs The Jenkins label 'hasSlaveScripts' was used when labs slaves did not have the integration/jenkins.git scripts or missed some dependencies. Replace 'hasSlaveScripts' with 'contintLabsSlave' for jshint, jsonlint and all the -jslint jobs. The jsonlint and jslint jobs are still tied to Precise since they use a PHP based linter, seems safer to keep them under Zend PHP 5.3 which is on Precise (Trusty would yield HHVM). Migrate jshint to Trusty though. Bug: T101966 Change-Id: If8144f3537a2b9f22ffe9d1dbffaaad7cf7198fe --- M jjb/job-templates.yaml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index 0925048..9c6bbf9 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -16,7 +16,7 @@ # below. - job-template: name: '{name}-jslint' -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuPrecise defaults: use-remote-zuul-no-submodules concurrent: true triggers: @@ -27,7 +27,7 @@ - job: name: 'jshint' -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuTrusty defaults: use-remote-zuul-shallow-clone concurrent: true triggers: @@ -37,7 +37,7 @@ - job: name: 'jsonlint' -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuPrecise defaults: use-remote-zuul-shallow-clone concurrent: true triggers: -- To view, visit https://gerrit.wikimedia.org/r/222115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8144f3537a2b9f22ffe9d1dbffaaad7cf7198fe Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ntpd on ulsfo and esams - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/222118 Change subject: Enable ntpd on ulsfo and esams .. Enable ntpd on ulsfo and esams Use hiera to enable ntp again after the leap second on esams and ulsfo Change-Id: Ie6be81f2b4daac51300f5f58ec1e255dab4d3680 --- A hieradata/esams/ntp/daemon.yaml A hieradata/ulsfo/ntp/daemon.yaml 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/222118/1 diff --git a/hieradata/esams/ntp/daemon.yaml b/hieradata/esams/ntp/daemon.yaml new file mode 100644 index 000..bdc8eba --- /dev/null +++ b/hieradata/esams/ntp/daemon.yaml @@ -0,0 +1 @@ +ensure: present diff --git a/hieradata/ulsfo/ntp/daemon.yaml b/hieradata/ulsfo/ntp/daemon.yaml new file mode 100644 index 000..bdc8eba --- /dev/null +++ b/hieradata/ulsfo/ntp/daemon.yaml @@ -0,0 +1 @@ +ensure: present -- To view, visit https://gerrit.wikimedia.org/r/222118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6be81f2b4daac51300f5f58ec1e255dab4d3680 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] Modify API to return 'users' along with 'pages' - change (mediawiki...SmiteSpam)
Polybuildr has uploaded a new change for review. https://gerrit.wikimedia.org/r/222110 Change subject: Modify API to return 'users' along with 'pages' .. Modify API to return 'users' along with 'pages' Instead of returning the Special:Contributions link for each page, the API now only returns the creator's username. A separate JSON object is returned with the key being the username and the value being the link. Change-Id: I37980ef5921a1aa23c61fcb05e6bb82742d0ce3a --- M api/SmiteSpamApiQuery.php M static/js/ext.smitespam.retriever.js 2 files changed, 20 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmiteSpam refs/changes/10/222110/1 diff --git a/api/SmiteSpamApiQuery.php b/api/SmiteSpamApiQuery.php index ecc997d..ba0bcaa 100644 --- a/api/SmiteSpamApiQuery.php +++ b/api/SmiteSpamApiQuery.php @@ -16,7 +16,8 @@ $ss = new SmiteSpamAnalyzer(); $spamPages = $ss-run( $offset, $limit ); - $data = array(); + $pages = array(); + $users = array(); foreach ( $spamPages as $page ) { $title = $page-getTitle(); @@ -32,18 +33,18 @@ if ( $oldestRevision ) { $creator = $oldestRevision-getUserText( Revision::RAW ); if ( $creator ) { - $user = Linker::link( - SpecialPage::getTitleFor( 'Contributions', $creator ), - Sanitizer::escapeHtmlAllowEntities( $creator ), - array( 'target' = '_blank' ) - ); + if ( !isset( $users[$creator] ) ) { + $users[$creator] = Linker::link( + SpecialPage::getTitleFor( 'Contributions', $creator ), + Sanitizer::escapeHtmlAllowEntities( $creator ), + array( 'target' = '_blank' ) + ); + } + } else { + $creator = '-'; } - else { - $user = '-'; - } - } - else { - $user = '-'; + } else { + $creator = '-'; } if ( $page-spamProbability = 0.5 ) { @@ -64,10 +65,10 @@ $previewText .= '...'; } - $data[] = array( + $pages[] = array( 'id' = $page-getID(), 'link' = $titleLink, - 'creator-link' = $user, + 'creator' = $creator, 'spam-probability-value' = $page-spamProbability, 'spam-probability-text' = $spamProbability, 'preview' = $previewText @@ -79,7 +80,8 @@ null, $this-getModuleName(), array ( - 'pages' = $data + 'pages' = $pages, + 'users' = $users, ) ); return true; } diff --git a/static/js/ext.smitespam.retriever.js b/static/js/ext.smitespam.retriever.js index 880bf00..b438b72 100644 --- a/static/js/ext.smitespam.retriever.js +++ b/static/js/ext.smitespam.retriever.js @@ -35,6 +35,7 @@ var queryPageSize = mw.config.get( 'queryPageSize' ); var displayPageSize = mw.config.get( 'displayPageSize' ); var results = []; + var users = {}; results.push( [] ); var editToken, deleteIndex = 0; @@ -62,7 +63,7 @@ function processResponse( data ) { var receivedPages = data.smitespamanalyze.pages; - + $.extend( users, data.smitespamanalyze.users ); while ( receivedPages.length ) { var remaining = displayPageSize - results[results.length - 1].length; var toAppend = receivedPages.slice( 0, remaining ); @@ -148,7 +149,7 @@ var $row = $( 'tr' ).attr( 'id', 'result-row-page-' + page.id ); $( 'td/td' ).html( page.link ).appendTo( $row );
[MediaWiki-commits] [Gerrit] Delete cxserver-source-npm (we use 'npm') - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222112 Change subject: Delete cxserver-source-npm (we use 'npm') .. Delete cxserver-source-npm (we use 'npm') The job has been phased out in favor of the generic 'npm' job. Change-Id: I610523ff2c7d8c0d575f28a1ff73ff8d85af596a --- M jjb/mediawiki-services.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/12/222112/1 diff --git a/jjb/mediawiki-services.yaml b/jjb/mediawiki-services.yaml index dde8595..31f8743 100644 --- a/jjb/mediawiki-services.yaml +++ b/jjb/mediawiki-services.yaml @@ -2,7 +2,6 @@ # mediawiki/services/cxserver.git name: 'cxserver' repository: - - source # mediawiki/services/cxserver - deploy # mediawiki/services/cxserver/deploy jobs: - '{name}-{repository}-npm' -- To view, visit https://gerrit.wikimedia.org/r/222112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I610523ff2c7d8c0d575f28a1ff73ff8d85af596a Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove alias uniqueness constraints - change (mediawiki...Wikibase)
Bene has uploaded a new change for review. https://gerrit.wikimedia.org/r/222113 Change subject: Remove alias uniqueness constraints .. Remove alias uniqueness constraints This should be reverted when T104393 is fixed. Bug: T104393 Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee --- M repo/includes/Validators/LabelUniquenessValidator.php 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/13/222113/1 diff --git a/repo/includes/Validators/LabelUniquenessValidator.php b/repo/includes/Validators/LabelUniquenessValidator.php index d7edfc2..6f3644c 100644 --- a/repo/includes/Validators/LabelUniquenessValidator.php +++ b/repo/includes/Validators/LabelUniquenessValidator.php @@ -44,7 +44,8 @@ return $this-duplicateDetector-detectLabelConflicts( $entity-getType(), $entity-getFingerprint()-getLabels()-toTextArray(), - $entity-getFingerprint()-getAliasGroups()-toTextArray(), + // insert again when T104393 is resolved + null, //$entity-getFingerprint()-getAliasGroups()-toTextArray(), $entity-getId() ); } @@ -83,7 +84,8 @@ return $this-duplicateDetector-detectLabelConflicts( $entityId-getEntityType(), $labels, - $aliases, + // insert again when T104393 is resolved + null, //$aliases, $entityId ); } -- To view, visit https://gerrit.wikimedia.org/r/222113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Group results by creator on special page - change (mediawiki...SmiteSpam)
Polybuildr has uploaded a new change for review. https://gerrit.wikimedia.org/r/222116 Change subject: [WIP] Group results by creator on special page .. [WIP] Group results by creator on special page Group results by creator and then sort by total spam value. Change-Id: Id4f777b12c7ee73469b812641f234e1bb356d8a5 --- M static/js/ext.smitespam.retriever.js 1 file changed, 52 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmiteSpam refs/changes/16/222116/1 diff --git a/static/js/ext.smitespam.retriever.js b/static/js/ext.smitespam.retriever.js index b438b72..246fe60 100644 --- a/static/js/ext.smitespam.retriever.js +++ b/static/js/ext.smitespam.retriever.js @@ -144,29 +144,59 @@ pagination.data.pagesToDelete.splice( index, 1 ); } } - for ( var i = 0; i displayPageSize; ++i ) { - var page = results[resultPageToDisplay.getValue()][i]; - var $row = $( 'tr' ).attr( 'id', 'result-row-page-' + page.id ); - $( 'td/td' ).html( page.link ).appendTo( $row ); - $( 'td/td' ).text( page['spam-probability-text'] ).appendTo( $row ); - $( 'td/td' ).html( users[page.creator] || page.creator ).appendTo( $row ); - $( 'td/td' ).text( page.preview ).appendTo( $row ); - if ( $.inArray( page.id.toString(), pagination.data.pagesDeleted ) !== -1 ) { - $( 'td/td' ).text( mw.msg( 'smitespam-delete-page-success-msg' ) ).appendTo( $row ); - } else if ( $.inArray( page.id.toString(), pagination.data.failedToDeletePages ) !== -1 ) { - $( 'td/td' ).text( mw.msg( 'smitespam-delete-page-failure-msg' ) ).appendTo( $row ); - } else { - var $checkbox = $( 'input', { - type: 'checkbox', - value: page.id - } ) - .on( 'change', checkboxChanged ); - if ( $.inArray( $checkbox.val(), pagination.data.pagesToDelete ) !== -1 ) { - $checkbox.attr( 'checked', 'checked' ); - } - $( 'td/td' ).append( $checkbox ).appendTo( $row ); + var creatorGroups = {}; + var i, page; + for ( i = 0; i displayPageSize; ++i ) { + page = results[resultPageToDisplay.getValue()][i]; + if ( !( page.creator in creatorGroups ) ) { + creatorGroups[page.creator] = {}; + creatorGroups[page.creator].pages = []; + creatorGroups[page.creator].totalSpamValue = 0; } - $( '#smitespam-page-list' ).append( $row ); + creatorGroups[page.creator].pages.push( page ); + creatorGroups[page.creator].totalSpamValue += page['spam-probability-value']; + } + var groupedPages = []; + $.each( creatorGroups, function ( key, value ) { + value.creator = key; + groupedPages.push( value ); + } ); + groupedPages.sort( function ( a, b ) { + return b.totalSpamValue - a.totalSpamValue; + } ); + for ( i = 0; i groupedPages.length; i++ ) { + var group = groupedPages[i].pages; + var c = groupedPages[i].creator; + var $u = $( 'td' ).attr( 'colspan', 5 ).css( { + 'text-align': 'center', + 'font-weight': 'bold' + } ).text( c ); + var $urow = $( 'tr' ).append( $u ); + $( '#smitespam-page-list' ).append( $urow ); + for ( var j = 0; j group.length; j++ ) { + page = group[j]; + var $row = $( 'tr' ).attr( 'id', 'result-row-page-' + page.id ); +
[MediaWiki-commits] [Gerrit] Add more EditEntity API tests for (non-) conflicting edits - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add more EditEntity API tests for (non-) conflicting edits .. Add more EditEntity API tests for (non-) conflicting edits This is a follow-up to Iaafbf9b. Bug: 103019 Change-Id: I04a8b7577ba40f432cc78a2923bff8976212b8b3 --- M repo/tests/phpunit/includes/api/EditEntityTest.php M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php 3 files changed, 59 insertions(+), 17 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/api/EditEntityTest.php b/repo/tests/phpunit/includes/api/EditEntityTest.php index cf764db..826706c 100644 --- a/repo/tests/phpunit/includes/api/EditEntityTest.php +++ b/repo/tests/phpunit/includes/api/EditEntityTest.php @@ -538,20 +538,47 @@ $this-doTestQueryExceptions( $params, $expected['exception'] ); } - public function testLabelDescriptionConflict() { - // FIXME: MySQL doesn't support self-joins on temporary tables, - //so skip this check during unit tests on MySQL! - //There is a similar check to this in TermSqlIndex - if ( $this-db-getType() == 'mysql' ) { - $this-markTestSkipped( 'MySQL doesn\'t support self-joins on temporary tables' ); - } + public function testPropertyLabelConflict() { + $params = array( + 'action' = 'wbeditentity', + 'data' = '{ + datatype: string, + labels: { de: { language: de, value: LabelConflict } } + }', + 'new' = 'property', + ); + $this-doApiRequestWithToken( $params ); + + $expectedException = array( + 'type' = 'UsageException', + 'code' = 'failed-save', + ); + // Repeating the same request with the same label should fail. + $this-doTestQueryExceptions( $params, $expectedException ); + } + + public function testItemLabelWithoutDescriptionNotConflicting() { + $params = array( + 'action' = 'wbeditentity', + 'data' = '{ labels: { de: { language: de, value: NotConflicting } } }', + 'new' = 'item', + ); + $this-doApiRequestWithToken( $params ); + + // Repeating the same request with the same label should not fail. + list( $result, , ) = $this-doApiRequestWithToken( $params ); + $this-assertArrayHasKey( 'success', $result ); + } + + public function testItemLabelDescriptionConflict() { + $this-markTestSkippedOnMySql(); $params = array( 'action' = 'wbeditentity', 'new' = 'item', 'data' = '{ - labels: { de: { language: de, value: LabelWithDescriptionConflict } }, - descriptions: { de: { language: de, value: LabelWithDescriptionConflict } } + labels: { de: { language: de, value: LabelDescriptionConflict } }, + descriptions: { de: { language: de, value: LabelDescriptionConflict } } }', ); $this-doApiRequestWithToken( $params ); @@ -560,6 +587,7 @@ 'type' = 'UsageException', 'code' = 'modification-failed', ); + // Repeating the same request with the same label and description should fail. $this-doTestQueryExceptions( $params, $expectedException ); } @@ -588,4 +616,14 @@ $this-doTestQueryExceptions( $params, $expectedException ); } + /** +* @see http://bugs.mysql.com/bug.php?id=10327 +* @see TermSqlIndexTest::markTestSkippedOnMySql +*/ + private function markTestSkippedOnMySql() { + if ( $this-db-getType() === 'mysql' ) { + $this-markTestSkipped( 'MySQL doesn\'t support self-joins on temporary tables' ); + } + } + } diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php index 3b0477e..25f6ef3 100644 --- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php +++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php @@ -78,7 +78,7 @@ * @param array|null $session * @param User|null $user * -* @return array +* @return array( $resultData, $request, $sessionArray )
[MediaWiki-commits] [Gerrit] Moved openDialog to a separate function - change (mediawiki...LanguageTool)
Ankita-ks has uploaded a new change for review. https://gerrit.wikimedia.org/r/222109 Change subject: Moved openDialog to a separate function .. Moved openDialog to a separate function Change-Id: I383fa72db549457dbec636e0640de2301ea177ec --- M modules/ext.LanguageToolAction.js 1 file changed, 24 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool refs/changes/09/222109/1 diff --git a/modules/ext.LanguageToolAction.js b/modules/ext.LanguageToolAction.js index 14e09e0..7f75a1a 100644 --- a/modules/ext.LanguageToolAction.js +++ b/modules/ext.LanguageToolAction.js @@ -77,34 +77,48 @@ var node = textNodes[nodeI]; var nodeRange = node.getRange(); var nodeText = model.getLinearFragment(nodeRange).getText(); - text += nodeText; + text = text + \n + nodeText; } var lang = mw.config.get( 'wgPageContentLanguage' ); var params = language= + lang + text= + text; $.ajax( { type: 'POST', - dataType: 'text', + //dataType: 'xml', url: 'http://127.0.0.1:8081/', data: {language: lang, text: text} } ) - .done(function(d) - { - // Example: Creating and opening a message dialog window. - var messageDialog = new OO.ui.MessageDialog(); + .done( this.openDialog ); + return; + } +mw.languageToolAction.prototype.openDialog = function ( responseXML ) { + var messageDialog = new OO.ui.MessageDialog(); // Create and append a window manager. var windowManager = new OO.ui.WindowManager(); $( 'body' ).append( windowManager.$element ); windowManager.addWindows( [ messageDialog ] ); + + var errors = responseXML.getElementsByTagName( error ); + console.log(errors); + var i; + var response = ; + for ( i = 0; i errors.length; i++ ) { + response = response + ERROR + i + :\n; + response = response + error : + errors[i].getAttribute( 'msg' ) + \n; + response = response + context : + errors[i].getAttribute( 'context' ) + \n; + messageDialog.setData( 'error', errors[i].getAttribute( 'msg' ) ); + messageDialog.setData( 'context', errors[i].getAttribute( 'context' )); + } + console.log(response); + // Example: Creating and opening a message dialog window. // Open the window. windowManager.openWindow( messageDialog, { title: 'LanguageTool Response', - message: d + message: response } ); - }); - return; - } +} + /* Registration */ -- To view, visit https://gerrit.wikimedia.org/r/222109 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I383fa72db549457dbec636e0640de2301ea177ec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LanguageTool Gerrit-Branch: master Gerrit-Owner: Ankita-ks kumariankita...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add lvs::configuration::service_ips to beta - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Add lvs::configuration::service_ips to beta .. Add lvs::configuration::service_ips to beta Adding lvs::configuration::service_ips to beta. This is not because beta has LVS but because that Puppet Hash structure is being used in role::cache::configuration in a non realm abstracted way, so the manifest fails to compile. Bug: T104076 Change-Id: If0054bb1f77dad5bbe6543ec968632c51cd16919 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index da27d21..cc9e801 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -28,6 +28,33 @@ - wikivoyage.org - wiktionary.org graphoid::protocol: http +lvs::configuration::lvs_services: dummy +lvs::configuration::lvs_service_ips: + apaches: +eqiad: dummy + api: {} + bits: +eqiad: + bitslb: dummy + citoid: {} + cxserver: {} + dns_rec: {} + graphoid: {} + mathoid: {} + misc_web: {} + mobile: {} + ocg: {} + osm: {} + parsoid: {} + parsoidcache: {} + rendering: {} + restbase: {} + search: {} + stream: {} + swift: {} + text: {} + upload: {} + zotero: {} cassandra::listen_address: '%{::ipaddress_eth0}' cassandra::rpc_address: '%{::ipaddress_eth0}' cassandra::seeds: -- To view, visit https://gerrit.wikimedia.org/r/222099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0054bb1f77dad5bbe6543ec968632c51cd16919 Gerrit-PatchSet: 4 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] Remove quotes from wikibase-item-summary-wbmergeitems - change (mediawiki...Wikibase)
Lucie Kaffee has uploaded a new change for review. https://gerrit.wikimedia.org/r/222114 Change subject: Remove quotes from wikibase-item-summary-wbmergeitems .. Remove quotes from wikibase-item-summary-wbmergeitems Bug: T104445 Change-Id: Iaf75286818dbc7926ffdcea675966adc97603200 --- M repo/i18n/en.json 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/14/222114/1 diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 7bdd3d7..540d93b 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -9,7 +9,8 @@ Daniel Werner, Michał Łazowik, Adam Shorland, - Bene* + Bene*, + Lucie-Aimée Kaffee ] }, wikibase-desc: Structured data repository, @@ -380,8 +381,8 @@ wikibase-item-summary-wbsetqualifier-update: Changed {{PLURAL:$1|qualifier|qualifiers}}, wikibase-item-summary-wbremovequalifiers-remove: Removed {{PLURAL:$1|qualifier|qualifiers}}, wikibase-item-summary-wbremovereferences-remove: Removed {{PLURAL:$3|reference|references}} from claim, - wikibase-item-summary-wbmergeitems-from: Merged item from \$3\, - wikibase-item-summary-wbmergeitems-to: Merged item into \$3\, + wikibase-item-summary-wbmergeitems-from: Merged item from $3, + wikibase-item-summary-wbmergeitems-to: Merged item into $3, wikibase-property-summary-wbcreate-new: Created a new property, wikibase-property-summary-wbcreateclaim-create: Created claim, wikibase-property-summary-wbcreateclaim: Created {{PLURAL:$1|a claim|claims}}, -- To view, visit https://gerrit.wikimedia.org/r/222114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf75286818dbc7926ffdcea675966adc97603200 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Lucie Kaffee lucie.kaf...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not trim the T in TimeDetailsFormatter - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/222119 Change subject: Do not trim the T in TimeDetailsFormatter .. Do not trim the T in TimeDetailsFormatter I did that in I27861d4. I think I was wrong. Originally the idea of the timezone was similar to the calendar: the timestamp string is *always* Gregorian and *always* UTC (Z). The calendar option was meant as a formatter hint. Same for the timezone option. We are changing the meaning of the calendar option now. I think we will do the same with the timezone option. I suggest to show the timestamp string as it is (including the Z) no matter what. This makes this more transparent/visible. Change-Id: Id453e9e9f57a3bfa246b83aa1dd17e42017c2313 --- M lib/includes/formatters/TimeDetailsFormatter.php M lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php 2 files changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/19/222119/1 diff --git a/lib/includes/formatters/TimeDetailsFormatter.php b/lib/includes/formatters/TimeDetailsFormatter.php index 6aba78d..6f051cc 100644 --- a/lib/includes/formatters/TimeDetailsFormatter.php +++ b/lib/includes/formatters/TimeDetailsFormatter.php @@ -106,17 +106,19 @@ * @return string HTML */ private function getTimestampHtml( $timestamp ) { - // Loose check if the ISO-like string contains at least year, month, day and hour. - if ( !preg_match( '/^([-+]?)(\d+)(-\d+-\d+T\d+(?::\d+)*)Z?$/i', $timestamp, $matches ) ) { + // Loose check if the ISO-like string contains at least year, month, day and the T. + if ( !preg_match( '/^([-+]?)(\d+)(-\d+-\d+T.*)/', $timestamp, $matches ) ) { return htmlspecialchars( $timestamp ); } + list( , $sign, $year, $rest ) = $matches; + // Actual MINUS SIGN (U+2212) instead of HYPHEN-MINUS (U+002D) - $sign = $matches[1] === '-' ? \xE2\x88\x92 : '+'; + $sign = $sign === '-' ? \xE2\x88\x92 : '+'; // Warning, never cast the year to integer to not run into 32-bit integer overflows! - $year = ltrim( $matches[2], '0' ); + $year = ltrim( $year, '0' ); // Keep the sign. Pad the year. Keep month, day, and time. Drop the trailing Z. - return htmlspecialchars( $sign . str_pad( $year, 4, '0', STR_PAD_LEFT ) . $matches[3] ); + return htmlspecialchars( $sign . str_pad( $year, 4, '0', STR_PAD_LEFT ) . $rest ); } /** diff --git a/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php b/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php index 1e8ebc2..5dc1ede 100644 --- a/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php +++ b/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php @@ -110,7 +110,7 @@ '@' . implode( '.*', array( 'h4[^]*aHTML/a/h4', - 'td[^]*\+0*2001-01-01T00:00:00/td', + 'td[^]*\+0*2001-01-01T00:00:00Z/td', 'td[^]*\+01:00/td', 'td[^]*\(valueview-expert-timevalue-calendar-gregorian\)/td', 'td[^]*\(months: 1\)/td', @@ -121,11 +121,11 @@ ), '3 digit year' = array( new TimeValue( '+999-01-01T00:00:00Z', 0, 0, 0, $day, $gregorian ), - '@.*td[^]*isotime\+0999-01-01T00:00:00/td.*@s' + '@.*td[^]*isotime\+0999-01-01T00:00:00Z/td.*@s' ), 'Negative, padded year' = array( new TimeValue( '-09-01-01T00:00:00Z', 0, 0, 0, $day, $gregorian ), - '@.*td[^]*isotime\xE2\x88\x929-01-01T00:00:00/td.*@s' + '@.*td[^]*isotime\xE2\x88\x929-01-01T00:00:00Z/td.*@s' ), 'Optional Z' = array( $this-getTimeValue( '-09-01-01T00:00:00' ), @@ -133,7 +133,7 @@ ), 'Optional sign' = array( $this-getTimeValue( '09-01-01T00:00:00Z' ), - '@.*td[^]*isotime\+9-01-01T00:00:00/td.*@s' + '@.*td[^]*isotime\+9-01-01T00:00:00Z/td.*@s' ), 'Julian' = array( new TimeValue(
[MediaWiki-commits] [Gerrit] T103311 adapt escaping and comments in special page - change (mediawiki...WikibaseQuality)
jenkins-bot has submitted this change and it was merged. Change subject: T103311 adapt escaping and comments in special page .. T103311 adapt escaping and comments in special page Change-Id: I8b01412ddfdfa6d2f992fe268e896ea8e062a135 --- M specials/SpecialViolationsPage.php 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: Soeren.oldag: Looks good to me, approved jenkins-bot: Verified diff --git a/specials/SpecialViolationsPage.php b/specials/SpecialViolationsPage.php old mode 100644 new mode 100755 index 530ab82..d7ec952 --- a/specials/SpecialViolationsPage.php +++ b/specials/SpecialViolationsPage.php @@ -216,9 +216,9 @@ 'div', array( 'class' = 'wbq-violations-infobox' ) ) - . $this-msg( 'wbq-violations-explanations-general' )-escaped() + . $this-msg( 'wbq-violations-explanations-general' )-parse() . Html::element( 'br' ) - . $this-msg( 'wbq-violations-explanations-exceptions' )-escaped() + . $this-msg( 'wbq-violations-explanations-exceptions' )-parse() . Html::closeElement( 'div' ); return $infoBox; @@ -332,7 +332,7 @@ 'for' = $name, 'class' = 'wbq-violations-label' ), - $this-msg( $labelMessage )-escaped() + $this-msg( $labelMessage )-text() ) . Html::closeElement( 'div' ) . Html::openElement( 'div', array( 'class' = 'wbq-violations-form-table-cell' ) ) @@ -564,12 +564,12 @@ private function buildViolationTable( array $violations ) { $table = new HtmlTableBuilder( array( - new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-entity' )-escaped() ), - new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-claim' )-escaped() ), - new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-constraint-type' )-escaped() ), - new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-status' )-escaped() ), - new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-updated-at' )-escaped() ), - new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-additional-info' )-escaped() ) + new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-entity' )-text() ), + new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-claim' )-text() ), + new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-constraint-type' )-text() ), + new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-status' )-text() ), + new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-updated-at' )-text() ), + new HtmlTableHeaderBuilder( $this-msg( 'wbq-violations-table-header-additional-info' )-text() ) ) ); @@ -591,7 +591,7 @@ new HtmlTableCellBuilder( $claim, array(), true ), new HtmlTableCellBuilder( $type, array(), true ), new HtmlTableCellBuilder( $status, array(), true ), - new HtmlTableCellBuilder( $updatedAt, array(), true ), + new HtmlTableCellBuilder( $updatedAt, array() ), new HtmlTableCellBuilder( $additionalInformation, array(), true ) ) ); @@ -650,7 +650,7 @@ * Additionally, if the current user is permitted, a link for marking the violation as exception/violation is appended. * * @param Violation $violation -* @return string +* @return string HTML */ private function formatStatus( Violation $violation ) { $html = Html::element( @@ -695,7 +695,7 @@ /** * @param string $message * @param bool $error -* @return string +* @return string HTML */ private function buildNotice( $message, $error = false ) { $cssClasses = 'wbq-violations-notice'; @@ -717,7 +717,7 @@ * @param Violation[] $violations * @param bool $prevPageAvailable
[MediaWiki-commits] [Gerrit] Clean up blueprint left nav - change (mediawiki...Blueprint)
jenkins-bot has submitted this change and it was merged. Change subject: Clean up blueprint left nav .. Clean up blueprint left nav Make it configurable and fix display when on a page not in the left nav. Bug: T99757 Change-Id: Icfd60fcb6f229f6c535121cc27cd88f6b4c5207e --- M Blueprint.php A i18n/en.json A i18n/qqq.json M resources/toc.js M src/BlueprintSkinTemplate.php 5 files changed, 50 insertions(+), 31 deletions(-) Approvals: Prtksxna: Looks good to me, approved jenkins-bot: Verified diff --git a/Blueprint.php b/Blueprint.php index 503e8f1..bb29502 100644 --- a/Blueprint.php +++ b/Blueprint.php @@ -82,17 +82,4 @@ $wgValidSkinNames['blueprint'] = 'Blueprint'; -$wgBlueprintLeftNav = array( - 'Main Page', - 'Buttons', - 'Inputs', - 'Selects', - 'Checks, radios and toggles', - 'Guiders', - 'Progress and loading indicators', - 'Dialogs', - 'Form layouts', - 'Animation', - 'Content views', - 'FAQ', -); +$wgMessagesDirs['OOUIPlayground'] = __DIR__ . '/i18n'; diff --git a/i18n/en.json b/i18n/en.json new file mode 100644 index 000..e44a6d5 --- /dev/null +++ b/i18n/en.json @@ -0,0 +1,3 @@ +{ + blueprint-left-nav: * [[Main Page]]\n +} diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 000..b9e22a9 --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,3 @@ +{ + blueprint-left-nav: List of links to show in the left navigation for the skin +} diff --git a/resources/toc.js b/resources/toc.js index ad3b535..f99bfd7 100644 --- a/resources/toc.js +++ b/resources/toc.js @@ -7,5 +7,6 @@ $( '#toc' ) .detach() + .addClass( 'sidebar-toc' ) .appendTo( $appendTo ); } ); diff --git a/src/BlueprintSkinTemplate.php b/src/BlueprintSkinTemplate.php index 346c90c..76078b3 100755 --- a/src/BlueprintSkinTemplate.php +++ b/src/BlueprintSkinTemplate.php @@ -3,26 +3,51 @@ class BlueprintSkinTemplate extends LightNCandyTemplate { public function execute() { global $wgBlueprintLeftNav; - // Someone may have used {{DISPLAYTITLE:}} to monkey with the title, e.g. - // to hide or color it; then data['title'] has the div contents in it - // (T103454). Could use Sanitizer::stripAllTags( $this-data['title'] ), - // but instead use thispage. - $this-data['left_nav_sections'] = array_map( - function($title) { - $title = Title::newFromText( $title ); - return array( - 'text' = $title-getPrefixedText(), - 'title' = $title, - 'url' = $title-getFullUrl(), - 'current' = $title-equals( Title::newFromText( $this-data['thispage'] ) ), - ); - }, - $wgBlueprintLeftNav - ); - // die( var_dump( $this-data['left_nav_sections'] ) ); + + $this-data['left_nav_sections'] = $this-getLeftNav(); return parent::execute(); } + protected function getLeftNav() { + global $wgMemc; + + $cacheKey = wfMemcKey( 'blueprint', 'left-nav' ); + + $cacheVal = $wgMemc-get( $cacheKey ); + + if ( $cacheVal ) { + return $cacheVal; + } else { + $text = wfMessage( 'blueprint-left-nav' )-plain(); + $leftNav = array(); + $page_regex = '([^\[\]\|]+)'; + $line_regex = '/^[#*]\s*\[\['.$page_regex.'(?:\|'.$page_regex.')?\]\]$/'; + + foreach( explode( \n, $text ) as $line ) { + $matches = null; + if ( preg_match( $line_regex, $line, $matches ) ) { + $title = Title::newFromText( $matches[1] ); + $text = isset( $matches[2] ) ? $matches[2] : $matches[1]; + + // Someone may have used {{DISPLAYTITLE:}} to monkey with the title, e.g. + // to hide or color it; then data['title'] has the div contents in it + // (T103454). Could use Sanitizer::stripAllTags( $this-data['title'] ), + // but instead use thispage. + $leftNav[] = array( + 'text' = $text, + 'title' = $title, + 'url' = $title-getFullUrl(), +
[MediaWiki-commits] [Gerrit] Beta: Test Restbase in ContentTranslation - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Beta: Test Restbase in ContentTranslation .. Beta: Test Restbase in ContentTranslation Change-Id: I0a6d41abc8aa66fcd38baead776cdf51bf9cd855 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index da27d21..21bcb04 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -63,6 +63,7 @@ cxserver::logstash_host: deployment-logstash1.deployment-prep.eqiad.wmflabs cxserver::apertium: http://apertium-beta.wmflabs.org cxserver::proxy: http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080 +cxserver::restbase: http://10.68.17.189/@lang.wikipedia.org/v1/page/html/@title cxserver::yandex_url: 'https://translate.yandex.net' cxserver::registry: source: -- To view, visit https://gerrit.wikimedia.org/r/222084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a6d41abc8aa66fcd38baead776cdf51bf9cd855 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com 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] Use bold in comments instead of h4 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Use bold in comments instead of h4 .. Use bold in comments instead of h4 Change-Id: If149c6998b5aa437662e782279ab83db042d50b9 --- M src/widgets/OutlineControlsWidget.js M src/widgets/OutlineSelectWidget.js M src/widgets/TabSelectWidget.js 3 files changed, 4 insertions(+), 3 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/widgets/OutlineControlsWidget.js b/src/widgets/OutlineControlsWidget.js index e6bd614..ae90a3c 100644 --- a/src/widgets/OutlineControlsWidget.js +++ b/src/widgets/OutlineControlsWidget.js @@ -1,7 +1,8 @@ /** * OutlineControlsWidget is a set of controls for an {@link OO.ui.OutlineSelectWidget outline select widget}. * Controls include moving items up and down, removing items, and adding different kinds of items. - * Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}. + * + * **Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}.** * * @class * @extends OO.ui.Widget diff --git a/src/widgets/OutlineSelectWidget.js b/src/widgets/OutlineSelectWidget.js index cbf36c3..c00b026 100644 --- a/src/widgets/OutlineSelectWidget.js +++ b/src/widgets/OutlineSelectWidget.js @@ -2,7 +2,7 @@ * OutlineSelectWidget is a structured list that contains {@link OO.ui.OutlineOptionWidget outline options} * A set of controls can be provided with an {@link OO.ui.OutlineControlsWidget outline controls} widget. * - * Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}. + * **Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}.** * * @class * @extends OO.ui.SelectWidget diff --git a/src/widgets/TabSelectWidget.js b/src/widgets/TabSelectWidget.js index 7992e38..a696815 100644 --- a/src/widgets/TabSelectWidget.js +++ b/src/widgets/TabSelectWidget.js @@ -1,7 +1,7 @@ /** * TabSelectWidget is a list that contains {@link OO.ui.TabOptionWidget tab options} * - * Currently, this class is only used by {@link OO.ui.IndexLayout index layouts}. + * **Currently, this class is only used by {@link OO.ui.IndexLayout index layouts}.** * * @class * @extends OO.ui.SelectWidget -- To view, visit https://gerrit.wikimedia.org/r/222089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If149c6998b5aa437662e782279ab83db042d50b9 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@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 toolbar save button frameless - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/222094 Change subject: Make toolbar save button frameless .. Make toolbar save button frameless Depends on I26b540dd2 in oojs-ui for styling. Bug: T101165 Change-Id: I075b8cecf9df2026fb1da17e2ebdf0d848a3d250 --- M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/94/222094/1 diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js index deeb0d2..019477f 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js +++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js @@ -1195,6 +1195,7 @@ ve.init.mw.ViewPageTarget.prototype.setupToolbarSaveButton = function () { this.toolbarSaveButton = new OO.ui.ButtonWidget( { label: ve.msg( 'visualeditor-toolbar-savedialog' ), + framed: false, flags: [ 'progressive', 'primary' ], disabled: !this.restoring } ); -- To view, visit https://gerrit.wikimedia.org/r/222094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I075b8cecf9df2026fb1da17e2ebdf0d848a3d250 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Beta: Test Restbase in ContentTranslation - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/222096 Change subject: Revert Beta: Test Restbase in ContentTranslation .. Revert Beta: Test Restbase in ContentTranslation This reverts commit 6f2c25b412eb1c4527dbd8ca169014ad7d5b7b9c. Change-Id: I31b7fcb4555c5c2fc6e8ab55957f8aaad8173b97 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/222096/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 21bcb04..da27d21 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -63,7 +63,6 @@ cxserver::logstash_host: deployment-logstash1.deployment-prep.eqiad.wmflabs cxserver::apertium: http://apertium-beta.wmflabs.org cxserver::proxy: http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080 -cxserver::restbase: http://10.68.17.189/@lang.wikipedia.org/v1/page/html/@title cxserver::yandex_url: 'https://translate.yandex.net' cxserver::registry: source: -- To view, visit https://gerrit.wikimedia.org/r/222096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31b7fcb4555c5c2fc6e8ab55957f8aaad8173b97 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more EditEntity API tests for (non-) conflicting edits - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/222095 Change subject: Add more EditEntity API tests for (non-) conflicting edits .. Add more EditEntity API tests for (non-) conflicting edits This is a follow-up to Iaafbf9b. Bug: 103019 Change-Id: I04a8b7577ba40f432cc78a2923bff8976212b8b3 --- M repo/tests/phpunit/includes/api/EditEntityTest.php M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php 3 files changed, 59 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/95/222095/1 diff --git a/repo/tests/phpunit/includes/api/EditEntityTest.php b/repo/tests/phpunit/includes/api/EditEntityTest.php index cf764db..826706c 100644 --- a/repo/tests/phpunit/includes/api/EditEntityTest.php +++ b/repo/tests/phpunit/includes/api/EditEntityTest.php @@ -538,20 +538,47 @@ $this-doTestQueryExceptions( $params, $expected['exception'] ); } - public function testLabelDescriptionConflict() { - // FIXME: MySQL doesn't support self-joins on temporary tables, - //so skip this check during unit tests on MySQL! - //There is a similar check to this in TermSqlIndex - if ( $this-db-getType() == 'mysql' ) { - $this-markTestSkipped( 'MySQL doesn\'t support self-joins on temporary tables' ); - } + public function testPropertyLabelConflict() { + $params = array( + 'action' = 'wbeditentity', + 'data' = '{ + datatype: string, + labels: { de: { language: de, value: LabelConflict } } + }', + 'new' = 'property', + ); + $this-doApiRequestWithToken( $params ); + + $expectedException = array( + 'type' = 'UsageException', + 'code' = 'failed-save', + ); + // Repeating the same request with the same label should fail. + $this-doTestQueryExceptions( $params, $expectedException ); + } + + public function testItemLabelWithoutDescriptionNotConflicting() { + $params = array( + 'action' = 'wbeditentity', + 'data' = '{ labels: { de: { language: de, value: NotConflicting } } }', + 'new' = 'item', + ); + $this-doApiRequestWithToken( $params ); + + // Repeating the same request with the same label should not fail. + list( $result, , ) = $this-doApiRequestWithToken( $params ); + $this-assertArrayHasKey( 'success', $result ); + } + + public function testItemLabelDescriptionConflict() { + $this-markTestSkippedOnMySql(); $params = array( 'action' = 'wbeditentity', 'new' = 'item', 'data' = '{ - labels: { de: { language: de, value: LabelWithDescriptionConflict } }, - descriptions: { de: { language: de, value: LabelWithDescriptionConflict } } + labels: { de: { language: de, value: LabelDescriptionConflict } }, + descriptions: { de: { language: de, value: LabelDescriptionConflict } } }', ); $this-doApiRequestWithToken( $params ); @@ -560,6 +587,7 @@ 'type' = 'UsageException', 'code' = 'modification-failed', ); + // Repeating the same request with the same label and description should fail. $this-doTestQueryExceptions( $params, $expectedException ); } @@ -588,4 +616,14 @@ $this-doTestQueryExceptions( $params, $expectedException ); } + /** +* @see http://bugs.mysql.com/bug.php?id=10327 +* @see TermSqlIndexTest::markTestSkippedOnMySql +*/ + private function markTestSkippedOnMySql() { + if ( $this-db-getType() === 'mysql' ) { + $this-markTestSkipped( 'MySQL doesn\'t support self-joins on temporary tables' ); + } + } + } diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php index 3b0477e..25f6ef3 100644 --- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php +++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php @@ -78,7 +78,7 @@ * @param array|null $session * @param User|null $user * -* @return array
[MediaWiki-commits] [Gerrit] Workaround fopen lack of SubjectAltName support for instantC... - change (mediawiki/core)
Brian Wolff has uploaded a new change for review. https://gerrit.wikimedia.org/r/222086 Change subject: Workaround fopen lack of SubjectAltName support for instantCommons .. Workaround fopen lack of SubjectAltName support for instantCommons Hacky work around, where on php 5.6.0 where SubjectAltName is not supported, if a request to commons.wikimedia.org fails, retry the request but telling php fopen wrapper to treat it as if it came from en.wikipedia.org for validation purposes, since as of c02fab71422a that's what the common name of the cert will be. In the ideal world, everyone would just have curl installed. I know this is super hacky, but I'd really like instant commons to work out of the box even without curl installed. Note: I'm basing the php 5.6 part on documentation, I have not tested this with a copy of that version of php. Bug: T75199 Change-Id: Ibde59be61a5b3d7cd5397ba352dce9be11e1b06f --- M includes/HttpFunctions.php 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/86/222086/1 diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 825cd06..2029092 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -912,7 +912,13 @@ } if ( $this-sslVerifyHost ) { - $options['ssl']['CN_match'] = $this-parsedUrl['host']; + // PHP 5.6.0 deprecates CN_match, in favour of peer_name which + // actually checks SubjectAltName properly. + if ( version_compare( PHP_VERSION, '5.6.0', '=' ) ) { + $options['ssl']['peer_name'] = $this-parsedUrl['host']; + } else { + $options['ssl']['CN_match'] = $this-parsedUrl['host']; + } } if ( is_dir( $this-caInfo ) ) { @@ -943,6 +949,19 @@ MediaWiki\restoreWarnings(); if ( !$fh ) { + // HACK for instant commons. + // If we are contacting (commons|upload).wikimedia.org + // try again with CN_match for en.wikipedia.org + // as php does not handle SubjectAltName properly + // prior to peer_name option in php 5.6 + if ( isset( $options['ssl']['CN_match'] ) +( $options['ssl']['CN_match'] === 'commons.wikimedia.org' + || $options['ssl']['CN_match'] === 'upload.wikimedia.org' ) + ) { + $options['ssl']['CN_match'] = 'en.wikipedia.org'; + $context = stream_context_create( $options ); + continue; + } break; } -- To view, visit https://gerrit.wikimedia.org/r/222086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibde59be61a5b3d7cd5397ba352dce9be11e1b06f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff bawolff...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] etcd::ssl: do not restart the server upon changes - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/222102 Change subject: etcd::ssl: do not restart the server upon changes .. etcd::ssl: do not restart the server upon changes Restarts of etcd should be limited to cases where we change disruptively the configuration - a change of the underlying certificates isn't (etcd will still serve the same data from the same cluster) and automatic restarts are scary to say the least. Disable them from now on, until we use intra-cluster SSL certificates. Change-Id: Ib1a9cc9efe81ff7a8da66adfa5f5c4075226cf11 --- M modules/etcd/manifests/ssl.pp 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/222102/1 diff --git a/modules/etcd/manifests/ssl.pp b/modules/etcd/manifests/ssl.pp index c13f8cc..c034ee9 100644 --- a/modules/etcd/manifests/ssl.pp +++ b/modules/etcd/manifests/ssl.pp @@ -34,7 +34,6 @@ group = 'etcd', mode = '0400', source = ${ssldir}/certs/ca.pem, -notify = Service['etcd'], } file { '/var/lib/etcd/ssl/certs/cert.pem': @@ -44,7 +43,6 @@ mode= '0400', source = ${ssldir}/certs/${puppet_cert_name}.pem, require = File['/var/lib/etcd/ssl/certs/ca.pem'], -notify = Service['etcd'], } file { '/var/lib/etcd/ssl/private_keys': @@ -60,6 +58,5 @@ group = 'etcd', mode = '0400', source = ${ssldir}/private_keys/${puppet_cert_name}.pem, -notify = Service['etcd'], } } -- To view, visit https://gerrit.wikimedia.org/r/222102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1a9cc9efe81ff7a8da66adfa5f5c4075226cf11 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...mathoid)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222105 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid refs/changes/05/222105/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/222105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix named i18n parameters - change (pywikibot/i18n)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/222087 Change subject: fix named i18n parameters .. fix named i18n parameters Change-Id: I4d3b4f1d11d3ac5227aab9ed4a296def371b3cc0 --- M piper/be-x-old.json M piper/el.json M piper/ksh.json M remove_edp_images/be-x-old.json 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n refs/changes/87/222087/1 diff --git a/piper/be-x-old.json b/piper/be-x-old.json index da53baf..ab9a670 100644 --- a/piper/be-x-old.json +++ b/piper/be-x-old.json @@ -4,5 +4,5 @@ Red Winged Duck ] }, - piper-edit-summary: Робат: апрацоўка тэксту артыкула з дапамогай %s + piper-edit-summary: Робат: апрацоўка тэксту артыкула з дапамогай %(filters)s } diff --git a/piper/el.json b/piper/el.json index 85e69b7..ad6ee48 100644 --- a/piper/el.json +++ b/piper/el.json @@ -4,5 +4,5 @@ Protnet ] }, - piper-edit-summary: Ρομπότ: Διοχέτευση του κειμένου της σελίδας μέσω του %s + piper-edit-summary: Ρομπότ: Διοχέτευση του κειμένου της σελίδας μέσω του %(filtes)s } diff --git a/piper/ksh.json b/piper/ksh.json index 6a35e8d..55f9eb3 100644 --- a/piper/ksh.json +++ b/piper/ksh.json @@ -4,5 +4,5 @@ Xqt ] }, - piper-edit-summary: Bot: Mer scheke dä Täx vun heh dä Sigg dorsch %s + piper-edit-summary: Bot: Mer scheke dä Täx vun heh dä Sigg dorsch %(filters)s } diff --git a/remove_edp_images/be-x-old.json b/remove_edp_images/be-x-old.json index 768129a..66c8374 100644 --- a/remove_edp_images/be-x-old.json +++ b/remove_edp_images/be-x-old.json @@ -4,5 +4,5 @@ Red Winged Duck ] }, - remove_edp_images-edit-summary: Робат: выпраўленьне выкарыстаньня несвабоднага файла: [[%s]] + remove_edp_images-edit-summary: Робат: выпраўленьне выкарыстаньня несвабоднага файла: [[%(title)s]] } -- To view, visit https://gerrit.wikimedia.org/r/222087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d3b4f1d11d3ac5227aab9ed4a296def371b3cc0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When using fopen on https streams, disable weak ciphers and ... - change (mediawiki/core)
Brian Wolff has uploaded a new change for review. https://gerrit.wikimedia.org/r/222088 Change subject: When using fopen on https streams, disable weak ciphers and compression .. When using fopen on https streams, disable weak ciphers and compression Per recomendation of http://www.docnet.nu/tech-portal/2014/06/26/ssl-and-php-streams-part-1-you-are-doing-it-wrongtm/C0 Change-Id: I69d063ff4aa4248dd4f3d03de5a168c4b5a99c50 --- M includes/HttpFunctions.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/88/222088/1 diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php index 825cd06..c47b5e6 100644 --- a/includes/HttpFunctions.php +++ b/includes/HttpFunctions.php @@ -899,6 +899,8 @@ 'ssl' = array( 'verify_peer' = $this-sslVerifyCert, 'SNI_enabled' = true, + 'ciphers' = 'HIGH:!SSLv2:!SSLv3', + 'disable_compression' = true, ), ); -- To view, visit https://gerrit.wikimedia.org/r/222088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I69d063ff4aa4248dd4f3d03de5a168c4b5a99c50 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff bawolff...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for frameless primary buttons in MW - change (oojs/ui)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/222093 Change subject: Add support for frameless primary buttons in MW .. Add support for frameless primary buttons in MW Also fix frameless button support in toolbars (both primary and non-primary). Bug: T103403 Change-Id: I26b540dd22a975c9b0c139e9dc748da6a2313958 --- M demos/pages/toolbars.js M demos/pages/widgets.js M src/themes/apex/tools.less M src/themes/mediawiki/MediaWikiTheme.js M src/themes/mediawiki/elements.less M src/themes/mediawiki/tools.less 6 files changed, 58 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/93/222093/1 diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js index 550d812..4a58a33 100644 --- a/demos/pages/toolbars.js +++ b/demos/pages/toolbars.js @@ -1,5 +1,5 @@ OO.ui.Demo.static.pages.toolbars = function ( demo ) { - var i, toolGroups, saveButton, actionButton, actionButtonDisabled, PopupTool, ToolGroupTool, + var i, toolGroups, saveButton, deleteButton, actionButton, actionButtonDisabled, PopupTool, ToolGroupTool, $demo = demo.$element, $containers = $(), toolFactories = [], @@ -217,14 +217,15 @@ } ] ); - saveButton = new OO.ui.ButtonWidget( { label: 'Save', flags: [ 'progressive', 'primary' ] } ); + saveButton = new OO.ui.ButtonWidget( { label: 'Save', framed: false, flags: [ 'progressive', 'primary' ] } ); + deleteButton = new OO.ui.ButtonWidget( { label: 'Delete', framed: false, flags: [ 'destructive' ] } ); actionButton = new OO.ui.ButtonWidget( { label: 'Action' } ); actionButtonDisabled = new OO.ui.ButtonWidget( { label: 'Disabled', disabled: true } ); toolbars[ 1 ].$actions .append( actionButton.$element, actionButtonDisabled.$element ); toolbars[ 3 ].$actions - .append( toolbars[ 2 ].$element, saveButton.$element ); + .append( toolbars[ 2 ].$element, deleteButton.$element, saveButton.$element ); for ( i = 0; i toolbars.length; i++ ) { toolbars[ i ].emit( 'updateState' ); diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index 5c0843c..d4880b5 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -418,6 +418,18 @@ new OO.ui.FieldLayout( new OO.ui.ButtonWidget( { framed: false, + flags: [ 'progressive', 'primary' ], + icon: 'check', + label: 'Primary' + } ), + { + label: 'ButtonWidget (frameless, primary, progressive)\u200E', + align: 'top' + } + ), + new OO.ui.FieldLayout( + new OO.ui.ButtonWidget( { + framed: false, flags: [ 'warning' ], icon: 'alert', label: 'Warning' diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less index 913bb51..7429822 100644 --- a/src/themes/apex/tools.less +++ b/src/themes/apex/tools.less @@ -12,16 +12,22 @@ } -actions { -.oo-ui-buttonElement { +.oo-ui-buttonElement-framed, +.oo-ui-buttonElement-framed:last-child { margin-top: 0.4em; margin-bottom: 0.4em; - } - -.oo-ui-buttonElement:last-child { margin-right: 0.5em; } + +.oo-ui-buttonElement-frameless { + margin: 0; +.oo-ui-buttonElement-button { + padding: 1.1953125em 1.3em; + } + } } + -shadow { .oo-ui-background-image('@{oo-ui-default-image-path}/toolbar-shadow.png'); bottom: -9px; diff --git a/src/themes/mediawiki/MediaWikiTheme.js b/src/themes/mediawiki/MediaWikiTheme.js index edad3f8..9e2a7cb 100644 --- a/src/themes/mediawiki/MediaWikiTheme.js +++ b/src/themes/mediawiki/MediaWikiTheme.js @@ -34,7 +34,10 @@ if ( element.supports( [ 'hasFlag' ] ) ) { isFramed = element.supports( [ 'isFramed' ] ) element.isFramed(); - if ( isFramed ( element.isDisabled() || element.hasFlag( 'primary'
[MediaWiki-commits] [Gerrit] Fixed escaping issue. - change (mediawiki...WikibaseQualityConstraints)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed escaping issue. .. Fixed escaping issue. Change-Id: I3f0e15835c8393d3633f27752841969d392ac68a --- M i18n/en.json M i18n/qqq.json M includes/ConstraintCheck/Checker/FormatChecker.php M includes/ConstraintCheck/Checker/UniqueValueChecker.php M includes/ConstraintCheck/Result/CheckResult.php M specials/SpecialConstraintReport.php 6 files changed, 14 insertions(+), 9 deletions(-) Approvals: Andreasburmeister: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 0bc8341..0df01d8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -31,6 +31,7 @@ wbqc-violation-message-not-yet-implemented: For technical reasons, the check for the constraint \$1\ has not yet been implemented., + wbqc-violation-message-security-reason: For security reasons, it is not possible to check the \$1\ constraint at the moment. We are working on a solution., wbqc-violation-message-value-needed: Properties with constraint \$1\ need to have a value., wbqc-violation-message-value-needed-of-type: Properties with constraint \$1\ need to have values of type \$2\., wbqc-violation-message-parameter-needed: Properties with constraint \$1\ need a parameter \$2\., diff --git a/i18n/qqq.json b/i18n/qqq.json index a9bb93f..614dffe 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -31,6 +31,7 @@ wbqc-violations-group: Type of violations this extension finds.\n{{Identical|Constraint}}, wbqc-violation-message: Generic message to tell that there was a violation., wbqc-violation-message-not-yet-implemented: Message for when a check is yet to be implemented. Not actually a violation, more of a todo., + wbqc-violation-message-security-reason: Message for when a check is not possible due to security reasons. Not actually a violation, more of a todo., wbqc-violation-message-value-needed: Message for when a property needs a value (rather than no or some value), but hasn't., wbqc-violation-message-value-needed-of-type: Message for when a property needs a value of a specific type (like string or wikibase-entityid), but it doesn't., wbqc-violation-message-parameter-needed: Message for when a constraint needs a specific parameter, but it's missing., diff --git a/includes/ConstraintCheck/Checker/FormatChecker.php b/includes/ConstraintCheck/Checker/FormatChecker.php index 7adf840..0b2ceda 100755 --- a/includes/ConstraintCheck/Checker/FormatChecker.php +++ b/includes/ConstraintCheck/Checker/FormatChecker.php @@ -78,7 +78,8 @@ return new CheckResult( $statement, $constraint-getConstraintTypeQid(), $parameters, CheckResult::STATUS_VIOLATION, $message ); } - return new CheckResult( $statement, $constraint-getConstraintTypeQid(), $parameters, CheckResult::STATUS_TODO, For security reasons, it is not possible to check the Format constraint at the moment. We are working on a solution. ); + $message = wfMessage( 'wbqc-violation-message-security-reason' )-params( $constraint-getConstraintTypeName(), 'string' )-escaped(); + return new CheckResult( $statement, $constraint-getConstraintTypeQid(), $parameters, CheckResult::STATUS_TODO, $message ); } } \ No newline at end of file diff --git a/includes/ConstraintCheck/Checker/UniqueValueChecker.php b/includes/ConstraintCheck/Checker/UniqueValueChecker.php index 3b2552d..e16e230 100755 --- a/includes/ConstraintCheck/Checker/UniqueValueChecker.php +++ b/includes/ConstraintCheck/Checker/UniqueValueChecker.php @@ -39,7 +39,7 @@ public function checkConstraint( Statement $statement, Constraint $constraint, Entity $entity = null ) { $parameters = array (); - $message = wfMessage( wbqc-violation-message-not-yet-implemented )-escaped(); + $message = wfMessage( wbqc-violation-message-not-yet-implemented )-params( $constraint-getConstraintTypeName(), 'string' )-escaped(); return new CheckResult( $statement, $constraint-getConstraintTypeQid(), $parameters, CheckResult::STATUS_TODO, $message ); } diff --git a/includes/ConstraintCheck/Result/CheckResult.php b/includes/ConstraintCheck/Result/CheckResult.php index b764094..9abbb62 100755 --- a/includes/ConstraintCheck/Result/CheckResult.php +++ b/includes/ConstraintCheck/Result/CheckResult.php @@ -55,7 +55,7 @@ * @param string $constraintName * @param array $parameters (string = string[]) * @param string $status -* @param string $message +* @param string $message (sanitized HTML) */ public function __construct( Statement $statement, $constraintName, $parameters = array (), $status = self::STATUS_TODO, $message = '' ) {
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...deploy)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222106 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/06/222106/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/222106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix named i18n parameters - change (pywikibot/i18n)
jenkins-bot has submitted this change and it was merged. Change subject: fix named i18n parameters .. fix named i18n parameters Change-Id: I4d3b4f1d11d3ac5227aab9ed4a296def371b3cc0 --- M piper/be-x-old.json M piper/el.json M piper/ksh.json M remove_edp_images/be-x-old.json 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/piper/be-x-old.json b/piper/be-x-old.json index da53baf..ab9a670 100644 --- a/piper/be-x-old.json +++ b/piper/be-x-old.json @@ -4,5 +4,5 @@ Red Winged Duck ] }, - piper-edit-summary: Робат: апрацоўка тэксту артыкула з дапамогай %s + piper-edit-summary: Робат: апрацоўка тэксту артыкула з дапамогай %(filters)s } diff --git a/piper/el.json b/piper/el.json index 85e69b7..7236fbf 100644 --- a/piper/el.json +++ b/piper/el.json @@ -4,5 +4,5 @@ Protnet ] }, - piper-edit-summary: Ρομπότ: Διοχέτευση του κειμένου της σελίδας μέσω του %s + piper-edit-summary: Ρομπότ: Διοχέτευση του κειμένου της σελίδας μέσω του %(filters)s } diff --git a/piper/ksh.json b/piper/ksh.json index 6a35e8d..55f9eb3 100644 --- a/piper/ksh.json +++ b/piper/ksh.json @@ -4,5 +4,5 @@ Xqt ] }, - piper-edit-summary: Bot: Mer scheke dä Täx vun heh dä Sigg dorsch %s + piper-edit-summary: Bot: Mer scheke dä Täx vun heh dä Sigg dorsch %(filters)s } diff --git a/remove_edp_images/be-x-old.json b/remove_edp_images/be-x-old.json index 768129a..66c8374 100644 --- a/remove_edp_images/be-x-old.json +++ b/remove_edp_images/be-x-old.json @@ -4,5 +4,5 @@ Red Winged Duck ] }, - remove_edp_images-edit-summary: Робат: выпраўленьне выкарыстаньня несвабоднага файла: [[%s]] + remove_edp_images-edit-summary: Робат: выпраўленьне выкарыстаньня несвабоднага файла: [[%(title)s]] } -- To view, visit https://gerrit.wikimedia.org/r/222087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d3b4f1d11d3ac5227aab9ed4a296def371b3cc0 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.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] varnish: activate dynamic lookup on one esams host - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/222091 Change subject: varnish: activate dynamic lookup on one esams host .. varnish: activate dynamic lookup on one esams host Change-Id: Ia89511b7a6f061f75e767fd724d766fe85246e91 --- A hieradata/hosts/cp3003.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/91/222091/1 diff --git a/hieradata/hosts/cp3003.yaml b/hieradata/hosts/cp3003.yaml new file mode 100644 index 000..c79c6db --- /dev/null +++ b/hieradata/hosts/cp3003.yaml @@ -0,0 +1 @@ +varnish::dynamic_directors: true -- To view, visit https://gerrit.wikimedia.org/r/222091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia89511b7a6f061f75e767fd724d766fe85246e91 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt to count actual watchers in the info action - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Attempt to count actual watchers in the info action .. Attempt to count actual watchers in the info action Proposed threshold to be considered an active watcher: two times $wgRCMaxAge, configurable with the new configuration setting $wgWatchersMaxAge. The information is not displayed when the number given would be 1 or 0, so that the number (or absence thereof) doesn't disclose that the page is (potentially) unpatrolled or completely unwatched and hence easier to vandalise. Configurable with $wgUnwatchedPageSecret too. Also, we don't display this row at all when the user doesn't have the right to see the count of total watchers. Bug: T51506 Change-Id: I10d294a339b131eee94839ed7088ab20d746d881 --- M RELEASE-NOTES-1.26 M includes/DefaultSettings.php M includes/actions/InfoAction.php M languages/i18n/en.json M languages/i18n/qqq.json 5 files changed, 59 insertions(+), 1 deletion(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26 index 940adc9..5675956 100644 --- a/RELEASE-NOTES-1.26 +++ b/RELEASE-NOTES-1.26 @@ -16,6 +16,9 @@ new style is encouraged as it's harder to implement incorrectly. === New features in 1.26 === +* (T51506) Now action=info gives estimates of actual watchers for a page. + See $wgRCMaxAge, $wgWatchersMaxAge and $wgUnwatchedPageSecret + to learn how to configure if needed. * Change tags can now be hidden in the interface by disabling the associated tag-id interface message. * ':' (colon) is now invalid in usernames for new accounts. Existing accounts diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index a755029..a239e68 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -6026,6 +6026,21 @@ $wgRCMaxAge = 90 * 24 * 3600; /** + * Page watchers inactive for more than this many seconds are considered inactive. + * Used mainly by action=info. Default: 180 days = about six months. + * @since 1.26 + */ +$wgWatchersMaxAge = 180 * 24 * 3600; + +/** + * If active watchers (per above) are this number or less, do not disclose it. + * Left to 1, prevents unprivileged users from knowing for sure that there are 0. + * Set to -1 if you want to always complement watchers count with this info. + * @since 1.26 + */ +$wgUnwatchedPageSecret = 1; + +/** * Filter $wgRCLinkDays by $wgRCMaxAge to avoid showing links for numbers * higher than what will be stored. Note that this is disabled by default * because we sometimes do have RC data which is beyond the limit for some diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index 0c34ddb..6d43ec5 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -325,8 +325,24 @@ ) { // Number of page watchers $pageInfo['header-basic'][] = array( - $this-msg( 'pageinfo-watchers' ), $lang-formatNum( $pageCounts['watchers'] ) + $this-msg( 'pageinfo-watchers' ), + $lang-formatNum( $pageCounts['watchers'] ) ); + if ( $config-get( 'ShowUpdatedMarker' ) ) { + $minToDisclose = $config-get( 'UnwatchedPageSecret' ); + if ( $pageCounts['visitingWatchers'] $minToDisclose || + $user-isAllowed( 'unwatchedpages' ) ) { + $pageInfo['header-basic'][] = array( + $this-msg( 'pageinfo-visiting-watchers' ), + $lang-formatNum( $pageCounts['visitingWatchers'] ) + ); + } else { + $pageInfo['header-basic'][] = array( + $this-msg( 'pageinfo-visiting-watchers' ), + $this-msg( 'pageinfo-few-visiting-watchers' ) + ); + } + } } elseif ( $unwatchedPageThreshold !== false ) { $pageInfo['header-basic'][] = array( $this-msg( 'pageinfo-watchers' ), @@ -671,6 +687,26 @@ ); $result['watchers'] = $watchers; + if ( $config-get( 'ShowUpdatedMarker' ) ) { + // Threshold: last visited about 26 weeks before latest edit + $updated = wfTimestamp( TS_UNIX, $this-page-getTimestamp() ); + $age = $config-get( 'WatchersMaxAge' ); + $threshold =