[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix the js error while loading a translation with saved tran...
Santhosh has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378199 ) Change subject: Fix the js error while loading a translation with saved translation .. Fix the js error while loading a translation with saved translation This will not make the restore-translation feature working. Just prevents the js error that prevents loading the source article to translation view. Change-Id: I28fcd0b7885b333c5cfbce6946f3fe04133ce3f9 --- M modules/dm/mw.cx.dm.Translation.js M modules/mw.cx.TranslationController.js 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/99/378199/1 diff --git a/modules/dm/mw.cx.dm.Translation.js b/modules/dm/mw.cx.dm.Translation.js index 36c9cbf..774b86f 100644 --- a/modules/dm/mw.cx.dm.Translation.js +++ b/modules/dm/mw.cx.dm.Translation.js @@ -281,6 +281,15 @@ return this.translationUnitById[ id ]; }; +/** + * Get a translation units + * + * @return {mw.cx.dm.TranslationUnit|undefined} The translation unit + */ +mw.cx.dm.Translation.prototype.getTranslationUnits = function () { + return this.topTranslationUnits; +}; + mw.cx.dm.Translation.prototype.getProgress = function () { return this.progress; }; diff --git a/modules/mw.cx.TranslationController.js b/modules/mw.cx.TranslationController.js index c5fb722..45e8023 100644 --- a/modules/mw.cx.TranslationController.js +++ b/modules/mw.cx.TranslationController.js @@ -292,7 +292,7 @@ this.translation.getTranslationUnits().forEach( function ( unit ) { var savedSection, provider, document, - sectionId = unit.getSectionId(); + sectionId = unit.getId(); if ( !savedUnits[ sectionId ] ) { return; -- To view, visit https://gerrit.wikimedia.org/r/378199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28fcd0b7885b333c5cfbce6946f3fe04133ce3f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GuidedTour[master]: Check real RL list for existence
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377919 ) Change subject: Check real RL list for existence .. Check real RL list for existence Change-Id: If43e31328750be28867f5ff1cd1a3e6ff8650346 --- M GuidedTourHooks.php 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Catrope: Looks good to me, but someone else must approve Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/GuidedTourHooks.php b/GuidedTourHooks.php index 0cc3076..0be10b5 100644 --- a/GuidedTourHooks.php +++ b/GuidedTourHooks.php @@ -109,8 +109,6 @@ * @return bool true if a module was added, false otherwise */ public static function addTour( $out, $tourName ) { - global $wgResourceModules; - $isUserJsAllowed = $out->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) >= ResourceLoaderModule::ORIGIN_USER_INDIVIDUAL; @@ -120,7 +118,7 @@ // extension-defined tours, but it's more conservative not to. if ( $isUserJsAllowed && $tourName !== null && strpbrk( $tourName, '-.' ) === false ) { $tourModuleName = "ext.guidedTour.tour.$tourName"; - if ( isset( $wgResourceModules[$tourModuleName] ) ) { + if ( $out->getResourceLoader()->getModule( $tourModuleName ) ) { // Add the tour itself for extension-defined tours. $out->addModules( $tourModuleName ); } else { @@ -130,7 +128,6 @@ */ $out->addModules( 'ext.guidedTour' ); } - return true; } -- To view, visit https://gerrit.wikimedia.org/r/377919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If43e31328750be28867f5ff1cd1a3e6ff8650346 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/GuidedTour Gerrit-Branch: master Gerrit-Owner: MooeypooGerrit-Reviewer: Catrope Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Swalling Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't cast days default to an integer
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378124 ) Change subject: RCFilters: Don't cast days default to an integer .. RCFilters: Don't cast days default to an integer Values can be floats, like 1.5 days, etc. Cast instead to a float. Bug: T175965 Change-Id: I14ba792f1cd435f89b2e09067b0a0e894a0a2557 --- M includes/specialpage/ChangesListSpecialPage.php M includes/specials/SpecialRecentchanges.php M includes/specials/SpecialWatchlist.php 3 files changed, 13 insertions(+), 8 deletions(-) Approvals: Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index ec09559..98b7aa1 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -1580,5 +1580,12 @@ abstract function getDefaultLimit(); + /** +* Get the default value of the number of days to display when loading +* the result set. +* Supports fractional values, and should be cast to a float. +* +* @return float +*/ abstract function getDefaultDays(); } diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 547a1b0..15c05ee 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -233,10 +233,9 @@ */ public function getDefaultOptions() { $opts = parent::getDefaultOptions(); - $user = $this->getUser(); - $opts->add( 'days', $user->getIntOption( 'rcdays' ), FormOptions::FLOAT ); - $opts->add( 'limit', $user->getIntOption( 'rclimit' ) ); + $opts->add( 'days', $this->getDefaultDays(), FormOptions::FLOAT ); + $opts->add( 'limit', $this->getDefaultLimit() ); $opts->add( 'from', '' ); $opts->add( 'categories', '' ); @@ -1010,6 +1009,6 @@ } function getDefaultDays() { - return $this->getUser()->getIntOption( 'rcdays' ); + return floatval( $this->getUser()->getOption( 'rcdays' ) ); } } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index ec64869..2750551 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -277,10 +277,9 @@ */ public function getDefaultOptions() { $opts = parent::getDefaultOptions(); - $user = $this->getUser(); - $opts->add( 'days', $user->getOption( 'watchlistdays' ), FormOptions::FLOAT ); - $opts->add( 'limit', $user->getIntOption( 'wllimit' ), FormOptions::INT ); + $opts->add( 'days', $this->getDefaultDays(), FormOptions::FLOAT ); + $opts->add( 'limit', $this->getDefaultLimit(), FormOptions::INT ); return $opts; } @@ -918,6 +917,6 @@ } function getDefaultDays() { - return $this->getUser()->getIntOption( 'watchlistdays' ); + return floatval( $this->getUser()->getOption( 'watchlistdays' ) ); } } -- To view, visit https://gerrit.wikimedia.org/r/378124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14ba792f1cd435f89b2e09067b0a0e894a0a2557 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MooeypooGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: Mooeypoo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: improve page unmarshaller typing
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378198 ) Change subject: Chore: improve page unmarshaller typing .. Chore: improve page unmarshaller typing Bug: T173323 Change-Id: I4b632874cc3f022440ecb8ac2b72e3bda0391e36 --- M docs/development.md M src/common/marshallers/page-unmarshaller.ts A src/common/types/json.d.ts 3 files changed, 48 insertions(+), 44 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/98/378198/1 diff --git a/docs/development.md b/docs/development.md index 065e35a..4d2 100644 --- a/docs/development.md +++ b/docs/development.md @@ -67,7 +67,8 @@ The reasoning is that the brevity of inferred code is preferred -as long as the compiler doesn't complain- but APIs are seams and their types should be both fixed and documented. We have set up the TypeScript compiler with the -strict settings so no implicit `any` or `null`/`undefined` should slip in. +strict settings so no implicit `any` or `null` / `undefined` should slip in. +When in doubt, treat typing as logical assertions. The following examples are possible module implementations but the second or third are preferred: diff --git a/src/common/marshallers/page-unmarshaller.ts b/src/common/marshallers/page-unmarshaller.ts index 48f5976..c90bcb4 100644 --- a/src/common/marshallers/page-unmarshaller.ts +++ b/src/common/marshallers/page-unmarshaller.ts @@ -4,53 +4,46 @@ PageSummary, PageThumbnail } from "../models/page"; +import { JSONObject } from "../types/json"; -const unmarshalPageThumbnailRESTBase = ( - json: RESTBase.PageThumbnail -): PageThumbnail => ({ - URL: json.source, - originalURL: json.original, - width: json.width, - height: json.height -}); -export const unmarshalPageThumbnail = (json: any): PageThumbnail => - unmarshalPageThumbnailRESTBase(json); +export const unmarshalPageThumbnail = (json: JSONObject): PageThumbnail => { + const type: RESTBase.PageThumbnail = json as any; + return { +URL: type.source, +originalURL: type.original, +width: type.width, +height: type.height + }; +}; -const unmarshalPageImageRESTBase = (json: RESTBase.PageImage): PageImage => ({ - URL: json.source, - width: json.width, - height: json.height -}); -export const unmarshalPageImage = (json: any): PageImage => - unmarshalPageImageRESTBase(json); +export const unmarshalPageImage = (json: JSONObject): PageImage => { + const type: RESTBase.PageImage = json as any; + return { URL: type.source, width: type.width, height: type.height }; +}; -const unmarshalPageGeolocationRESTBase = ( - json: RESTBase.PageGeolocation -): PageGeolocation => ({ - latitude: json.lat, - longitude: json.lon -}); -export const unmarshalPageGeolocation = (json: any): PageGeolocation => - unmarshalPageGeolocationRESTBase(json); +export const unmarshalPageGeolocation = (json: JSONObject): PageGeolocation => { + const type: RESTBase.PageGeolocation = json as any; + return { latitude: type.lat, longitude: type.lon }; +}; -const unmarshalPageSummaryRESTBase = ( - json: RESTBase.PageSummary -): PageSummary => ({ - wikiLanguageCode: json.lang, - localeDirection: json.dir, - pageID: json.pageid, - lastModified: new Date(json.timestamp), - titleText: json.title, - titleHTML: json.displaytitle, - descriptionText: json.description, - extractText: json.extract, - extractHTML: json.extract_html, - thumbnail: json.thumbnail && unmarshalPageThumbnail(json.thumbnail), - image: json.originalimage && unmarshalPageImage(json.originalimage), - geolocation: json.coordinates && unmarshalPageGeolocation(json.coordinates) -}); -export const unmarshalPageSummary = (json: any): PageSummary => - unmarshalPageSummaryRESTBase(json); +export const unmarshalPageSummary = (json: JSONObject): PageSummary => { + const type: RESTBase.PageSummary = json as any; + return { +wikiLanguageCode: type.lang, +localeDirection: type.dir, +pageID: type.pageid, +lastModified: new Date(type.timestamp), +titleText: type.title, +titleHTML: type.displaytitle, +descriptionText: type.description, +extractText: type.extract, +extractHTML: type.extract_html, +thumbnail: type.thumbnail && unmarshalPageThumbnail(type.thumbnail as {}), +image: type.originalimage && unmarshalPageImage(type.originalimage as {}), +geolocation: + type.coordinates && unmarshalPageGeolocation(type.coordinates as {}) + }; +}; namespace RESTBase { export interface PageThumbnail { diff --git a/src/common/types/json.d.ts b/src/common/types/json.d.ts new file mode 100644 index 000..e3f0f5c --- /dev/null +++ b/src/common/types/json.d.ts @@ -0,0 +1,10 @@ +// https://github.com/Microsoft/TypeScript/issues/1897 + +export type JSONPrimitive = string | number | boolean | null; + +// eslint-disable-next-line no-use-before-define +export type JSONValue = JSONPrimitive | JSONObject | JSONArray; +
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: allow TypeScript definitions to be linted
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378196 ) Change subject: Chore: allow TypeScript definitions to be linted .. Chore: allow TypeScript definitions to be linted A follow-up to 04a2349, remove the ESLint ignore entries for TSDs. Change-Id: I068c52f28e4dae086caab8e188553e248de24963 --- M .eslintignore M src/server/types/preact-render-to-string.d.ts 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/96/378196/1 diff --git a/.eslintignore b/.eslintignore index b673a91..178135c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1 @@ /dist/ -/src/common/types/ -/src/server/types/ diff --git a/src/server/types/preact-render-to-string.d.ts b/src/server/types/preact-render-to-string.d.ts index 065e0d2..022753d 100644 --- a/src/server/types/preact-render-to-string.d.ts +++ b/src/server/types/preact-render-to-string.d.ts @@ -1,6 +1,5 @@ // todo: delete file when // https://github.com/developit/preact-render-to-string/pull/39 is merged. -/// declare namespace render { interface Options { -- To view, visit https://gerrit.wikimedia.org/r/378196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I068c52f28e4dae086caab8e188553e248de24963 Gerrit-PatchSet: 1 Gerrit-Project: marvin Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: Sniedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Update: allow URL to be derived from Route
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378197 ) Change subject: Update: allow URL to be derived from Route .. Update: allow URL to be derived from Route Bug: T173323 Change-Id: I7aa87b563a8348f8d0009cbfe08b0eb5b2f99c0b --- M src/common/components/app/app.tsx M src/common/routers/api.ts M src/common/routers/route.ts M src/common/routers/router.ts 4 files changed, 57 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/97/378197/1 diff --git a/src/common/components/app/app.tsx b/src/common/components/app/app.tsx index 250e0d0..df006bd 100644 --- a/src/common/components/app/app.tsx +++ b/src/common/components/app/app.tsx @@ -1,5 +1,6 @@ import "./app.css"; import { ComponentProps, h } from "preact"; +import { about, index, wiki } from "../../../common/routers/api"; import Link from "../link"; export default function App({ children }: ComponentProps): JSX.Element { @@ -7,16 +8,16 @@ - Home + Home - About + About - Banana + Banana - Cucumber + Cucumber 404 diff --git a/src/common/routers/api.ts b/src/common/routers/api.ts index 39c9acc..c4855b2 100644 --- a/src/common/routers/api.ts +++ b/src/common/routers/api.ts @@ -1,38 +1,34 @@ -import { Route } from "./route"; +import { AnyRoute, Route, newRoute } from "./route"; import { Props as WikiProps } from "../pages/wiki"; -export const index: Route= { +export const index: Route = newRoute({ path: "/", endpoint: () => import(/* webpackChunkName: "pages/index" */ "../pages/index"), - chunkName: "pages/index", - status: 200 -}; + chunkName: "pages/index" +}); -export const about: Route = { +export const about: Route = newRoute({ path: "/about", endpoint: () => import(/* webpackChunkName: "pages/about" */ "../pages/about"), - chunkName: "pages/about", - status: 200 -}; + chunkName: "pages/about" +}); -export const wiki: Route = { +export const wiki: Route = newRoute({ path: "/wiki/:title", endpoint: () => import(/* webpackChunkName: "pages/wiki" */ "../pages/wiki"), - chunkName: "pages/wiki", - status: 200 -}; + chunkName: "pages/wiki" +}); -export const styleGuide: Route = { +export const styleGuide: Route = newRoute({ path: "/dev/style-guide", endpoint: () => import(/* webpackChunkName: "pages/style-guide" */ "../pages/style-guide"), - chunkName: "pages/style-guide", - status: 200 -}; + chunkName: "pages/style-guide" +}); -export const notFound: Route = { +export const notFound: Route = newRoute({ // `(.*)` is the new `*`. See // https://github.com/pillarjs/path-to-regexp/issues/37. path: "(.*)", @@ -40,12 +36,6 @@ import(/* webpackChunkName: "pages/not-found" */ "../pages/not-found"), chunkName: "pages/not-found", status: 404 -}; +}); -export const routes: Route [] = [ - index, - about, - wiki, - styleGuide, - notFound -]; +export const routes: AnyRoute[] = [index, about, wiki, styleGuide, notFound]; diff --git a/src/common/routers/route.ts b/src/common/routers/route.ts index fd49c66..af75f4b 100644 --- a/src/common/routers/route.ts +++ b/src/common/routers/route.ts @@ -1,10 +1,11 @@ +import * as pathToRegExp from "path-to-regexp"; import { AnyComponent } from "preact"; export interface RouteParameters { [name: string]: string; } -export interface Endpoint { +export interface Endpoint { /** A Preact view component. */ Component: AnyComponent ; @@ -15,9 +16,32 @@ initialProps?: (parameters: RouteParameters) => Promise; } -export interface Route { +export interface RouteConfiguration { path: string; endpoint: () => Promise >; chunkName: string; - status: number; + status?: number; } + +export interface Route + extends RouteConfiguration { + status: number; + + /** Generates a URL from parameters. */ + url: (properties?: Parameters) => string; +} + +export type AnyRoute = Route ; + +export const newRoute = ({ + path, + endpoint, + chunkName, + status = 200 +}: RouteConfiguration ): Route => ({ + path, + endpoint, + chunkName, + status, + url: pathToRegExp.compile(path) +}); diff --git a/src/common/routers/router.ts b/src/common/routers/router.ts index 2f7c852..695329d 100644 --- a/src/common/routers/router.ts +++ b/src/common/routers/router.ts @@ -1,5 +1,9 @@ import * as pathToRegExp from "path-to-regexp"; -import { Endpoint, Route, RouteParameters } from "../../common/routers/route"; +import { + AnyRoute, + Endpoint,
[MediaWiki-commits] [Gerrit] marvin[master]: Doc: add continuous integration links
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378195 ) Change subject: Doc: add continuous integration links .. Doc: add continuous integration links Change-Id: Idd9ae1dedf63c4c4802078614c3472c272a41161 --- M docs/development.md 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/95/378195/1 diff --git a/docs/development.md b/docs/development.md index 8f656da..065e35a 100644 --- a/docs/development.md +++ b/docs/development.md @@ -6,8 +6,8 @@ ## Requirements Marvin's requirements are listed in the package.json **engines** field. -Generally the latest [Node.js][] active LTS version (6.X), and npm > 5.X should -do it. +Generally the latest [Node.js] active LTS version (6.X), and npm > 5.X should do +it. Before running the project on development, run: @@ -145,3 +145,11 @@ ## Environment variables See [configuration](../src/server/configuration.ts). + +## Continuous integration + +- [Jenkins jobs] +- [Jenkins Job Builder configuration] + +[Jenkins jobs]: https://integration.wikimedia.org/ci/view/Default/search/?q=marvin +[Jenkins Job Builder configuration]: https://phabricator.wikimedia.org/diffusion/CICF/browse/master/jjb/misc.yaml -- To view, visit https://gerrit.wikimedia.org/r/378195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd9ae1dedf63c4c4802078614c3472c272a41161 Gerrit-PatchSet: 1 Gerrit-Project: marvin Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: Sniedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: skip Letsencrypt cert on gerrit2001
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378194 ) Change subject: gerrit: skip Letsencrypt cert on gerrit2001 .. gerrit: skip Letsencrypt cert on gerrit2001 I4ce94cb92d959d2598b2e338 had the side-effect that the non-active Gerrit server, currently gerrit2001, is also getting the whole Apache setup including Letsencrypt for the SSL cert. This fails and causes puppet errors because gerrit2001 doesn't have the gerrit.wm.org DNS name, so it can't succesfully get a cert signed for that. Use the Hiera override to skip Letsencrypt to fix that. It just has to be remembered to change this if Gerrit falls over to the other server. Change-Id: I9400a232aa24cea4943ddb2749be5118bc5ee894 --- A hieradata/hosts/gerrit2001.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/hosts/gerrit2001.yaml b/hieradata/hosts/gerrit2001.yaml new file mode 100644 index 000..370806d --- /dev/null +++ b/hieradata/hosts/gerrit2001.yaml @@ -0,0 +1 @@ +do_acme: false -- To view, visit https://gerrit.wikimedia.org/r/378194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9400a232aa24cea4943ddb2749be5118bc5ee894 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: skip Letsencrypt cert on gerrit2001
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378194 ) Change subject: gerrit: skip Letsencrypt cert on gerrit2001 .. gerrit: skip Letsencrypt cert on gerrit2001 I4ce94cb92d959d2598b2e338 had the side-effect that the non-active Gerrit server, currently gerrit2001, is also getting the whole Apache setup including Letsencrypt for the SSL cert. This fails and causes puppet errors because gerrit2001 doesn't have the gerrit.wm.org DNS name, so it can't succesfully get a cert signed for that. Use the Hiera override to skip Letsencrypt to fix that. It just has to be remembered to change this if Gerrit falls over to the other server. Change-Id: I9400a232aa24cea4943ddb2749be5118bc5ee894 --- A hieradata/hosts/gerrit2001.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/378194/1 diff --git a/hieradata/hosts/gerrit2001.yaml b/hieradata/hosts/gerrit2001.yaml new file mode 100644 index 000..370806d --- /dev/null +++ b/hieradata/hosts/gerrit2001.yaml @@ -0,0 +1 @@ +do_acme: false -- To view, visit https://gerrit.wikimedia.org/r/378194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9400a232aa24cea4943ddb2749be5118bc5ee894 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1100 (crashed)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378193 ) Change subject: mariadb: Depool db1100 (crashed) .. mariadb: Depool db1100 (crashed) Change-Id: I4409eb0d2945be09f2d2dfca67577e34eae31331 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d6587d4..adc60e9 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -150,7 +150,7 @@ 'db1092' => 500, # D2 3.6TB 512GB 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager - 'db1100' => 1, # C2 3.6TB 512GB, old master + # 'db1100' => 1, # C2 3.6TB 512GB, old master, crashed ], 's6' => [ 'db1061' => 0, # C3 2.8TB 128GB, master -- To view, visit https://gerrit.wikimedia.org/r/378193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4409eb0d2945be09f2d2dfca67577e34eae31331 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: JcrespoGerrit-Reviewer: Jcrespo Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Add non-masters to have public DNS entries
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356499 ) Change subject: Gerrit: Add non-masters to have public DNS entries .. Gerrit: Add non-masters to have public DNS entries This way, you can have public & private slaves. Public slaves get nice DNS entries that aren't the standard hostname Change-Id: I4ce94cb92d959d2598b2e338a11f0f5a1b4a239d --- M hieradata/role/common/gerrit/server.yaml M modules/gerrit/manifests/init.pp M modules/gerrit/manifests/proxy.pp M modules/gerrit/templates/gerrit.wikimedia.org.erb M modules/profile/manifests/gerrit/server.pp 5 files changed, 28 insertions(+), 16 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/common/gerrit/server.yaml b/hieradata/role/common/gerrit/server.yaml index c6ff8ab..765a12f 100644 --- a/hieradata/role/common/gerrit/server.yaml +++ b/hieradata/role/common/gerrit/server.yaml @@ -3,6 +3,8 @@ - gerrit-admin gerrit::server::host: 'gerrit.wikimedia.org' +gerrit::server::slave_hosts: +- 'gerrit-slave.wikimedia.org' gerrit::server::master_host: 'cobalt.wikimedia.org' gerrit::server::bacula: 'srv-gerrit-git' gerrit::server::config: 'gerrit.config.erb' diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index 3365849..eb04d71 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -2,6 +2,7 @@ class gerrit( $config, $host, +$slave_hosts = [], $slave = false, ) { @@ -10,11 +11,12 @@ config => $config, } -if !$slave { -class { '::gerrit::proxy': -require => Class['gerrit::jetty'], -} +class { '::gerrit::proxy': +require => Class['gerrit::jetty'], +slave_hosts => $slave_hosts, +} +if !$slave { class { '::gerrit::crons': require => Class['gerrit::jetty'], } diff --git a/modules/gerrit/manifests/proxy.pp b/modules/gerrit/manifests/proxy.pp index b055e5c..ea32251 100644 --- a/modules/gerrit/manifests/proxy.pp +++ b/modules/gerrit/manifests/proxy.pp @@ -1,5 +1,6 @@ class gerrit::proxy( $host = $::gerrit::host, +$slave_hosts = [], $maint_mode = false, ) { diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb b/modules/gerrit/templates/gerrit.wikimedia.org.erb index ffd4a19..c2dfded 100644 --- a/modules/gerrit/templates/gerrit.wikimedia.org.erb +++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb @@ -11,6 +11,9 @@ ServerAdmin n...@wikimedia.org ServerName <%= @host %> +<%- if @slave_hosts -%> +ServerAlias <%= Array(@slave_hosts).join(' ') %> +<%- end -%> DocumentRoot /var/www @@ -40,6 +43,10 @@ ServerAdmin n...@wikimedia.org ServerName <%= @host %> +<%- if @slave_hosts -%> +ServerAlias <%= Array(@slave_hosts).join(' ') %> +<%- end -%> + # https://httpoxy.org/ RequestHeader unset Proxy early diff --git a/modules/profile/manifests/gerrit/server.pp b/modules/profile/manifests/gerrit/server.pp index 36fa8cf..d3a8736 100644 --- a/modules/profile/manifests/gerrit/server.pp +++ b/modules/profile/manifests/gerrit/server.pp @@ -5,6 +5,7 @@ $ipv4 = hiera('gerrit::service::ipv4'), $ipv6 = hiera('gerrit::service::ipv6'), $host = hiera('gerrit::server::host'), +$slave_hosts = hiera('gerrit::server::slave_hosts'), $master_host = hiera('gerrit::server::master_host'), $bacula = hiera('gerrit::server::bacula'), $gerrit_servers = join(hiera('gerrit::servers'), ' '), @@ -47,16 +48,14 @@ srange => "(@resolve((${gerrit_servers})) @resolve((${gerrit_servers}), ))", } -if !$slave { -ferm::service { 'gerrit_http': -proto => 'tcp', -port => 'http', -} +ferm::service { 'gerrit_http': +proto => 'tcp', +port => 'http', +} -ferm::service { 'gerrit_https': -proto => 'tcp', -port => 'https', -} +ferm::service { 'gerrit_https': +proto => 'tcp', +port => 'https', } if $bacula != undef and !$slave { @@ -66,8 +65,9 @@ } class { '::gerrit': -host => $host, -slave => $slave, -config => $config, +host=> $host, +slave => $slave, +slave_hosts => $slave_hosts, +config => $config, } } -- To view, visit https://gerrit.wikimedia.org/r/356499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ce94cb92d959d2598b2e338a11f0f5a1b4a239d Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Faidon
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1100 (crashed)
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378193 ) Change subject: mariadb: Depool db1100 (crashed) .. mariadb: Depool db1100 (crashed) Change-Id: I4409eb0d2945be09f2d2dfca67577e34eae31331 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/93/378193/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d6587d4..adc60e9 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -150,7 +150,7 @@ 'db1092' => 500, # D2 3.6TB 512GB 'db1096' => 1, # A6 3.6TB 512GB, watchlist, recentchanges, contributions, logpager 'db1099' => 1, # B2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager - 'db1100' => 1, # C2 3.6TB 512GB, old master + # 'db1100' => 1, # C2 3.6TB 512GB, old master, crashed ], 's6' => [ 'db1061' => 0, # C3 2.8TB 128GB, master -- To view, visit https://gerrit.wikimedia.org/r/378193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4409eb0d2945be09f2d2dfca67577e34eae31331 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...gerrit[master]: Bump core and all plugins to 2.13.9
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378192 ) Change subject: Bump core and all plugins to 2.13.9 .. Bump core and all plugins to 2.13.9 Change-Id: I76edf0e9a6b91171829050eaa07730e4565ffb1f --- M gerrit.war M plugins/commit-message-length-validator.jar A plugins/its-phabricator.jar M plugins/replication.jar M plugins/reviewnotes.jar 5 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/gerrit refs/changes/92/378192/1 diff --git a/gerrit.war b/gerrit.war index af2de9c..ca023c5 100644 --- a/gerrit.war +++ b/gerrit.war @@ -1 +1 @@ -#$# git-fat 5d688379e7c6b219645d874de54edac833b4e37a 51262165 +#$# git-fat ffe0a60170ad298e9525df9238fc4ebde1d533a4 52560761 diff --git a/plugins/commit-message-length-validator.jar b/plugins/commit-message-length-validator.jar index 9bc6e96..362a51d 100644 --- a/plugins/commit-message-length-validator.jar +++ b/plugins/commit-message-length-validator.jar @@ -1 +1 @@ -#$# git-fat cc93672c7896532e8e11d7538ece712397663454 4316 +#$# git-fat 26aa79661819ad2f4d6a185d12cf6ba6384a2c54 4315 diff --git a/plugins/its-phabricator.jar b/plugins/its-phabricator.jar new file mode 100644 index 000..55f5102 --- /dev/null +++ b/plugins/its-phabricator.jar @@ -0,0 +1 @@ +#$# git-fat f2dfa16182f8e4468c2b80a5e0b965b738d49866 1445881 diff --git a/plugins/replication.jar b/plugins/replication.jar index 91ca080..6deac4c 100644 --- a/plugins/replication.jar +++ b/plugins/replication.jar @@ -1 +1 @@ -#$# git-fat 1aba9efd991aa924b7d0c98915b771dcb24e510d 210135 +#$# git-fat 3acc66f2cf5283f5b5f79198855e4a16ac4b9394 210135 diff --git a/plugins/reviewnotes.jar b/plugins/reviewnotes.jar index 07267b3..eb964c7 100644 --- a/plugins/reviewnotes.jar +++ b/plugins/reviewnotes.jar @@ -1 +1 @@ -#$# git-fat 1dcfc64ff86760c737a815ed3587515380ae049824583 +#$# git-fat 0e6f882616c654644320b510b2748434ca2daff724583 -- To view, visit https://gerrit.wikimedia.org/r/378192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76edf0e9a6b91171829050eaa07730e4565ffb1f Gerrit-PatchSet: 1 Gerrit-Project: operations/software/gerrit Gerrit-Branch: master Gerrit-Owner: Chad___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: CollabTarget: Disable submit button when input is invalid
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378019 ) Change subject: CollabTarget: Disable submit button when input is invalid .. CollabTarget: Disable submit button when input is invalid Change-Id: Id8b3c098fc2fbec778b0d4cf98fa7cc35202d95b --- M modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js b/modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js index 4a5de31..18f2301 100644 --- a/modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js +++ b/modules/ve-mw-collab/ve.init.mw.CollabTarget.init.js @@ -70,6 +70,14 @@ documentNameField.toggle( true ); } + function onChange() { + documentNameInput.getValidity().then( function () { + submitButton.setDisabled( false ); + }, function () { + submitButton.setDisabled( true ); + } ); + } + function onSubmit() { documentNameInput.getValidity().then( function () { var title = mw.Title.newFromText( documentNameInput.getValue() ), @@ -95,8 +103,10 @@ } ); submitButton.setDisabled( false ); + documentNameInput.on( 'change', onChange ); documentNameInput.on( 'enter', onSubmit ); submitButton.on( 'click', onSubmit ); + onChange(); if ( pageTitle ) { showPage( pageTitle ); -- To view, visit https://gerrit.wikimedia.org/r/378019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8b3c098fc2fbec778b0d4cf98fa7cc35202d95b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: install jsduck via gems
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377746 ) Change subject: contint: install jsduck via gems .. contint: install jsduck via gems We can not get a Debian package out of it, so install straight from gems. Bug: T175764 Change-Id: I6d86f79818b35743278fc58ef8a8e148e8d82f7e --- M modules/contint/manifests/packages/ruby.pp 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/contint/manifests/packages/ruby.pp b/modules/contint/manifests/packages/ruby.pp index 8aaa8ab..70f5205 100644 --- a/modules/contint/manifests/packages/ruby.pp +++ b/modules/contint/manifests/packages/ruby.pp @@ -25,4 +25,16 @@ ]: ensure => present, } +# JSDuck was built for Ubuntu ( T48236/ T82278 ) +# It is a pain to rebuild for Jessie so give up (T95008), we will use +# bundler/rubygems instead +package { 'jsduck': +ensure => present, +provider => 'gem', +require => [ +Package['ruby2.1-dev'], +Package['build-essential'], +], +} + } -- To view, visit https://gerrit.wikimedia.org/r/377746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d86f79818b35743278fc58ef8a8e148e8d82f7e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: HasharGerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/wikistats[master]: Update svn.wikimedia.org links to phabricator
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/316289 ) Change subject: Update svn.wikimedia.org links to phabricator .. Update svn.wikimedia.org links to phabricator Bug: T64570 Change-Id: I8d440abb153390ad870e34923c0040ad9dcf0684 --- M dumps/perl/WikiReportsLocalizations.pm 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Verified; Looks good to me, approved diff --git a/dumps/perl/WikiReportsLocalizations.pm b/dumps/perl/WikiReportsLocalizations.pm index f8eec10..6e2f8cc 100644 --- a/dumps/perl/WikiReportsLocalizations.pm +++ b/dumps/perl/WikiReportsLocalizations.pm @@ -457,7 +457,7 @@ if ($language eq "tg") { $language2 = "tg_cyrl" ; } if ($language eq "zh") { $language2 = "zh_hans" ; } - my $raw_url = "http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/cldr/LanguageNames; . ucfirst ($language2) . ".php?view=co=text%2Fplain" ; + my $raw_url = "https://phabricator.wikimedia.org/diffusion/ECLD/browse/master/CldrNames/; . ucfirst ($language2) . ".php?view=raw" ; my ($content, $attempts) ; @@ -470,7 +470,7 @@ $ua->timeout(60); my $req = HTTP::Request->new(GET => $url); - $req->referer ("http://www.wikipedia.org;); + $req->referer ("https://www.wikipedia.org;); my $success = $false ; -- To view, visit https://gerrit.wikimedia.org/r/316289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d440abb153390ad870e34923c0040ad9dcf0684 Gerrit-PatchSet: 3 Gerrit-Project: analytics/wikistats Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Dzahn Gerrit-Reviewer: Elukey Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add App Shortcuts icons for the homescreen
Cooltey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378191 ) Change subject: Add App Shortcuts icons for the homescreen .. Add App Shortcuts icons for the homescreen In this update: 1. Adds an intent filter on PageActivity for shortcut icons 2. Adjusts icon image width and height 3. Adds offline compilation for "Random" shortcut 4. Setup default opens "Main Page" for handling exceptions from "Radnom" and "Continue Reading" Discussion: - Should the app backs to the Feed page after clicking on the "X" (close) button? Right now it exists the app. Bug: T174308 Change-Id: I92da049871a7dd7036ea6d8f3edc3f96df81d950 --- M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/appshortcuts/AppShortcuts.java M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/res/values/dimens.xml 4 files changed, 59 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/91/378191/1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 252897e..1535034 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -104,6 +104,10 @@ + + + + = android.os.Build.VERSION_CODES.N_MR1) { - shortcutManager.setDynamicShortcuts(Arrays.asList(randomShortcut(), continueReadingShortcut(), searchShortcut())); + shortcutManager.setDynamicShortcuts(Arrays.asList(searchShortcut(), continueReadingShortcut(), randomShortcut())); } } } @@ -42,8 +42,7 @@ .setLongLabel(app.getString(R.string.app_shortcuts_random)) .setIcon(Icon.createWithResource(app, R.drawable.appshortcut_ic_random)) .setIntent( -new Intent(Intent.ACTION_MAIN, Uri.EMPTY, app, PageActivity.class) -.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) +new Intent(PageActivity.ACTION_APP_SHORTCUT) .putExtra(Constants.INTENT_APP_SHORTCUT_RANDOM, true)) .build(); @@ -57,14 +56,9 @@ .setShortLabel(app.getString(R.string.app_shortcuts_continue_reading)) .setLongLabel(app.getString(R.string.app_shortcuts_continue_reading)) .setIcon(Icon.createWithResource(app, R.drawable.appshortcut_ic_continue_reading)) -.setIntents( -new Intent[]{ -new Intent(Intent.ACTION_MAIN, Uri.EMPTY, app, MainActivity.class) - .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP), -new Intent(Intent.ACTION_MAIN, Uri.EMPTY, app, PageActivity.class) - .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - .putExtra(Constants.INTENT_APP_SHORTCUT_CONTINUE_READING, true) -}) +.setIntent( +new Intent(PageActivity.ACTION_APP_SHORTCUT) + .putExtra(Constants.INTENT_APP_SHORTCUT_CONTINUE_READING, true)) .build(); return shortcut; diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index 02b1841..e7eab48 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -45,6 +45,7 @@ import org.wikipedia.activity.BaseActivity; import org.wikipedia.analytics.IntentFunnel; import org.wikipedia.analytics.LinkPreviewFunnel; +import org.wikipedia.concurrency.CallbackTask; import org.wikipedia.dataclient.WikiSite; import org.wikipedia.dataclient.restbase.page.RbPageSummary; import org.wikipedia.descriptions.DescriptionEditRevertHelpView; @@ -57,11 +58,13 @@ import org.wikipedia.gallery.GalleryActivity; import org.wikipedia.history.HistoryEntry; import org.wikipedia.language.LangLinksActivity; +import org.wikipedia.offline.OfflineManager; import org.wikipedia.page.linkpreview.LinkPreviewDialog; import org.wikipedia.page.tabs.TabsProvider; import org.wikipedia.page.tabs.TabsProvider.TabPosition; import org.wikipedia.random.RandomSummaryClient; import org.wikipedia.readinglist.AddToReadingListDialog; +import org.wikipedia.readinglist.page.database.ReadingListPageDao; import org.wikipedia.search.SearchFragment; import org.wikipedia.search.SearchInvokeSource; import org.wikipedia.settings.SettingsActivity; @@ -75,6 +78,7 @@ import org.wikipedia.widgets.WidgetProviderFeaturedPage; import org.wikipedia.wiktionary.WiktionaryDialog; +import java.io.IOException; import java.util.List; import
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Redirect all http traffic to https
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354247 ) Change subject: Phabricator: Redirect all http traffic to https .. Phabricator: Redirect all http traffic to https Reason why I'm doing this is because in labs you can go to http or https. Using http can cause issues like T165643 . This will also safe guard phabricator.wikimedia.org too just in case a http request is not transferred to https. Bug: T165643 Change-Id: I0e513b209b11afde58a1c9b3f675dae77159 --- M modules/phabricator/templates/phabricator-default.conf.erb 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/phabricator/templates/phabricator-default.conf.erb b/modules/phabricator/templates/phabricator-default.conf.erb index 8a8fa09..72422cb 100644 --- a/modules/phabricator/templates/phabricator-default.conf.erb +++ b/modules/phabricator/templates/phabricator-default.conf.erb @@ -50,6 +50,10 @@ CustomLog /var/log/apache2/phabricator_access.log wmf ServerSignature Off + + RewriteCond %{HTTP:X-Forwarded-Proto} !https + RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L] + <% if !@serveraliases.empty? -%> <%- @serveraliases.each do |name| -%> # Redirect server alias home to the main server name -- To view, visit https://gerrit.wikimedia.org/r/354247 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e513b209b11afde58a1c9b3f675dae77159 Gerrit-PatchSet: 9 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: PaladoxGerrit-Reviewer: 20after4 Gerrit-Reviewer: BBlack Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Ema Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Change $deploy_user home directory to /var/lib/${deploy_user}
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365891 ) Change subject: Change $deploy_user home directory to /var/lib/${deploy_user} .. Change $deploy_user home directory to /var/lib/${deploy_user} This probably should not be hard-coded to /var/lib/scap? This only really causes a problem on deployment-prep because the mwdeploy user is in ldap so puppet can't change the home directory to /var/lib/scap. I think this is more correct though and it also happens to fix T166013 on beta. Bug: T166013 Change-Id: I28402371379b2b9f7e9ee05dd89af17d9afae71d --- M modules/scap/manifests/target.pp 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Chad: Looks good to me, but someone else must approve Hashar: Looks good to me, but someone else must approve jenkins-bot: Verified Gilles: Looks good to me, but someone else must approve Dzahn: Looks good to me, approved diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp index 00a9955..1f2d582 100644 --- a/modules/scap/manifests/target.pp +++ b/modules/scap/manifests/target.pp @@ -72,10 +72,12 @@ user { $deploy_user: ensure => present, shell => '/bin/bash', -home => '/var/lib/scap', +home => "/var/lib/${deploy_user}", system => true, managehome => true, } +} else { +notice("manage_user=true but user ${deploy_user} already defined") } if !defined(Ssh::Userkey[$deploy_user]) { $key_name_safe = regsubst($key_name, '\W', '_', 'G') -- To view, visit https://gerrit.wikimedia.org/r/365891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28402371379b2b9f7e9ee05dd89af17d9afae71d Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 20after4Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Gilles Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Hashar Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move phabricator conf files outside of source tree
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/374054 ) Change subject: Move phabricator conf files outside of source tree .. Move phabricator conf files outside of source tree Problem: scap doesn't keep untracked files SCAP deployments wipe out untracked files in the deployed source tree. Our current phabricator puppetization involves a lot of untracked files within /srv/phab/ which are managed by puppet. This has the consequence that every scap deployment requires a full puppet run to regenerate these config files. SCAP does not provide a clean way to deal with this and even if we run puppet from a hook, it would be slow. Accepting the slowness, we would also need to give the deploy user ability to sudo as root. Solution: Move untracked files outside of the source tree After discussing this with @thcipriani, we decided that the best approach would be to change puppet instead of adding a new feature to scap to keep untracked files. I still think that would be nice to have in scap, however, it's not trivial given that scap does a fresh clone of the repo for every deployment. Bug: T172847 Change-Id: I439b41692e9c54848410d442bb54b4627713fb71 --- M modules/phabricator/manifests/conf_env.pp M modules/phabricator/manifests/init.pp M modules/phabricator/manifests/redirector.pp 3 files changed, 29 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/phabricator/manifests/conf_env.pp b/modules/phabricator/manifests/conf_env.pp index 9904fee..6a673e1 100644 --- a/modules/phabricator/manifests/conf_env.pp +++ b/modules/phabricator/manifests/conf_env.pp @@ -11,7 +11,7 @@ $owner = 'root', $group = 'root', ) { -file { "${phabricator::phabdir}/phabricator/conf/local/${environment}.json": +file { "${phabricator::confdir}/local/${environment}.json": owner => $owner, group => $group, mode=> '0640', diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index 953fce0..7383adf 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -53,6 +53,7 @@ class phabricator ( $phabdir = '/srv/phab', +$confdir = '/srv/phab/phabricator/conf', $timezone = 'UTC', $trusted_proxies = [], $libraries= [], @@ -238,7 +239,21 @@ notify => Service['apache2'], } -file { "${phabdir}/phabricator/conf/local/local.json": +file { $confdir: +ensure => 'directory', +owner => 'root', +group => 'root', +mode => '0755', +} + +file { "${confdir}/local": +ensure => 'directory', +owner => 'root', +group => 'root', +mode => '0755', +} + +file { "${confdir}/local/local.json": content => template('phabricator/local.json.erb'), require => $base_requirements, owner => 'root', diff --git a/modules/phabricator/manifests/redirector.pp b/modules/phabricator/manifests/redirector.pp index dcdf54a..d750159 100644 --- a/modules/phabricator/manifests/redirector.pp +++ b/modules/phabricator/manifests/redirector.pp @@ -15,12 +15,22 @@ $phab_host = 'phabricator.wikimedia.org', $alt_host= 'phab.wmfusercontent.org' ) { +$preamble = "${phabricator::confdir}/preamble.php" +$redirect_config = "${phabricator::confdir}/redirect_config.json" + file { "${rootdir}/phabricator/support/preamble.php": +ensure => 'link', +target => $preamble +} +file { $preamble: content => template('phabricator/preamble.php.erb'), -require => File["${rootdir}/phabricator/support/redirect_config.json"], } -file { "${rootdir}/phabricator/support/redirect_config.json": +file { $redirect_config: content => template('phabricator/redirect_config.json.erb'), } +file { "${rootdir}/phabricator/support/redirect_config.json": +ensure => 'link', +target => $redirect_config, +} } -- To view, visit https://gerrit.wikimedia.org/r/374054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I439b41692e9c54848410d442bb54b4627713fb71 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 20after4Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Paladox Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: PHAB: deployment scripts to be called by scap
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370622 ) Change subject: PHAB: deployment scripts to be called by scap .. PHAB: deployment scripts to be called by scap These hooks will be called at various stages during a scap deployment. * Promote stops phd and disables puppet * Finalize applies database migrations, runs puppet and reloads phd + apache * Rollback runs puppet, restarts apache, restarts phd Bug: T172847 Change-Id: I3ecdcf2a88e499e44d17bc3009ecab845a93c5c3 --- M modules/phabricator/README M modules/phabricator/manifests/init.pp A modules/phabricator/templates/deployment/phab_deploy_finalize.erb A modules/phabricator/templates/deployment/phab_deploy_promote.erb A modules/phabricator/templates/deployment/phab_deploy_rollback.erb D modules/phabricator/templates/phab_update_tag.erb 6 files changed, 75 insertions(+), 126 deletions(-) Approvals: 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/phabricator/README b/modules/phabricator/README index 85b0273..efa0fa8 100644 --- a/modules/phabricator/README +++ b/modules/phabricator/README @@ -75,7 +75,7 @@ 3. Run the upgrade script on the Phabricator host -phab_update_tag +/usr/local/sbin/phab_deploy_finalize This script will manage setting up the migration state, upgrading the DB schema, rolling the git repositories to the appropriate tag defined in puppet, and diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index 1ad819e..953fce0 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -197,9 +197,11 @@ scap::target { $deploy_target: deploy_user => $deploy_user, key_name=> 'phabricator', +require => File['/usr/local/sbin/phab_deploy_finalize'], sudo_rules => [ -'ALL=(root) NOPASSWD: /usr/sbin/service phd *', -'ALL=(root) NOPASSWD: /usr/sbin/service apache2 *', +'ALL=(root) NOPASSWD: /usr/local/sbin/phab_deploy_promote', +'ALL=(root) NOPASSWD: /usr/local/sbin/phab_deploy_rollback', +'ALL=(root) NOPASSWD: /usr/local/sbin/phab_deploy_finalize', ], } @@ -244,6 +246,28 @@ mode=> '0644', } +file { '/usr/local/sbin/phab_deploy_promote': +content => template('phabricator/deployment/phab_deploy_promote.erb'), +owner => 'root', +group => 'root', +mode=> '0700', +} + +file { '/usr/local/sbin/phab_deploy_finalize': +content => template('phabricator/deployment/phab_deploy_finalize.erb'), +owner => 'root', +group => 'root', +mode=> '0700', +} + +file { '/usr/local/sbin/phab_deploy_rollback': +content => template('phabricator/deployment/phab_deploy_rollback.erb'), +owner => 'root', +group => 'root', +mode=> '0700', +} + + if !empty($conf_files) { create_resources(phabricator::conf_env, $conf_files) } diff --git a/modules/phabricator/templates/deployment/phab_deploy_finalize.erb b/modules/phabricator/templates/deployment/phab_deploy_finalize.erb new file mode 100644 index 000..1ab7e72 --- /dev/null +++ b/modules/phabricator/templates/deployment/phab_deploy_finalize.erb @@ -0,0 +1,39 @@ +#!/bin/bash + +git=$(which git) +logger=$(which logger) +puppet=$(which puppet) +systemctl=$(which systemctl) + +function log() { + echo -e "\n${green} ->${1}${CLEAR}" + $logger "${1}" +} + +function error() { + echo "" + $logger --stderr "${1}" +} + +log "Running puppet..." +$puppet agent --test + +log "Applying storage migrations" +<%= @phabdir %>/phabricator/bin/storage upgrade --force -u <%= @storage_user %> -p <%= @storage_pass %> + +log "Restarting PHD" +$systemctl start phd + +log "Reloading apache" +$systemctl reload apache2 + +log "Enabling puppet agent" +$puppet agent --enable + +log "Verifying database status" +<%= @phabdir %>/phabricator/bin/storage status &>/dev/null +retcode=$? +if [ "$retcode" != "0" ]; then +error ">>>ERROR: Phabricator storage is in a bad state." +exit 1 +fi diff --git a/modules/phabricator/templates/deployment/phab_deploy_promote.erb b/modules/phabricator/templates/deployment/phab_deploy_promote.erb new file mode 100644 index 000..ab2061c --- /dev/null +++ b/modules/phabricator/templates/deployment/phab_deploy_promote.erb @@ -0,0 +1,4 @@ +#!/bin/bash + +systemctl stop phd +puppet agent --disable diff --git a/modules/phabricator/templates/deployment/phab_deploy_rollback.erb b/modules/phabricator/templates/deployment/phab_deploy_rollback.erb new file mode 100644 index 000..71749de --- /dev/null +++ b/modules/phabricator/templates/deployment/phab_deploy_rollback.erb @@ -0,0 +1,5 @@ +#!/bin/bash +puppet agent
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add VirtualRestService config for Electron
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377928 ) Change subject: Add VirtualRestService config for Electron .. Add VirtualRestService config for Electron The URLs are copied from puppet: profile::restbase::pdfrender_uri in * hieradata/labs/deployment-prep/common.yaml (labs) * hieradata/role/common/restbase/production.yaml (production) $wmgElectronSecret must be set in the private repo before deploying this. (Value is in $::service::configuration::pdfrender_key.) For the code using this, see https://gerrit.wikimedia.org/r/#/c/361453/26/includes/ElectronVirtualRestService.php Bug: T175868 Change-Id: I9709b0548413d95b972fdfe95008f62aeaee5f60 --- M wmf-config/CommonSettings.php M wmf-config/LabsServices.php M wmf-config/ProductionServices.php 3 files changed, 16 insertions(+), 4 deletions(-) Approvals: GWicke: Looks good to me, but someone else must approve Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index ce718ca..f497107 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2226,7 +2226,7 @@ wfLoadExtension( 'Linter' ); } -if ( !isset( $wgVirtualRestConfig ) && ( $wmgUseRestbaseVRS || $wmgUseParsoid ) ) { +if ( !isset( $wgVirtualRestConfig ) && ( $wmgUseRestbaseVRS || $wmgUseParsoid || $wmgUseCollection ) ) { $wgVirtualRestConfig = [ 'modules' => [], 'global' => [ @@ -2261,6 +2261,15 @@ ]; } +if ( $wmgUseCollection ) { + $wgVirtualRestConfig['modules']['electron'] = [ + 'url' => $wmfLocalServices['electron'], + 'options' => [ + 'accessKey' => $wmgElectronSecret, // set in private repo + ], + ]; +} + if ( $wmgUseVisualEditor ) { wfLoadExtension( 'VisualEditor' ); diff --git a/wmf-config/LabsServices.php b/wmf-config/LabsServices.php index 816392b..70b5455 100644 --- a/wmf-config/LabsServices.php +++ b/wmf-config/LabsServices.php @@ -35,7 +35,8 @@ ], 'etcd' => 'deployment-etcd-01.deployment-prep.eqiad.wmflabs:2379', 'mediaSwiftAuth' => 'http://deployment-ms-fe02.deployment-prep.eqiad.wmflabs/auth', - 'mediaSwiftStore' => 'http://deployment-ms-fe02.deployment-prep.eqiad.wmflabs/v1/AUTH_mw' + 'mediaSwiftStore' => 'http://deployment-ms-fe02.deployment-prep.eqiad.wmflabs/v1/AUTH_mw', + 'electron' => 'http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252', ]; ### Logstash diff --git a/wmf-config/ProductionServices.php b/wmf-config/ProductionServices.php index 06ef67b..cef9c6d 100644 --- a/wmf-config/ProductionServices.php +++ b/wmf-config/ProductionServices.php @@ -25,7 +25,8 @@ 'cxserver' => 'http://cxserver.discovery.wmnet:8080', 'etcd' => '_etcd._tcp.eqiad.wmnet', 'mediaSwiftAuth' => 'https://ms-fe.svc.eqiad.wmnet/auth', - 'mediaSwiftStore' => 'https://ms-fe.svc.eqiad.wmnet/v1/AUTH_mw' + 'mediaSwiftStore' => 'https://ms-fe.svc.eqiad.wmnet/v1/AUTH_mw', + 'electron' => 'http://pdfrender.discovery.wmnet:5252', ]; $wmfAllServices['codfw'] = [ @@ -42,7 +43,8 @@ 'cxserver' => 'http://cxserver.discovery.wmnet:8080', 'etcd' => '_etcd._tcp.codfw.wmnet', 'mediaSwiftAuth' => 'https://ms-fe.svc.codfw.wmnet/auth', - 'mediaSwiftStore' => 'https://ms-fe.svc.codfw.wmnet/v1/AUTH_mw' + 'mediaSwiftStore' => 'https://ms-fe.svc.codfw.wmnet/v1/AUTH_mw', + 'electron' => 'http://pdfrender.discovery.wmnet:5252', ]; ### Logstash -- To view, visit https://gerrit.wikimedia.org/r/377928 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9709b0548413d95b972fdfe95008f62aeaee5f60 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Bmansurov Gerrit-Reviewer: Catrope Gerrit-Reviewer: GWicke Gerrit-Reviewer: Ppchelko Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[wmf/1.30.0-wmf.18]: Follow-up 7a33405a9ca: fix JS error
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377906 ) Change subject: Follow-up 7a33405a9ca: fix JS error .. Follow-up 7a33405a9ca: fix JS error Change-Id: I499c7522b80d8e0975c8f0415cf3ab5274eae660 --- M modules/widgets/translator/ext.cx.translator.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/widgets/translator/ext.cx.translator.js b/modules/widgets/translator/ext.cx.translator.js index f9a79ab..6f58b95 100644 --- a/modules/widgets/translator/ext.cx.translator.js +++ b/modules/widgets/translator/ext.cx.translator.js @@ -76,7 +76,7 @@ // thisMonthKey, but not guaranteed. if ( !lastMonthKey ) { // There is no month with non-zero contributions. - this.$widget.remove(); + self.$widget.remove(); return; } total = publishTrend[ lastMonthKey ].count || 0; -- To view, visit https://gerrit.wikimedia.org/r/377906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I499c7522b80d8e0975c8f0415cf3ab5274eae660 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: CatropeGerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.30.0-wmf.18]: Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378181 ) Change subject: Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2) .. Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2) New changes: 0222046b2 ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: I130024785e4d72484572df293482f966ddc00acf --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index dafc7bb..0222046 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit dafc7bbe5f9ba0f9833dc5127b90003cd6e70cfc +Subproject commit 0222046b29eb0f75cae2a29a7cb276d8d0c80028 -- To view, visit https://gerrit.wikimedia.org/r/378181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I130024785e4d72484572df293482f966ddc00acf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: JforresterGerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Give sysops the flow-create-board right on all wikis with Fl...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378183 ) Change subject: Give sysops the flow-create-board right on all wikis with Flow in general use .. Give sysops the flow-create-board right on all wikis with Flow in general use Specifically, this means wikis where the Flow beta feature is enabled, and wikis where Flow occupies one or more entire namespaces. Also remove manual settings for gomwiki and officewiki which are now implied by this. Bug: T175934 Change-Id: Ibfc69ffc34939e3fe45548121a42ab846345d17e --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 7 insertions(+), 4 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index dcf096e..ce718ca 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2875,6 +2875,12 @@ } $wgFlowEnableOptInBetaFeature = $wmgFlowEnableOptInBetaFeature; + + // On wikis that have Flow as a beta feature or in an entire namespace, + // give sysops the right to create and move Flow boards + if ( $wgFlowEnableOptInBetaFeature || $wmgFlowNamespaces ) { + $wgGroupPermissions['sysop']['flow-create-board'] = true; + } } if ( $wmgUseDisambiguator ) { diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d64762b..f96d715 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8593,9 +8593,6 @@ '+gawiki' => [ 'rollbacker' => [ 'rollback' => true ], ], - 'gomwiki' => [ - 'sysop' => [ 'flow-create-board' => true ], // T139226 - ], 'guwiki' => [ // T119787 'rollbacker' => [ 'rollback' => true ], 'autopatrolled' => [ 'autopatrol' => true ], @@ -9035,7 +9032,7 @@ 'communityapps' => [ 'view-community-applications' => true ], 'flood' => [ 'bot' => true ], // T86237 'user' => [ 'massmessage' => true, ], // T66978 - 'sysop' => [ 'importupload' => true, 'flow-create-board' => true ], // T101663 + 'sysop' => [ 'importupload' => true, ], // T101663 'securepoll' => [ 'securepoll-create-poll' => true, 'editinterface' => true ], ], '+ombudsmenwiki' => [ -- To view, visit https://gerrit.wikimedia.org/r/378183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfc69ffc34939e3fe45548121a42ab846345d17e Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: CatropeGerrit-Reviewer: Catrope Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[master]: i18n: Change "parsermigration-current" to say "Old"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378190 ) Change subject: i18n: Change "parsermigration-current" to say "Old" .. i18n: Change "parsermigration-current" to say "Old" On some wikis it's not current. Change-Id: I093b050379de90e2f9eaf04803d129246526fd52 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index c846ff7..4a59c43 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -9,7 +9,7 @@ "apihelp-parser-migration-param-config": "The parser configuration to use. May be \"old\", \"new\" or \"old|new\".", "parsermigration-desc": "Parser migration tool", "parsermigration-edit-subtitle": "with parser migration tool", - "parsermigration-current": "Current", + "parsermigration-current": "Old", "parsermigration-new": "New", "parsermigration-pref-label": "Enable parser migration tool", "parsermigration-pref-help": "This adds a sidebar link giving access to [https://www.mediawiki.org/wiki/Extension:ParserMigration a tool] for migrating page text to new versions of the MediaWiki parser.", -- To view, visit https://gerrit.wikimedia.org/r/378190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I093b050379de90e2f9eaf04803d129246526fd52 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ParserMigration Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ParserMigration[master]: i18n: Change "parsermigration-current" to say "Old"
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378190 ) Change subject: i18n: Change "parsermigration-current" to say "Old" .. i18n: Change "parsermigration-current" to say "Old" On some wikis it's not current. Change-Id: I093b050379de90e2f9eaf04803d129246526fd52 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserMigration refs/changes/90/378190/2 diff --git a/i18n/en.json b/i18n/en.json index c846ff7..4a59c43 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -9,7 +9,7 @@ "apihelp-parser-migration-param-config": "The parser configuration to use. May be \"old\", \"new\" or \"old|new\".", "parsermigration-desc": "Parser migration tool", "parsermigration-edit-subtitle": "with parser migration tool", - "parsermigration-current": "Current", + "parsermigration-current": "Old", "parsermigration-new": "New", "parsermigration-pref-label": "Enable parser migration tool", "parsermigration-pref-help": "This adds a sidebar link giving access to [https://www.mediawiki.org/wiki/Extension:ParserMigration a tool] for migrating page text to new versions of the MediaWiki parser.", -- To view, visit https://gerrit.wikimedia.org/r/378190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I093b050379de90e2f9eaf04803d129246526fd52 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ParserMigration Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "site/dns: tmp remove acamar from resolv.conf overrides"
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378189 ) Change subject: Revert "site/dns: tmp remove acamar from resolv.conf overrides" .. Revert "site/dns: tmp remove acamar from resolv.conf overrides" This reverts commit 82773baaff5354b6f774055f89c4070cafb0d208. Change-Id: Ie7c038fa1ac2cdd688259a275f350048d1869f4a --- M manifests/site.pp 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index c322756..4724d6c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -25,7 +25,7 @@ role(dnsrecursor, ntp) # use acamar (directly) + eqiad LVS (avoid self-dep) -$nameservers_override = [ '208.80.154.254' ] +$nameservers_override = [ '208.80.153.12', '208.80.154.254' ] interface::add_ip6_mapped { 'main': } } @@ -1446,7 +1446,7 @@ # so they need to use the recursive DNS backends directly # (acamar and achernar) with fallback to eqiad # (doing this for all lvs for now, see T103921) -$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { 'eth0': bnx2x => true, txqlen => 1; @@ -1473,7 +1473,7 @@ # ULSFO lvs servers node /^lvs400[1-4]\.ulsfo\.wmnet$/ { # ns override for all lvs for now, see T103921 -$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { -- To view, visit https://gerrit.wikimedia.org/r/378189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7c038fa1ac2cdd688259a275f350048d1869f4a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Use RemexHtml instead of Tidy on mediawikiwiki, testwiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377943 ) Change subject: Use RemexHtml instead of Tidy on mediawikiwiki, testwiki .. Use RemexHtml instead of Tidy on mediawikiwiki, testwiki Bug: T175095 Change-Id: I97c6eab07c827fb558b8467f605c3ae3cf4f23dd --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified Jforrester: Looks good to me, but someone else must approve diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7205387..d64762b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19000,6 +19000,12 @@ 'donatewiki' => false, ], +'wgTidyConfig' => [ + 'default' => null, + 'mediawikiwiki' => [ 'driver' => 'RemexHtml' ], + 'testwiki' => [ 'driver' => 'RemexHtml' ], +], + // Cache ResourceLoader modules in localStorage 'wgResourceLoaderStorageEnabled' => [ 'default' => true, -- To view, visit https://gerrit.wikimedia.org/r/377943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97c6eab07c827fb558b8467f605c3ae3cf4f23dd Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Tim StarlingGerrit-Reviewer: Catrope Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Follow-up 6d62e9ea8a. Also allow crats to remove accountcreator
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/37 ) Change subject: Follow-up 6d62e9ea8a. Also allow crats to remove accountcreator .. Follow-up 6d62e9ea8a. Also allow crats to remove accountcreator Bug: T175903 Change-Id: I1a014966ff488ac5b68bbba5f72d4c33c9a40321 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MarcoAurelio: Looks good to me, but someone else must approve Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 648eb92..7205387 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10870,7 +10870,7 @@ ], '+mediawikiwiki' => [ 'sysop' => [ 'autopatrolled' ], - 'bureaucrat' => [ 'autopatrolled', 'transwiki', 'import', 'translationadmin' ], + 'bureaucrat' => [ 'autopatrolled', 'transwiki', 'import', 'translationadmin', 'accountcreator' ], ], '+metawiki' => [ 'bureaucrat' => [ 'flood', 'translationadmin', 'centralnoticeadmin', 'uploader' ], // T39198, T52287, T110674 -- To view, visit https://gerrit.wikimedia.org/r/37 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a014966ff488ac5b68bbba5f72d4c33c9a40321 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Brian WolffGerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Catrope Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: MarcoAurelio Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "site/dns: tmp remove acamar from resolv.conf overrides"
Hello jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/378189 to review the following change. Change subject: Revert "site/dns: tmp remove acamar from resolv.conf overrides" .. Revert "site/dns: tmp remove acamar from resolv.conf overrides" This reverts commit 82773baaff5354b6f774055f89c4070cafb0d208. Change-Id: Ie7c038fa1ac2cdd688259a275f350048d1869f4a --- M manifests/site.pp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/89/378189/1 diff --git a/manifests/site.pp b/manifests/site.pp index c322756..4724d6c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -25,7 +25,7 @@ role(dnsrecursor, ntp) # use acamar (directly) + eqiad LVS (avoid self-dep) -$nameservers_override = [ '208.80.154.254' ] +$nameservers_override = [ '208.80.153.12', '208.80.154.254' ] interface::add_ip6_mapped { 'main': } } @@ -1446,7 +1446,7 @@ # so they need to use the recursive DNS backends directly # (acamar and achernar) with fallback to eqiad # (doing this for all lvs for now, see T103921) -$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { 'eth0': bnx2x => true, txqlen => 1; @@ -1473,7 +1473,7 @@ # ULSFO lvs servers node /^lvs400[1-4]\.ulsfo\.wmnet$/ { # ns override for all lvs for now, see T103921 -$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { -- To view, visit https://gerrit.wikimedia.org/r/378189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7c038fa1ac2cdd688259a275f350048d1869f4a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site/dns: tmp remove acamar from resolv.conf overrides
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378188 ) Change subject: site/dns: tmp remove acamar from resolv.conf overrides .. site/dns: tmp remove acamar from resolv.conf overrides The server needs to be rebooted for a BIOS firmware upgrade and taking it out of these overrides is one of the precautions to do before doing this. Bug: T162850 Change-Id: I5afaf2a29c13208aec1fcbd0226fae67a077eeb7 --- M manifests/site.pp 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index 4724d6c..c322756 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -25,7 +25,7 @@ role(dnsrecursor, ntp) # use acamar (directly) + eqiad LVS (avoid self-dep) -$nameservers_override = [ '208.80.153.12', '208.80.154.254' ] +$nameservers_override = [ '208.80.154.254' ] interface::add_ip6_mapped { 'main': } } @@ -1446,7 +1446,7 @@ # so they need to use the recursive DNS backends directly # (acamar and achernar) with fallback to eqiad # (doing this for all lvs for now, see T103921) -$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { 'eth0': bnx2x => true, txqlen => 1; @@ -1473,7 +1473,7 @@ # ULSFO lvs servers node /^lvs400[1-4]\.ulsfo\.wmnet$/ { # ns override for all lvs for now, see T103921 -$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { -- To view, visit https://gerrit.wikimedia.org/r/378188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5afaf2a29c13208aec1fcbd0226fae67a077eeb7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: DzahnGerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (05439f5b7)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378155 ) Change subject: Update VE core submodule to master (05439f5b7) .. Update VE core submodule to master (05439f5b7) New changes: 8c64fe2b5 VisualDiff: Show minimal moves in diff 85a6489ee Localisation updates from https://translatewiki.net. c20e589d5 Fire position event when direction is changed 32bc67544 Fix AuthorListPopupTool's surface setting 7ff9a3a4e Correct inheritance for CommentInspector actions 05439f5b7 ui.TableLineContext: fix z-index for menu Bug: T169389 Bug: T171451 Change-Id: Ib8046bd830572829541946f3539a9fcb447cf76f --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: DLynch: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 7028f79..05439f5 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 7028f79aa11c0e1f5af157e945d586a38f11d387 +Subproject commit 05439f5b7822ae35c5048f3a2e1ecd5a5db21454 -- To view, visit https://gerrit.wikimedia.org/r/378155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib8046bd830572829541946f3539a9fcb447cf76f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: DLynch Gerrit-Reviewer: Deskana Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: site/dns: tmp remove acamar from resolv.conf overrides
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378188 ) Change subject: site/dns: tmp remove acamar from resolv.conf overrides .. site/dns: tmp remove acamar from resolv.conf overrides The server needs to be rebooted for a BIOS firmware upgrade and taking it out of these overrides is one of the precautions to do before doing this. Bug: T162850 Change-Id: I5afaf2a29c13208aec1fcbd0226fae67a077eeb7 --- M manifests/site.pp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/378188/1 diff --git a/manifests/site.pp b/manifests/site.pp index 4724d6c..c322756 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -25,7 +25,7 @@ role(dnsrecursor, ntp) # use acamar (directly) + eqiad LVS (avoid self-dep) -$nameservers_override = [ '208.80.153.12', '208.80.154.254' ] +$nameservers_override = [ '208.80.154.254' ] interface::add_ip6_mapped { 'main': } } @@ -1446,7 +1446,7 @@ # so they need to use the recursive DNS backends directly # (acamar and achernar) with fallback to eqiad # (doing this for all lvs for now, see T103921) -$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { 'eth0': bnx2x => true, txqlen => 1; @@ -1473,7 +1473,7 @@ # ULSFO lvs servers node /^lvs400[1-4]\.ulsfo\.wmnet$/ { # ns override for all lvs for now, see T103921 -$nameservers_override = [ '208.80.153.12', '208.80.153.42', '208.80.154.254' ] +$nameservers_override = [ '208.80.153.42', '208.80.154.254' ] role(lvs::balancer) lvs::interface_tweaks { -- To view, visit https://gerrit.wikimedia.org/r/378188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5afaf2a29c13208aec1fcbd0226fae67a077eeb7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [labs] Override prod settings
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378187 ) Change subject: [labs] Override prod settings .. [labs] Override prod settings Change-Id: I45ce2bcbaec9679a4245ffa115aac7a2dbe64a48 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 4d87eb6..d59d8b8 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -466,7 +466,7 @@ 'nonecho' => false, ], - 'wmgUseCodeMirror' => [ + '-wmgUseCodeMirror' => [ 'default' => true, ], -- To view, visit https://gerrit.wikimedia.org/r/378187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45ce2bcbaec9679a4245ffa115aac7a2dbe64a48 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSemGerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [labs] Override prod settings
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378187 ) Change subject: [labs] Override prod settings .. [labs] Override prod settings Change-Id: I45ce2bcbaec9679a4245ffa115aac7a2dbe64a48 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/87/378187/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 4d87eb6..d59d8b8 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -466,7 +466,7 @@ 'nonecho' => false, ], - 'wmgUseCodeMirror' => [ + '-wmgUseCodeMirror' => [ 'default' => true, ], -- To view, visit https://gerrit.wikimedia.org/r/378187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45ce2bcbaec9679a4245ffa115aac7a2dbe64a48 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolforge: adjust comment on tools-mail queue check
Rush has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378186 ) Change subject: toolforge: adjust comment on tools-mail queue check .. toolforge: adjust comment on tools-mail queue check Bug: T96898 Bug: T175837 Change-Id: I905f307e5fcb335d7470fd82aa56555091a6f6ed --- M modules/toollabs/files/shinken.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/files/shinken.cfg b/modules/toollabs/files/shinken.cfg index a857608..b700160 100644 --- a/modules/toollabs/files/shinken.cfg +++ b/modules/toollabs/files/shinken.cfg @@ -21,7 +21,7 @@ usegeneric-service } -# Check that the exim queue length is not more than 100 (warn) / 200 (crit) over the last 10 minutes +# 'exim -bpc' to see queue length define service { service_description exim queue length host_name tools-mail -- To view, visit https://gerrit.wikimedia.org/r/378186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I905f307e5fcb335d7470fd82aa56555091a6f6ed Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RushGerrit-Reviewer: Coren Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Rush Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolforge: adjust comment on tools-mail queue check
Rush has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378186 ) Change subject: toolforge: adjust comment on tools-mail queue check .. toolforge: adjust comment on tools-mail queue check Bug: T96898 Bug: T175837 Change-Id: I905f307e5fcb335d7470fd82aa56555091a6f6ed --- M modules/toollabs/files/shinken.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/378186/1 diff --git a/modules/toollabs/files/shinken.cfg b/modules/toollabs/files/shinken.cfg index a857608..b700160 100644 --- a/modules/toollabs/files/shinken.cfg +++ b/modules/toollabs/files/shinken.cfg @@ -21,7 +21,7 @@ usegeneric-service } -# Check that the exim queue length is not more than 100 (warn) / 200 (crit) over the last 10 minutes +# 'exim -bpc' to see queue length define service { service_description exim queue length host_name tools-mail -- To view, visit https://gerrit.wikimedia.org/r/378186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I905f307e5fcb335d7470fd82aa56555091a6f6ed Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Remove Cirrus API forecasting
Bearloga has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378185 ) Change subject: Remove Cirrus API forecasting .. Remove Cirrus API forecasting Bug: T112170 Change-Id: I8a2107f7c494c4567c41d1f8331902687fb26112 --- M docs/README.md M modules/forecasts/forecast.R D modules/forecasts/search/api_cirrus_arima D modules/forecasts/search/api_cirrus_bsts D modules/forecasts/search/api_cirrus_prophet M modules/forecasts/search/config.yaml 6 files changed, 36 insertions(+), 52 deletions(-) Approvals: Bearloga: Verified; Looks good to me, approved diff --git a/docs/README.md b/docs/README.md index 1b2abe6..afc5111 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,7 +8,7 @@ infrastructure. These datasets provide the metrics that are used by [Discovery's Dashboards](https://discovery.wmflabs.org/) -Last updated on 30 August 2017 +Last updated on 14 September 2017 Daily Metrics - @@ -57,14 +57,24 @@ top 10 countries - **all\_country\_data.tsv**: Sampled traffic to Wikipedia.org Portal, broken down by country +- **all\_country\_data\_history.tsv**: Sampled traffic to +Wikipedia.org Portal, broken down by country. Historical data store. - **app\_link\_clicks.tsv**: Clicks to Wikipedia mobile apps and list of apps - **last\_action\_country.tsv**: Last action performed on Wikipedia.org Portal per user session +- **last\_action\_country\_history.tsv**: Last action performed on +Wikipedia.org Portal per user session. Historical data store. - **most\_common\_country.tsv**: Most common action performed on Wikipedia.org Portal per user session, broken down by country +- **most\_common\_country\_history.tsv**: Most common action performed +on Wikipedia.org Portal per user session, broken down by country. +Historical data store. - **first\_visits\_country.tsv**: Action performed on Wikipedia.org Portal on each user's initial visit, broken down by country +- **first\_visits\_country\_history.tsv**: Action performed on +Wikipedia.org Portal on each user's initial visit, broken down by +country. Historical data store. - **clickthrough\_rate.tsv**: Last action (no action vs clickthrough) by Wikipedia.org Portal visitors - **clickthrough\_sisterprojects.tsv**: Clicks to Wikimedia projects @@ -85,6 +95,9 @@ - **app\_event\_counts\_langproj\_breakdown.tsv**: Clicks and other events by users searching on Android and iOS apps broken down by language +- **app\_event\_counts\_langproj\_breakdown\_history.tsv**: Clicks and +other events by users searching on Android and iOS apps broken down +by language. Historical data store. - **app\_load\_times.tsv**: User-perceived load times when searching on Android and iOS apps - **invoke\_source\_counts.tsv**: How the user initiated their search @@ -96,6 +109,9 @@ - **mobile\_event\_counts\_langproj\_breakdown.tsv**: Clicks and other events by users searching on mobile web broken down by language-project pairs +- **mobile\_event\_counts\_langproj\_breakdown\_history.tsv**: Clicks +and other events by users searching on mobile web broken down by +language-project pairs. Historical data store. - **mobile\_load\_times.tsv**: User-perceived load times when searching on mobile web - **desktop\_event\_counts.tsv**: Clicks and other events by users @@ -103,6 +119,9 @@ - **desktop\_event\_counts\_langproj\_breakdown.tsv**: Clicks and other events by users searching on desktop broken down by language-project pairs +- **desktop\_event\_counts\_langproj\_breakdown\_history.tsv**: Clicks +and other events by users searching on desktop broken down by +language-project pairs. Historical data store. - **desktop\_load\_times.tsv**: User-perceived load times when searching on desktop - **paulscore\_approximations.tsv**: Relevancy of our desktop search @@ -112,6 +131,10 @@ Relevancy of our fulltext desktop search as measured by [PaulScore](https://www.mediawiki.org/wiki/Wikimedia_Discovery/Search/Glossary#PaulScore) broken down by language-project pairs +- **paulscore\_approximations\_fulltext\_langproj\_breakdown\_history.tsv**: +Relevancy of our fulltext desktop search as measured by + [PaulScore](https://www.mediawiki.org/wiki/Wikimedia_Discovery/Search/Glossary#PaulScore) +broken down by language-project pairs. Historical data store. - **sample\_page\_visit\_ld.tsv**: How long users last on pages they arrived at from the search results page, computed like [median lethal dose in @@ -122,6 +145,10 @@ - **search\_threshold\_pass\_rate\_langproj\_breakdown.tsv**: Proportion of users having search sessions longer than a predetermined threshold (10s) broken down by language-project pairs +-
[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Remove Cirrus API forecasting
Bearloga has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378185 ) Change subject: Remove Cirrus API forecasting .. Remove Cirrus API forecasting Bug: T112170 Change-Id: I8a2107f7c494c4567c41d1f8331902687fb26112 --- M docs/README.md M modules/forecasts/forecast.R D modules/forecasts/search/api_cirrus_arima D modules/forecasts/search/api_cirrus_bsts D modules/forecasts/search/api_cirrus_prophet M modules/forecasts/search/config.yaml 6 files changed, 36 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden refs/changes/85/378185/1 diff --git a/docs/README.md b/docs/README.md index 1b2abe6..afc5111 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,7 +8,7 @@ infrastructure. These datasets provide the metrics that are used by [Discovery's Dashboards](https://discovery.wmflabs.org/) -Last updated on 30 August 2017 +Last updated on 14 September 2017 Daily Metrics - @@ -57,14 +57,24 @@ top 10 countries - **all\_country\_data.tsv**: Sampled traffic to Wikipedia.org Portal, broken down by country +- **all\_country\_data\_history.tsv**: Sampled traffic to +Wikipedia.org Portal, broken down by country. Historical data store. - **app\_link\_clicks.tsv**: Clicks to Wikipedia mobile apps and list of apps - **last\_action\_country.tsv**: Last action performed on Wikipedia.org Portal per user session +- **last\_action\_country\_history.tsv**: Last action performed on +Wikipedia.org Portal per user session. Historical data store. - **most\_common\_country.tsv**: Most common action performed on Wikipedia.org Portal per user session, broken down by country +- **most\_common\_country\_history.tsv**: Most common action performed +on Wikipedia.org Portal per user session, broken down by country. +Historical data store. - **first\_visits\_country.tsv**: Action performed on Wikipedia.org Portal on each user's initial visit, broken down by country +- **first\_visits\_country\_history.tsv**: Action performed on +Wikipedia.org Portal on each user's initial visit, broken down by +country. Historical data store. - **clickthrough\_rate.tsv**: Last action (no action vs clickthrough) by Wikipedia.org Portal visitors - **clickthrough\_sisterprojects.tsv**: Clicks to Wikimedia projects @@ -85,6 +95,9 @@ - **app\_event\_counts\_langproj\_breakdown.tsv**: Clicks and other events by users searching on Android and iOS apps broken down by language +- **app\_event\_counts\_langproj\_breakdown\_history.tsv**: Clicks and +other events by users searching on Android and iOS apps broken down +by language. Historical data store. - **app\_load\_times.tsv**: User-perceived load times when searching on Android and iOS apps - **invoke\_source\_counts.tsv**: How the user initiated their search @@ -96,6 +109,9 @@ - **mobile\_event\_counts\_langproj\_breakdown.tsv**: Clicks and other events by users searching on mobile web broken down by language-project pairs +- **mobile\_event\_counts\_langproj\_breakdown\_history.tsv**: Clicks +and other events by users searching on mobile web broken down by +language-project pairs. Historical data store. - **mobile\_load\_times.tsv**: User-perceived load times when searching on mobile web - **desktop\_event\_counts.tsv**: Clicks and other events by users @@ -103,6 +119,9 @@ - **desktop\_event\_counts\_langproj\_breakdown.tsv**: Clicks and other events by users searching on desktop broken down by language-project pairs +- **desktop\_event\_counts\_langproj\_breakdown\_history.tsv**: Clicks +and other events by users searching on desktop broken down by +language-project pairs. Historical data store. - **desktop\_load\_times.tsv**: User-perceived load times when searching on desktop - **paulscore\_approximations.tsv**: Relevancy of our desktop search @@ -112,6 +131,10 @@ Relevancy of our fulltext desktop search as measured by [PaulScore](https://www.mediawiki.org/wiki/Wikimedia_Discovery/Search/Glossary#PaulScore) broken down by language-project pairs +- **paulscore\_approximations\_fulltext\_langproj\_breakdown\_history.tsv**: +Relevancy of our fulltext desktop search as measured by + [PaulScore](https://www.mediawiki.org/wiki/Wikimedia_Discovery/Search/Glossary#PaulScore) +broken down by language-project pairs. Historical data store. - **sample\_page\_visit\_ld.tsv**: How long users last on pages they arrived at from the search results page, computed like [median lethal dose in @@ -122,6 +145,10 @@ - **search\_threshold\_pass\_rate\_langproj\_breakdown.tsv**: Proportion of users having search sessions longer than a predetermined threshold (10s) broken down by language-project pairs +-
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove $wgStructuredChangeFiltersEnableLiveUpdate
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378184 ) Change subject: Remove $wgStructuredChangeFiltersEnableLiveUpdate .. Remove $wgStructuredChangeFiltersEnableLiveUpdate Doesn't exist in MW any more. Change-Id: I6516e7f1760f1784b091e60df6577f3cbb71a89d --- M wmf-config/CommonSettings-labs.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index ede7c1e..9bf7a5a 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -337,7 +337,6 @@ } $wgStructuredChangeFiltersEnableExperimentalViews = true; -$wgStructuredChangeFiltersEnableLiveUpdate = true; $wgMessageCacheType = CACHE_ACCEL; -- To view, visit https://gerrit.wikimedia.org/r/378184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6516e7f1760f1784b091e60df6577f3cbb71a89d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: CatropeGerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: Add shinken check for tools-mail exim queue length
Rush has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378105 ) Change subject: toollabs: Add shinken check for tools-mail exim queue length .. toollabs: Add shinken check for tools-mail exim queue length Bug: T96898 Bug: T175837 Change-Id: Id119f46593308cb28dccdae29fb13ce8635518dc --- M modules/nagios_common/files/contactgroups-labs.cfg M modules/toollabs/files/shinken.cfg 2 files changed, 10 insertions(+), 2 deletions(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/nagios_common/files/contactgroups-labs.cfg b/modules/nagios_common/files/contactgroups-labs.cfg index 76f0f5f..030a800 100644 --- a/modules/nagios_common/files/contactgroups-labs.cfg +++ b/modules/nagios_common/files/contactgroups-labs.cfg @@ -1,5 +1,5 @@ # This file is managed by puppet -# Add contact 'guest' to all groups so webUI will show the guest accout +# Add contact 'guest' to all groups so webUI will show the guest account # status for services define contactgroup { contactgroup_name tools diff --git a/modules/toollabs/files/shinken.cfg b/modules/toollabs/files/shinken.cfg index 1b64b54..a857608 100644 --- a/modules/toollabs/files/shinken.cfg +++ b/modules/toollabs/files/shinken.cfg @@ -19,4 +19,12 @@ hostgroup_name tools service_descriptionHigh iowait usegeneric-service -} \ No newline at end of file +} + +# Check that the exim queue length is not more than 100 (warn) / 200 (crit) over the last 10 minutes +define service { +service_description exim queue length +host_name tools-mail +check_command check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.exim.queue.length!600!1000!10min!0min!1!--over +use generic-service +} -- To view, visit https://gerrit.wikimedia.org/r/378105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id119f46593308cb28dccdae29fb13ce8635518dc Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MadhuvishyGerrit-Reviewer: Chasemp Gerrit-Reviewer: Madhuvishy Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove $wgStructuredChangeFiltersEnableLiveUpdate
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378184 ) Change subject: Remove $wgStructuredChangeFiltersEnableLiveUpdate .. Remove $wgStructuredChangeFiltersEnableLiveUpdate Doesn't exist in MW any more. Change-Id: I6516e7f1760f1784b091e60df6577f3cbb71a89d --- M wmf-config/CommonSettings-labs.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/84/378184/1 diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index ede7c1e..9bf7a5a 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -337,7 +337,6 @@ } $wgStructuredChangeFiltersEnableExperimentalViews = true; -$wgStructuredChangeFiltersEnableLiveUpdate = true; $wgMessageCacheType = CACHE_ACCEL; -- To view, visit https://gerrit.wikimedia.org/r/378184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6516e7f1760f1784b091e60df6577f3cbb71a89d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Rename to Structured Discussions IV: Initial i18n keys
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378182 ) Change subject: Rename to Structured Discussions IV: Initial i18n keys .. Rename to Structured Discussions IV: Initial i18n keys Change-Id: Ied9cf74c6e390b722630a7dd2c994a1c7a83131c --- M i18n/ais.json M i18n/ar.json M i18n/ast.json M i18n/bn.json M i18n/br.json M i18n/bs.json M i18n/ca.json M i18n/ce.json M i18n/cs.json M i18n/de.json M i18n/diq.json M i18n/el.json M i18n/en.json M i18n/eo.json M i18n/es.json M i18n/fa.json M i18n/fi.json M i18n/fr.json M i18n/gl.json M i18n/gom-latn.json M i18n/gu.json M i18n/he.json M i18n/hi.json M i18n/hr.json M i18n/hu.json M i18n/hy.json M i18n/ia.json M i18n/id.json M i18n/it.json M i18n/ja.json M i18n/ka.json M i18n/kab.json M i18n/kk-cyrl.json M i18n/ko.json M i18n/lb.json M i18n/lv.json M i18n/mk.json M i18n/ml.json M i18n/mr.json M i18n/mwl.json M i18n/nap.json M i18n/nb.json M i18n/nl.json M i18n/oc.json M i18n/or.json M i18n/pa.json M i18n/pl.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json M i18n/roa-tara.json M i18n/ru.json M i18n/scn.json M i18n/skr-arab.json M i18n/sr-ec.json M i18n/sr-el.json M i18n/sv.json M i18n/tt-cyrl.json M i18n/uk.json M i18n/ur.json M i18n/vi.json M i18n/zh-hans.json M i18n/zh-hant.json 63 files changed, 102 insertions(+), 102 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/ais.json b/i18n/ais.json index 51dbd58..d1cd8a3 100644 --- a/i18n/ais.json +++ b/i18n/ais.json @@ -100,7 +100,7 @@ "flow-moderation-title-hide-topic": "midimut sasakamuen?", "flow-load-more": "kayadahan miasip", "flow-newest-topics": "sabaluhay sasakamuen", - "flow": "Flow", + "structureddiscussions": "Flow", "flow-special-type": "nikalahizaan", "flow-special-type-post": "patiyak", "flow-special-type-workflow": "laylay nu kawaw", diff --git a/i18n/ar.json b/i18n/ar.json index 2fd3db1..13cde95 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -18,7 +18,7 @@ "Mido" ] }, - "enableflow": "فعّل النقاشات الهيكلية", + "enablestructureddiscussions": "فعّل النقاشات الهيكلية", "notification-dynamic-actions-flow-board-unwatch": "{{GENDER:$3|توقف|توقفي}} عن مراقبة النشاط الجديد على \"$1\"", "notification-dynamic-actions-flow-board-unwatch-confirmation": "{{GENDER:$3|أنت}} لم تعد تراقب الصفحة \"$1\"", "notification-dynamic-actions-flow-board-unwatch-confirmation-description": "هذا لن يؤثر على الموضوعات الفردية التي {{GENDER:$3|تراقبها|تراقبينها}} . يمكنك مراقبة [$2 هذه الصفحة] في أي وقت.", @@ -431,7 +431,7 @@ "flow-whatlinkshere-post": "من [$1 منشور]", "flow-whatlinkshere-header": "من [$1 الوصف]", "flow-whatlinkshere-post-summary": "من [ملخص $1]", - "flow": "نقاشات هيكلية", + "structureddiscussions": "نقاشات هيكلية", "flow-special-desc": "هذه الصفحة تحول إلى workflow للنقاشات الهيكليةأو post للنقاشات الهيكلية مع إعطاء UUID.", "flow-special-type": "نوع", "flow-special-type-post": "نشر", diff --git a/i18n/ast.json b/i18n/ast.json index 1bf7914..49b6521 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -8,7 +8,7 @@ "Matiia" ] }, - "enableflow": "Activar Flow", + "enablestructureddiscussions": "Activar Flow", "notification-dynamic-actions-flow-board-unwatch": "{{GENDER:$3|Dexar}} de siguir l'actividá nueva en «$1»", "notification-dynamic-actions-flow-board-unwatch-confirmation": "Yá nun {{GENDER:$3|tas}} siguiendo la páxina «$1»", "notification-dynamic-actions-flow-board-unwatch-confirmation-description": "Esto nun afeutará a temes individuales que {{GENDER:$3|teas}} siguiendo. Puedes siguir [$2 esta páxina] en cualquier momentu.", @@ -421,7 +421,7 @@ "flow-whatlinkshere-post": "d'una [$1 publicación]", "flow-whatlinkshere-header": "de la [$1 descripción]", "flow-whatlinkshere-post-summary": "del [$1 resume]", - "flow": "Flow", + "structureddiscussions": "Flow", "flow-special-desc": "Indicando un UUID, esta páxina especial redirixe a un fluxu de trabayu o publicación de Flow.", "flow-special-type": "Triba", "flow-special-type-post": "Publicación", diff --git a/i18n/bn.json b/i18n/bn.json index db40bdd..346df3b 100644 --- a/i18n/bn.json +++ b/i18n/bn.json @@ -11,7 +11,7 @@ "Bodhisattwa" ] }, - "enableflow": "কাঠামোবদ্ধ আলোচনা সক্রিয় করুন", + "enablestructureddiscussions": "কাঠামোবদ্ধ আলোচনা সক্রিয় করুন", "notification-dynamic-actions-flow-board-unwatch-confirmation": "{{GENDER:$3|আপনি}} আর \"$1\" পাতাটির নজর রাখছেন না", "notification-dynamic-actions-flow-topic-unwatch": "নজরতালিকা থেকে এই প্রসঙ্গ দেখা
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Give sysops the flow-create-board right on all wikis with Fl...
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378183 ) Change subject: Give sysops the flow-create-board right on all wikis with Flow in general use .. Give sysops the flow-create-board right on all wikis with Flow in general use Specifically, this means wikis where the Flow beta feature is enabled, and wikis where Flow occupies one or more entire namespaces. Also remove manual settings for gomwiki and officewiki which are now implied by this. Bug: T175934 Change-Id: Ibfc69ffc34939e3fe45548121a42ab846345d17e --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/83/378183/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index dcf096e..ce718ca 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2875,6 +2875,12 @@ } $wgFlowEnableOptInBetaFeature = $wmgFlowEnableOptInBetaFeature; + + // On wikis that have Flow as a beta feature or in an entire namespace, + // give sysops the right to create and move Flow boards + if ( $wgFlowEnableOptInBetaFeature || $wmgFlowNamespaces ) { + $wgGroupPermissions['sysop']['flow-create-board'] = true; + } } if ( $wmgUseDisambiguator ) { diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 648eb92..f375813 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8593,9 +8593,6 @@ '+gawiki' => [ 'rollbacker' => [ 'rollback' => true ], ], - 'gomwiki' => [ - 'sysop' => [ 'flow-create-board' => true ], // T139226 - ], 'guwiki' => [ // T119787 'rollbacker' => [ 'rollback' => true ], 'autopatrolled' => [ 'autopatrol' => true ], @@ -9035,7 +9032,7 @@ 'communityapps' => [ 'view-community-applications' => true ], 'flood' => [ 'bot' => true ], // T86237 'user' => [ 'massmessage' => true, ], // T66978 - 'sysop' => [ 'importupload' => true, 'flow-create-board' => true ], // T101663 + 'sysop' => [ 'importupload' => true, ], // T101663 'securepoll' => [ 'securepoll-create-poll' => true, 'editinterface' => true ], ], '+ombudsmenwiki' => [ -- To view, visit https://gerrit.wikimedia.org/r/378183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfc69ffc34939e3fe45548121a42ab846345d17e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Rename to Structured Discussions IV: Initial i18n keys
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378182 ) Change subject: Rename to Structured Discussions IV: Initial i18n keys .. Rename to Structured Discussions IV: Initial i18n keys Change-Id: Ied9cf74c6e390b722630a7dd2c994a1c7a83131c --- M i18n/ais.json M i18n/ar.json M i18n/ast.json M i18n/bn.json M i18n/br.json M i18n/bs.json M i18n/ca.json M i18n/ce.json M i18n/cs.json M i18n/de.json M i18n/diq.json M i18n/el.json M i18n/en.json M i18n/eo.json M i18n/es.json M i18n/fa.json M i18n/fi.json M i18n/fr.json M i18n/gl.json M i18n/gom-latn.json M i18n/gu.json M i18n/he.json M i18n/hi.json M i18n/hr.json M i18n/hu.json M i18n/hy.json M i18n/ia.json M i18n/id.json M i18n/it.json M i18n/ja.json M i18n/ka.json M i18n/kab.json M i18n/kk-cyrl.json M i18n/ko.json M i18n/lb.json M i18n/lv.json M i18n/mk.json M i18n/ml.json M i18n/mr.json M i18n/mwl.json M i18n/nap.json M i18n/nb.json M i18n/nl.json M i18n/oc.json M i18n/or.json M i18n/pa.json M i18n/pl.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json M i18n/roa-tara.json M i18n/ru.json M i18n/scn.json M i18n/skr-arab.json M i18n/sr-ec.json M i18n/sr-el.json M i18n/sv.json M i18n/tt-cyrl.json M i18n/uk.json M i18n/ur.json M i18n/vi.json M i18n/zh-hans.json M i18n/zh-hant.json 63 files changed, 102 insertions(+), 102 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/82/378182/1 diff --git a/i18n/ais.json b/i18n/ais.json index 51dbd58..d1cd8a3 100644 --- a/i18n/ais.json +++ b/i18n/ais.json @@ -100,7 +100,7 @@ "flow-moderation-title-hide-topic": "midimut sasakamuen?", "flow-load-more": "kayadahan miasip", "flow-newest-topics": "sabaluhay sasakamuen", - "flow": "Flow", + "structureddiscussions": "Flow", "flow-special-type": "nikalahizaan", "flow-special-type-post": "patiyak", "flow-special-type-workflow": "laylay nu kawaw", diff --git a/i18n/ar.json b/i18n/ar.json index 2fd3db1..13cde95 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -18,7 +18,7 @@ "Mido" ] }, - "enableflow": "فعّل النقاشات الهيكلية", + "enablestructureddiscussions": "فعّل النقاشات الهيكلية", "notification-dynamic-actions-flow-board-unwatch": "{{GENDER:$3|توقف|توقفي}} عن مراقبة النشاط الجديد على \"$1\"", "notification-dynamic-actions-flow-board-unwatch-confirmation": "{{GENDER:$3|أنت}} لم تعد تراقب الصفحة \"$1\"", "notification-dynamic-actions-flow-board-unwatch-confirmation-description": "هذا لن يؤثر على الموضوعات الفردية التي {{GENDER:$3|تراقبها|تراقبينها}} . يمكنك مراقبة [$2 هذه الصفحة] في أي وقت.", @@ -431,7 +431,7 @@ "flow-whatlinkshere-post": "من [$1 منشور]", "flow-whatlinkshere-header": "من [$1 الوصف]", "flow-whatlinkshere-post-summary": "من [ملخص $1]", - "flow": "نقاشات هيكلية", + "structureddiscussions": "نقاشات هيكلية", "flow-special-desc": "هذه الصفحة تحول إلى workflow للنقاشات الهيكليةأو post للنقاشات الهيكلية مع إعطاء UUID.", "flow-special-type": "نوع", "flow-special-type-post": "نشر", diff --git a/i18n/ast.json b/i18n/ast.json index 1bf7914..49b6521 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -8,7 +8,7 @@ "Matiia" ] }, - "enableflow": "Activar Flow", + "enablestructureddiscussions": "Activar Flow", "notification-dynamic-actions-flow-board-unwatch": "{{GENDER:$3|Dexar}} de siguir l'actividá nueva en «$1»", "notification-dynamic-actions-flow-board-unwatch-confirmation": "Yá nun {{GENDER:$3|tas}} siguiendo la páxina «$1»", "notification-dynamic-actions-flow-board-unwatch-confirmation-description": "Esto nun afeutará a temes individuales que {{GENDER:$3|teas}} siguiendo. Puedes siguir [$2 esta páxina] en cualquier momentu.", @@ -421,7 +421,7 @@ "flow-whatlinkshere-post": "d'una [$1 publicación]", "flow-whatlinkshere-header": "de la [$1 descripción]", "flow-whatlinkshere-post-summary": "del [$1 resume]", - "flow": "Flow", + "structureddiscussions": "Flow", "flow-special-desc": "Indicando un UUID, esta páxina especial redirixe a un fluxu de trabayu o publicación de Flow.", "flow-special-type": "Triba", "flow-special-type-post": "Publicación", diff --git a/i18n/bn.json b/i18n/bn.json index db40bdd..346df3b 100644 --- a/i18n/bn.json +++ b/i18n/bn.json @@ -11,7 +11,7 @@ "Bodhisattwa" ] }, - "enableflow": "কাঠামোবদ্ধ আলোচনা সক্রিয় করুন", + "enablestructureddiscussions": "কাঠামোবদ্ধ আলোচনা সক্রিয় করুন", "notification-dynamic-actions-flow-board-unwatch-confirmation": "{{GENDER:$3|আপনি}} আর \"$1\" পাতাটির নজর রাখছেন না", "notification-dynamic-actions-flow-topic-unwatch": "নজরতালিকা থেকে এই প্রসঙ্গ দেখা
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ApiVisualEditorEdit: Make tryDeflate public and static
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378032 ) Change subject: ApiVisualEditorEdit: Make tryDeflate public and static .. ApiVisualEditorEdit: Make tryDeflate public and static So other extensions can use it, e.g. ContentTranslation. Eventually we could upstream some of these document editing APIs. Change-Id: I1e4925c7302fbe90ab4f9380c5efb83c9c379609 --- M ApiVisualEditorEdit.php 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php index b48c24e..5ab517d 100644 --- a/ApiVisualEditorEdit.php +++ b/ApiVisualEditorEdit.php @@ -118,14 +118,19 @@ ]; } - protected function tryDeflate( $content ) { + public static function tryDeflate( $content ) { if ( substr( $content, 0, 11 ) === 'rawdeflate,' ) { $deflated = base64_decode( substr( $content, 11 ) ); MediaWiki\suppressWarnings(); $inflated = gzinflate( $deflated ); MediaWiki\restoreWarnings(); if ( $deflated === $inflated || $inflated === false ) { - $this->dieWithError( 'apierror-visualeditor-invaliddeflate', 'invaliddeflate' ); + // Static equivalent of $this->dieWithError + throw ApiUsageException::newWithMessage( + null, + 'apierror-visualeditor-invaliddeflate', + 'invaliddeflate' + ); } return $inflated; } @@ -147,7 +152,7 @@ protected function getWikitextNoCache( $title, $params, $parserParams ) { $this->requireOnlyOneParameter( $params, 'html' ); $wikitext = $this->postHTML( - $title, $this->tryDeflate( $params['html'] ), $parserParams, $params['etag'] + $title, self::tryDeflate( $params['html'] ), $parserParams, $params['etag'] ); if ( $wikitext === false ) { $this->dieWithError( 'apierror-visualeditor-docserver', 'docserver' ); -- To view, visit https://gerrit.wikimedia.org/r/378032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e4925c7302fbe90ab4f9380c5efb83c9c379609 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Skip categorisation for some countries
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378021 ) Change subject: Skip categorisation for some countries .. Skip categorisation for some countries Some countries have such a backlog of uncategorized images that it slows down the entire process to the point of unsability. This skips the countries which have more than 1000 such images, per https://commons.wikimedia.org/wiki/Commons:Monuments_database/Categorization/Statistics Bug: T174871 Change-Id: I59acf501cff433aabb6684db10ac069c1d253619 --- M erfgoedbot/categorize_images.py 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/erfgoedbot/categorize_images.py b/erfgoedbot/categorize_images.py index d94e4cc..1705d56 100644 --- a/erfgoedbot/categorize_images.py +++ b/erfgoedbot/categorize_images.py @@ -32,6 +32,15 @@ _logger = "categorize_images" +SKIP_LIST = [ +(u'cn', u'en'), +(u'ir', u'fa'), +(u'it', u'it'), +(u'jo', u'ar'), +(u'ge', u'ka'), +(u'np', u'en'), +] + class NoMonumentIdentifierFoundException(pywikibot.exceptions.PageRelatedError): message = u"No Monument Identifier could be found for %s" @@ -549,6 +558,12 @@ else: statistics = [] for (countrycode, lang), countryconfig in mconfig.countries.iteritems(): + +if (countrycode, lang) in SKIP_LIST: +pywikibot.log( +u'Skipping countrycode "%s" in language "%s"' % (countrycode, lang)) +continue + pywikibot.log( u'Working on countrycode "%s" in language "%s"' % (countrycode, lang)) commonsCatTemplates = getCommonscatTemplates( -- To view, visit https://gerrit.wikimedia.org/r/378021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59acf501cff433aabb6684db10ac069c1d253619 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/heritage Gerrit-Branch: master Gerrit-Owner: Jean-FrédéricGerrit-Reviewer: Lokal Profil Gerrit-Reviewer: Multichill Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.30.0-wmf.18]: Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378181 ) Change subject: Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2) .. Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2) New changes: 0222046b2 ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: I130024785e4d72484572df293482f966ddc00acf --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/81/378181/1 diff --git a/lib/ve b/lib/ve index dafc7bb..0222046 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit dafc7bbe5f9ba0f9833dc5127b90003cd6e70cfc +Subproject commit 0222046b29eb0f75cae2a29a7cb276d8d0c80028 -- To view, visit https://gerrit.wikimedia.org/r/378181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I130024785e4d72484572df293482f966ddc00acf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378176 ) Change subject: Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2) .. Update VE core submodule to wmf/1.30.0-wmf.18 HEAD (0222046b2) New changes: 0222046b2 ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: I130024785e4d72484572df293482f966ddc00acf --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/76/378176/1 diff --git a/lib/ve b/lib/ve index dafc7bb..0222046 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit dafc7bbe5f9ba0f9833dc5127b90003cd6e70cfc +Subproject commit 0222046b29eb0f75cae2a29a7cb276d8d0c80028 -- To view, visit https://gerrit.wikimedia.org/r/378176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I130024785e4d72484572df293482f966ddc00acf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: fullstack: add a 'success' stat
Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378175 ) Change subject: fullstack: add a 'success' stat .. fullstack: add a 'success' stat This adds a simple binary stat based on whether a given test made it to the end (create, test, delete) or whether an exception (most likely a timeout) was thrown. Note that in order to catch these exceptions, I'm changing the the way this test handles failures; previously a failure killed the script and it was restarted init script... now the script will persist through failures (but still exit if we leak too many VMs) Hopefully additional stat will allow us to compute how much of the time instance creation is working. Any time that the test isn't running (e.g. after it quits due to hitting the cap on leaked instances and the problem is fixed but the test hasn't restarted) will count against us :/ Change-Id: Ibadd185c98ae124f6b9b9aea6ba5c897aa8c0d78 --- M modules/openstack2/files/nova/fullstack/nova_fullstack_test.py 1 file changed, 63 insertions(+), 58 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/378175/1 diff --git a/modules/openstack2/files/nova/fullstack/nova_fullstack_test.py b/modules/openstack2/files/nova/fullstack/nova_fullstack_test.py index d38326c..741928e 100644 --- a/modules/openstack2/files/nova/fullstack/nova_fullstack_test.py +++ b/modules/openstack2/files/nova/fullstack/nova_fullstack_test.py @@ -485,75 +485,80 @@ cimage = nova_conn.images.find(name=args.image) cflavor = nova_conn.flavors.find(name=args.flavor) -vc, server = verify_create(nova_conn, - name, - cimage, - cflavor, - args.creation_timeout, - args.virthost) -stat('verify.creation', vc) +try: +vc, server = verify_create(nova_conn, + name, + cimage, + cflavor, + args.creation_timeout, + args.virthost) +stat('verify.creation', vc) -addr = server.addresses['public'][0]['addr'] -if not addr.startswith('10.'): -raise Exception("Bad address of {}".format(addr)) +addr = server.addresses['public'][0]['addr'] +if not addr.startswith('10.'): +raise Exception("Bad address of {}".format(addr)) -if not args.skip_dns: -host = '{}.{}.eqiad.wmnet'.format(server.name, server.tenant_id) -dnsd = args.dns_resolvers.split(',') -vdns = verify_dns(host, - dnsd, - timeout=2.0) -stat('verify.dns', vdns) +if not args.skip_dns: +host = '{}.{}.eqiad.wmnet'.format(server.name, server.tenant_id) +dnsd = args.dns_resolvers.split(',') +vdns = verify_dns(host, + dnsd, + timeout=2.0) +stat('verify.dns', vdns) -if not args.skip_ssh: -vs = verify_ssh(addr, -user, -args.keyfile, -args.ssh_timeout) +if not args.skip_ssh: +vs = verify_ssh(addr, +user, +args.keyfile, +args.ssh_timeout) -stat('verify.ssh', vs) -if args.adhoc_command: -sshout = run_remote(addr, -user, -args.keyfile, -args.adhoc_command, -debug=args.debug) -logging.debug(sshout) +stat('verify.ssh', vs) +if args.adhoc_command: +sshout = run_remote(addr, +user, +args.keyfile, +args.adhoc_command, +debug=args.debug) +logging.debug(sshout) -if not args.skip_puppet: -ps, puppetrun = verify_puppet(addr, - user, - args.keyfile, - args.puppet_timeout) -stat('verify.puppet', ps) +if not args.skip_puppet: +ps, puppetrun = verify_puppet(addr, + user, +
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[wmf/1.30.0-wmf.18]: ui.TableLineContext: fix z-index for menu
Jforrester has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378151 ) Change subject: ui.TableLineContext: fix z-index for menu .. ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 (cherry picked from commit 05439f5b7822ae35c5048f3a2e1ecd5a5db21454) --- M src/ui/styles/ve.ui.TableLineContext.css 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/ui/styles/ve.ui.TableLineContext.css b/src/ui/styles/ve.ui.TableLineContext.css index d372ede..435da04 100644 --- a/src/ui/styles/ve.ui.TableLineContext.css +++ b/src/ui/styles/ve.ui.TableLineContext.css @@ -34,3 +34,7 @@ left: -1.2em; border-right: 0; } + +.ve-ui-tableLineContext-menu { + z-index: 2; +} -- To view, visit https://gerrit.wikimedia.org/r/378151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: JforresterGerrit-Reviewer: DLynch Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (05439f5b7)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378155 ) Change subject: Update VE core submodule to master (05439f5b7) .. Update VE core submodule to master (05439f5b7) New changes: 8c64fe2b5 VisualDiff: Show minimal moves in diff 85a6489ee Localisation updates from https://translatewiki.net. c20e589d5 Fire position event when direction is changed 32bc67544 Fix AuthorListPopupTool's surface setting 7ff9a3a4e Correct inheritance for CommentInspector actions 05439f5b7 ui.TableLineContext: fix z-index for menu Bug: T169389 Bug: T171451 Change-Id: Ib8046bd830572829541946f3539a9fcb447cf76f --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/55/378155/1 diff --git a/lib/ve b/lib/ve index 7028f79..05439f5 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 7028f79aa11c0e1f5af157e945d586a38f11d387 +Subproject commit 05439f5b7822ae35c5048f3a2e1ecd5a5db21454 -- To view, visit https://gerrit.wikimedia.org/r/378155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8046bd830572829541946f3539a9fcb447cf76f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[wmf/1.30.0-wmf.18]: ui.TableLineContext: fix z-index for menu
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378151 ) Change subject: ui.TableLineContext: fix z-index for menu .. ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 (cherry picked from commit 05439f5b7822ae35c5048f3a2e1ecd5a5db21454) --- M src/ui/styles/ve.ui.TableLineContext.css 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/51/378151/1 diff --git a/src/ui/styles/ve.ui.TableLineContext.css b/src/ui/styles/ve.ui.TableLineContext.css index d372ede..435da04 100644 --- a/src/ui/styles/ve.ui.TableLineContext.css +++ b/src/ui/styles/ve.ui.TableLineContext.css @@ -34,3 +34,7 @@ left: -1.2em; border-right: 0; } + +.ve-ui-tableLineContext-menu { + z-index: 2; +} -- To view, visit https://gerrit.wikimedia.org/r/378151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: JforresterGerrit-Reviewer: DLynch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ui.TableLineContext: fix z-index for menu
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378099 ) Change subject: ui.TableLineContext: fix z-index for menu .. ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 --- M src/ui/styles/ve.ui.TableLineContext.css 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/ui/styles/ve.ui.TableLineContext.css b/src/ui/styles/ve.ui.TableLineContext.css index d372ede..435da04 100644 --- a/src/ui/styles/ve.ui.TableLineContext.css +++ b/src/ui/styles/ve.ui.TableLineContext.css @@ -34,3 +34,7 @@ left: -1.2em; border-right: 0; } + +.ve-ui-tableLineContext-menu { + z-index: 2; +} -- To view, visit https://gerrit.wikimedia.org/r/378099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: DLynchGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Esanders Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[wmf/1.30.0-wmf.18]: Register Eventlogging schema
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378125 ) Change subject: Register Eventlogging schema .. Register Eventlogging schema Bug: T175756 Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d (cherry picked from commit dbabca174c5d040d47503877aacc3a3c34a3a92a) --- M extension.json M includes/Hooks.php 2 files changed, 26 insertions(+), 1 deletion(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 7b53a0e..3448f74 100644 --- a/extension.json +++ b/extension.json @@ -12,7 +12,8 @@ "Hooks": { "CustomEditor": "ArticleCreationWorkflow\\Hooks::onCustomEditor", "ShowMissingArticle": "ArticleCreationWorkflow\\Hooks::onShowMissingArticle", - "BeforePageDisplay": "ArticleCreationWorkflow\\Hooks::onBeforePageDisplay" + "BeforePageDisplay": "ArticleCreationWorkflow\\Hooks::onBeforePageDisplay", + "EventLoggingRegisterSchemas": "ArticleCreationWorkflow\\Hooks::onEventLoggingRegisterSchemas" }, "AutoloadClasses": { "ArticleCreationWorkflow\\Hooks": "includes/Hooks.php", @@ -42,6 +43,15 @@ "ArticleCreationLandingPage": { "description": "The name of the wiki page to which users should be redirected if intercepted.", "value": "Project:Article wizard" + }, + "ArticleCreationEventLoggingSchemas": { + "value": { + "ArticleCreationWorkflow": { + "enabled": true, + "revision": 17145434 + } + }, + "merge_strategy": "array_plus_2d" } }, "ConfigRegistry": { diff --git a/includes/Hooks.php b/includes/Hooks.php index 5c92238..22d131f 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -84,4 +84,19 @@ $out->addModules( 'ext.acw.eventlogging' ); } } + + /** +* EventLoggingRegisterSchemas hook handler +* Register our eventlogging schema +* +* @param array &$schemas Schemas array for eventlogging +*/ + public static function onEventLoggingRegisterSchemas( array &$schemas ) { + global $wgArticleCreationEventLoggingSchemas; + foreach ( $wgArticleCreationEventLoggingSchemas as $schema => $property ) { + if ( $property['enabled'] ) { + $schemas[$schema] = $property['revision']; + } + } + } } -- To view, visit https://gerrit.wikimedia.org/r/378125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: Niharika29Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Avoid menu's `box-shadow` from lurkin into toolbar
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378141 ) Change subject: demos: Avoid menu's `box-shadow` from lurkin into toolbar .. demos: Avoid menu's `box-shadow` from lurkin into toolbar Change-Id: Iedf7e54842484a52a7dab54905b53f32abb23a8e --- M demos/styles/demo.css 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/41/378141/1 diff --git a/demos/styles/demo.css b/demos/styles/demo.css index 3a101a8..76cebb1 100644 --- a/demos/styles/demo.css +++ b/demos/styles/demo.css @@ -254,8 +254,8 @@ /* Toolbars demo */ .demo-container.demo-toolbars { + margin-top: 4em; padding: 0; - margin-bottom: 2em; } .demo-toolbars-contents { @@ -420,8 +420,13 @@ } /* This needs extra specificity to beat PanelLayout styles */ - .demo-container.oo-ui-panelLayout { + .demo-menu + .demo-container.oo-ui-panelLayout { margin-top: 11.4em; + } + + /* Avoid `box-shadow` from menu lurkin into toolbar demo, +1.2em to be harmonious with menu */ + .demo-menu + .demo-container.oo-ui-panelLayout.demo-toolbars { + margin-top: 12.6em; } } } @@ -436,8 +441,12 @@ display: inline-block; } - .demo-container.oo-ui-panelLayout { + .demo-menu + .demo-container.oo-ui-panelLayout { margin-top: 7.5em; + } + + .demo-menu + .demo-container.oo-ui-panelLayout.demo-toolbars { + margin-top: 8.7em; } .demo-console-expanded .demo-console-toggle { @@ -490,9 +499,13 @@ right: auto; } - .demo-container.oo-ui-panelLayout { + .demo-menu + .demo-container.oo-ui-panelLayout { margin-top: 4.5em; } + + .demo-menu + .demo-container.oo-ui-panelLayout.demo-toolbars { + margin-top: 5.7em; + } } } /* stylelint-enable selector-pseudo-element-colon-notation */ -- To view, visit https://gerrit.wikimedia.org/r/378141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedf7e54842484a52a7dab54905b53f32abb23a8e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix header edit button tint (once more, with feeling)
Mholloway has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378129 ) Change subject: Fix header edit button tint (once more, with feeling) .. Fix header edit button tint (once more, with feeling) Confirmed the fix on API levels 16 and 25. Bug: T172157 Change-Id: I2d8fa75b78a2764e543857e608a6e22734f541f1 --- M app/src/main/res/layout/view_page_header.xml M app/src/main/res/values/attrs.xml M app/src/main/res/values/styles_dark.xml M app/src/main/res/values/styles_light.xml 4 files changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/29/378129/1 diff --git a/app/src/main/res/layout/view_page_header.xml b/app/src/main/res/layout/view_page_header.xml index 3f12821..1993f7b 100644 --- a/app/src/main/res/layout/view_page_header.xml +++ b/app/src/main/res/layout/view_page_header.xml @@ -71,9 +71,8 @@ android:layout_marginRight="@dimen/edit_pencil_horizontal_margin" android:layout_gravity="bottom|end" app:srcCompat="@drawable/ic_mode_edit_white_24dp" +app:theme="?attr/header_edit_button" android:scaleType="fitCenter" -android:tint="?android:attr/textColorSecondary" -android:alpha="?attr/page_header_edit_pencil_alpha" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/article_header_edit_hint" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 1ceb73e..5bc16a0 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -35,7 +35,6 @@ - @@ -47,6 +46,7 @@ + diff --git a/app/src/main/res/values/styles_dark.xml b/app/src/main/res/values/styles_dark.xml index bfddba8..a0f473d 100644 --- a/app/src/main/res/values/styles_dark.xml +++ b/app/src/main/res/values/styles_dark.xml @@ -52,8 +52,6 @@ @color/link_preview_offline_text_dark @color/list_item_text_primary_dark @color/list_item_text_secondary_dark -1.0 - @color/base10 @color/base18 @color/color_state_nav_tab_dark @@ -65,7 +63,7 @@ @color/feed_text_tertiary_dark @color/base12 @color/base14 - +@style/HeaderEditButtonDark @color/accent75 @@ -90,4 +88,8 @@ @color/base30 + +- @color/base100
+- 0.7
+ diff --git a/app/src/main/res/values/styles_light.xml b/app/src/main/res/values/styles_light.xml index 2d6aa93..ce7eb85 100644 --- a/app/src/main/res/values/styles_light.xml +++ b/app/src/main/res/values/styles_light.xml @@ -52,8 +52,6 @@ @color/link_preview_offline_text_light @color/list_item_text_primary_light @color/list_item_text_secondary_light -0.55 - @color/base80 @android:color/white @color/color_state_nav_tab_light @@ -65,7 +63,7 @@ @color/feed_text_tertiary_light @color/base100 @color/base100 - +@style/HeaderEditButtonLight @color/accent50 @@ -92,4 +90,8 @@ src_in + +- 0.55
+ + -- To view, visit https://gerrit.wikimedia.org/r/378129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d8fa75b78a2764e543857e608a6e22734f541f1 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Mholloway___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[wmf/1.30.0-wmf.18]: Register Eventlogging schema
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378125 ) Change subject: Register Eventlogging schema .. Register Eventlogging schema Bug: T175756 Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d (cherry picked from commit dbabca174c5d040d47503877aacc3a3c34a3a92a) --- M extension.json M includes/Hooks.php 2 files changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow refs/changes/25/378125/1 diff --git a/extension.json b/extension.json index 7b53a0e..3448f74 100644 --- a/extension.json +++ b/extension.json @@ -12,7 +12,8 @@ "Hooks": { "CustomEditor": "ArticleCreationWorkflow\\Hooks::onCustomEditor", "ShowMissingArticle": "ArticleCreationWorkflow\\Hooks::onShowMissingArticle", - "BeforePageDisplay": "ArticleCreationWorkflow\\Hooks::onBeforePageDisplay" + "BeforePageDisplay": "ArticleCreationWorkflow\\Hooks::onBeforePageDisplay", + "EventLoggingRegisterSchemas": "ArticleCreationWorkflow\\Hooks::onEventLoggingRegisterSchemas" }, "AutoloadClasses": { "ArticleCreationWorkflow\\Hooks": "includes/Hooks.php", @@ -42,6 +43,15 @@ "ArticleCreationLandingPage": { "description": "The name of the wiki page to which users should be redirected if intercepted.", "value": "Project:Article wizard" + }, + "ArticleCreationEventLoggingSchemas": { + "value": { + "ArticleCreationWorkflow": { + "enabled": true, + "revision": 17145434 + } + }, + "merge_strategy": "array_plus_2d" } }, "ConfigRegistry": { diff --git a/includes/Hooks.php b/includes/Hooks.php index 5c92238..22d131f 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -84,4 +84,19 @@ $out->addModules( 'ext.acw.eventlogging' ); } } + + /** +* EventLoggingRegisterSchemas hook handler +* Register our eventlogging schema +* +* @param array &$schemas Schemas array for eventlogging +*/ + public static function onEventLoggingRegisterSchemas( array &$schemas ) { + global $wgArticleCreationEventLoggingSchemas; + foreach ( $wgArticleCreationEventLoggingSchemas as $schema => $property ) { + if ( $property['enabled'] ) { + $schemas[$schema] = $property['revision']; + } + } + } } -- To view, visit https://gerrit.wikimedia.org/r/378125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: Niharika29___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't cast days default to an integer
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378124 ) Change subject: RCFilters: Don't cast days default to an integer .. RCFilters: Don't cast days default to an integer Values can be floats, like 1.5 days, etc. Cast instead to a float. Change-Id: I14ba792f1cd435f89b2e09067b0a0e894a0a2557 --- M includes/specialpage/ChangesListSpecialPage.php M includes/specials/SpecialRecentchanges.php M includes/specials/SpecialWatchlist.php 3 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/24/378124/1 diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index ec09559..6bf9d1b 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -606,12 +606,13 @@ 'wgRCFiltersChangeTags', $this->buildChangeTagList() ); + $out->addJsConfigVars( 'StructuredChangeFiltersDisplayConfig', [ 'maxDays' => (int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days 'limitArray' => $this->getConfig()->get( 'RCLinkLimits' ), - 'limitDefault' => $this->getDefaultLimit(), + 'limitDefault' => floatval( $this->getDefaultLimit() ), 'daysArray' => $this->getConfig()->get( 'RCLinkDays' ), 'daysDefault' => $this->getDefaultDays(), ] diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 547a1b0..3fee309 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -1010,6 +1010,6 @@ } function getDefaultDays() { - return $this->getUser()->getIntOption( 'rcdays' ); + return $this->getUser()->getOption( 'rcdays' ); } } diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index ec64869..b84c846 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -918,6 +918,6 @@ } function getDefaultDays() { - return $this->getUser()->getIntOption( 'watchlistdays' ); + return $this->getUser()->getOption( 'watchlistdays' ); } } -- To view, visit https://gerrit.wikimedia.org/r/378124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14ba792f1cd435f89b2e09067b0a0e894a0a2557 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mooeypoo___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix confusing warning message on throtthled filters
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376091 ) Change subject: Fix confusing warning message on throtthled filters .. Fix confusing warning message on throtthled filters A confusing warning message was displayed when filters have af_throttled = true. That message was replaced with a new one reflecting the behavior that is actually ocurring and how to solve it Bug: T54525 Change-Id: I5c6e434249d5c9649eb2d7c5b16b9ecb1f530c8a --- M i18n/en.json M i18n/qqq.json M includes/Views/AbuseFilterViewEdit.php 3 files changed, 21 insertions(+), 11 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 649fc3e..0d32b9f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -135,7 +135,7 @@ "abusefilter-edit-status-label": "Statistics:", "abusefilter-edit-status": "Of the last $1 {{PLURAL:$1|action|actions}}, this filter has matched $2 ($3%).", "abusefilter-edit-status-profile": "Of the last $1 {{PLURAL:$1|action|actions}}, this filter has matched $2 ($3%).\nOn average, its run time is $4 ms, and it consumes $5 {{PLURAL:$5|condition|conditions}} of the condition limit.", - "abusefilter-edit-throttled": "'''Warning:''' This filter was automatically disabled as a safety measure.\nIt reached the limit of matching more than $1% of actions.", + "abusefilter-edit-throttled-warning": "'''Warning:''' This filter was automatically flagged as harmful. As a safety measure, the following actions will not execute ($1). Please review and [[mw:Extension:AbuseFilter/Conditions|optimize]] your conditions to remove this restriction", "abusefilter-edit-new": "New filter", "abusefilter-edit-save": "Save filter", "abusefilter-edit-id": "Filter ID:", diff --git a/i18n/qqq.json b/i18n/qqq.json index a7aff88..e2d5aec 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -166,7 +166,7 @@ "abusefilter-edit-status-label": "Field label for abuse filter statistics.\n{{Identical|Statistics}}", "abusefilter-edit-status": "Parameters:\n* $1 - number of actions\n* $2 - matched count\n* $3 - matched percentage", "abusefilter-edit-status-profile": "Parameters:\n* $1 - number of actions\n* $2 - matched count\n* $3 - matched percentage\n* $4 - time (in milliseconds)\n* $5 - number of conditions", - "abusefilter-edit-throttled": "Used as warning message. Parameters:\n* $1 - threshold percentage", + "abusefilter-edit-throttled-warning": "Used as warning message when the filter is throttled and actions will not execute. Parameters:\n* $1 - is a string containing the actions that will not execute", "abusefilter-edit-new": "Field value in case an edited filter is new.", "abusefilter-edit-save": "Submit button text to save a filter.", "abusefilter-edit-id": "Field label for filter identifier.\n{{Identical|Filter ID}}", diff --git a/includes/Views/AbuseFilterViewEdit.php b/includes/Views/AbuseFilterViewEdit.php index d4f6cc1..4f10be0 100644 --- a/includes/Views/AbuseFilterViewEdit.php +++ b/includes/Views/AbuseFilterViewEdit.php @@ -527,18 +527,28 @@ } if ( isset( $row->af_throttled ) && $row->af_throttled ) { - global $wgAbuseFilterEmergencyDisableThreshold; + global $wgAbuseFilterRestrictions; - // determine emergency disable value for this action - $emergencyDisableThreshold = AbuseFilter::getEmergencyValue( - $wgAbuseFilterEmergencyDisableThreshold, - $row->af_group + $filterActions = explode( ',', $row->af_actions ); + $throttledActions = array_intersect_key( + array_flip( $filterActions ), + array_filter( $wgAbuseFilterRestrictions ) ); - $threshold_percent = sprintf( '%.2f', $emergencyDisableThreshold * 100 ); - $flags .= $out->parse( - $this->msg( 'abusefilter-edit-throttled' )->numParams( $threshold_percent )->text() - ); + if ( $throttledActions ) { + $throttledActions = array_map( + function ( $filterAction ) { + return $this->msg( 'abusefilter-action-' . $filterAction )->text(); + }, + array_keys( $throttledActions ) + ); + + $flags .= $out->parse( + $this->msg( 'abusefilter-edit-throttled-warning' ) +
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: ACTRIAL
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378104 ) Change subject: ACTRIAL .. ACTRIAL Bug: T175963 Change-Id: Ia760dd38fdd22559ecaac3928eaf376e21762949 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index be7cde5..648eb92 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19379,6 +19379,7 @@ 'default' => false, 'testwiki' => true, 'test2wiki' => true, // T175302 + 'enwiki' => true, ], 'wgArticleCreationWorkflows' => [ @@ -19389,6 +19390,12 @@ 'excludeRight' => 'autoconfirmed' ], ], + 'enwiki' => [ + [ + 'namespaces' => [ 0 ], + 'excludeRight' => 'autoconfirmed' + ], + ], ], 'wgArticleCreationLandingPage' => [ -- To view, visit https://gerrit.wikimedia.org/r/378104 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia760dd38fdd22559ecaac3928eaf376e21762949 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSemGerrit-Reviewer: Niharika29 Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: Add shinken check for tools-mail exim queue length
Madhuvishy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378105 ) Change subject: toollabs: Add shinken check for tools-mail exim queue length .. toollabs: Add shinken check for tools-mail exim queue length Bug: T96898 Change-Id: Id119f46593308cb28dccdae29fb13ce8635518dc --- M modules/nagios_common/files/contactgroups-labs.cfg M modules/toollabs/files/shinken.cfg 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/378105/1 diff --git a/modules/nagios_common/files/contactgroups-labs.cfg b/modules/nagios_common/files/contactgroups-labs.cfg index 76f0f5f..030a800 100644 --- a/modules/nagios_common/files/contactgroups-labs.cfg +++ b/modules/nagios_common/files/contactgroups-labs.cfg @@ -1,5 +1,5 @@ # This file is managed by puppet -# Add contact 'guest' to all groups so webUI will show the guest accout +# Add contact 'guest' to all groups so webUI will show the guest account # status for services define contactgroup { contactgroup_name tools diff --git a/modules/toollabs/files/shinken.cfg b/modules/toollabs/files/shinken.cfg index 1b64b54..a632f0e 100644 --- a/modules/toollabs/files/shinken.cfg +++ b/modules/toollabs/files/shinken.cfg @@ -19,4 +19,12 @@ hostgroup_name tools service_descriptionHigh iowait usegeneric-service -} \ No newline at end of file +} + +# Check that the exim queue length is not more than 100 (warn) / 200 (crit) over the last 10 minutes +define service { +service_description exim queue length +host_name tools-mail +check_command check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.exim.queue.length!100!200!10min!0min!1!--over +use generic-service +} -- To view, visit https://gerrit.wikimedia.org/r/378105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id119f46593308cb28dccdae29fb13ce8635518dc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Introduce TranslateUtils::getEditorUrl
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372388 ) Change subject: Introduce TranslateUtils::getEditorUrl .. Introduce TranslateUtils::getEditorUrl This allows creating links that open the translation in the message editor. It falls back to action=edit for unknown messages. To implement this, I added MessageHandle::getInternalKey which figures out the correct format for Special:Translate. Used this new method in two special pages which provide edit links: * Special:Translations * Special:SearchTranslations Change-Id: Id0ba1e05386ca9e04360440a0ba593bdf84d6dd2 --- M TranslateUtils.php M specials/SpecialSearchTranslations.php M specials/SpecialTranslations.php M utils/MessageHandle.php 4 files changed, 64 insertions(+), 26 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslateUtils.php b/TranslateUtils.php index c6d26ab..9de73fa 100644 --- a/TranslateUtils.php +++ b/TranslateUtils.php @@ -402,4 +402,23 @@ return wfGetDB( $index ); } + + /** +* Get an URL that points to an editor for this message handle. +* @param MessageHandle $handle +* @return string Domain relative URL +* @since 2017.10 +*/ + public static function getEditorUrl( MessageHandle $handle ) { + if ( !$handle->isValid() ) { + return $handle->getTitle()->getLocalURL( [ 'action' => 'edit' ] ); + } + + $title = SpecialPageFactory::getPage( 'Translate' )->getPageTitle(); + return $title->getLocalURL( [ + 'showMessage' => $handle->getInternalKey(), + 'group' => $handle->getGroup()->getId(), + 'language' => $handle->getCode(), + ] ); + } } diff --git a/specials/SpecialSearchTranslations.php b/specials/SpecialSearchTranslations.php index 8ff9400..2c30099 100644 --- a/specials/SpecialSearchTranslations.php +++ b/specials/SpecialSearchTranslations.php @@ -191,7 +191,7 @@ $resultAttribs['data-translation'] = $helpers->getTranslation(); $resultAttribs['data-group'] = $groupId; - $uri = $title->getLocalURL( [ 'action' => 'edit' ] ); + $uri = TranslateUtils::getEditorUrl( $handle ); $link = Html::element( 'a', [ 'href' => $uri ], diff --git a/specials/SpecialTranslations.php b/specials/SpecialTranslations.php index a93a3ca..da0793d 100644 --- a/specials/SpecialTranslations.php +++ b/specials/SpecialTranslations.php @@ -37,9 +37,9 @@ public function execute( $par ) { $this->setHeaders(); $this->outputHeader(); - $this->includeAssets(); $out = $this->getOutput(); + $out->addModuleStyles( 'ext.translate.legacy' ); $par = (string)$par; @@ -216,7 +216,6 @@ $canTranslate = $this->getUser()->isAllowed( 'translate' ); - $ajaxPageList = []; $historyText = '' . $this->msg( 'translate-translations-history-short' )->escaped() . ''; @@ -225,7 +224,6 @@ foreach ( $res as $s ) { $key = $s->page_title; $tTitle = Title::makeTitle( $s->page_namespace, $key ); - $ajaxPageList[] = $tTitle->getPrefixedDBkey(); $tHandle = new MessageHandle( $tTitle ); $code = $tHandle->getCode(); @@ -233,16 +231,11 @@ $text = TranslateUtils::getLanguageName( $code, $this->getLanguage()->getCode() ); $text .= $separator; $text .= $this->msg( 'parentheses' )->params( $code )->plain(); - $text = htmlspecialchars( $text ); - - if ( $canTranslate ) { - $tools['edit'] = TranslationHelpers::ajaxEditLink( - $tTitle, - $text - ); - } else { - $tools['edit'] = $this->makeLink( $tTitle, $text ); - } + $tools['edit'] = Html::element( + 'a', + [ 'href' => TranslateUtils::getEditorUrl( $tHandle ) ], + $text + ); $tools['history'] = $this->makeLink( $tTitle, @@ -280,17 +273,5 @@ $out .=
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Add showMessage and limit query parameters to Special:Translate
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372361 ) Change subject: Add showMessage and limit query parameters to Special:Translate .. Add showMessage and limit query parameters to Special:Translate The purpose is to allow linking to specific messages in the message editor. The lack of such feature is a blocker for removing the remaining legacy non-TUX editor code. The code is implemented by manipulating the offset and limit parameters in the message table. Some changes were needed to make it not load more messages than requested. Changing any filter will clear the showMessage parameter to resume normal use. The limit parameter defaults to showing only one message, but it can be specified to show multiple consecutive messages. The message editor is opened automatically for the first message in this mode. The exact format of the key required for the showMessage parameter is hard to predict. It is basically the same as the key used in the message group it originates from. Message groups take care of avoiding invalid titles, but normalization of spaces and capitalization of the first letter are still an issue. For PHP code the format is not an issue, as it is easy to write a function that returns the key that works for the offset. I am also planning to add "Link to this message" feature to the editor. Use cases such as linking from Special:Allmessages mostly work, due to the fact that by convention most mediawiki messages start with a lower case letter and don't use spaces. Change-Id: I14af3d8746cb05d83e1e728e37723401ed30f5f4 --- M resources/js/ext.translate.messagetable.js M resources/js/ext.translate.special.translate.js 2 files changed, 39 insertions(+), 9 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/js/ext.translate.messagetable.js b/resources/js/ext.translate.messagetable.js index 13abb38..5a405e2 100644 --- a/resources/js/ext.translate.messagetable.js +++ b/resources/js/ext.translate.messagetable.js @@ -426,16 +426,23 @@ .removeAttr( 'data-offset' ) .removeClass( 'hide' ); + if ( changes.offset ) { + this.$loader.data( 'offset', changes.offset ); + } + // Start loading messages - this.load(); + this.load( changes.limit ); }, - load: function () { + /** +* @param {number} [limit] Only load this many messages and then stop even if there is more. +*/ + load: function ( limit ) { var remaining, query, self = this, offset = this.$loader.data( 'offset' ), - pageSize = this.$loader.data( 'pagesize' ); + pageSize = limit || this.$loader.data( 'pagesize' ); if ( offset === -1 ) { return; @@ -496,10 +503,14 @@ self.search( query ); } - if ( result[ 'query-continue' ] === undefined ) { + if ( result[ 'query-continue' ] === undefined || limit ) { // End of messages self.$loader.data( 'offset', -1 ) .addClass( 'hide' ); + + // Helpfully open the first message in show mode + // TODO: Refactor to avoid direct DOM access + $( '.tux-message-item' ).first().click(); } else { self.$loader.data( 'offset', result[ 'query-continue' ].messagecollection.mcoffset ); diff --git a/resources/js/ext.translate.special.translate.js b/resources/js/ext.translate.special.translate.js index 2b9944c..18b4c3f 100644 --- a/resources/js/ext.translate.special.translate.js +++ b/resources/js/ext.translate.special.translate.js @@ -27,7 +27,9 @@ state.group = group.id; changes = { - group: group.id + group: group.id, + showMessage: null + }; mw.translate.changeUrl( changes ); @@ -38,7 +40,8 @@ changeLanguage: function ( language ) { var changes = { - language: language + language: language, +
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: ACTRIAL
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378104 ) Change subject: ACTRIAL .. ACTRIAL Change-Id: Ia760dd38fdd22559ecaac3928eaf376e21762949 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/04/378104/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index be7cde5..648eb92 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19379,6 +19379,7 @@ 'default' => false, 'testwiki' => true, 'test2wiki' => true, // T175302 + 'enwiki' => true, ], 'wgArticleCreationWorkflows' => [ @@ -19389,6 +19390,12 @@ 'excludeRight' => 'autoconfirmed' ], ], + 'enwiki' => [ + [ + 'namespaces' => [ 0 ], + 'excludeRight' => 'autoconfirmed' + ], + ], ], 'wgArticleCreationLandingPage' => [ -- To view, visit https://gerrit.wikimedia.org/r/378104 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia760dd38fdd22559ecaac3928eaf376e21762949 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] RCLFilters: convert related changes tool to new UX
Sbisson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378103 ) Change subject: [WIP] RCLFilters: convert related changes tool to new UX .. [WIP] RCLFilters: convert related changes tool to new UX Bug: T172161 Change-Id: I96af7ba583d03e6ff9833ac3b5f4b80cfd0ee626 --- M languages/i18n/en.json M languages/i18n/qqq.json M resources/Resources.php M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclTargetPageWidget.less A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclToOrFromWidget.less A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RclTopSectionWidget.less M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTargetPageWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclToOrFromWidget.js A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RclTopSectionWidget.js 15 files changed, 374 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/378103/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 1a0f6a6..4eaa3bf 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1475,6 +1475,11 @@ "rcfilters-watchlist-showupdated": "Changes to pages you haven't visited since the changes occurred are in bold, with solid markers.", "rcfilters-preference-label": "Hide the improved version of Recent Changes", "rcfilters-preference-help": "Rolls back the 2017 interface redesign and all tools added then and since.", + "rcfilters-filter-showlinkedfrom-label": "Show changes on pages linked from:", + "rcfilters-filter-showlinkedfrom-option-label": "Show changes on pages linked FROM a page", + "rcfilters-filter-showlinkedto-label": "Show changes on pages linked to:", + "rcfilters-filter-showlinkedto-option-label": "Show changes on pages linked TO a page", + "rcfilters-target-page-placeholder": "Select a page", "rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since $3, $4 (up to $1 shown).", "rclistfromreset": "Reset date selection", "rclistfrom": "Show new changes starting from $2, $3", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 607e5c3..4a6aa21 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1666,6 +1666,11 @@ "rcfilters-watchlist-showupdated": "Message at the top of [[Special:Watchlist]] when the Structured filters are enabled that describes what unseen changes look like.\n\nCf. {{msg-mw|wlheader-showupdated}}", "rcfilters-preference-label": "Option in RecentChanges tab of [[Special:Preferences]].", "rcfilters-preference-help": "Explanation for the option in the RecentChanges tab of [[Special:Preferences]].", + "rcfilters-filter-showlinkedfrom-label": "Label that indicates that the page is showing changes that link FROM the target page. Used on [[Special:Recentchangeslinked]] when structured filters are enabled.", + "rcfilters-filter-showlinkedfrom-option-label": "Menu option to show changes FROM the target page. Used on [[Special:Recentchangeslinked]] when structured filters are enabled.", + "rcfilters-filter-showlinkedto-label": "Label that indicates that the page is showing changes that link TO the target page. Used on [[Special:Recentchangeslinked]] when structured filters are enabled.", + "rcfilters-filter-showlinkedto-option-label": "Menu option to show changes TO the target page. Used on [[Special:Recentchangeslinked]] when structured filters are enabled.", + "rcfilters-target-page-placeholder": "Placeholder text for the title lookup [[Special:Recentchangeslinked]] when structured filters are enabled.", "rcnotefrom": "This message is displayed at [[Special:RecentChanges]] when viewing recentchanges from some specific time.\n\nThe corresponding message is {{msg-mw|Rclistfrom}}.\n\nParameters:\n* $1 - the maximum number of changes that are displayed\n* $2 - (Optional) a date and time\n* $3 - a date\n* $4 - a time\n* $5 - Number of changes are displayed, for use with PLURAL", "rclistfromreset": "Used on [[Special:RecentChanges]] to reset a selection of a certain date range.", "rclistfrom": "Used on [[Special:RecentChanges]]. Parameters:\n* $1 - (Currently not use) date and time. The date and the time adds to the rclistfrom description.\n* $2 - time. The time adds to the rclistfrom link description (with split of date and time).\n* $3 - date.
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.18]: Fix another SVG
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378102 ) Change subject: Fix another SVG .. Fix another SVG Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c --- M resources/skins.minerva.userpage.icons/userpage.svg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/skins.minerva.userpage.icons/userpage.svg b/resources/skins.minerva.userpage.icons/userpage.svg index c356faf..1a86b83 100644 --- a/resources/skins.minerva.userpage.icons/userpage.svg +++ b/resources/skins.minerva.userpage.icons/userpage.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage \ No newline at end of file +http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage -- To view, visit https://gerrit.wikimedia.org/r/378102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Fix another SVG
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378101 ) Change subject: Fix another SVG .. Fix another SVG Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c --- M resources/skins.minerva.userpage.icons/userpage.svg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/skins.minerva.userpage.icons/userpage.svg b/resources/skins.minerva.userpage.icons/userpage.svg index c356faf..1a86b83 100644 --- a/resources/skins.minerva.userpage.icons/userpage.svg +++ b/resources/skins.minerva.userpage.icons/userpage.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage \ No newline at end of file +http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage -- To view, visit https://gerrit.wikimedia.org/r/378101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: fix article subtitle drawable tint on non-current ve...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378088 ) Change subject: Update: fix article subtitle drawable tint on non-current versions .. Update: fix article subtitle drawable tint on non-current versions Bug: T172157 Change-Id: I41c8c9246bc614d9ad7f253573e998e97b8973bd --- M app/src/main/res/drawable/ic_short_text.xml M app/src/main/res/layout/view_page_header.xml 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/res/drawable/ic_short_text.xml b/app/src/main/res/drawable/ic_short_text.xml index 081e555..5137c91 100644 --- a/app/src/main/res/drawable/ic_short_text.xml +++ b/app/src/main/res/drawable/ic_short_text.xml @@ -1,7 +1,7 @@ http://schemas.android.com/apk/res/android;> - diff --git a/app/src/main/res/layout/view_page_header.xml b/app/src/main/res/layout/view_page_header.xml index 1a0eb99..3f12821 100644 --- a/app/src/main/res/layout/view_page_header.xml +++ b/app/src/main/res/layout/view_page_header.xml @@ -51,7 +51,6 @@ android:textColorLink="?attr/page_description_color" android:textColorHighlight="?attr/page_description_color" android:drawablePadding="8dp" -android:drawableTint="?attr/colorAccent" tools:text="Subtitle" /> https://gerrit.wikimedia.org/r/378088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41c8c9246bc614d9ad7f253573e998e97b8973bd Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: MhollowayGerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Cooltey Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Sharvaniharan Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.18]: Fix another SVG
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378102 ) Change subject: Fix another SVG .. Fix another SVG Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c --- M resources/skins.minerva.userpage.icons/userpage.svg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/02/378102/1 diff --git a/resources/skins.minerva.userpage.icons/userpage.svg b/resources/skins.minerva.userpage.icons/userpage.svg index c356faf..1a86b83 100644 --- a/resources/skins.minerva.userpage.icons/userpage.svg +++ b/resources/skins.minerva.userpage.icons/userpage.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage \ No newline at end of file +http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage -- To view, visit https://gerrit.wikimedia.org/r/378102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: Chad___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Fix another SVG
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378101 ) Change subject: Fix another SVG .. Fix another SVG Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c --- M resources/skins.minerva.userpage.icons/userpage.svg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/01/378101/1 diff --git a/resources/skins.minerva.userpage.icons/userpage.svg b/resources/skins.minerva.userpage.icons/userpage.svg index c356faf..1a86b83 100644 --- a/resources/skins.minerva.userpage.icons/userpage.svg +++ b/resources/skins.minerva.userpage.icons/userpage.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage \ No newline at end of file +http://www.w3.org/2000/svg; width="88" height="118" viewBox="0 0 88 118">userpage -- To view, visit https://gerrit.wikimedia.org/r/378101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95d76339fa5dc8dcbb1472ad98ae8476c35fba1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: master Gerrit-Owner: ChadGerrit-Reviewer: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: Disable cassandra-metrics-collector when Prometheus age...
Eevans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378100 ) Change subject: WIP: Disable cassandra-metrics-collector when Prometheus agent is enabled .. WIP: Disable cassandra-metrics-collector when Prometheus agent is enabled Moves the `jmx_exporter_enabled` variable up to the cassandra class where it can be assigned once for a cluster, and then passed into `cassandra::metrics` to disable the systemd unit. Bug: T171772 Change-Id: I3ce1a963df3ca89c7a119675820d95c27934aaf9 --- M hieradata/role/common/restbase/dev_cluster.yaml M hieradata/role/common/restbase/production_ng.yaml M hieradata/role/common/restbase/test_cluster.yaml M modules/cassandra/manifests/init.pp M modules/cassandra/manifests/instance.pp M modules/cassandra/manifests/metrics.pp M modules/profile/manifests/cassandra.pp 7 files changed, 22 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/00/378100/1 diff --git a/hieradata/role/common/restbase/dev_cluster.yaml b/hieradata/role/common/restbase/dev_cluster.yaml index 25b274e..98f6e94 100644 --- a/hieradata/role/common/restbase/dev_cluster.yaml +++ b/hieradata/role/common/restbase/dev_cluster.yaml @@ -89,7 +89,6 @@ - /srv/cassandra-a/data_1 - /srv/cassandra-a/data_2 - /srv/cassandra-a/data_3 - jmx_exporter_enabled: true b: listen_address: 10.64.0.168 data_file_directories: @@ -97,33 +96,28 @@ - /srv/cassandra-b/data_1 - /srv/cassandra-b/data_2 - /srv/cassandra-b/data_3 - jmx_exporter_enabled: true "restbase-dev1005.eqiad.wmnet": a: listen_address: 10.64.16.97 data_file_directories: - /srv/cassandra-a/data_0 - /srv/cassandra-a/data_1 - jmx_exporter_enabled: true b: listen_address: 10.64.16.98 data_file_directories: - /srv/cassandra-b/data_0 - /srv/cassandra-b/data_1 - jmx_exporter_enabled: true "restbase-dev1006.eqiad.wmnet": a: listen_address: 10.64.48.168 data_file_directories: - /srv/cassandra-a/data_0 - /srv/cassandra-a/data_1 - jmx_exporter_enabled: true b: listen_address: 10.64.48.169 data_file_directories: - /srv/cassandra-b/data_0 - /srv/cassandra-b/data_1 - jmx_exporter_enabled: true profile::cassandra::settings: start_rpc: 'true' @@ -147,6 +141,7 @@ internode_encryption: dc permissions_validity_in_ms: 60 trickle_fsync: false +jmx_exporter_enabled: true service::configuration::log_dir: "/var/log" diff --git a/hieradata/role/common/restbase/production_ng.yaml b/hieradata/role/common/restbase/production_ng.yaml index 7c8c7e2..8ca3f7f 100644 --- a/hieradata/role/common/restbase/production_ng.yaml +++ b/hieradata/role/common/restbase/production_ng.yaml @@ -54,7 +54,6 @@ commitlog_directory: /srv/cassandra/instance-data/cassandra-a/commitlog hints_directory: /srv/cassandra/instance-data/cassandra-a/hints saved_caches_directory: /srv/cassandra/instance-data/cassandra-a/saved_caches - jmx_exporter_enabled: true b: listen_address: 10.64.32.195 data_file_directories: @@ -67,7 +66,6 @@ commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog hints_directory: /srv/cassandra/instance-data/cassandra-b/hints saved_caches_directory: /srv/cassandra/instance-data/cassandra-b/saved_caches - jmx_exporter_enabled: true c: listen_address: 10.64.32.196 data_file_directories: @@ -80,7 +78,6 @@ commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog hints_directory: /srv/cassandra/instance-data/cassandra-c/hints saved_caches_directory: /srv/cassandra/instance-data/cassandra-c/saved_caches - jmx_exporter_enabled: true "restbase1009.eqiad.wmnet": a: listen_address: 10.64.48.120 @@ -94,7 +91,6 @@ commitlog_directory: /srv/cassandra/instance-data/cassandra-a/commitlog hints_directory: /srv/cassandra/instance-data/cassandra-a/hints saved_caches_directory: /srv/cassandra/instance-data/cassandra-a/saved_caches - jmx_exporter_enabled: true b: listen_address: 10.64.48.130 data_file_directories: @@ -107,7 +103,6 @@ commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog hints_directory: /srv/cassandra/instance-data/cassandra-b/hints saved_caches_directory: /srv/cassandra/instance-data/cassandra-b/saved_caches - jmx_exporter_enabled: true c: listen_address: 10.64.48.131 data_file_directories: @@ -120,7 +115,6 @@ commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog hints_directory: /srv/cassandra/instance-data/cassandra-c/hints saved_caches_directory:
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ui.TableLineContext: fix z-index for menu
DLynch has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378099 ) Change subject: ui.TableLineContext: fix z-index for menu .. ui.TableLineContext: fix z-index for menu Bug: T169389 Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 --- M src/ui/styles/ve.ui.TableLineContext.css 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/99/378099/1 diff --git a/src/ui/styles/ve.ui.TableLineContext.css b/src/ui/styles/ve.ui.TableLineContext.css index d372ede..435da04 100644 --- a/src/ui/styles/ve.ui.TableLineContext.css +++ b/src/ui/styles/ve.ui.TableLineContext.css @@ -34,3 +34,7 @@ left: -1.2em; border-right: 0; } + +.ve-ui-tableLineContext-menu { + z-index: 2; +} -- To view, visit https://gerrit.wikimedia.org/r/378099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4c69b5469bd0bdfbe7420804df5276d075757c8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: DLynch___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.18]: ApiFeedWatchlist: Fix copy-paste error
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378095 ) Change subject: ApiFeedWatchlist: Fix copy-paste error .. ApiFeedWatchlist: Fix copy-paste error Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 (cherry picked from commit de3eb81e4b2cfbb7b9cc63928d54fd0a66e69a67) --- M includes/api/ApiFeedWatchlist.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index b7c5ccc..e3a757f 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -167,7 +167,7 @@ // Something is seriously wrong $errorCode = 'internal_api_error'; } - $errorTitle = $this->msg( 'api-feed-error-title', $msg->getApiCode() ); + $errorTitle = $this->msg( 'api-feed-error-title', $errorCode ); $errorText = $e->getMessage(); $feedItems[] = new FeedItem( $errorTitle, $errorText, '', '', '' ); } -- To view, visit https://gerrit.wikimedia.org/r/378095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: ChadGerrit-Reviewer: Anomie Gerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.18]: ApiFeedWatchlist: Fix copy-paste error
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378095 ) Change subject: ApiFeedWatchlist: Fix copy-paste error .. ApiFeedWatchlist: Fix copy-paste error Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 (cherry picked from commit de3eb81e4b2cfbb7b9cc63928d54fd0a66e69a67) --- M includes/api/ApiFeedWatchlist.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/378095/1 diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index b7c5ccc..e3a757f 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -167,7 +167,7 @@ // Something is seriously wrong $errorCode = 'internal_api_error'; } - $errorTitle = $this->msg( 'api-feed-error-title', $msg->getApiCode() ); + $errorTitle = $this->msg( 'api-feed-error-title', $errorCode ); $errorText = $e->getMessage(); $feedItems[] = new FeedItem( $errorTitle, $errorText, '', '', '' ); } -- To view, visit https://gerrit.wikimedia.org/r/378095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: ChadGerrit-Reviewer: Anomie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Do not encode XMLMETA.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378087 ) Change subject: Do not encode XMLMETA. .. Do not encode XMLMETA. No reason to escape &<> Change-Id: Id8c2649f62768cceb9f57eca6223afc27f683b78 --- M EventBus.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: GWicke: Looks good to me, approved jenkins-bot: Verified diff --git a/EventBus.php b/EventBus.php index 06e174a..f882f8d 100644 --- a/EventBus.php +++ b/EventBus.php @@ -116,7 +116,7 @@ * @return string JSON */ public static function serializeEvents( $events ) { - $serializedEvents = FormatJson::encode( $events, false, FormatJson::UTF8_OK ); + $serializedEvents = FormatJson::encode( $events, false, FormatJson::ALL_OK ); if ( empty( $serializedEvents ) ) { $context = [ -- To view, visit https://gerrit.wikimedia.org/r/378087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8c2649f62768cceb9f57eca6223afc27f683b78 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventBus Gerrit-Branch: master Gerrit-Owner: PpchelkoGerrit-Reviewer: GWicke Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiFeedWatchlist: Fix copy-paste error
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378090 ) Change subject: ApiFeedWatchlist: Fix copy-paste error .. ApiFeedWatchlist: Fix copy-paste error Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 --- M includes/api/ApiFeedWatchlist.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index b7c5ccc..e3a757f 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -167,7 +167,7 @@ // Something is seriously wrong $errorCode = 'internal_api_error'; } - $errorTitle = $this->msg( 'api-feed-error-title', $msg->getApiCode() ); + $errorTitle = $this->msg( 'api-feed-error-title', $errorCode ); $errorText = $e->getMessage(); $feedItems[] = new FeedItem( $errorTitle, $errorText, '', '', '' ); } -- To view, visit https://gerrit.wikimedia.org/r/378090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: AnomieGerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Log a DB disconnect with successful reconnect at INFO
Hello Aaron Schulz, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/378093 to review the following change. Change subject: Log a DB disconnect with successful reconnect at INFO .. Log a DB disconnect with successful reconnect at INFO If we reconnected, it's not a huge deal Change-Id: I62bc3f68fcbe43532dce849d515a5e0620fba6f2 --- M includes/libs/rdbms/database/Database.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/378093/1 diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index c904092..9998313 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -946,8 +946,8 @@ $this->handleSessionLoss(); if ( $this->reconnect() ) { $msg = __METHOD__ . ": lost connection to {$this->getServer()}; reconnected"; - $this->connLogger->warning( $msg ); - $this->queryLogger->warning( + $this->connLogger->info( $msg ); + $this->queryLogger->info( "$msg:\n" . ( new RuntimeException() )->getTraceAsString() ); if ( !$recoverable ) { -- To view, visit https://gerrit.wikimedia.org/r/378093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62bc3f68fcbe43532dce849d515a5e0620fba6f2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: ChadGerrit-Reviewer: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OAuth[wmf/1.30.0-wmf.18]: MWOAuthDAO: Fix for distinction between field and column
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378091 ) Change subject: MWOAuthDAO: Fix for distinction between field and column .. MWOAuthDAO: Fix for distinction between field and column Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 (cherry picked from commit b227052466de2ae77ead4127f3e81045f79ec483) --- M backend/MWOAuthDAO.php 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/backend/MWOAuthDAO.php b/backend/MWOAuthDAO.php index e4bad47..ba8cba6 100644 --- a/backend/MWOAuthDAO.php +++ b/backend/MWOAuthDAO.php @@ -176,11 +176,12 @@ } else { $this->logger->debug( get_class( $this ) . ': performing DB update; new object.' ); $afield = static::getAutoIncrField(); + $acolumn = $afield !== null ? static::getColumn( $afield ) : null; $row = $this->getRowArray( $dbw ); - if ( $afield !== null && $row[$afield] === null ) { + if ( $acolumn !== null && $row[$acolumn] === null ) { // auto-increment field should be omitted, not set null, for // auto-incrementing behavior - unset( $row[$afield] ); + unset( $row[$acolumn] ); } $dbw->insert( static::getTable(), -- To view, visit https://gerrit.wikimedia.org/r/378091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: ChadGerrit-Reviewer: Anomie Gerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OAuth[wmf/1.30.0-wmf.18]: MWOAuthDAO: Fix for distinction between field and column
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378091 ) Change subject: MWOAuthDAO: Fix for distinction between field and column .. MWOAuthDAO: Fix for distinction between field and column Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 (cherry picked from commit b227052466de2ae77ead4127f3e81045f79ec483) --- M backend/MWOAuthDAO.php 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth refs/changes/91/378091/1 diff --git a/backend/MWOAuthDAO.php b/backend/MWOAuthDAO.php index e4bad47..ba8cba6 100644 --- a/backend/MWOAuthDAO.php +++ b/backend/MWOAuthDAO.php @@ -176,11 +176,12 @@ } else { $this->logger->debug( get_class( $this ) . ': performing DB update; new object.' ); $afield = static::getAutoIncrField(); + $acolumn = $afield !== null ? static::getColumn( $afield ) : null; $row = $this->getRowArray( $dbw ); - if ( $afield !== null && $row[$afield] === null ) { + if ( $acolumn !== null && $row[$acolumn] === null ) { // auto-increment field should be omitted, not set null, for // auto-incrementing behavior - unset( $row[$afield] ); + unset( $row[$acolumn] ); } $dbw->insert( static::getTable(), -- To view, visit https://gerrit.wikimedia.org/r/378091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: ChadGerrit-Reviewer: Anomie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: MWOAuthDAO: Fix for distinction between field and column
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378089 ) Change subject: MWOAuthDAO: Fix for distinction between field and column .. MWOAuthDAO: Fix for distinction between field and column Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 --- M backend/MWOAuthDAO.php 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/backend/MWOAuthDAO.php b/backend/MWOAuthDAO.php index e4bad47..ba8cba6 100644 --- a/backend/MWOAuthDAO.php +++ b/backend/MWOAuthDAO.php @@ -176,11 +176,12 @@ } else { $this->logger->debug( get_class( $this ) . ': performing DB update; new object.' ); $afield = static::getAutoIncrField(); + $acolumn = $afield !== null ? static::getColumn( $afield ) : null; $row = $this->getRowArray( $dbw ); - if ( $afield !== null && $row[$afield] === null ) { + if ( $acolumn !== null && $row[$acolumn] === null ) { // auto-increment field should be omitted, not set null, for // auto-incrementing behavior - unset( $row[$afield] ); + unset( $row[$acolumn] ); } $dbw->insert( static::getTable(), -- To view, visit https://gerrit.wikimedia.org/r/378089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: AnomieGerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQuality[master]: Can't abbreviate composer validate as @validate
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377990 ) Change subject: Can't abbreviate composer validate as @validate .. Can't abbreviate composer validate as @validate And change "data-values/number" constraint to ">=0.1 <0.10". Change-Id: Ie94771b9e9fd694e6a583a461b31634589ad3689 --- M composer.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved Lucas Werkmeister (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/composer.json b/composer.json index 9e1bae3..9376c3d 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "data-values/geo": "~1.0|~2.0", - "data-values/number": ">=0.1 <0.9", + "data-values/number": ">=0.1 <0.10", "data-values/serialization": ">=0.1 <2.0", "data-values/time": ">=0.1 <0.9", "jakub-onderka/php-console-highlighter": "0.3.2", @@ -42,7 +42,7 @@ "scripts": { "fix": "phpcbf", "test": [ - "@validate --no-interaction", + "composer validate --no-interaction", "parallel-lint . --exclude vendor", "phpcs -p -s" ] -- To view, visit https://gerrit.wikimedia.org/r/377990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie94771b9e9fd694e6a583a461b31634589ad3689 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WikibaseQuality Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Lucas Werkmeister (WMDE) Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Can't abbreviate composer validate as @validate
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377991 ) Change subject: Can't abbreviate composer validate as @validate .. Can't abbreviate composer validate as @validate And change "data-values/number" constraint to ">=0.1 <0.10". Change-Id: Ia7cda3ea43d50a9e8302dd2fa13d0e33707eddb7 --- M composer.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved Lucas Werkmeister (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/composer.json b/composer.json index 4a3e979..545eee4 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "data-values/common": ">=0.1 <0.4", "data-values/geo": "~1.0|~2.0", - "data-values/number": ">=0.1 <0.9", + "data-values/number": ">=0.1 <0.10", "data-values/time": "~0.8", "php": ">=5.5.9", "serialization/serialization": "3.*,>=3.2.1", @@ -46,7 +46,7 @@ "scripts": { "fix": "phpcbf", "test": [ - "@validate --no-interaction", + "composer validate --no-interaction", "parallel-lint . --exclude vendor", "phpcs -p -s" ] -- To view, visit https://gerrit.wikimedia.org/r/377991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7cda3ea43d50a9e8302dd2fa13d0e33707eddb7 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Lucas Werkmeister (WMDE) Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiFeedWatchlist: Fix copy-paste error
Anomie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378090 ) Change subject: ApiFeedWatchlist: Fix copy-paste error .. ApiFeedWatchlist: Fix copy-paste error Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 --- M includes/api/ApiFeedWatchlist.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/90/378090/1 diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php index b7c5ccc..e3a757f 100644 --- a/includes/api/ApiFeedWatchlist.php +++ b/includes/api/ApiFeedWatchlist.php @@ -167,7 +167,7 @@ // Something is seriously wrong $errorCode = 'internal_api_error'; } - $errorTitle = $this->msg( 'api-feed-error-title', $msg->getApiCode() ); + $errorTitle = $this->msg( 'api-feed-error-title', $errorCode ); $errorText = $e->getMessage(); $feedItems[] = new FeedItem( $errorTitle, $errorText, '', '', '' ); } -- To view, visit https://gerrit.wikimedia.org/r/378090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibea5bd881c746d7c27c97fc470ee1e3ac9d4b699 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: MWOAuthDAO: Fix for distinction between field and column
Anomie has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378089 ) Change subject: MWOAuthDAO: Fix for distinction between field and column .. MWOAuthDAO: Fix for distinction between field and column Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 --- M backend/MWOAuthDAO.php 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth refs/changes/89/378089/1 diff --git a/backend/MWOAuthDAO.php b/backend/MWOAuthDAO.php index e4bad47..ba8cba6 100644 --- a/backend/MWOAuthDAO.php +++ b/backend/MWOAuthDAO.php @@ -176,11 +176,12 @@ } else { $this->logger->debug( get_class( $this ) . ': performing DB update; new object.' ); $afield = static::getAutoIncrField(); + $acolumn = $afield !== null ? static::getColumn( $afield ) : null; $row = $this->getRowArray( $dbw ); - if ( $afield !== null && $row[$afield] === null ) { + if ( $acolumn !== null && $row[$acolumn] === null ) { // auto-increment field should be omitted, not set null, for // auto-incrementing behavior - unset( $row[$afield] ); + unset( $row[$acolumn] ); } $dbw->insert( static::getTable(), -- To view, visit https://gerrit.wikimedia.org/r/378089 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I785230df11a7c81644fe08dc384a42631f4e5775 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Instruct stashed upload failures to reupload file
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/365607 ) Change subject: Instruct stashed upload failures to reupload file .. Instruct stashed upload failures to reupload file Given enough permissions, anonymous users can upload files just fine. But when there are warnings, their failes can't be stashed. This is handled correctly by adding the back to the form, but that could easily be overlooked: - if you're used to being logged in and having your upload stashed - the instructions only mention changing the description This will slightly alter the instructions in such case so that users are directed to re-upload their file when it couldn't be stashed. Bug: T115822 Change-Id: I81f5b112d158fe5f8b0850654af07d248bc3fda5 --- M includes/specials/SpecialUpload.php M languages/i18n/en.json M languages/i18n/qqq.json 3 files changed, 10 insertions(+), 4 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 4cdc78f..fe16b90 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -345,15 +345,16 @@ $stashStatus = $this->mUpload->tryStashFile( $this->getUser() ); if ( $stashStatus->isGood() ) { $sessionKey = $stashStatus->getValue()->getFileKey(); + $uploadWarning = 'upload-tryagain'; } else { $sessionKey = null; - // TODO Add a warning message about the failure to stash here? + $uploadWarning = 'upload-tryagain-nostash'; } $message = '' . $this->msg( 'uploaderror' )->escaped() . "\n" . '' . $message . "\n"; $form = $this->getUploadForm( $message, $sessionKey ); - $form->setSubmitText( $this->msg( 'upload-tryagain' )->escaped() ); + $form->setSubmitText( $this->msg( $uploadWarning )->escaped() ); $this->showUploadForm( $form ); } @@ -380,9 +381,10 @@ $stashStatus = $this->mUpload->tryStashFile( $this->getUser() ); if ( $stashStatus->isGood() ) { $sessionKey = $stashStatus->getValue()->getFileKey(); + $uploadWarning = 'uploadwarning-text'; } else { $sessionKey = null; - // TODO Add a warning message about the failure to stash here? + $uploadWarning = 'uploadwarning-text-nostash'; } // Add styles for the warning, reused from the live preview @@ -444,7 +446,7 @@ $warningHtml .= $msg; } $warningHtml .= "\n"; - $warningHtml .= $this->msg( 'uploadwarning-text' )->parseAsBlock(); + $warningHtml .= $this->msg( $uploadWarning )->parseAsBlock(); $form = $this->getUploadForm( $warningHtml, $sessionKey, /* $hideIgnoreWarning */ true ); $form->setSubmitText( $this->msg( 'upload-tryagain' )->text() ); diff --git a/languages/i18n/en.json b/languages/i18n/en.json index a44b3cf..1b832ab 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1528,6 +1528,7 @@ "uploadbtn": "Upload file", "reuploaddesc": "Cancel upload and return to the upload form", "upload-tryagain": "Submit modified file description", + "upload-tryagain-nostash": "Submit re-uploaded file and modified description", "uploadnologin": "Not logged in", "uploadnologintext": "Please $1 to upload files.", "upload_directory_missing": "The upload directory ($1) is missing and could not be created by the webserver.", @@ -1590,6 +1591,7 @@ "file-deleted-duplicate-notitle": "A file identical to this file has previously been deleted, and the title has been suppressed.\nYou should ask someone with the ability to view suppressed file data to review the situation before proceeding to re-upload it.", "uploadwarning": "Upload warning", "uploadwarning-text": "Please modify the file description below and try again.", + "uploadwarning-text-nostash": "Please re-upload the file, modify the description below and try again.", "savefile": "Save file", "uploadedimage": "uploaded \"[[$1]]\"", "overwroteimage": "uploaded a new version of \"[[$1]]\"", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index fb05de8..96ae965 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1718,6 +1718,7 @@ "uploadbtn": "Button name in [[Special:Upload]].\n\nSee also:\n* {{msg-mw|Uploadbtn}}\n* {{msg-mw|Accesskey-upload}}\n*
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: fix article subtitle compound drawable tint on API <23
Mholloway has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378088 ) Change subject: Update: fix article subtitle compound drawable tint on API <23 .. Update: fix article subtitle compound drawable tint on API <23 The TextView drawableTint property only applies to API 23 (M) and higher; we'll have to shim it in Java code for pre-Marshmallow versions. Bug: T172157 Change-Id: I41c8c9246bc614d9ad7f253573e998e97b8973bd --- M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java M app/src/main/res/layout/view_page_header.xml 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/88/378088/1 diff --git a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java index ca31c78..09955de 100644 --- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java +++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java @@ -4,8 +4,11 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.PointF; +import android.graphics.PorterDuff; import android.graphics.Typeface; +import android.graphics.drawable.Drawable; import android.os.Build; +import android.support.annotation.ColorInt; import android.support.annotation.DimenRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -196,6 +199,9 @@ 0, isLangRTL(locale) ? R.drawable.ic_short_text : 0, 0); +if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { +addSubtitleDrawableTintPreMarshmallow(); +} } else { subtitleText.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); } @@ -342,6 +348,14 @@ setPadding(0, offset, 0, 0); } +private void addSubtitleDrawableTintPreMarshmallow() { +@ColorInt int accentColor = getThemedColor(getContext(), R.attr.colorAccent); +Drawable[] drawables = subtitleText.getCompoundDrawables(); +if (drawables[0] != null) { +drawables[0].setColorFilter(accentColor, PorterDuff.Mode.SRC_IN); +} +} + private class DescriptionClickableSpan extends ClickableSpan { @Override public void onClick(View view) { diff --git a/app/src/main/res/layout/view_page_header.xml b/app/src/main/res/layout/view_page_header.xml index 1a0eb99..360cc9b 100644 --- a/app/src/main/res/layout/view_page_header.xml +++ b/app/src/main/res/layout/view_page_header.xml @@ -52,6 +52,7 @@ android:textColorHighlight="?attr/page_description_color" android:drawablePadding="8dp" android:drawableTint="?attr/colorAccent" +tools:targetApi="23" tools:text="Subtitle" /> https://gerrit.wikimedia.org/r/378088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41c8c9246bc614d9ad7f253573e998e97b8973bd Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Mholloway___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make chunkedUpload match upload behavior
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363841 ) Change subject: Make chunkedUpload match upload behavior .. Make chunkedUpload match upload behavior .upload will upload the entire file, then reject the promise if it has warnings. This also happened in chunkedUpload, but a warning could already be present after uploading only 1 chunk & that rejection would cause the entire chain of chunks to stop. Instead, it'll now keep uploading all chunks & then reject with the complete upload data. Also fixed how abort is dealt with when retrying because of network issues. Change-Id: I8ecef2271359a9505c8c5fa22883b0df55e9e914 --- M resources/src/mediawiki/api/upload.js 1 file changed, 69 insertions(+), 19 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki/api/upload.js b/resources/src/mediawiki/api/upload.js index 4a2895d..29bd59a 100644 --- a/resources/src/mediawiki/api/upload.js +++ b/resources/src/mediawiki/api/upload.js @@ -392,7 +392,7 @@ * @return {jQuery.Promise} */ uploadChunk: function ( file, data, start, end, filekey, retries ) { - var upload, retry, + var upload, api = this, chunk = this.slice( file, start, end ); @@ -401,22 +401,6 @@ // In such case, it could be useful to try again: a network hickup // doesn't necessarily have to result in upload failure... retries = retries === undefined ? 1 : retries; - retry = function ( code, result ) { - var deferred = $.Deferred(), - callback = function () { - api.uploadChunk( file, data, start, end, filekey, retries - 1 ) - .then( deferred.resolve, deferred.reject ); - }; - - // Don't retry if the request failed because we aborted it (or - // if it's another kind of request failure) - if ( code !== 'http' || result.textStatus === 'abort' ) { - return deferred.reject( code, result ); - } - - setTimeout( callback, 1000 ); - return deferred.promise(); - }; data.filesize = file.size; data.chunk = chunk; @@ -431,8 +415,36 @@ upload = this.uploadWithFormData( file, data ); return upload.then( null, - // If the call fails, we may want to try again... - retries === 0 ? null : retry, + function ( code, result ) { + var retry; + + // uploadWithFormData will reject uploads with warnings, but + // these warnings could be "harmless" or recovered from + // (e.g. exists-normalized, when it'll be renamed later) + // In the case of (only) a warning, we still want to + // continue the chunked upload until it completes: then + // reject it - at least it's been fully uploaded by then and + // failure handlers have a complete result object (including + // possibly more warnings, e.g. duplicate) + // This matches .upload, which also completes the upload. + if ( result.upload && result.upload.warnings && code in result.upload.warnings ) { + if ( end === file.size ) { + // uploaded last chunk = reject with result data + return $.Deferred().reject( code, result ); + } else { + // still uploading chunks = resolve to keep going + return $.Deferred().resolve( result ); + } + } + + if ( retries === 0 ) { +
[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Do not encode XMLMETA.
Ppchelko has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378087 ) Change subject: Do not encode XMLMETA. .. Do not encode XMLMETA. No reason to escape &<> Change-Id: Id8c2649f62768cceb9f57eca6223afc27f683b78 --- M EventBus.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus refs/changes/87/378087/1 diff --git a/EventBus.php b/EventBus.php index 06e174a..f882f8d 100644 --- a/EventBus.php +++ b/EventBus.php @@ -116,7 +116,7 @@ * @return string JSON */ public static function serializeEvents( $events ) { - $serializedEvents = FormatJson::encode( $events, false, FormatJson::UTF8_OK ); + $serializedEvents = FormatJson::encode( $events, false, FormatJson::ALL_OK ); if ( empty( $serializedEvents ) ) { $context = [ -- To view, visit https://gerrit.wikimedia.org/r/378087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8c2649f62768cceb9f57eca6223afc27f683b78 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventBus Gerrit-Branch: master Gerrit-Owner: Ppchelko___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CreateUserPage[master]: Corrected user page creation to use wikitext instead of text.
Kji has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378086 ) Change subject: Corrected user page creation to use wikitext instead of text. .. Corrected user page creation to use wikitext instead of text. Change-Id: I048fa563cde69a0306b18156891a7c32296b178a --- M includes/CreateUserPageHooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CreateUserPage refs/changes/86/378086/1 diff --git a/includes/CreateUserPageHooks.php b/includes/CreateUserPageHooks.php index 565d6a2..acaf6ec 100755 --- a/includes/CreateUserPageHooks.php +++ b/includes/CreateUserPageHooks.php @@ -28,7 +28,7 @@ $title = Title::newFromText( 'User:' . $user->mName ); if ( !is_null( $title ) && !$title->exists() ) { $page = new WikiPage( $title ); - $pageContent = new TextContent( $GLOBALS['wgCreateUserPage_PageContent'] ); + $pageContent = new WikitextContent( $GLOBALS['wgCreateUserPage_PageContent'] ); $page->doEditContent( $pageContent, 'create user page', EDIT_NEW); } } -- To view, visit https://gerrit.wikimedia.org/r/378086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I048fa563cde69a0306b18156891a7c32296b178a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CreateUserPage Gerrit-Branch: master Gerrit-Owner: Kji___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.18]: Fix userNormal.svg syntax
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378083 ) Change subject: Fix userNormal.svg syntax .. Fix userNormal.svg syntax Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c (cherry picked from commit 0bf4aeb74689048696f37305e1348b42211272cf) --- M resources/skins.minerva.icons.images.scripts/userNormal.svg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/skins.minerva.icons.images.scripts/userNormal.svg b/resources/skins.minerva.icons.images.scripts/userNormal.svg index 36883d3..40112c4 100644 --- a/resources/skins.minerva.icons.images.scripts/userNormal.svg +++ b/resources/skins.minerva.icons.images.scripts/userNormal.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> \ No newline at end of file +http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> -- To view, visit https://gerrit.wikimedia.org/r/378083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Allow unicode in serialized events.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378072 ) Change subject: Allow unicode in serialized events. .. Allow unicode in serialized events. We shouldn't encode unicode codepoints when serializing events. All the rest of the system supports unicode just fine and avoiding encoding will make events smaller, save space in kafka and some CPU cycles. Bug: T175316 Change-Id: I087defb9b395cba0e9964ff8a7232a5aa30357d8 --- M EventBus.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: GWicke: Looks good to me, approved Ottomata: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/EventBus.php b/EventBus.php index 7e2d843..06e174a 100644 --- a/EventBus.php +++ b/EventBus.php @@ -116,7 +116,7 @@ * @return string JSON */ public static function serializeEvents( $events ) { - $serializedEvents = FormatJson::encode( $events ); + $serializedEvents = FormatJson::encode( $events, false, FormatJson::UTF8_OK ); if ( empty( $serializedEvents ) ) { $context = [ -- To view, visit https://gerrit.wikimedia.org/r/378072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I087defb9b395cba0e9964ff8a7232a5aa30357d8 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/EventBus Gerrit-Branch: master Gerrit-Owner: PpchelkoGerrit-Reviewer: GWicke Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Remove jquery.scrollTo library
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377808 ) Change subject: Remove jquery.scrollTo library .. Remove jquery.scrollTo library This is an old library that is broken in Chrome 61. Rather than updating it we can just use $(window).scrollTop/Left which works in all the browsers we currently support. Fix MPSP.toggle to return a promise, instead of a deferred (although this return value is not used yet). Bug: T173618 Change-Id: Iaec56debbb808bd95cf65c1ebfe22bdf0116da68 --- M extension.json D resources/jquery.scrollTo/LICENSE D resources/jquery.scrollTo/jquery.scrollTo.js M resources/mmv/mmv.bootstrap.js M resources/mmv/mmv.lightboxinterface.js M resources/mmv/ui/mmv.ui.metadataPanelScroller.js M tests/qunit/mmv/mmv.bootstrap.test.js M tests/qunit/mmv/ui/mmv.ui.metadataPanelScroller.test.js 8 files changed, 56 insertions(+), 298 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/extension.json b/extension.json index 5c5fab9..92fc5e0 100644 --- a/extension.json +++ b/extension.json @@ -334,8 +334,7 @@ "mmv/logging/mmv.logging.Logger.js", "mmv/logging/mmv.logging.ActionLogger.js", "mmv/logging/mmv.logging.DurationLogger.js", - "jquery.hashchange/jquery.hashchange.js", - "jquery.scrollTo/jquery.scrollTo.js" + "jquery.hashchange/jquery.hashchange.js" ], "styles": [ "mmv/mmv.bootstrap.less" diff --git a/resources/jquery.scrollTo/LICENSE b/resources/jquery.scrollTo/LICENSE deleted file mode 100644 index 69c814d..000 --- a/resources/jquery.scrollTo/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -(The MIT License) - -Copyright (c) 2007-2014 Ariel Flesler- -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/resources/jquery.scrollTo/jquery.scrollTo.js b/resources/jquery.scrollTo/jquery.scrollTo.js deleted file mode 100644 index c1cf2d1..000 --- a/resources/jquery.scrollTo/jquery.scrollTo.js +++ /dev/null @@ -1,186 +0,0 @@ -/*! - * jQuery.ScrollTo - * Copyright (c) 2007-2014 Ariel Flesler - afleslergmailcom | http://flesler.blogspot.com - * Licensed under MIT - * http://flesler.blogspot.com/2007/10/jqueryscrollto.html - * @projectDescription Easy element scrolling using jQuery. - * @author Ariel Flesler - * @version 1.4.9 - */ - -;(function (factory) { -// AMD Support -if (typeof define === 'function' && define.amd) { -define(['jquery'], factory); -} else { -factory(jQuery); -} -}(function ($) { - - var $scrollTo = $.scrollTo = function( target, duration, settings ) { - return $(window).scrollTo( target, duration, settings ); - }; - - $scrollTo.defaults = { - axis:'xy', - duration: parseFloat($.fn.jquery) >= 1.3 ? 0 : 1, - limit:true - }; - - // Returns the element that needs to be animated to scroll the window. - // Kept for backwards compatibility (specially for localScroll & serialScroll) - $scrollTo.window = function( scope ) { - return $(window)._scrollable(); - }; - - // Hack, hack, hack :) - // Returns the real elements to scroll (supports window/iframes, documents and regular nodes) - $.fn._scrollable = function() { - return this.map(function() { - var elem = this, - isWin = !elem.nodeName || $.inArray( elem.nodeName.toLowerCase(), ['iframe','#document','html','body'] ) != -1; - - if (!isWin) -
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove use of deprecated EditPage::getCheckboxes()
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/375021 ) Change subject: Remove use of deprecated EditPage::getCheckboxes() .. Remove use of deprecated EditPage::getCheckboxes() Follow-up to I5bfca5e116fe790302c3b6ac1357e80237fb1ed2. Bug: T174613 Change-Id: I5747871065416ca23038b099f128b02b5cbb431b --- M ApiVisualEditor.php 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index f508f10..7983f75 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -442,15 +442,12 @@ $req->setVal( 'format', $editPage->contentFormat ); // By reference for some reason (T54466) $editPage->importFormData( $req ); - $tabindex = 0; $states = [ 'minor' => $user->getOption( 'minordefault' ) && $title->exists(), 'watch' => $user->getOption( 'watchdefault' ) || ( $user->getOption( 'watchcreations' ) && !$title->exists() ) || $user->isWatched( $title ), ]; - $checkboxes = method_exists( $editPage, 'getCheckboxes' ) - ? $editPage->getCheckboxes( $tabindex, $states ) : ''; $checkboxesDef = $editPage->getCheckboxesDefinition( $states ); $checkboxesMessages = []; foreach ( $checkboxesDef as $name => $options ) { @@ -517,7 +514,6 @@ $result = [ 'result' => 'success', 'notices' => $notices, - 'checkboxes' => $checkboxes, 'checkboxesDef' => $checkboxesDef, 'checkboxesMessages' => $checkboxesMessages, 'templates' => $templates, -- To view, visit https://gerrit.wikimedia.org/r/375021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5747871065416ca23038b099f128b02b5cbb431b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: DLynch Gerrit-Reviewer: Esanders Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.17]: Fix userNormal.svg syntax
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378084 ) Change subject: Fix userNormal.svg syntax .. Fix userNormal.svg syntax Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c (cherry picked from commit 0bf4aeb74689048696f37305e1348b42211272cf) --- M resources/skins.minerva.icons.images.scripts/userNormal.svg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/skins.minerva.icons.images.scripts/userNormal.svg b/resources/skins.minerva.icons.images.scripts/userNormal.svg index 36883d3..40112c4 100644 --- a/resources/skins.minerva.icons.images.scripts/userNormal.svg +++ b/resources/skins.minerva.icons.images.scripts/userNormal.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> \ No newline at end of file +http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> -- To view, visit https://gerrit.wikimedia.org/r/378084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: wmf/1.30.0-wmf.17 Gerrit-Owner: ChadGerrit-Reviewer: Chad Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Remove class_exists() check. Covered by requireExtension
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378085 ) Change subject: Remove class_exists() check. Covered by requireExtension .. Remove class_exists() check. Covered by requireExtension Change-Id: I6d7e27898b4a67191c637fc8fa6b0f138ac5 --- M maintenance/populateLocalAndGlobalIds.php 1 file changed, 77 insertions(+), 82 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/85/378085/1 diff --git a/maintenance/populateLocalAndGlobalIds.php b/maintenance/populateLocalAndGlobalIds.php index a430d3a..62b378f 100644 --- a/maintenance/populateLocalAndGlobalIds.php +++ b/maintenance/populateLocalAndGlobalIds.php @@ -17,98 +17,93 @@ } public function execute() { - if ( class_exists( 'CentralAuthUtils' ) ) { - $dbr = CentralAuthUtils::getCentralSlaveDB(); - $dbw = CentralAuthUtils::getCentralDB(); - $lastGlobalId = -1; + $dbr = CentralAuthUtils::getCentralSlaveDB(); + $dbw = CentralAuthUtils::getCentralDB(); + $lastGlobalId = -1; - // Skip people in global rename queue - $wiki = wfWikiID(); - $globalRenames = []; + // Skip people in global rename queue + $wiki = wfWikiID(); + $globalRenames = []; + $rows = $dbr->select( + 'renameuser_status', + 'ru_oldname' + ); + foreach ( $rows as $row ) { + $globalRenames[] = $row->ru_oldname; + } + + $lb = wfGetLB( $wiki ); + $ldbr = $lb->getConnection( DB_REPLICA, [], $wiki ); + + $this->output( "Populating fields for wiki $wiki... \n" ); + do { $rows = $dbr->select( - 'renameuser_status', - 'ru_oldname' + [ 'localuser', 'globaluser' ], + [ 'lu_name', 'gu_id' ], + [ + // Start from where we left off in last batch + 'gu_id >= ' . $lastGlobalId, + 'lu_wiki' => $wiki, + // Only pick records not already populated + 'lu_local_id' => null, + 'gu_name = lu_name' + ], + __METHOD__, + [ 'LIMIT' => $this->mBatchSize, 'ORDER BY' => 'gu_id ASC' ] ); + $numRows = $rows->numRows(); + + $globalUidToLocalName = []; foreach ( $rows as $row ) { - $globalRenames[] = $row->ru_oldname; - } - - $lb = wfGetLB( $wiki ); - $ldbr = $lb->getConnection( DB_REPLICA, [], $wiki ); - - $this->output( "Populating fields for wiki $wiki... \n" ); - do { - $rows = $dbr->select( - [ 'localuser', 'globaluser' ], - [ 'lu_name', 'gu_id' ], - [ - // Start from where we left off in last batch - 'gu_id >= ' . $lastGlobalId, - 'lu_wiki' => $wiki, - // Only pick records not already populated - 'lu_local_id' => null, - 'gu_name = lu_name' - ], - __METHOD__, - [ 'LIMIT' => $this->mBatchSize, 'ORDER BY' => 'gu_id ASC' ] - ); - $numRows = $rows->numRows(); - - $globalUidToLocalName = []; - foreach ( $rows as $row ) { - if ( in_array( $row->lu_name, $globalRenames ) ) { - $this->output( - "User " . $row->lu_name . " not migrated (pending rename)\n" - ); - continue; - } -
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.18]: Fix userNormal.svg syntax
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378083 ) Change subject: Fix userNormal.svg syntax .. Fix userNormal.svg syntax Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c (cherry picked from commit 0bf4aeb74689048696f37305e1348b42211272cf) --- M resources/skins.minerva.icons.images.scripts/userNormal.svg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/83/378083/1 diff --git a/resources/skins.minerva.icons.images.scripts/userNormal.svg b/resources/skins.minerva.icons.images.scripts/userNormal.svg index 36883d3..40112c4 100644 --- a/resources/skins.minerva.icons.images.scripts/userNormal.svg +++ b/resources/skins.minerva.icons.images.scripts/userNormal.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> \ No newline at end of file +http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> -- To view, visit https://gerrit.wikimedia.org/r/378083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: wmf/1.30.0-wmf.18 Gerrit-Owner: Chad___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[wmf/1.30.0-wmf.17]: Fix userNormal.svg syntax
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378084 ) Change subject: Fix userNormal.svg syntax .. Fix userNormal.svg syntax Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c (cherry picked from commit 0bf4aeb74689048696f37305e1348b42211272cf) --- M resources/skins.minerva.icons.images.scripts/userNormal.svg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue refs/changes/84/378084/1 diff --git a/resources/skins.minerva.icons.images.scripts/userNormal.svg b/resources/skins.minerva.icons.images.scripts/userNormal.svg index 36883d3..40112c4 100644 --- a/resources/skins.minerva.icons.images.scripts/userNormal.svg +++ b/resources/skins.minerva.icons.images.scripts/userNormal.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> \ No newline at end of file +http://www.w3.org/2000/svg; viewBox="271.5 72.8 16 16"> -- To view, visit https://gerrit.wikimedia.org/r/378084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I350d2c2270fead706240fa0cd1cce17875a8ce0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: wmf/1.30.0-wmf.17 Gerrit-Owner: Chad___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Theme reckoning: abolish ThemedActionBarActivity, and furthe...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378059 ) Change subject: Theme reckoning: abolish ThemedActionBarActivity, and further cleanup. .. Theme reckoning: abolish ThemedActionBarActivity, and further cleanup. Change-Id: I63d9d6da7109062129780b843e795068e9d0642e --- M app/src/main/AndroidManifest.xml M app/src/main/java/org/wikipedia/activity/ActivityUtil.java M app/src/main/java/org/wikipedia/activity/BaseActivity.java M app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java M app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java D app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java M app/src/main/java/org/wikipedia/language/LangLinksActivity.java M app/src/main/java/org/wikipedia/login/LoginActivity.java M app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/java/org/wikipedia/settings/AboutActivity.java M app/src/main/java/org/wikipedia/settings/LicenseActivity.java M app/src/main/res/layout/activity_create_account.xml M app/src/main/res/layout/activity_login.xml M app/src/main/res/values/styles_dark.xml M app/src/main/res/values/styles_light.xml 19 files changed, 108 insertions(+), 161 deletions(-) Approvals: jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c46c8ae..252897e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -216,7 +216,8 @@ android:name=".offline.CompilationDetailActivity" /> +android:name=".offline.OfflineTutorialActivity" +android:theme="@style/AppTheme.TranslucentStatus"/> https://android.googlesource.com/platform/frameworks/base.git/+/ea04f3cfc6e245fb415fd352ed0048cd940a46fe%5E!/ +Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey"); +if (menuKeyField != null) { +menuKeyField.setAccessible(true); +menuKeyField.setBoolean(config, false); +} +} catch (IllegalAccessException ignore) { +} catch (NoSuchFieldException ignore) { } +} + private ActivityUtil() { } } diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java b/app/src/main/java/org/wikipedia/activity/BaseActivity.java index d0bf688..f399936 100644 --- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java +++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java @@ -24,11 +24,14 @@ import org.wikipedia.Constants; import org.wikipedia.R; import org.wikipedia.WikipediaApp; +import org.wikipedia.crash.CrashReportActivity; import org.wikipedia.events.NetworkConnectEvent; +import org.wikipedia.events.ThemeChangeEvent; import org.wikipedia.events.WikipediaZeroEnterEvent; import org.wikipedia.offline.Compilation; import org.wikipedia.offline.OfflineManager; import org.wikipedia.readinglist.sync.ReadingListSynchronizer; +import org.wikipedia.recurring.RecurringTasksExecutor; import org.wikipedia.settings.Prefs; import org.wikipedia.util.DeviceUtil; import org.wikipedia.util.FeedbackUtil; @@ -43,20 +46,22 @@ private EventBusMethods busMethods; private NetworkStateReceiver networkStateReceiver = new NetworkStateReceiver(); -@Override public boolean onOptionsItemSelected(MenuItem item) { -switch (item.getItemId()) { -case android.R.id.home: -onBackPressed(); -return true; -default: -return false; -} -} - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); busMethods = new EventBusMethods(); WikipediaApp.getInstance().getBus().register(busMethods); + +setTheme(); +removeSplashBackground(); + +if (getSupportActionBar() != null) { +getSupportActionBar().setDisplayHomeAsUpEnabled(true); +} +ActivityUtil.forceOverflowMenuIcon(this); + +// Conditionally execute all recurring tasks +new RecurringTasksExecutor(WikipediaApp.getInstance()).run(); + IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); registerReceiver(networkStateReceiver, filter); } @@ -67,6 +72,26 @@ busMethods = null; super.onDestroy(); destroyed = true; +} + +@Override protected void onResume() { +super.onResume(); + +// The UI is likely shown, giving the user the opportunity to exit and