[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...FlaggedRevs)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I437e470880b8503d0501ca7a5a97f19a2cbd8aa9 --- M i18n/flaggedrevs/ksh.json 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/flaggedrevs/ksh.json b/i18n/flaggedrevs/ksh.json index 2613455..4535591 100644 --- a/i18n/flaggedrevs/ksh.json +++ b/i18n/flaggedrevs/ksh.json @@ -94,6 +94,9 @@ revreview-newest-basic-i: De [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} neuste {{int:revreview-lev-basic}}] ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE All opleßte]) wood [{{fullurl:{{#Special:Log}}|type=reviewpage={{FULLPAGENAMEE {{lcfirst:{{int:revreview-approved] aam i$2/i.\nEt sinn_er noch [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly Änderunge aan enjebonge Schablohne, Datteije, udder beeds] drop am waade, dat se nohjekik wääde., revreview-newest-quality: De [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} neuste quality Version] ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE All opleßte]) wood [{{fullurl:{{#Special:Log}}|type=reviewpage={{FULLPAGENAMEE {{lcfirst:{{int:revreview-approved] aam i$2/i. {{PLURAL:$3|||Et es ävver}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly {{PLURAL:$3|Ein Änderung|$3 Änderunge|keij Änderung}}] {{PLURAL:$3|es|sin|}} op et Nohkike am waade., revreview-newest-quality-i: De [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} neuste {{int:revreview-lev-quality}}] ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE all opleßte]) wood [{{fullurl:{{#Special:Log}}|type=reviewpage={{FULLPAGENAMEE {{lcfirst:{{int:revreview-approved] aam i$2/i.\n[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly Änderunge aan enjebonge Schablohne udder Datteije udder beeds] sin op et Nohkike am waade., + revreview-pending-basic: De [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} beschtändeje Väsjohn] wood aam i$2/i [{{fullurl:{{#Special:Log}}|type=reviewpage={{FULLPAGENAMEE jepröhv]. Em Momang jidd et [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly {{PLURAL:$3|ein Änderong|$3 Änderonge|kein noch nit nohjelohrte Anderonge}}], di obb et Nohlohre {{PLURAL:$3|wahd|waade|waade }}., + revreview-pending-quality: De [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} beschtändeje Väsjohn] wood aam i$2/i [{{fullurl:{{#Special:Log}}|type=reviewpage={{FULLPAGENAMEE approved]. Em Momang jidd et [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly {{PLURAL:$3|ein Änderong|$3 Änderonge|kein noch nit nohjelohrte Anderonge}}], di obb et Nohlohre {{PLURAL:$3|wahd|waade|waade }}., + revreview-pending-nosection: Versöhk de [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} neuste Väsjohn] ze belohre, woh [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly {{PLURAL:$2|ein nit nohjelohrte Änderong dren es|$2 nit nohjelohrte Änderonge dren sin|kein nit nohjelohrte Anderonge dren sin}}], öm ze sinn, ov dä Afschned woh anders hen jedonn udder eruß jenumme woode es., revreview-noflagged: Mer han kei nohjekik Versione vun hee dä Sigg, dröm künnt dä ier Qualliteit och '''nit''' [[{{MediaWiki:Validationpage}}|nohjeprööf]] sin., revreview-oldrating: Se wohr enjeshtoof als:, revreview-quality: Dat es de neuste [[{{MediaWiki:Validationpage}}|{{int:revreview-lev-quality}}]], [{{fullurl:{{#Special:Log}}|type=reviewpage={{FULLPAGENAMEE {{lcfirst:{{int:revreview-approved] aam i$2/i.\n[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} Dä aktoälle Äntworf] hät [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1diff=cur{{MediaWiki:flaggedrevs-diffonly {{PLURAL:$3|ein Änderung|$3 Änderunge |keij Änderung}}] op et Nohkike am waade., -- To view, visit https://gerrit.wikimedia.org/r/198325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I437e470880b8503d0501ca7a5a97f19a2cbd8aa9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FlaggedRevs Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid flash of unstyled content - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Avoid flash of unstyled content .. Avoid flash of unstyled content Move lists.less into ext.gather.styles module since the file is in the ext.gather.styles folder and this is confusing. Drop use of addModules which causes styles to be loaded via JavaScript Change-Id: I04040e8543372772501da31ea6e2c57d33975364 --- M includes/specials/SpecialGatherLists.php M resources/Resources.php 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Robmoen: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialGatherLists.php b/includes/specials/SpecialGatherLists.php index d29bd7b..cc5c302 100644 --- a/includes/specials/SpecialGatherLists.php +++ b/includes/specials/SpecialGatherLists.php @@ -19,9 +19,6 @@ public function __construct() { parent::__construct( 'GatherLists' ); $out = $this-getOutput(); - $out-addModules( array( - 'ext.gather.lists' - ) ); $out-addModuleStyles( array( 'mediawiki.ui.anchor', 'mediawiki.ui.icon', diff --git a/resources/Resources.php b/resources/Resources.php index 97d439a..031b500 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -64,6 +64,7 @@ 'ext.gather.styles' = $wgGatherMobileSpecialPageResourceBoilerplate + array( 'styles' = array( 'ext.gather.styles/collections.less', + 'ext.gather.styles/lists.less', ), ), -- To view, visit https://gerrit.wikimedia.org/r/198372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04040e8543372772501da31ea6e2c57d33975364 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Robmoen rm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Configure)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: Iaa29290eefa5caf563583135aac4f5ad1be1544d --- M i18n/zh-hant.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json index 59b1d9f..7245a6a 100644 --- a/i18n/zh-hant.json +++ b/i18n/zh-hant.json @@ -78,7 +78,7 @@ configure-section-mysql: MySQL專有, configure-section-postgres: PostgreSQL專有, configure-section-sqlite: SQLite專有, - configure-section-email: 電子郵箱, + configure-section-email: 電子郵件, configure-section-enotif: 電子郵件通知, configure-section-localization: 在地化, configure-section-timezone: 時區, @@ -173,7 +173,7 @@ configure-condition-requirement: 需求, configure-condition-name-1: 最小編輯次數, configure-condition-name-2: 最小年齡, - configure-condition-name-3: 已確認電子郵箱, + configure-condition-name-3: 已確認電子郵件, configure-condition-name-4: 在群組中, configure-condition-name-5: 使用者的IP位址, configure-condition-name-6: 使用者的IP位址在CIDR範圍中, -- To view, visit https://gerrit.wikimedia.org/r/198315 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa29290eefa5caf563583135aac4f5ad1be1544d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Configure Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...BetaFeatures)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I68a8d5d16923cdd2268ef6c27c01bc88c2c64d59 --- A i18n/arq.json 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/arq.json b/i18n/arq.json new file mode 100644 index 000..6ab665b --- /dev/null +++ b/i18n/arq.json @@ -0,0 +1,9 @@ +{ + @metadata: { + authors: [ + Oldstoneage + ] + }, + betafeatures-toplink: بيطا, + tooltip-pt-betafeatures: شي مصاوبات بيطا (مازالت تتجرّب) +} -- To view, visit https://gerrit.wikimedia.org/r/198306 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68a8d5d16923cdd2268ef6c27c01bc88c2c64d59 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BetaFeatures Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I2ae95278c4749c4994e78f40522c94b68b5f6944 --- M i18n/arq.json M i18n/be-tarask.json M i18n/fa.json M i18n/he.json M i18n/hi.json M i18n/lb.json M i18n/lt.json M i18n/pms.json M i18n/pt.json M i18n/sr-ec.json M i18n/zh-hant.json 11 files changed, 53 insertions(+), 20 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/arq.json b/i18n/arq.json index ff65585..72d4867 100644 --- a/i18n/arq.json +++ b/i18n/arq.json @@ -4,5 +4,9 @@ Oldstoneage ] }, + centralauth-foreign-link: مستعملي $1 في $2, + centralauth-foreign-contributions: $1 {{PLURAL:$1|مساهمة|مساهمات}} في $2, + centralauth-merge-method-login: مخلوق وقت` تسجال الدخول, + centralauth-admin-blocklog: دفتار المنوعات, centralauth-rename-antispoofconflicts2: سميّت` المستعملي المختار راه مشابه بزّاف شي سميّات راهم كاينين: $1. } diff --git a/i18n/be-tarask.json b/i18n/be-tarask.json index 45f7574..34a3432 100644 --- a/i18n/be-tarask.json +++ b/i18n/be-tarask.json @@ -305,5 +305,6 @@ centralauth-finishglobaliseemail_subject: Пацьверджаньне рахунку ў {{GRAMMAR:месны|{{SITENAME, centralauth-finishglobaliseemail_body: Ваш адрас e-mail асацыюецца з рахункам «$2» ва ўсіх праектах Вікімэдыі, асноўны рахунак месьціцца ў {{GRAMMAR:месны|{{SITENAME.\n\nКаб пацьвердзіць, што гэты рахунак сапраўды належыць вам, а таксама злучыць рахункі, якія мы не змаглі злучыць аўтаматычна, і каб дазволіць вам аднавіць рахунак, калі вы забылі пароль, адкрыце гэтую спасылку ў браўзэры, калі ласка:\n\n$3\n\nКалі рахунак *не* належыць вам, націсьніце гэтую спасылку, каб скасаваць пацьверджаньне паштовага адрасу:\n\n$5\n\nКод для пацьверджаньня будзе страчаны $6 а $7., globalrenameprogress: Прагрэс глябальных перайменаваньняў, - globalrenamerequest: Запыт перайменаваньня аб’яднанага рахунку + globalrenamerequest: Запыт перайменаваньня аб’яднанага рахунку, + userswhowillberenamed: Удзельнікі, якія будуць перайменаваныя } diff --git a/i18n/fa.json b/i18n/fa.json index 35921c5..3077845 100644 --- a/i18n/fa.json +++ b/i18n/fa.json @@ -397,8 +397,8 @@ centralauth-usermerge-toomany: فقط $1 {{PLURAL:$1|کاربر}} میتواند در یک زمان ادغام شود., centralauth-usermerge-ratelimited: به عنوان یک اقدام امنیتی شما تنها مجاز ادغام سراسری کاربر در دقیقه هستید. لطفاً دوباره پس از یک دقیقه تلاش کنید., globalrenamerequest-desc: درخواست تغییر نام سراسری, - globalrenamerequest: درخواست تغییرنام متحدسازی, - globalrenamerequest-legend: درخواست تغییرنام متحدسازی, + globalrenamerequest: درخواست تغییر نام یکپارچه, + globalrenamerequest-legend: درخواست تغییر نام یکپارچه, globalrenamerequest-forced: بنیاد ویکیمدیا نامهای کاربری را در همۀ پروژهها یکی کرده است. نام کاربری خود را به عنوان استفادهشده در ویکیهای دیگر شناسایی شد و به منظور نهایی کردن یکی کردن باید تغییر کند. در نتیجه، شما باید یک نام کاربری جدید برای ادامه انتخاب کنید., globalrenamerequest-pretext: یک نام کاربری جدید برای شناخته شدن در همۀ پروژههای انتخاب کنید.\n\nهمۀ مشارکتهای قبلی شما به این نام کاربری جدید متصل خواهد شد.\n\nهمین که شما یک نام کاربری جدید درخواست کردید، یک آگاهسازی به پروژۀ استیوارد برای انجام تغییر نام ارسال خواهد شد. هنگامی که این فرایند کامل شد به شما اطلاع داده خواهد شد., globalrenamerequest-username-label: نام کاربری فعلی:, diff --git a/i18n/he.json b/i18n/he.json index 9f67fa8..d434d4f 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -483,6 +483,7 @@ userswhowillberenamed: משתמשים ששמם ישונה, centralauth-uwbr-name: שם המשתמש, centralauth-uwbr-registration: תאריך הרישום, + centralauth-uwbr-registration-nodate: אינו ידוע, centralauth-uwbr-editcount: מספר העריכות, centralauth-uwbr-intro: בדף הזה מופיעה רשימה של משתמשים שנרשמו בוויקי הזה וששמם ישונה. } diff --git a/i18n/hi.json b/i18n/hi.json index dbcbaf7..785f98d 100644 --- a/i18n/hi.json +++ b/i18n/hi.json @@ -11,7 +11,8 @@ Siddhartha Ghai, Suman, Vivek Rai, - आलोक + आलोक, + Phoenix303 ] }, mergeaccount: खाता एकत्रिकरण स्थिति, @@ -323,5 +324,6 @@ centralauth-warning-notloggedin: आप इस समय लॉग इन नहीं हैं।, centralauth-warning-notattached: स्थानीय खाता वैश्विक खाते से नहीं जुड़ा है।, centralauth-finishglobaliseemail_subject: {{SITENAME}} खाता प्रमाणीकरण, - centralauth-finishglobaliseemail_body: आपके ईमेल पते को विकिमीडिया परियोजनाओं पर \$2\ खाते से सम्बद्ध माना गया है, और {{SITENAME}} पर आपका खाता
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...CategoryTree)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: Ibe64191b6abda4e84ded46cf01b16f6a094e35b6 --- A i18n/lzh.json M i18n/tt-cyrl.json 2 files changed, 14 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/lzh.json b/i18n/lzh.json new file mode 100644 index 000..24db9d6 --- /dev/null +++ b/i18n/lzh.json @@ -0,0 +1,11 @@ +{ + @metadata: { + authors: [ + StephDC + ] + }, + categorytree-expand: 展, + categorytree-num-categories: $1 類, + categorytree-num-pages: $1 頁, + categorytree-num-files: $1 檔 +} diff --git a/i18n/tt-cyrl.json b/i18n/tt-cyrl.json index e12d247..000b3ec 100644 --- a/i18n/tt-cyrl.json +++ b/i18n/tt-cyrl.json @@ -3,7 +3,8 @@ authors: [ Ajdar, Ilnur efende, - Ильнар + Ильнар, + Derslek ] }, categorytree: Төркемнәр \агачы\., @@ -20,7 +21,7 @@ categorytree-mode-all: барлык битләр, categorytree-collapse: яшерү, categorytree-expand: ачарга, - categorytree-member-counts: $1 {{PLURAL:$1|тәркемчәне|тәркемчәләрне|тәркемчәләрдән}}, $2 {{PLURAL:$2|битне|битләрне|битләрдән}} и $3 {{PLURAL:$3|файл|файл|файллар}} ны үз эченә ала, + categorytree-member-counts: $1 {{PLURAL:$1|1 тәркемчәне|$1 тәркемчәләрне|$1 тәркемчәләрдән}}, $2 {{PLURAL:$2|1 битне|$2 битләрне|$2 битләрдән}} и {{PLURAL:$3|1 файл|$3 файлны}}ны үз эченә ала, categorytree-num-categories: $1 К, categorytree-num-pages: $1 С, categorytree-num-files: $1 Ф, -- To view, visit https://gerrit.wikimedia.org/r/198309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe64191b6abda4e84ded46cf01b16f6a094e35b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CategoryTree Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: Ia54c1a89a3827d44f410500a24e45da3972f446b --- M InsertLink/i18n/zh-hant.json M Review/i18n/hi.json A Review/i18n/lt.json M Review/i18n/pt.json M UserManager/i18n/zh-hant.json M WikiAdmin/i18n/lt.json 6 files changed, 19 insertions(+), 5 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/InsertLink/i18n/zh-hant.json b/InsertLink/i18n/zh-hant.json index a79b6ff..e0cc5a4 100644 --- a/InsertLink/i18n/zh-hant.json +++ b/InsertLink/i18n/zh-hant.json @@ -15,7 +15,7 @@ bs-insertlink-tab-ext-file: 連結至檔案, bs-insertlink-label-page: 頁面, bs-insertlink-label-link: 連結, - bs-insertlink-label-mail: 電子郵箱地址, + bs-insertlink-label-mail: 電子郵件地址, bs-insertlink-label-description: 描述, bs-insertlink-label-file: 檔案, bs-insertlink-label-searchfile: 搜尋 ..., diff --git a/Review/i18n/hi.json b/Review/i18n/hi.json index ce82962..b8ffd56 100644 --- a/Review/i18n/hi.json +++ b/Review/i18n/hi.json @@ -1,8 +1,10 @@ { @metadata: { authors: [ - संजीव कुमार + संजीव कुमार, + Phoenix303 ] }, + bs-review-pending: अपूर्ण, bs-review-error-insufficient-permissions: आपके पास इसे निष्पादित करने की अनुमति नहीं है (आपको $1 की आवश्यकता है) } diff --git a/Review/i18n/lt.json b/Review/i18n/lt.json new file mode 100644 index 000..fd2c66d --- /dev/null +++ b/Review/i18n/lt.json @@ -0,0 +1,9 @@ +{ + @metadata: { + authors: [ + Pofka + ] + }, + bs-review-pending: Laukiama, + bs-review-mail-finish-header: Peržiūra baigta +} diff --git a/Review/i18n/pt.json b/Review/i18n/pt.json index d432896..9f37cb5 100644 --- a/Review/i18n/pt.json +++ b/Review/i18n/pt.json @@ -12,6 +12,7 @@ bs-review-date: Nem todos os participantes votaram ainda., bs-review-agreed: Todos os participantes concordaram., bs-review-denied-disagreed: Um participante, pelo menos, discordou., + bs-review-pending: Pendente, bs-review-review-finished: Esta página foi revista., bs-review-reviewed-till: Esta página será revista entre $1 e $2., bs-review-reviewed-till-extra: {{GENDER:$1|Criada}} por $2, diff --git a/UserManager/i18n/zh-hant.json b/UserManager/i18n/zh-hant.json index 8d8d2a3..28df6bd 100644 --- a/UserManager/i18n/zh-hant.json +++ b/UserManager/i18n/zh-hant.json @@ -8,7 +8,7 @@ }, bs-usermanager-headerusername: 使用者名稱, bs-usermanager-headerrealname: 真實姓名, - bs-usermanager-headeremail: 電子郵箱, + bs-usermanager-headeremail: 電子郵件, bs-usermanager-headergroups: 群組, bs-usermanager-titleadduser: 新增使用者, bs-usermanager-titleeditdetails: 編輯使用者, diff --git a/WikiAdmin/i18n/lt.json b/WikiAdmin/i18n/lt.json index c5833dc..0cedbb0 100644 --- a/WikiAdmin/i18n/lt.json +++ b/WikiAdmin/i18n/lt.json @@ -1,8 +1,10 @@ { @metadata: { authors: [ - Gediminas + Gediminas, + Pofka ] }, - bs-wikiadmin-shop: Parduotuvė + bs-wikiadmin-shop: Parduotuvė, + bs-wikiadmin-mediawiki-specialpages-text: Specialūs puslapiai } -- To view, visit https://gerrit.wikimedia.org/r/198307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia54c1a89a3827d44f410500a24e45da3972f446b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...BlueSpiceFoundation)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I0406810beee1b5ada9c94b7d8c80e03a8341208f --- A i18n/extjs/lt.json M i18n/extjs/roa-tara.json M i18n/validator/zh-hant.json 3 files changed, 12 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/extjs/lt.json b/i18n/extjs/lt.json new file mode 100644 index 000..ec12c30 --- /dev/null +++ b/i18n/extjs/lt.json @@ -0,0 +1,8 @@ +{ + @metadata: { + authors: [ + Pofka + ] + }, + bs-extjs-filter-less-than: mažiau negu +} diff --git a/i18n/extjs/roa-tara.json b/i18n/extjs/roa-tara.json index af2d16e..d0b1ff9 100644 --- a/i18n/extjs/roa-tara.json +++ b/i18n/extjs/roa-tara.json @@ -39,6 +39,8 @@ bs-extjs-filter-contains-not: non ge tène, bs-extjs-filter-starts-with: accumenze cu, bs-extjs-filter-ends-with: spicce cu, + bs-extjs-filter-greater-than: cchiù granne de, + bs-extjs-filter-less-than: cchiù piccinne de, bs-extjs-title-success: Tutte apposte, bs-extjs-title-warning: Avvertimende } diff --git a/i18n/validator/zh-hant.json b/i18n/validator/zh-hant.json index 5b639c6..85e3c64 100644 --- a/i18n/validator/zh-hant.json +++ b/i18n/validator/zh-hant.json @@ -5,8 +5,8 @@ LNDDYL ] }, - bs-validator-email-validation-approved: 電子郵件位址已驗證成功。, - bs-validator-email-validation-not-approved: 無法驗證電子郵件位址。, + bs-validator-email-validation-approved: 電子郵件地址已驗證成功。, + bs-validator-email-validation-not-approved: 無法驗證電子郵件地址。, bs-validator-url-validation-approved: URL 網址已驗證成功。, bs-validator-url-validation-not-approved: 無法驗證 URL 網址。 } -- To view, visit https://gerrit.wikimedia.org/r/198308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0406810beee1b5ada9c94b7d8c80e03a8341208f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I8362b46bb9ea5549ed09ec5c792725dfeadae929 --- M i18n/de.json M i18n/roa-tara.json M i18n/zh-hant.json 3 files changed, 7 insertions(+), 5 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/de.json b/i18n/de.json index 0e595a1..aec55a2 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -168,7 +168,7 @@ abusefilter-edit-action-flag: Die Bearbeitung im Missbrauchsfilter-Logbuch markieren., abusefilter-edit-action-blockautopromote: Den Status „Automatisch bestätigter Benutzer“ entziehen., abusefilter-edit-action-degroup: Benutzer aus allen Gruppen mit Sonderrechten entfernen, - abusefilter-edit-action-block: Benutzer/IP-Adresse sperren, + abusefilter-edit-action-block: IP-Adresse/Benutzer sperren, abusefilter-edit-action-throttle: Die Aktion nur auslösen, sofern der Benutzer ein bestimmtes Limit überschreitet., abusefilter-edit-action-rangeblock: /16-Range sperren, aus der der Benutzer stammt, abusefilter-edit-action-tag: Die Bearbeitung für eine spätere Überprüfung markieren., diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json index da530f3..523e2af 100644 --- a/i18n/roa-tara.json +++ b/i18n/roa-tara.json @@ -104,9 +104,10 @@ abusefilter-list-options-deleted-only: Fa vedè sulamende le filtre scangellate, abusefilter-list-options-deleted-hide: Scunne le filtre scangellate, abusefilter-list-options-deleted-show: Conzidere pure le filtre scangellate, - abusefilter-list-options-scope: Fà vedè le filtre da:, - abusefilter-list-options-scope-local: Uicchi locale, - abusefilter-list-options-scope-global: Regole globbale, + abusefilter-list-options-scope: Fà vedè le filtre:, + abusefilter-list-options-scope-local: Sulamende regole locale, + abusefilter-list-options-scope-global: Sulamende regole globbale, + abusefilter-list-options-scope-all: Regole locale e globbale, abusefilter-list-options-disabled: Filtre disabbilitate:, abusefilter-list-options-hidedisabled: Scunne le filtre disabbilitate, abusefilter-list-options-submit: Aggiorne, @@ -259,6 +260,7 @@ abusefilter-edit-builder-vars-user-age: Età d'u cunde utende, abusefilter-edit-builder-vars-user-name: Nome d'u cunde utende, abusefilter-edit-builder-vars-user-groups: Gruppe (combrese 'mblicitamènde) jndre cui ce stonne le utinde, + abusefilter-edit-builder-vars-user-rights: Le deritte ca stu utende tène, abusefilter-edit-builder-vars-user-blocked: Ce l'utende jè bloccate, abusefilter-edit-builder-vars-user-emailconfirm: Mò le 'nderizze e-mail jè state confermate, abusefilter-edit-builder-vars-recent-contributors: Le urteme dice utinde ce honne condrebbuite ad 'a pagene, diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json index d85a7e9..9ebac8b 100644 --- a/i18n/zh-hant.json +++ b/i18n/zh-hant.json @@ -285,7 +285,7 @@ abusefilter-edit-builder-vars-user-groups: 群組使用者所在 (含隱含群組), abusefilter-edit-builder-vars-user-rights: 使用者擁有的權限, abusefilter-edit-builder-vars-user-blocked: 使用者是否被封鎖, - abusefilter-edit-builder-vars-user-emailconfirm: 電子郵件位址的確認時間, + abusefilter-edit-builder-vars-user-emailconfirm: 電子郵件地址的確認時間, abusefilter-edit-builder-vars-recent-contributors: 最近十位貢獻給該頁面的使用者, abusefilter-edit-builder-vars-first-contributor: 貢獻該頁面的第一位使用者, abusefilter-edit-builder-vars-all-links: 所有一開始加入的外部連結, -- To view, visit https://gerrit.wikimedia.org/r/198305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8362b46bb9ea5549ed09ec5c792725dfeadae929 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: Ibbe206435c0925eb1e83fb71d03d420705181985 --- M i18n/ksh.json 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/ksh.json b/i18n/ksh.json index 40a1f9d..a1b5acf 100644 --- a/i18n/ksh.json +++ b/i18n/ksh.json @@ -91,7 +91,7 @@ centralnotice-clone-notice: Maach en Kopi fun dä Banner_Schablohn, centralnotice-clone-name: Der Name:, centralnotice-clone-cancel: Ophüre, - centralnotice-preview-all-template-translations: Vör-Aansich fun all dä Övversäzunge fun dä Banner_Schablohn, + centralnotice-preview-all-template-translations: {{int:preview}} fun all dä beschtähteschte Övversäzunge, centralnotice-insert: Enfööje: $1, centralnotice-close-button: Knopp zom Zohmaache, centralnotice-close-title: Zohmaache, @@ -189,6 +189,8 @@ centralnotice-archive-banner-confirm: Beim Aschevehre wähde alle Schablohne opjelühß un de Sigg wähde jähje Veränderonge jeschöz\nDadd es nit einfach zeröck ze nämme., centralnotice-archive-banner-cancel: Ophüre, centralnotice-change-summary-label: Zosammejefaß, + centralnotice-change-summary-prompt: Nohreescht övver di Änderonge, kann fott blihve, + centralnotice-change-summary-action-prompt: Nohreescht övver däh Opdacht, kann fott blihve, centralnotice-archive-show: Donn de Kampannje em Aschihf aanzeije, centralnotice-archive-campaign: En et Aschihf donn, centralnotice-archive-campaign-title: {{PLURAL:$1|En|$1|Kein}} Kampannje en et Aschihf donn?, @@ -208,6 +210,7 @@ centralnotice-specialhidebanners-p3p: Beschtemmpte Brauser bruche en kumpakte i lang=\en\ xml:lang=\en\ dir=\ltr\ title=\Platform for Privacy Preferences\P3P/i Rähjel för i lang=\en\ xml:lang=\en\ dir=\ltr\ title=\„Plätzjer“\cookies/i, di en bschtemmpte Fäll eröm jescheck wähde.\n!--\n\nhttps://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Centralauth-centralautologin-p3p-explanation/ksh\n--\nDonn Der de Rähjelle övver de Prevahtheid un der Dahteschoz för heh dat Wikki aanlohre., apihelp-centralnoticeallocations-param-country: Et Land, öm dernoh ze söhke., apihelp-centralnoticeallocations-param-language: De schprohch, öm dernoh ze söhke., + apihelp-centralnoticeallocations-param-anonymous: Ennjelogg udder nit, zom Enschrängke (true|false).\n!--\nhttps://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-centralnoticeallocations-param-anonymous/en\n--, apihelp-centralnoticequerycampaign-description: Holl alle Enschtällonge för en Kampannje., apihelp-centralnoticequerycampaign-param-campaign: De Nahme för de Kampannje. Donn e „|“-Zeijsche zwesche de eijnzel Nahme., apihelp-centralnoticequerycampaign-example-1: Zeijsch de Kampannje „code lang=\en\ xml:lang=\en\ dir=\ltr\Plea_US/code“ aan, -- To view, visit https://gerrit.wikimedia.org/r/198311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibbe206435c0925eb1e83fb71d03d420705181985 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I29acf2b0703443cb6cd8aa71b68292091db9c2a1 --- M i18n/arq.json M i18n/bg.json M i18n/de.json M i18n/lzh.json M i18n/tt-cyrl.json 5 files changed, 34 insertions(+), 5 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/arq.json b/i18n/arq.json index 7ba90f0..e76e657 100644 --- a/i18n/arq.json +++ b/i18n/arq.json @@ -11,6 +11,21 @@ coll-move_down: حرك للتحت شويه, coll-print_export: طباعه, coll-create_a_book: أعمل كتاب, + coll-book_creator: خلّاق الكتوبا, coll-download_as: تطلع ب$1, - coll-remove_this_page: نحّي هاد الباجة من الكتاب تاعك + coll-disable: حبّس, + coll-book_creator_disable: حبّس خلّاق الكتوبا, + coll-book_creator_disable_tooltip: حبّس ما تستعمل خلّاق الكتوبا, + coll-add_this_page: زيد هاد الصفحة فل كتاب تاعك, + coll-add_page_tooltip: زيد صفحت` الويكي الحاضرة في كتابك, + coll-help: معاونة, + coll-help_tooltip: ورّي معاونة على كيفاش يكون خليق الكتوبا, + coll-helppage: Help:كتوبا, + coll-n_pages: $1 {{PLURAL:$1|صفحة|صفحات}}, + coll-remove_this_page: نحّي هاد الباجة من الكتاب تاعك, + coll-show_collection: ورّي الكتاب, + coll-show_collection_tooltip: كليكي باش تبدّل/تنزّل/تكموندي كتابك, + coll-make_suggestions: اقتارح شي صفحات, + coll-make_suggestions_tooltip: ورّي قتيراحات علاحساب الصفحات الّي في كتابك, + coll-image-attribution: b$1/b iالمصدر:/i $2 iالترخيص:/i $3 iالمساهمين:/i $4 iالفنّان الأصلي:/i $5 } diff --git a/i18n/bg.json b/i18n/bg.json index 84f58cb..508fd80 100644 --- a/i18n/bg.json +++ b/i18n/bg.json @@ -4,7 +4,8 @@ DCLXVI, Spiritia, Stanqo, - Turin + Turin, + StanProg ] }, coll-desc: [[Special:Book|Създаване на книги]], @@ -129,5 +130,6 @@ coll-not_addable: Тази страница не може да бъде добавена, coll-make_suggestions: Предлагане на страници, coll-make_suggestions_tooltip: Показване на предложения въз основа на страниците в книгата ви, - coll-suggest_empty: празно + coll-suggest_empty: празно, + coll-attribution-anons: Анонимни: $1 } diff --git a/i18n/de.json b/i18n/de.json index 0ea2aa9..2a216c0 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -146,7 +146,7 @@ coll-format-rdf2text: Textverarbeitung (Klartext), right-collectionsaveasuserpage: Bücher als Benutzerseite speichern, right-collectionsaveascommunitypage: Bücher als Gemeinschaftsseite speichern, - coll-print_export: Drucken/exportieren, + coll-print_export: Drucken/exportieren, coll-create_a_book: Buch erstellen, coll-create_a_book_tooltip: Ein Buch oder eine Artikelsammlung erstellen, coll-book_creator: Buchgenerator, diff --git a/i18n/lzh.json b/i18n/lzh.json index 532d8bc..d2d9fa5 100644 --- a/i18n/lzh.json +++ b/i18n/lzh.json @@ -4,6 +4,14 @@ StephDC ] }, + coll-remove: 刪, + coll-show: 示, + coll-move_up: 上移, + coll-move_down: 下移, + coll-download_as: 下載為 $1, + coll-disable: 禁, + coll-help: 助, + coll-show_collection: 示書, coll-setting-toc-yes: 是, coll-setting-toc-no: 否 } diff --git a/i18n/tt-cyrl.json b/i18n/tt-cyrl.json index 83745f1..c75b999 100644 --- a/i18n/tt-cyrl.json +++ b/i18n/tt-cyrl.json @@ -3,7 +3,8 @@ authors: [ Ilnur efende, Timming, - Ильнар + Ильнар, + Derslek ] }, coll-desc: [[Special:Book|Китап төзүче]], @@ -22,7 +23,10 @@ coll-download_text: Үзегезнең китапны йөкләү өчен китаның форматын сайлап, төймәгә басыгыз., coll-download_as_text: Үзегезнең китапны $1 форматында йөкләү төймәгә басыгыз., coll-download: Йөкләргә, + coll-remove: Бетерү, coll-show: күрсәт, + coll-move_up: Югарырак күчерү, + coll-move_down: Аскарак күчерү, coll-title: Башлам:, coll-subtitle: Аскы башлам:, coll-contents: Эчтәлек, -- To view, visit https://gerrit.wikimedia.org/r/198314 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29acf2b0703443cb6cd8aa71b68292091db9c2a1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Spaces = Tabs - change (mediawiki...VisualEditor)
Ankita-ks has uploaded a new change for review. https://gerrit.wikimedia.org/r/198386 Change subject: Spaces = Tabs .. Spaces = Tabs Change-Id: If07c1905311e44eb478adaadd82089e7e6f548aa --- M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/86/198386/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js index 3ec2650..552041b 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js @@ -170,6 +170,7 @@ if ( this.transclusionModel.getParts().length === 0 ) { this.addParameterButton.setDisabled( true ); + this.addPart( new ve.dm.MWTemplatePlaceholderModel( this.transclusionModel ) ); } single = this.isSingleTemplateTransclusion(); -- To view, visit https://gerrit.wikimedia.org/r/198386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If07c1905311e44eb478adaadd82089e7e6f548aa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Ankita-ks kumariankita...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...Citoid)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I559539653e01742340524576505be321339227f5 --- M i18n/es.json M i18n/fr.json M i18n/hi.json M i18n/is.json M i18n/lb.json A i18n/lt.json A i18n/pms.json M i18n/pt.json M i18n/zh-hant.json 9 files changed, 64 insertions(+), 11 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/es.json b/i18n/es.json index 5b0af36..bd4a1bd 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -7,6 +7,8 @@ ] }, citoid-520-error: No se pudo obtener información a partir del identificador proporcionado., + citoid-citation-widget-insert-button: Insertar, + citoid-citeFromIDDialog-back: Atrás, citoid-citeFromIDDialog-search: Buscar, citoid-citeFromIDDialog-search-label: URL o DOI, citoid-citeFromIDDialog-search-placeholder: por ejemplo, http://www.ejemplo.com;, diff --git a/i18n/fr.json b/i18n/fr.json index 359b75c..cda47f4 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -5,7 +5,8 @@ Orikrin1998, Linedwell, Gomoko, - Jdforrester + Jdforrester, + NemesisIII ] }, citoid-520-error: Impossible de récupérer les informations à partir de son identifiant., @@ -14,14 +15,14 @@ citoid-citeFromIDDialog-lookup-button: Trouver, citoid-citeFromIDDialog-search: Chercher, citoid-citeFromIDDialog-search-label: URL ou DOI, - citoid-citeFromIDDialog-search-placeholder: par exemple, http://www.example.com;, + citoid-citeFromIDDialog-search-placeholder: par exemple, http://www.exemple.com;, citoid-citeFromIDDialog-search-progress: Recherche en cours, veuillez patienter..., - citoid-citeFromIDDialog-title: Ajouter une citation, - citoid-citeFromIDDialog-use-general-dialog-button: dialogue de citation complète, - citoid-citeFromIDDialog-use-general-dialog-message: Ou utiliser la $1 à remplir dans les détails vous-même., - citoid-citeFromIDDialog-use-general-error-message: Nous ne pouvons pas faire une citation pour vous. Vous pouvez en faire une en utilisant le $1., + citoid-citeFromIDDialog-title: Ajouter une référence, + citoid-citeFromIDDialog-use-general-dialog-button: Outil complet de modification de référence, + citoid-citeFromIDDialog-use-general-dialog-message: Ou utiliser la $1 pour emplir les détails vous-même., + citoid-citeFromIDDialog-use-general-error-message: Nous ne pouvons pas faire de référence pour vous. Vous pouvez en faire une en utilisant le $1., citoid-citeFromIDTool-title: Citer, citoid-desc: Offre des points d'accès entre le service citoid et MediaWiki, citoid-typeMap-config-error: Mediawiki:citoid-template-type-map.json n'est pas correctement configuré., - citoid-unknown-error: Une erreur inconnue s'est produite ce qui nous a empêchés de création d'une citation. S'il vous plaît essayer à nouveau plus tard. + citoid-unknown-error: Une erreur inconnue s’est produite ce qui nous a empêché de créer la référence. Veuillez réessayer plus tard. } diff --git a/i18n/hi.json b/i18n/hi.json index 329f713..e6d3a3e 100644 --- a/i18n/hi.json +++ b/i18n/hi.json @@ -4,5 +4,6 @@ Phoenix303 ] }, - citoid-citation-widget-insert-button: सम्मिलित करें + citoid-citation-widget-insert-button: सम्मिलित करें, + citoid-citeFromIDDialog-back: पीछे } diff --git a/i18n/is.json b/i18n/is.json index 5f7566d..7b1ed61 100644 --- a/i18n/is.json +++ b/i18n/is.json @@ -11,9 +11,12 @@ citoid-citeFromIDDialog-search: Leita, citoid-citeFromIDDialog-search-label: Vefslóð eða DOI, citoid-citeFromIDDialog-search-placeholder: t.d. http://www.example.com;, + citoid-citeFromIDDialog-search-progress: Leita, vinsamlegast bíddu..., citoid-citeFromIDDialog-title: Bæta við heimild, citoid-citeFromIDDialog-use-general-dialog-message: Eða notaðu $1 til að fylla inn upplýsingarnar sjálf/ur., citoid-citeFromIDDialog-use-general-error-message: Við gátum ekki búið til heimild fyrir þig. Þú getur búið hana til með því að nota $1., citoid-citeFromIDTool-title: Heimild, - citoid-desc: Veitir aðgang á milli citoid þjónustunnar og MediaWiki. + citoid-desc: Veitir aðgang á milli citoid þjónustunnar og MediaWiki., + citoid-typeMap-config-error: Mediawiki:citoid-template-type-map.json er sett upp á rangan hátt., + citoid-unknown-error: Óþekkt villa átti sér stað sem kom í veg fyrir að heimildin væri búin til. Vinsamlegast reyndu aftur síðar. }
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...ConfirmAccount)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I8a0efba172e57d9f33f1501e9f68840ea6e0a97e --- M i18n/requestaccount/zh-hant.json M i18n/usercredentials/zh-hant.json 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/requestaccount/zh-hant.json b/i18n/requestaccount/zh-hant.json index 21049b1..58c2b6d 100644 --- a/i18n/requestaccount/zh-hant.json +++ b/i18n/requestaccount/zh-hant.json @@ -24,7 +24,7 @@ requestaccount-bio-text-i: '''你的簡履將會成為你的用戶頁的內容。'''\n請確保你可以發佈該等資訊。, requestaccount-real: 真實名字:, requestaccount-same: (同真實名字), - requestaccount-email: 電郵位址:, + requestaccount-email: 電子郵件地址:, requestaccount-reqtype: 位置, requestaccount-level-0: 作者, requestaccount-level-1: 編輯, @@ -35,16 +35,16 @@ requestaccount-agree: 您一定要證明到您的真實名字是正確的,而且您同意我們的服務細則。, requestaccount-inuse: 該使用者名稱已經用來請求帳號。, requestaccount-tooshort: 您的傳記必須最少有$1{{PLURAL:$1|字|個字}}的長度。, - requestaccount-emaildup: 另一個尚未確認的帳號已經使用了此電子郵件位址。, + requestaccount-emaildup: 另一個尚未確認的帳號已經使用了此電子郵件地址。, requestaccount-exts: 此類型的檔案不允許上傳, requestaccount-resub: 出於安全原因,您的簡歷或履歷必須被重新選擇。\n若您不想再加入一個,請將此欄留空。, requestaccount-tos: 我已經閱讀以及同意持續遵守{{SITENAME}}的服務細則。, requestaccount-submit: 請求帳戶, requestaccount-sent: 您的帳戶請求已經成功發出,現正等候複審。\n一個確認電郵已傳送至您的電郵。, request-account-econf: 您的電郵位址已經確認,將會在您的帳戶口請求中列示。, - requestaccount-email-subj: {{SITENAME}}電郵位址確認, + requestaccount-email-subj: {{SITENAME}} Email 地址確認, requestaccount-email-body: 有人,可能是您,由 IP 位址 $1 ,在 {{SITENAME}} 中用這個電郵地址請求一個名叫 「$2」 的帳號。\n\n要確認在 {{SITENAME}} 上的這個帳號真的屬於您,請在您的瀏覽器中開啟這個連結:\n\n$3\n\n如果該帳號已經建立,只有您才會收到該電郵密碼。\n如果這個帳號*不是*屬於您的話,不要點這個連結。\n這個確認碼將會在 $4 過期。, requestaccount-email-subj-admin: {{SITENAME}}帳號請求, - requestaccount-email-body-admin: \$1\ 請求了一個帳號並正在等待批准.\n電子郵件位址已確認. 要批准帳號,請點擊 \$2\., + requestaccount-email-body-admin: \$1\ 請求了一個帳號並正在等待核准.\n電子郵件地址已確認. 要核准帳號,請點選 \$2\., acct_request_throttle_hit: 抱歉,您已經請求了{{PLURAL:$1|1個|$1個}}帳號。\n您不可以請求更多帳號。 } diff --git a/i18n/usercredentials/zh-hant.json b/i18n/usercredentials/zh-hant.json index 8c1706f..2694085 100644 --- a/i18n/usercredentials/zh-hant.json +++ b/i18n/usercredentials/zh-hant.json @@ -19,7 +19,7 @@ usercredentials-leg-person: 個人資訊, usercredentials-leg-other: 其他資訊, usercredentials-leg-ip: IP位址資料, - usercredentials-email: 電子郵箱:, + usercredentials-email: 電子郵件:, usercredentials-real: 真實姓名:, usercredentials-bio: 個人簡介:, usercredentials-attach: 簡歷或履歷:, -- To view, visit https://gerrit.wikimedia.org/r/198316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a0efba172e57d9f33f1501e9f68840ea6e0a97e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmAccount Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misc: remove tungsten - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: misc: remove tungsten .. misc: remove tungsten unused by misc-web Change-Id: I3645e0ce6a57b0efdffacf3b51ee144386d5427b --- M manifests/role/cache.pp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index f145883..f2f09af 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -1667,7 +1667,6 @@ 'dataset1001.wikimedia.org', 'gallium.wikimedia.org', # CI server 'ytterbium.wikimedia.org', # Gerrit -'tungsten.eqiad.wmnet', 'graphite1001.eqiad.wmnet', 'zirconium.wikimedia.org', 'ruthenium.eqiad.wmnet', # parsoid rt test server -- To view, visit https://gerrit.wikimedia.org/r/198385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3645e0ce6a57b0efdffacf3b51ee144386d5427b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis johnflewi...@gmail.com Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...CheckUser)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I9c592395e6bf4e124aff659cbf8140f948f75c3b --- M i18n/de.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/de.json b/i18n/de.json index 91dd389..97e9deb 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -91,5 +91,6 @@ apihelp-query+checkuserlog-description: Einträge aus dem CheckUser-Logbuch abrufen., apihelp-query+checkuserlog-param-user: Benutzername des zu überprüfenden Benutzers., apihelp-query+checkuserlog-param-target: Überprüfter Benutzer, CIDR-Bereich oder überprüfte IP-Adresse., - apihelp-query+checkuserlog-example-1: Prüfungen von [[User:Example]] anzeigen + apihelp-query+checkuserlog-example-1: Prüfungen von [[User:Example]] anzeigen, + apihelp-query+checkuserlog-example-2: Zeigt Überprüfungen von 192.0.2.0/24 nach 2011-10-15T23:00:00Z } -- To view, visit https://gerrit.wikimedia.org/r/198312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c592395e6bf4e124aff659cbf8140f948f75c3b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CheckUser Gerrit-Branch: master Gerrit-Owner: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: L10n-bot l10n-...@translatewiki.net Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] phabricator: delete legalpad.yaml - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: phabricator: delete legalpad.yaml .. phabricator: delete legalpad.yaml legalpad has been decom'ed. This can be deleted. Change-Id: Ie6181ff0b6917d79a7900ce01f474bab3b44f59b --- D hieradata/role/common/phabricator/legalpad.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Rush: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/common/phabricator/legalpad.yaml b/hieradata/role/common/phabricator/legalpad.yaml deleted file mode 100644 index 7ad0377..000 --- a/hieradata/role/common/phabricator/legalpad.yaml +++ /dev/null @@ -1 +0,0 @@ -standard::has_default_mail_relay: false -- To view, visit https://gerrit.wikimedia.org/r/197320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6181ff0b6917d79a7900ce01f474bab3b44f59b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Rush r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove ori weekend commit check - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/198389 Change subject: remove ori weekend commit check .. remove ori weekend commit check I've been behaving myself. Change-Id: I3ac89a8484d1981b69e10183cbd07918d67bb7a4 --- D files/icinga/check-ori-weekend-commits M manifests/misc/monitoring.pp M manifests/site.pp 3 files changed, 0 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/89/198389/1 diff --git a/files/icinga/check-ori-weekend-commits b/files/icinga/check-ori-weekend-commits deleted file mode 100755 index d2d9552..000 --- a/files/icinga/check-ori-weekend-commits +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Icinga alert script for Ori weekend commits -# -# Alerts if the time is between 21:00 on Friday and 01:00 on Monday -# (my time zone) and there exists a commit from me in the last hour. - -TZ=America/Los_Angeles - /usr/bin/git \ - --git-dir=/var/lib/git/operations/puppet/.git log \ - --author=o...@wikimedia.org \ - --since=1hour \ - --format=%cd | /bin/grep -Pq '(Fri .* 2.:|Sat|Sun)' - -if [ $? -eq 0 ]; then - echo CRITICAL: Ori committed a change on a weekend - exit 2 -else - echo OK: Ori is behaving himself - exit 0 -fi diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp index d243ed6..70f350c 100644 --- a/manifests/misc/monitoring.pp +++ b/manifests/misc/monitoring.pp @@ -612,19 +612,3 @@ ], } } - - -class misc::monitoring::ori_weekend_commits { -file { '/usr/local/lib/nagios/plugins/check-ori-weekend-commits': -source = 'puppet:///files/icinga/check-ori-weekend-commits', -owner = 'root', -group = 'root', -mode = '0555', -} - -nrpe::monitor_service { 'ori_weekend_commits': -description = 'Ori committing changes on the weekend', -nrpe_command = '/usr/local/lib/nagios/plugins/check-ori-weekend-commits', -require = File['/usr/local/lib/nagios/plugins/check-ori-weekend-commits'], -} -} diff --git a/manifests/site.pp b/manifests/site.pp index 98f3904..3332b5c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2108,7 +2108,6 @@ include role::access_new_install include role::puppetmaster::frontend include role::pybal_config -include misc::monitoring::ori_weekend_commits } node /pc100[1-3]\.eqiad\.wmnet/ { -- To view, visit https://gerrit.wikimedia.org/r/198389 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ac89a8484d1981b69e10183cbd07918d67bb7a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add generic nrpe script check-fresh-files-in-dir.py - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/198387 Change subject: add generic nrpe script check-fresh-files-in-dir.py .. add generic nrpe script check-fresh-files-in-dir.py Change-Id: I28bef50f3c3e284573dc060c517ae6ac9e2f7731 --- A modules/base/files/monitoring/check-fresh-files-in-dir.py M modules/base/manifests/monitoring/host.pp 2 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/198387/1 diff --git a/modules/base/files/monitoring/check-fresh-files-in-dir.py b/modules/base/files/monitoring/check-fresh-files-in-dir.py new file mode 100644 index 000..e83d589 --- /dev/null +++ b/modules/base/files/monitoring/check-fresh-files-in-dir.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# check-fresh-files-in-dir.py - nagios check for age of files in dir +# +# Copyright 2015 Brandon Black +# Copyright 2015 Wikimedia Foundation, Inc. + +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +import os +import glob +import time +import sys + +def dir_exists(path): +Helper for argparse to check if a directory argument exists +if not os.path.isdir(path): +raise argparse.ArgumentTypeError(directory %s does not exist % path) +return path + + +def parse_options(): +Parse command-line options, return args hash +parser = argparse.ArgumentParser(description=Nagios dir freshness checker) +parser.add_argument('--dir', '-d', dest=dir, +type=dir_exists, +help=directory to check (must exist), +required=True) +parser.add_argument('--warn-age', '-w', dest=warn_age, +help=warn if file age in secs this, +type=int, +default=3600) +parser.add_argument('--crit-age', '-c', dest=crit_age, +help=crit if file age in secs this, +type=int, +default=86400) +parser.add_argument('--glob', '-g', dest=file_glob, +help=Only check filenames within dir matching glob, +default='*') + +return parser.parse_args() + + +def main(): +args = parse_options() +crit_out = [] +warn_out = [] +crit_time = time.time() - args.crit_age +warn_time = time.time() - args.warn_age +for checkme in glob.glob(os.path.join(args.dir, args.file_glob)): +checkme_time = os.path.getmtime(checkme); +if checkme_time crit_time: +crit_out.append(CRITICAL: File %s is more than %s secs old! +% (checkme, args.crit_age)) +elif checkme_time warn_time: +warn_out.append(WARNING: File %s is more than %s secs old! +% (checkme, args.warn_age)) + +if crit_out: +print \n.join(crit_out) +print \n.join(warn_out) +return 2 + +if warn_out: +print \n.join(warn_out) +return 1 + +print OK\n +return 0 + +if __name__ == '__main__': +sys.exit(main()) + +# vim: set ts=4 sw=4 et: diff --git a/modules/base/manifests/monitoring/host.pp b/modules/base/manifests/monitoring/host.pp index 30d95c1..564ad70 100644 --- a/modules/base/manifests/monitoring/host.pp +++ b/modules/base/manifests/monitoring/host.pp @@ -79,6 +79,14 @@ source = 'puppet:///modules/base/check_sysctl', } +file { '/usr/lib/nagios/plugins/check-fresh-files-in-dir.py': +ensure = present, +owner = 'root', +group = 'root', +mode = '0555', +source = 'puppet:///modules/base/monitoring/check-fresh-files-in-dir.py', +} + sudo::user { 'nagios': privileges = [ 'ALL = NOPASSWD: /usr/local/bin/check-raid.py', -- To view, visit https://gerrit.wikimedia.org/r/198387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28bef50f3c3e284573dc060c517ae6ac9e2f7731 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test OCSP Stapling on cp1008 - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/198388 Change subject: test OCSP Stapling on cp1008 .. test OCSP Stapling on cp1008 Bug: T8 Change-Id: I299a2730dd4f8fa306ac27270dd2253c9e5377e8 --- M manifests/role/cache.pp 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/198388/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index c3193b0..b1071b8 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -654,9 +654,18 @@ include certificates::wmf_ca_2014_2017 include role::protoproxy::ssl::common +# Test OCSP on cp1008 only initially +if $::hostname == 'cp1008' { +$ocsp_test = true +} +else { +$ocsp_test = false +} + localssl { 'unified': certname = 'uni.wikimedia.org', default_server = true, +do_ocsp = $ocsp_test, } define sni_cert() { @@ -664,6 +673,7 @@ certname = sni.${name}, server_name = $name, server_aliases = [*.${name}], +do_ocsp = $ocsp_test, } } -- To view, visit https://gerrit.wikimedia.org/r/198388 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I299a2730dd4f8fa306ac27270dd2253c9e5377e8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove ori weekend commit check - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: remove ori weekend commit check .. remove ori weekend commit check I've been behaving myself. Change-Id: I3ac89a8484d1981b69e10183cbd07918d67bb7a4 --- D files/icinga/check-ori-weekend-commits M manifests/misc/monitoring.pp M manifests/site.pp 3 files changed, 0 insertions(+), 37 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/files/icinga/check-ori-weekend-commits b/files/icinga/check-ori-weekend-commits deleted file mode 100755 index d2d9552..000 --- a/files/icinga/check-ori-weekend-commits +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Icinga alert script for Ori weekend commits -# -# Alerts if the time is between 21:00 on Friday and 01:00 on Monday -# (my time zone) and there exists a commit from me in the last hour. - -TZ=America/Los_Angeles - /usr/bin/git \ - --git-dir=/var/lib/git/operations/puppet/.git log \ - --author=o...@wikimedia.org \ - --since=1hour \ - --format=%cd | /bin/grep -Pq '(Fri .* 2.:|Sat|Sun)' - -if [ $? -eq 0 ]; then - echo CRITICAL: Ori committed a change on a weekend - exit 2 -else - echo OK: Ori is behaving himself - exit 0 -fi diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp index d243ed6..70f350c 100644 --- a/manifests/misc/monitoring.pp +++ b/manifests/misc/monitoring.pp @@ -612,19 +612,3 @@ ], } } - - -class misc::monitoring::ori_weekend_commits { -file { '/usr/local/lib/nagios/plugins/check-ori-weekend-commits': -source = 'puppet:///files/icinga/check-ori-weekend-commits', -owner = 'root', -group = 'root', -mode = '0555', -} - -nrpe::monitor_service { 'ori_weekend_commits': -description = 'Ori committing changes on the weekend', -nrpe_command = '/usr/local/lib/nagios/plugins/check-ori-weekend-commits', -require = File['/usr/local/lib/nagios/plugins/check-ori-weekend-commits'], -} -} diff --git a/manifests/site.pp b/manifests/site.pp index 7be6c5a..e4cd688 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2126,7 +2126,6 @@ include role::access_new_install include role::puppetmaster::frontend include role::pybal_config -include misc::monitoring::ori_weekend_commits } node /pc100[1-3]\.eqiad\.wmnet/ { -- To view, visit https://gerrit.wikimedia.org/r/198389 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ac89a8484d1981b69e10183cbd07918d67bb7a4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] exlude check-fresh-files-in-dir.py from pep8 checks - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/198390 Change subject: exlude check-fresh-files-in-dir.py from pep8 checks .. exlude check-fresh-files-in-dir.py from pep8 checks Change-Id: Ic1150acd64b7da2a4aae97515ea160ef503057c8 --- A modules/base/files/monitoring/.pep8 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/198390/1 diff --git a/modules/base/files/monitoring/.pep8 b/modules/base/files/monitoring/.pep8 new file mode 100644 index 000..7d13af7 --- /dev/null +++ b/modules/base/files/monitoring/.pep8 @@ -0,0 +1,2 @@ +[pep8] +exclude = check-fresh-files-in-dir.py -- To view, visit https://gerrit.wikimedia.org/r/198390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1150acd64b7da2a4aae97515ea160ef503057c8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I2a30a623d1e70298d50d59fc7d2261bf638fb4db --- M includes/api/i18n/it.json M includes/api/i18n/ksh.json M includes/api/i18n/zh-hans.json M includes/api/i18n/zh-hant.json M includes/installer/i18n/zh-hant.json M languages/i18n/arq.json M languages/i18n/awa.json M languages/i18n/be-tarask.json M languages/i18n/ce.json M languages/i18n/da.json M languages/i18n/de.json M languages/i18n/egl.json M languages/i18n/es.json M languages/i18n/hi.json M languages/i18n/hu.json M languages/i18n/ia.json M languages/i18n/is.json M languages/i18n/ka.json M languages/i18n/ksh.json M languages/i18n/lt.json M languages/i18n/lzh.json M languages/i18n/mr.json M languages/i18n/nap.json M languages/i18n/ne.json M languages/i18n/pl.json M languages/i18n/pms.json M languages/i18n/roa-tara.json M languages/i18n/sr-ec.json M languages/i18n/tt-cyrl.json M languages/i18n/zh-hant.json 30 files changed, 245 insertions(+), 101 deletions(-) Approvals: L10n-bot: Looks good to me, approved Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/i18n/it.json b/includes/api/i18n/it.json index 085113d..277f368 100644 --- a/includes/api/i18n/it.json +++ b/includes/api/i18n/it.json @@ -7,6 +7,11 @@ ] }, apihelp-block-description: Blocca un utente., + apihelp-emailuser-description: Manda un'e-mail ad un utente., + apihelp-emailuser-param-ccme: Mandami una copia di questa mail., + apihelp-expandtemplates-description: Espandi tutti i template nel wikitesto., + apihelp-expandtemplates-param-title: Titolo della pagina., + apihelp-expandtemplates-param-text: Wikitesto da convertire., apihelp-query+recentchanges-example-simple: Elenco modifiche recenti., apihelp-upload-example-url: Carica da un URL., api-help-parameters: {{PLURAL:$1|Parametro|Parametri}}:, diff --git a/includes/api/i18n/ksh.json b/includes/api/i18n/ksh.json index d180d81..4dcc433 100644 --- a/includes/api/i18n/ksh.json +++ b/includes/api/i18n/ksh.json @@ -90,6 +90,21 @@ apihelp-login-param-password: Paßwoot., apihelp-login-param-domain: De Domaijn (kann fott bliehve), apihelp-login-example-login: Enlogge., + apihelp-logout-example-logout: Donn dä aktoälle Metmaacher ußlogge., + apihelp-move-description: Donn en Sigg ömbenänne, + apihelp-move-param-to: De neue Övverschreff för di Sigg drop ömzebenänne., + apihelp-move-param-reason: Der jrond för di Sigg ömzebenänne., + apihelp-move-param-movetalk: Donn de Klaafsigg ömbenänne, wann et se jitt., + apihelp-move-param-movesubpages: Donn de Ongersigge ömbenänne, wann müjjelesch., + apihelp-move-param-noredirect: Donn kein Ömleidong aanlähje., + apihelp-move-param-watch: Donn de Sigg un de Ömleijdong op dem aktoälle Metmaacher sing Oppaßleß., + apihelp-move-param-unwatch: Donn de Sigg un de Ömleijdong uß dem aktoälle Metmaacher sing Oppaßleß eruß nämme., + apihelp-move-param-watchlist: Donn di Sigg en dem aktoälle Metmaacher sing Oppaßleß udder nemm se eruß, donn de Enschtällonge nämme udder donn de Oppaßleß nid ändere., + apihelp-move-param-ignorewarnings: Donn alle Warnonge övverjonn, + apihelp-move-example-move: Donn kbd lang=\en\ xml:lang=\en\ dir=\ltr\Schlääschte Övverschreff/kbd nach kbd lang=\en\ xml:lang=\en\ dir=\ltr\Johde Övverschreff/kbd önmännde, der ohne en Ömleijdong aanzelähje., + apihelp-opensearch-param-search: Noh wat söhke?, + apihelp-opensearch-param-limit: De hühßte Aanzahl vun Äjeebnesse för zeröck ze jävve, + apihelp-opensearch-param-namespace: En wällschem Appachtemang söhke., apihelp-protect-description: Änder der Siggeschoz för en Sigg., apihelp-query+allmessages-param-prop: Wat för en Eijeschaffte holle., apihelp-query+allmessages-param-filter: Jiv blohß de Täxte un Nohreesche uß, woh heh dat Täxschtöck dren änthallde es., diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json index ed19d4a..81e5941 100644 --- a/includes/api/i18n/zh-hans.json +++ b/includes/api/i18n/zh-hans.json @@ -375,9 +375,11 @@ apihelp-query+allusers-param-dir: 排序方向。, apihelp-query+allusers-param-group: 只包含指定组中的用户。, apihelp-query+allusers-param-excludegroup: 排除指定组中的用户。, + apihelp-query+allusers-param-limit: 返回的总计用户数。, apihelp-query+allusers-param-witheditsonly: 只列出有编辑的用户。, apihelp-query+allusers-param-activeusers: 只列出最近$1天内活跃的用户。, apihelp-query+allusers-example-Y: 列出以kbdY/kbd开头的用户。, + apihelp-query+backlinks-description: 查找所有链接至指定页面的页面。, apihelp-query+backlinks-param-title: 要搜索的标题。不能与var$1pageid/var一起使用。,
[MediaWiki-commits] [Gerrit] Revert Add knockout-bootstrap and update dependencies - change (wikimedia...bower_modules)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/198391 Change subject: Revert Add knockout-bootstrap and update dependencies .. Revert Add knockout-bootstrap and update dependencies This library turns out not to do the stuff we need. This reverts commit e554ed28cca9d593a3edf293103f3ad4ca724719. Change-Id: I4995255825bcd73a23cffc1b242eb02c3179c4c2 --- M bootstrap/.bower.json M bootstrap/Gruntfile.js M bootstrap/LICENSE M bootstrap/README.md M bootstrap/bower.json M bootstrap/dist/css/bootstrap-theme.css M bootstrap/dist/css/bootstrap-theme.css.map M bootstrap/dist/css/bootstrap-theme.min.css M bootstrap/dist/css/bootstrap.css M bootstrap/dist/css/bootstrap.css.map M bootstrap/dist/css/bootstrap.min.css M bootstrap/dist/fonts/glyphicons-halflings-regular.eot M bootstrap/dist/fonts/glyphicons-halflings-regular.svg M bootstrap/dist/fonts/glyphicons-halflings-regular.ttf M bootstrap/dist/fonts/glyphicons-halflings-regular.woff D bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 M bootstrap/dist/js/bootstrap.js M bootstrap/dist/js/bootstrap.min.js D bootstrap/dist/js/npm.js M bootstrap/fonts/glyphicons-halflings-regular.eot M bootstrap/fonts/glyphicons-halflings-regular.svg M bootstrap/fonts/glyphicons-halflings-regular.ttf M bootstrap/fonts/glyphicons-halflings-regular.woff D bootstrap/fonts/glyphicons-halflings-regular.woff2 D bootstrap/grunt/.jshintrc D bootstrap/grunt/bs-commonjs-generator.js M bootstrap/grunt/bs-glyphicons-data-generator.js M bootstrap/grunt/bs-lessdoc-parser.js D bootstrap/grunt/configBridge.json M bootstrap/grunt/sauce_browsers.yml D bootstrap/js/.jscsrc D bootstrap/js/.jshintrc M bootstrap/js/affix.js M bootstrap/js/alert.js M bootstrap/js/button.js M bootstrap/js/carousel.js M bootstrap/js/collapse.js M bootstrap/js/dropdown.js M bootstrap/js/modal.js M bootstrap/js/popover.js M bootstrap/js/scrollspy.js M bootstrap/js/tab.js M bootstrap/js/tooltip.js M bootstrap/js/transition.js D bootstrap/less/.csscomb.json D bootstrap/less/.csslintrc M bootstrap/less/alerts.less M bootstrap/less/badges.less M bootstrap/less/button-groups.less M bootstrap/less/buttons.less M bootstrap/less/carousel.less M bootstrap/less/close.less M bootstrap/less/code.less M bootstrap/less/component-animations.less M bootstrap/less/dropdowns.less M bootstrap/less/forms.less M bootstrap/less/glyphicons.less M bootstrap/less/jumbotron.less M bootstrap/less/list-group.less M bootstrap/less/media.less M bootstrap/less/mixins/buttons.less M bootstrap/less/mixins/forms.less M bootstrap/less/mixins/grid-framework.less M bootstrap/less/mixins/image.less M bootstrap/less/mixins/labels.less M bootstrap/less/mixins/vendor-prefixes.less M bootstrap/less/modals.less M bootstrap/less/navbar.less M bootstrap/less/navs.less M bootstrap/less/normalize.less M bootstrap/less/pager.less M bootstrap/less/pagination.less M bootstrap/less/panels.less M bootstrap/less/popovers.less M bootstrap/less/print.less M bootstrap/less/progress-bars.less M bootstrap/less/responsive-embed.less M bootstrap/less/scaffolding.less M bootstrap/less/tables.less M bootstrap/less/theme.less M bootstrap/less/thumbnails.less M bootstrap/less/tooltip.less M bootstrap/less/type.less M bootstrap/less/utilities.less M bootstrap/less/variables.less D bootstrap/package.js M bootstrap/package.json D knockout-bootstrap/.bower.json D knockout-bootstrap/Gruntfile.js D knockout-bootstrap/README.md D knockout-bootstrap/banner.txt D knockout-bootstrap/bower.json D knockout-bootstrap/build/knockout-bootstrap.min.js D knockout-bootstrap/examples/css/bootstrap.css D knockout-bootstrap/examples/css/bootstrap.css.map D knockout-bootstrap/examples/css/bootstrap.min.css D knockout-bootstrap/examples/css/docs.css D knockout-bootstrap/examples/css/prettify.css D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.eot D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.svg D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.ttf D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.woff D knockout-bootstrap/examples/img/bs-docs-masthead-pattern.png D knockout-bootstrap/examples/img/glyphicons-halflings-white.png D knockout-bootstrap/examples/img/glyphicons-halflings.png D knockout-bootstrap/examples/index.html D knockout-bootstrap/examples/js/bootstrap.js D knockout-bootstrap/examples/js/bootstrap.min.js D knockout-bootstrap/examples/js/knockout.js D knockout-bootstrap/examples/js/prettify.js D knockout-bootstrap/examples/js/typeahead.jquery.js D knockout-bootstrap/gulpfile.js D knockout-bootstrap/karma.conf.js D knockout-bootstrap/package.json D knockout-bootstrap/spec/test-spec.js D knockout-bootstrap/src/knockout-bootstrap.js D typeahead.js/.bower.json D typeahead.js/.gitignore D typeahead.js/.jshintrc D typeahead.js/.travis.yml D typeahead.js/CHANGELOG.md D typeahead.js/CONTRIBUTING.md D typeahead.js/Gruntfile.js D
[MediaWiki-commits] [Gerrit] Revert Add knockout-bootstrap and update dependencies - change (wikimedia...bower_modules)
Ejegg has submitted this change and it was merged. Change subject: Revert Add knockout-bootstrap and update dependencies .. Revert Add knockout-bootstrap and update dependencies This library turns out not to do the stuff we need. This reverts commit e554ed28cca9d593a3edf293103f3ad4ca724719. Change-Id: I4995255825bcd73a23cffc1b242eb02c3179c4c2 --- M bootstrap/.bower.json M bootstrap/Gruntfile.js M bootstrap/LICENSE M bootstrap/README.md M bootstrap/bower.json M bootstrap/dist/css/bootstrap-theme.css M bootstrap/dist/css/bootstrap-theme.css.map M bootstrap/dist/css/bootstrap-theme.min.css M bootstrap/dist/css/bootstrap.css M bootstrap/dist/css/bootstrap.css.map M bootstrap/dist/css/bootstrap.min.css M bootstrap/dist/fonts/glyphicons-halflings-regular.eot M bootstrap/dist/fonts/glyphicons-halflings-regular.svg M bootstrap/dist/fonts/glyphicons-halflings-regular.ttf M bootstrap/dist/fonts/glyphicons-halflings-regular.woff D bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 M bootstrap/dist/js/bootstrap.js M bootstrap/dist/js/bootstrap.min.js D bootstrap/dist/js/npm.js M bootstrap/fonts/glyphicons-halflings-regular.eot M bootstrap/fonts/glyphicons-halflings-regular.svg M bootstrap/fonts/glyphicons-halflings-regular.ttf M bootstrap/fonts/glyphicons-halflings-regular.woff D bootstrap/fonts/glyphicons-halflings-regular.woff2 D bootstrap/grunt/.jshintrc D bootstrap/grunt/bs-commonjs-generator.js M bootstrap/grunt/bs-glyphicons-data-generator.js M bootstrap/grunt/bs-lessdoc-parser.js D bootstrap/grunt/configBridge.json M bootstrap/grunt/sauce_browsers.yml D bootstrap/js/.jscsrc D bootstrap/js/.jshintrc M bootstrap/js/affix.js M bootstrap/js/alert.js M bootstrap/js/button.js M bootstrap/js/carousel.js M bootstrap/js/collapse.js M bootstrap/js/dropdown.js M bootstrap/js/modal.js M bootstrap/js/popover.js M bootstrap/js/scrollspy.js M bootstrap/js/tab.js M bootstrap/js/tooltip.js M bootstrap/js/transition.js D bootstrap/less/.csscomb.json D bootstrap/less/.csslintrc M bootstrap/less/alerts.less M bootstrap/less/badges.less M bootstrap/less/button-groups.less M bootstrap/less/buttons.less M bootstrap/less/carousel.less M bootstrap/less/close.less M bootstrap/less/code.less M bootstrap/less/component-animations.less M bootstrap/less/dropdowns.less M bootstrap/less/forms.less M bootstrap/less/glyphicons.less M bootstrap/less/jumbotron.less M bootstrap/less/list-group.less M bootstrap/less/media.less M bootstrap/less/mixins/buttons.less M bootstrap/less/mixins/forms.less M bootstrap/less/mixins/grid-framework.less M bootstrap/less/mixins/image.less M bootstrap/less/mixins/labels.less M bootstrap/less/mixins/vendor-prefixes.less M bootstrap/less/modals.less M bootstrap/less/navbar.less M bootstrap/less/navs.less M bootstrap/less/normalize.less M bootstrap/less/pager.less M bootstrap/less/pagination.less M bootstrap/less/panels.less M bootstrap/less/popovers.less M bootstrap/less/print.less M bootstrap/less/progress-bars.less M bootstrap/less/responsive-embed.less M bootstrap/less/scaffolding.less M bootstrap/less/tables.less M bootstrap/less/theme.less M bootstrap/less/thumbnails.less M bootstrap/less/tooltip.less M bootstrap/less/type.less M bootstrap/less/utilities.less M bootstrap/less/variables.less D bootstrap/package.js M bootstrap/package.json D knockout-bootstrap/.bower.json D knockout-bootstrap/Gruntfile.js D knockout-bootstrap/README.md D knockout-bootstrap/banner.txt D knockout-bootstrap/bower.json D knockout-bootstrap/build/knockout-bootstrap.min.js D knockout-bootstrap/examples/css/bootstrap.css D knockout-bootstrap/examples/css/bootstrap.css.map D knockout-bootstrap/examples/css/bootstrap.min.css D knockout-bootstrap/examples/css/docs.css D knockout-bootstrap/examples/css/prettify.css D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.eot D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.svg D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.ttf D knockout-bootstrap/examples/fonts/glyphicons-halflings-regular.woff D knockout-bootstrap/examples/img/bs-docs-masthead-pattern.png D knockout-bootstrap/examples/img/glyphicons-halflings-white.png D knockout-bootstrap/examples/img/glyphicons-halflings.png D knockout-bootstrap/examples/index.html D knockout-bootstrap/examples/js/bootstrap.js D knockout-bootstrap/examples/js/bootstrap.min.js D knockout-bootstrap/examples/js/knockout.js D knockout-bootstrap/examples/js/prettify.js D knockout-bootstrap/examples/js/typeahead.jquery.js D knockout-bootstrap/gulpfile.js D knockout-bootstrap/karma.conf.js D knockout-bootstrap/package.json D knockout-bootstrap/spec/test-spec.js D knockout-bootstrap/src/knockout-bootstrap.js D typeahead.js/.bower.json D typeahead.js/.gitignore D typeahead.js/.jshintrc D typeahead.js/.travis.yml D typeahead.js/CHANGELOG.md D typeahead.js/CONTRIBUTING.md D typeahead.js/Gruntfile.js D typeahead.js/LICENSE D
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-03-20T14:58:20+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/198234 Change subject: New Wikidata Build - 2015-03-20T14:58:20+ .. New Wikidata Build - 2015-03-20T14:58:20+ Change-Id: I38949181e6deb800f5be141beb8b2809d4efe191 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/PropertySuggester/build/travis/after_script.sh M extensions/PropertySuggester/build/travis/before_script.sh M extensions/PropertySuggester/build/travis/script.sh M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery/jquery.focusAt.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/Wikibase/.jscsrc M extensions/Wikibase/README.md M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/build/travis/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/script.sh M extensions/Wikibase/build/travis/update-db.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/ang.json M extensions/Wikibase/client/i18n/arq.json M extensions/Wikibase/client/i18n/as.json M extensions/Wikibase/client/i18n/az.json M extensions/Wikibase/client/i18n/be-tarask.json A extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/da.json M extensions/Wikibase/client/i18n/de.json A extensions/Wikibase/client/i18n/gom-deva.json M extensions/Wikibase/client/i18n/kk-cyrl.json M extensions/Wikibase/client/i18n/lt.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/client/i18n/sr-el.json A extensions/Wikibase/client/i18n/tcy.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/Changes/ChangeHandler.php M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php M extensions/Wikibase/client/includes/scribunto/EntityAccessor.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/json.wiki M extensions/Wikibase/lib/i18n/as.json M extensions/Wikibase/lib/i18n/az.json A extensions/Wikibase/lib/i18n/gom-deva.json M extensions/Wikibase/lib/i18n/lt.json M extensions/Wikibase/lib/i18n/oc.json M extensions/Wikibase/lib/i18n/ps.json M extensions/Wikibase/lib/i18n/qu.json M extensions/Wikibase/lib/i18n/sr-ec.json M extensions/Wikibase/lib/i18n/sr-el.json M extensions/Wikibase/lib/i18n/sv.json A extensions/Wikibase/lib/i18n/sw.json M extensions/Wikibase/lib/includes/Summary.php M extensions/Wikibase/lib/includes/changes/EntityChange.php M extensions/Wikibase/lib/includes/formatters/CommonsLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/EntityIdHtmlLinkFormatterFactory.php M extensions/Wikibase/lib/includes/formatters/EntityIdLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php M extensions/Wikibase/lib/includes/formatters/HtmlTimeFormatter.php M extensions/Wikibase/lib/includes/formatters/HtmlUrlFormatter.php M extensions/Wikibase/lib/includes/formatters/MonolingualHtmlFormatter.php M extensions/Wikibase/lib/includes/formatters/PropertyValueSnakFormatter.php M extensions/Wikibase/lib/includes/formatters/QuantityDetailsFormatter.php M extensions/Wikibase/lib/includes/formatters/TimeDetailsFormatter.php M extensions/Wikibase/lib/includes/formatters/UnDeserializableValueFormatter.php D extensions/Wikibase/lib/includes/parsers/DateTimeParser.php M extensions/Wikibase/lib/includes/parsers/EntityIdValueParser.php M extensions/Wikibase/lib/includes/parsers/MWTimeIsoParser.php A extensions/Wikibase/lib/includes/parsers/PhpDateTimeParser.php M extensions/Wikibase/lib/includes/parsers/TimeParser.php M extensions/Wikibase/lib/includes/parsers/YearMonthTimeParser.php M extensions/Wikibase/lib/includes/parsers/YearTimeParser.php D extensions/Wikibase/lib/maintenance/rebuildAllData.php M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementlistview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js M
[MediaWiki-commits] [Gerrit] Fix aggregated reports to work on the new reviews system - change (wikimedia/iegreview)
Niharika29 has uploaded a new change for review. https://gerrit.wikimedia.org/r/198233 Change subject: Fix aggregated reports to work on the new reviews system .. Fix aggregated reports to work on the new reviews system Bug: T93251 Change-Id: I159ae76915db15cfbb5f26006529608ea43b4ea8 --- M src/Controllers/Reports/Aggregated.php M src/Dao/Reports.php 2 files changed, 39 insertions(+), 55 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/iegreview refs/changes/33/198233/1 diff --git a/src/Controllers/Reports/Aggregated.php b/src/Controllers/Reports/Aggregated.php index b3aec85..8b0b5d8 100644 --- a/src/Controllers/Reports/Aggregated.php +++ b/src/Controllers/Reports/Aggregated.php @@ -57,34 +57,6 @@ 'sortable' = true, 'sortcolumn' = 'amount', ), - 'report-aggregated-impact' = array( - 'column' = 'impact', - 'format' = 'number', - 'precision' = 2, - 'sortable' = true, - 'sortcolumn' = 'impact', - ), - 'report-aggregated-innovation' = array( - 'column' = 'innovation', - 'format' = 'number', - 'precision' = 2, - 'sortable' = true, - 'sortcolumn' = 'innovation', - ), - 'report-aggregated-ability' = array( - 'column' = 'ability', - 'format' = 'number', - 'precision' = 2, - 'sortable' = true, - 'sortcolumn' = 'ability', - ), - 'report-aggregated-engagement' = array( - 'column' = 'engagement', - 'format' = 'number', - 'precision' = 2, - 'sortable' = true, - 'sortcolumn' = 'engagement', - ), 'report-aggregated-recommend' = array( 'format' = 'message', 'message' = 'report-format-recommend', @@ -115,6 +87,6 @@ 'items' = $this-form-get( 'items' ), 'page' = $this-form-get( 'p' ), ); - return $this-dao-aggregatedScores( $params ); + return $this-dao-aggregatedScores( $this-activeCampaign, $params ); } } diff --git a/src/Dao/Reports.php b/src/Dao/Reports.php index 13d256a..87fc627 100644 --- a/src/Dao/Reports.php +++ b/src/Dao/Reports.php @@ -52,10 +52,11 @@ } /** +* @param int $campaign Active campaign ID * @param array $params * @return object StdClass with rows and found memebers */ - public function aggregatedScores( array $params ) { + public function aggregatedScores( $campaign, array $params ) { $this-logger-debug( __METHOD__, $params ); $defaults = array( 'sort' = 'pcnt', @@ -67,7 +68,7 @@ $validSorts = array( 'id', 'title', 'amount', 'theme', - 'impact', 'innovation', 'ability', 'engagement', 'recommend', + //'impact', 'innovation', 'ability', 'engagement', 'recommend', 'rcnt', 'pcnt', ); $sortby = in_array( $params['sort'], $validSorts ) ? @@ -75,7 +76,7 @@ $order = $params['order'] === 'desc' ? 'DESC' : 'ASC'; $crit = array(); - + $crit['campaign'] = $campaign; if ( $params['items'] == 'all' ) { $limit = ''; $offset = ''; @@ -85,30 +86,41 @@ $limit = 'LIMIT :int_limit'; $offset = 'OFFSET :int_offset'; } - + //die(print_r($crit)); + $fields = array( + 'p.id', + 'p.title', + 'p.theme', + 'p.amount' + ); $sql = self::concat( - 'SELECT p.id, p.title, p.theme, p.amount,', - 'r.impact,', - 'r.innovation,', - 'r.ability,', - 'r.engagement,', - 'r.recommend,', - 'IF(r.conditional 0, \'*\', \'\') AS conditional,', - 'r.cnt AS rcnt,', -
[MediaWiki-commits] [Gerrit] Allow limn instances to specify Apache config for proxy - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Allow limn instances to specify Apache config for proxy .. Allow limn instances to specify Apache config for proxy Change-Id: Ic17f69e406746a9b2110f5d1c37a5cd65560b504 --- M manifests/misc/limn.pp M modules/limn/manifests/instance/proxy.pp 2 files changed, 19 insertions(+), 14 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/misc/limn.pp b/manifests/misc/limn.pp index 7d8ba27..b0f9e84 100644 --- a/manifests/misc/limn.pp +++ b/manifests/misc/limn.pp @@ -5,23 +5,25 @@ # default $server_name and $server_aliases. # # == Parameters: -# $port- limn port -# $server_name - ServerName for limn instance proxy. Default it to infer from $name and $::realm. -# $server_aliases - ServerAliases for limn instance proxy. Default is to infer from $name and $::realm. -# $environment - Node environment. Default: production -# $base_directory - Limn install base directory. Default: /usr/local/share/limn -# $var_directory - Limn instance var directory. Limn datafiles live here. Default: /var/lib/limn/$name +# $port- limn port +# $server_name - ServerName for limn instance proxy. Default it to infer from $name and $::realm. +# $server_aliases - ServerAliases for limn instance proxy. Default is to infer from $name and $::realm. +# $environment - Node environment. Default: production +# $base_directory - Limn install base directory. Default: /usr/local/share/limn +# $var_directory - Limn instance var directory. Limn datafiles live here. Default: /var/lib/limn/$name +# $proxy_site_template - Template for proxy Apache conf Default: limn/vhost-limn-proxy.conf.erb. # # == Example # misc::limn::instance { 'reportcard': } # define misc::limn::instance( -$port = 8081, -$environment= 'production', -$base_directory = '/usr/local/share/limn', -$var_directory = /var/lib/limn/${name}, -$server_name= undef, -$server_aliases = undef) +$port= 8081, +$environment = 'production', +$base_directory = '/usr/local/share/limn', +$var_directory = /var/lib/limn/${name}, +$server_name = undef, +$server_aliases = undef, +$proxy_site_template = 'limn/vhost-limn-proxy.conf.erb') { ::limn::instance { $name: port = $port, @@ -59,5 +61,6 @@ server_name= $servername, server_aliases = $serveraliases, require= ::Limn::Instance[$name], +site_template = $proxy_site_template, } } diff --git a/modules/limn/manifests/instance/proxy.pp b/modules/limn/manifests/instance/proxy.pp index 5332846..0e89c78 100644 --- a/modules/limn/manifests/instance/proxy.pp +++ b/modules/limn/manifests/instance/proxy.pp @@ -14,6 +14,7 @@ # $document_root - Path to Apache document root. This should be the limn::instance $var_directory. Default: /usr/local/share/limn/var. # $server_name- Named VirtualHost.Default: $name.$domain # $server_aliases - Server name aliases. Default: none. +# $site_template - Template for Apache conf. Default: limn/vhost-limn-proxy.conf.erb. # define limn::instance::proxy ( $port= 80, @@ -21,13 +22,14 @@ $limn_port = '8081', $document_root = '/usr/local/share/limn/var', $server_name = ${name}.${::domain}, - $server_aliases = '') + $server_aliases = '', + $site_template = 'limn/vhost-limn-proxy.conf.erb') { # Configure the Apache Limn instance proxy VirtualHost. $priority = 10 file { ${priority}-limn-${name}.conf: path= /etc/apache2/sites-enabled/${priority}-limn-${name}.conf, -content = template('limn/vhost-limn-proxy.conf.erb'), +content = template($site_template), owner = 'root', group = 'root', mode= '0444', -- To view, visit https://gerrit.wikimedia.org/r/198118 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic17f69e406746a9b2110f5d1c37a5cd65560b504 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add limn proxy template that handles taken down Wikipedia Ze... - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Add limn proxy template that handles taken down Wikipedia Zero dashboards .. Add limn proxy template that handles taken down Wikipedia Zero dashboards Bug: T92920 Change-Id: I39f940ed9978692b6024bcce41436dea42735dd2 --- A modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb 1 file changed, 66 insertions(+), 0 deletions(-) Approvals: Ottomata: Looks good to me, approved Milimetric: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb b/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb new file mode 100644 index 000..9945ec2 --- /dev/null +++ b/modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb @@ -0,0 +1,66 @@ +# This file is managed by Puppet +VirtualHost *:80 + ServerName %= @server_name % +% if @server_aliases.is_a? Array -% +% server_aliases.each do |name| %%= ServerAlias #{name}\n %% end % +% elsif @server_aliases != '' -% +%= ServerAlias #{server_aliases} % +% end -% + + DocumentRoot %= @document_root % + + LogLevel warn + ErrorLog /var/log/apache2/%= @name %_error.log + CustomLog /var/log/apache2/%= @name %_access.log combined + + ProxyRequests Off + Proxy * +Order allow,deny +Allow from all + /Proxy + + # 410 - Gone for Wikipedia Zero + ErrorDocument 410 htmlheadtitle410 Gone/title/headbodyh1Gone/h1pThis Wikipedia Zero dashboard is no longer available. It has been replaced by a new system which requires a username and password. Please contact your partner manager, or write to a href=\mailto:wikipediaz...@wikimedia.org\;wikipediaz...@wikimedia.org/a to learn more./p/body/html + + # Wikipedia Zero carrier redirects + RewriteRule [/_-]aircel[_-] - [G] + RewriteRule [/_-]airtel[_-] - [G] + RewriteRule [/_-]babilon[_-] - [G] + RewriteRule [/_-]banglalink[_-] - [G] + RewriteRule [/_-]beeline[_-] - [G] + RewriteRule [/_-]celcom[_-] - [G] + RewriteRule [/_-]dialog[_-]sri - [G] + RewriteRule [/_-]digi[_-]malaysia - [G] + RewriteRule [/_-]dtac[_-]thailand - [G] + RewriteRule [/_-]g[_-]mobile[_-]mongolia - [G] + RewriteRule [/_-]grameenphone[_-] - [G] + RewriteRule [/_-]ipko[_-]kosovo - [G] + RewriteRule [/_-]mobilink[_-] - [G] + RewriteRule [/_-]mtn[_-] - [G] + RewriteRule [/_-]ncell[_-] - [G] + RewriteRule [/_-]orange[_-] - [G] + RewriteRule [/_-]safaricom[_-] - [G] + RewriteRule [/_-]saudi[_-]telecom - [G] + RewriteRule [/_-]smart[_-]philippines - [G] + RewriteRule [/_-]smart[_-]cambodia - [G] + RewriteRule [/_-]sun[_-]philippines - [G] + RewriteRule [/_-]tcell[_-]tajikistan - [G] + RewriteRule [/_-]telenor[_-] - [G] + RewriteRule [/_-]tigo[_-]ghana - [G] + RewriteRule [/_-]timor[_-]telecom - [G] + RewriteRule [/_-]t[_-]mobile[_-] - [G] + RewriteRule [/_-]umniah[_-] - [G] + RewriteRule [/_-]viva[_-]bahrain - [G] + RewriteRule [/_-]xl[_-]axiata - [G] + + # Wikipedia Zero generic redirects + RewriteRule [/_-]free[_-]mobile[_-]traffic - [G] + RewriteRule [/_-]mobile[_-]page[_-]requests[_-]as[_-]percent[_-]of[_-]country - [G] + RewriteRule [_-]mobile[_-]wp[_-]views[_-]by[_-]country - [G] + + # If the file does not exist, assume this is a dynamic + # request and send it to the Limn instance. + RewriteEngine On + RewriteCond %= @document_root %/%{REQUEST_FILENAME} !-s + RewriteRule ^(.*) http://%= @limn_host %:%= @limn_port %$1 [P] +/VirtualHost -- To view, visit https://gerrit.wikimedia.org/r/198119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39f940ed9978692b6024bcce41436dea42735dd2 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor core submodule for cherry-picks - change (mediawiki...VisualEditor)
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/198270 Change subject: Update VisualEditor core submodule for cherry-picks .. Update VisualEditor core submodule for cherry-picks New changes: b1690ef [BREAKING CHANGE] Allow access to surface through window manager 6536380 Add directionality classes to window manager Change-Id: I7c5b870aa54f938030d32876108b5c977ac7b6ac --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/70/198270/1 diff --git a/lib/ve b/lib/ve index 263b194..6536380 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 263b194004ab77f6a013fb10641d8f162d2a568d +Subproject commit 653638069805990ece6d2422ab2fcbeecd992d92 -- To view, visit https://gerrit.wikimedia.org/r/198270 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c5b870aa54f938030d32876108b5c977ac7b6ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Mooeypoo mor...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix webkit column hack - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Fix webkit column hack .. Fix webkit column hack * Was checking for 'size' (which doesn't exist) instead of 'width' * The default value is 'auto', which isn't falsey. As a result the webkit hack was triggering on all focusables. Bug: T93322 Change-Id: Id361221bba9ea9f20c57eedeea6939bb48107727 --- M src/ce/ve.ce.FocusableNode.js 1 file changed, 22 insertions(+), 21 deletions(-) Approvals: Trevor Parscal: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js index 42d857c..f9ad510 100644 --- a/src/ce/ve.ce.FocusableNode.js +++ b/src/ce/ve.ce.FocusableNode.js @@ -406,7 +406,7 @@ * Calculate position of highlights */ ve.ce.FocusableNode.prototype.calculateHighlights = function () { - var i, l, $set, + var i, l, $set, columnCount, columnWidth, rects = [], filteredRects = [], webkitColumns = 'webkitColumnCount' in document.createElement( 'div' ).style, @@ -427,27 +427,28 @@ return; } - if ( - webkitColumns - ( $el.css( '-webkit-column-count' ) || $el.css( '-webkit-column-size' ) ) - ) { - // Chrome incorrectly measures children of nodes with columns [1], let's - // just ignore them rather than render a possibly bizarre highlight. They - // will usually not be positioned, because Chrome also doesn't position - // them correctly [2] and so people avoid doing it. - // - // Of course there are other ways to render a node outside the bounding - // box of its parent, like negative margin. We do not handle these cases, - // and the highlight may not correctly cover the entire node if that - // happens. This can't be worked around without implementing CSS - // layouting logic ourselves, which is not worth it. - // - // [1] http://code.google.com/p/chromium/issues/detail?id=391271 - // [2] https://code.google.com/p/chromium/issues/detail?id=291616 + if ( webkitColumns ) { + columnCount = $el.css( '-webkit-column-count' ); + columnWidth = $el.css( '-webkit-column-width' ); + if ( ( columnCount columnCount !== 'auto' ) || ( columnWidth columnWidth !== 'auto' ) ) { + // Chrome incorrectly measures children of nodes with columns [1], let's + // just ignore them rather than render a possibly bizarre highlight. They + // will usually not be positioned, because Chrome also doesn't position + // them correctly [2] and so people avoid doing it. + // + // Of course there are other ways to render a node outside the bounding + // box of its parent, like negative margin. We do not handle these cases, + // and the highlight may not correctly cover the entire node if that + // happens. This can't be worked around without implementing CSS + // layouting logic ourselves, which is not worth it. + // + // [1] https://code.google.com/p/chromium/issues/detail?id=391271 + // [2] https://code.google.com/p/chromium/issues/detail?id=291616 - // jQuery keeps nodes in its collections in document order, so the - // children have not been processed yet and can be safely removed. - $set = $set.not( $el.find( '*' ) ); + // jQuery keeps nodes in its collections in document order, so the + // children have not been processed yet and can be safely removed. + $set = $set.not( $el.find( '*' ) ); + } } clientRects = el.getClientRects(); -- To view, visit https://gerrit.wikimedia.org/r/198216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id361221bba9ea9f20c57eedeea6939bb48107727 Gerrit-PatchSet: 3 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] WIP Campaign-associated mixins: schema update - change (mediawiki...CentralNotice)
AndyRussG has uploaded a new change for review. https://gerrit.wikimedia.org/r/198267 Change subject: WIP Campaign-associated mixins: schema update .. WIP Campaign-associated mixins: schema update Bug: T90913 Change-Id: I7b6b67d37af83240a0768db06357f43637a6c302 --- M CentralNotice.sql M patches/CNDatabasePatcher.php A patches/patch-notice-mixins.sql 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/67/198267/1 diff --git a/CentralNotice.sql b/CentralNotice.sql index 39a135b..41b0349 100644 --- a/CentralNotice.sql +++ b/CentralNotice.sql @@ -72,6 +72,15 @@ CREATE INDEX /*i*/tmxn_page_id ON /*_*/cn_template_mixins (page_id); CREATE INDEX /*i*/tmxn_mixin_name ON /*_*/cn_template_mixins (mixin_name); +CREATE TABLE IF NOT EXISTS /*_*/cn_notice_mixins ( + `nmxn_id` int PRIMARY KEY AUTO_INCREMENT, + `nmxn_not_id` int(11) NOT NULL, + `nmxn_mixin_name` varchar(255) NOT NULL, + `nmxn_mixin_params` BLOB +) /*$wgDBTableOptions*/; +CREATE INDEX /*i*/nmxn_not_id_idx ON /*_*/cn_notice_mixins (nmxn_not_id); +CREATE INDEX /*i*/nmxn_mixin_name_idx ON /*_*/cn_notice_mixins (nmxn_mixin_name); + CREATE TABLE IF NOT EXISTS /*_*/cn_known_devices ( `dev_id` int PRIMARY KEY AUTO_INCREMENT, `dev_name` varchar(255) NOT NULL, diff --git a/patches/CNDatabasePatcher.php b/patches/CNDatabasePatcher.php index da58e6e..10e0f21 100644 --- a/patches/CNDatabasePatcher.php +++ b/patches/CNDatabasePatcher.php @@ -148,6 +148,12 @@ $base . '/patch-assignments_index.sql', true ) ); + $updater-addExtensionUpdate( + array( +'addTable', 'cn_notice_mixins', +$base . '/patch-notice-mixins.sql', true + ) + ); } elseif ( $updater-getDB()-getType() == 'sqlite' ) { // Add the entire schema... $updater-addExtensionUpdate( diff --git a/patches/patch-notice-mixins.sql b/patches/patch-notice-mixins.sql new file mode 100644 index 000..f393d9d --- /dev/null +++ b/patches/patch-notice-mixins.sql @@ -0,0 +1,10 @@ +-- Add a table and indexes for mixins associated with campaigns (a.k.a. notices) + +CREATE TABLE IF NOT EXISTS /*_*/cn_notice_mixins ( + `nmxn_id` int PRIMARY KEY AUTO_INCREMENT, + `nmxn_not_id` int(11) NOT NULL, + `nmxn_mixin_name` varchar(255) NOT NULL, + `nmxn_mixin_params` BLOB +) /*$wgDBTableOptions*/; +CREATE INDEX /*i*/nmxn_not_id_idx ON /*_*/cn_notice_mixins (nmxn_not_id); +CREATE INDEX /*i*/nmxn_mixin_name_idx ON /*_*/cn_notice_mixins (nmxn_mixin_name); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/198267 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b6b67d37af83240a0768db06357f43637a6c302 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: AndyRussG andrew.green...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add script to remove attached users from the users_to_rename... - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/198269 Change subject: Add script to remove attached users from the users_to_rename table .. Add script to remove attached users from the users_to_rename table Bug: T93139 Change-Id: I328db2959d69d64052b0c4cc75e946e84eac4bb3 --- A maintenance/updateUsersToRename.php 1 file changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/69/198269/1 diff --git a/maintenance/updateUsersToRename.php b/maintenance/updateUsersToRename.php new file mode 100644 index 000..8046b82 --- /dev/null +++ b/maintenance/updateUsersToRename.php @@ -0,0 +1,54 @@ +?php + +$IP = getenv( 'MW_INSTALL_PATH' ); +if ( $IP === false ) { + $IP = __DIR__ . '/../../..'; +} +require_once $IP/maintenance/Maintenance.php; + +/** + * Removes attached accounts from the users_to_rename + * table + */ +class UpdateUsersToRename extends Maintenance { + public function __construct() { + parent::__construct(); + $this-setBatchSize( 100 ); + } + + + public function execute() { + $dbw = CentralAuthUser::getCentralDB(); + $dbr = CentralAuthUser::getCentralSlaveDB(); + $total = 0; + do { + $rows = $dbr-select( + array( 'users_to_rename', 'localuser' ), + array( 'utr_id', 'utr_name', 'utr_wiki' ), + array(), + __METHOD__, + array( 'LIMIT' = $this-mBatchSize ), + array( 'localuser' = array( 'JOIN', 'utr_wiki=lu_wiki AND utr_name=lu_name' ) ) + ); + $ids = array(); + foreach ( $rows as $row ) { + $ids[] = $row-utr_id; + $this-output( {$row-utr_name}@{$row-utr_wiki} is now attached!\n ); + } + if ( $ids ) { + $count = count( $ids ); + $this-output( Deleting $count users...\n ); + $dbw-delete( + 'users_to_rename', + array( 'utr_id' = $ids ), + __METHOD__ + ); + $total += $count; + } + } while ( $rows-numRows() = $this-mBatchSize ); + $this-output( Removed $total users in total.\n ); + } +} + +$maintClass = 'UpdateUsersToRename'; +require_once RUN_MAINTENANCE_IF_MAIN; -- To view, visit https://gerrit.wikimedia.org/r/198269 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I328db2959d69d64052b0c4cc75e946e84eac4bb3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use more specific warning labels - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Use more specific warning labels .. Use more specific warning labels * Useful to quickly sift through noise in Kibana logs. * Different ones for DSR warning types and API warning types. Change-Id: I2b251a1c9bbb6efecca968c7203b503e1ada6220 --- M lib/dom.computeDSR.js M lib/mediawiki.ApiRequest.js 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/dom.computeDSR.js b/lib/dom.computeDSR.js index 14dde55..ba67bd0 100644 --- a/lib/dom.computeDSR.js +++ b/lib/dom.computeDSR.js @@ -449,7 +449,7 @@ if (cs !== null || ce !== null) { if (ce 0) { if (!fosteredNode) { - env.log(warning, Negative DSR for node: + node.nodeName + ; resetting to zero); + env.log(warning/dsr/negative, Negative DSR for node: + node.nodeName + ; resetting to zero); } ce = 0; } @@ -563,7 +563,7 @@ // Detect errors if (s !== null s !== undefined cs !== s !acceptableInconsistency(opts, node, cs, s)) { - env.log(warning, DSR inconsistency: cs/s mismatch for node:, + env.log(warning/dsr/inconsistent, DSR inconsistency: cs/s mismatch for node:, node.nodeName, s:,s,; cs:,cs); } diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js index 4c09fef..0c6e056 100644 --- a/lib/mediawiki.ApiRequest.js +++ b/lib/mediawiki.ApiRequest.js @@ -150,7 +150,8 @@ var self = this; if (error) { - this.env.log('warning/api', 'Failed API request,', { + this.env.log('warning/api' + (error.code ? (/ + error.code).toLowerCase() : ''), + 'Failed API request,', { error: error, status: response response.statusCode, retries-remaining: this.retries -- To view, visit https://gerrit.wikimedia.org/r/198239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b251a1c9bbb6efecca968c7203b503e1ada6220 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: Marcoil marc...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool cp1058 be - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/198272 Change subject: depool cp1058 be .. depool cp1058 be Change-Id: Id40436fdbdfa4296b5001eec5dcc0f9e4cac405c --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/72/198272/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 05cf5dd..70270e5 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -197,7 +197,7 @@ 'parsoid' = { 'eqiad' = [ 'cp1045.eqiad.wmnet', - 'cp1058.eqiad.wmnet', # needs-jessie-install + # 'cp1058.eqiad.wmnet', # needs-jessie-install ], 'esams' = [], 'ulsfo' = [] -- To view, visit https://gerrit.wikimedia.org/r/198272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id40436fdbdfa4296b5001eec5dcc0f9e4cac405c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-enable mediawiki qunit job for wmf and release branches - change (integration/config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198276 Change subject: Re-enable mediawiki qunit job for wmf and release branches .. Re-enable mediawiki qunit job for wmf and release branches It was temporarily disabled as the implementation was changed to Karma, which needed backporting to release branches. Supported: * master * 1.25wmf21 * 1.25wmf22 * REL1_24 * REL1_23 Other wmf and release branches are no longer active. Except for 1.19, which is therefore blacklisted. In MediaWiki 1.19 our QUnit test suite was still experimental and did not pass. Change-Id: I82d13cb869c1bc51db8b764f20680e1dbbcb39e6 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/76/198276/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3a73dbb..95ce9d9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1761,11 +1761,8 @@ queue-name: mediawiki - name: mediawiki-core-qunit -branch: ^(master)$ +branch: ^(REL1_19)$ queue-name: mediawiki - - - name: mwext-VisualEditor-qunit -branch: ^(master)$ - name: ^mwext-WikibaseJavaScriptApi-qunit$ voting: false -- To view, visit https://gerrit.wikimedia.org/r/198276 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82d13cb869c1bc51db8b764f20680e1dbbcb39e6 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix webkit column hack - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/198278 Change subject: Fix webkit column hack .. Fix webkit column hack * Was checking for 'size' (which doesn't exist) instead of 'width' * The default value is 'auto', which isn't falsey. As a result the webkit hack was triggering on all focusables. Bug: T93322 Change-Id: Id361221bba9ea9f20c57eedeea6939bb48107727 (cherry picked from commit 2d14f7acd28787eb4bebc8ae7b02d95122e01cb8) --- M src/ce/ve.ce.FocusableNode.js 1 file changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/78/198278/1 diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js index 42d857c..f9ad510 100644 --- a/src/ce/ve.ce.FocusableNode.js +++ b/src/ce/ve.ce.FocusableNode.js @@ -406,7 +406,7 @@ * Calculate position of highlights */ ve.ce.FocusableNode.prototype.calculateHighlights = function () { - var i, l, $set, + var i, l, $set, columnCount, columnWidth, rects = [], filteredRects = [], webkitColumns = 'webkitColumnCount' in document.createElement( 'div' ).style, @@ -427,27 +427,28 @@ return; } - if ( - webkitColumns - ( $el.css( '-webkit-column-count' ) || $el.css( '-webkit-column-size' ) ) - ) { - // Chrome incorrectly measures children of nodes with columns [1], let's - // just ignore them rather than render a possibly bizarre highlight. They - // will usually not be positioned, because Chrome also doesn't position - // them correctly [2] and so people avoid doing it. - // - // Of course there are other ways to render a node outside the bounding - // box of its parent, like negative margin. We do not handle these cases, - // and the highlight may not correctly cover the entire node if that - // happens. This can't be worked around without implementing CSS - // layouting logic ourselves, which is not worth it. - // - // [1] http://code.google.com/p/chromium/issues/detail?id=391271 - // [2] https://code.google.com/p/chromium/issues/detail?id=291616 + if ( webkitColumns ) { + columnCount = $el.css( '-webkit-column-count' ); + columnWidth = $el.css( '-webkit-column-width' ); + if ( ( columnCount columnCount !== 'auto' ) || ( columnWidth columnWidth !== 'auto' ) ) { + // Chrome incorrectly measures children of nodes with columns [1], let's + // just ignore them rather than render a possibly bizarre highlight. They + // will usually not be positioned, because Chrome also doesn't position + // them correctly [2] and so people avoid doing it. + // + // Of course there are other ways to render a node outside the bounding + // box of its parent, like negative margin. We do not handle these cases, + // and the highlight may not correctly cover the entire node if that + // happens. This can't be worked around without implementing CSS + // layouting logic ourselves, which is not worth it. + // + // [1] https://code.google.com/p/chromium/issues/detail?id=391271 + // [2] https://code.google.com/p/chromium/issues/detail?id=291616 - // jQuery keeps nodes in its collections in document order, so the - // children have not been processed yet and can be safely removed. - $set = $set.not( $el.find( '*' ) ); + // jQuery keeps nodes in its collections in document order, so the + // children have not been processed yet and can be safely removed. + $set = $set.not( $el.find( '*' ) ); + } } clientRects = el.getClientRects(); -- To view, visit https://gerrit.wikimedia.org/r/198278 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id361221bba9ea9f20c57eedeea6939bb48107727 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Jforrester
[MediaWiki-commits] [Gerrit] Support Parallels VM provider for Vagrant - change (mediawiki/vagrant)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/198280 Change subject: Support Parallels VM provider for Vagrant .. Support Parallels VM provider for Vagrant Enable with: $ vagrant up --provider=parallels Requires plugins: * Parallels provider - http://parallels.github.io/vagrant-parallels/ $ vagrant plugin install vagrant-parallels * Puppet installer - https://github.com/petems/vagrant-puppet-install $ vagrant plugin install vagrant-puppet-install Note that port forwarding works via localhost but not via external interfaces of the host machine by default. Change-Id: Iaf91b73afffec963a847b9ccb35e5121d48a17ca --- M Vagrantfile 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/80/198280/1 diff --git a/Vagrantfile b/Vagrantfile index 19c481d..0814a92 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -97,6 +97,24 @@ override.vm.box = 'Wikimedia/trusty64-puppet-lxc' end +# Parallels provider. Enable with `--provider=parallels` +# +# Requires plugins: +# * Parallels provider - http://parallels.github.io/vagrant-parallels/ +# $ vagrant plugin install vagrant-parallels +# * Puppet installer - https://github.com/petems/vagrant-puppet-install +# $ vagrant plugin install vagrant-puppet-install +# +# Note that port forwarding works via localhost but not via external interfaces +# of the host machine by default... +config.vm.provider :parallels do |vw, override| +override.vm.box = 'parallels/ubuntu-14.04' + +config.puppet_install.puppet_version = :latest + +override.vm.network :private_network, ip: settings[:static_ip] +end + config.vm.network :forwarded_port, guest: 80, host: settings[:http_port], id: 'http' -- To view, visit https://gerrit.wikimedia.org/r/198280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf91b73afffec963a847b9ccb35e5121d48a17ca Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Statsd reporter checks format of processor files - change (mediawiki...EventLogging)
Ottomata has submitted this change and it was merged. Change subject: Statsd reporter checks format of processor files .. Statsd reporter checks format of processor files We added a new processor of files whose format doesn't exactly abide to what the statsd reporter is expecting. The new processor format needs to be added. Now, since reporting of metrics and thus, alarms are broken in prod this change just fixes the reporter so it continues to report the pre-existing metrics. Change-Id: I515d1362e5c3183d61e4b8cf7f129e2f5fca3348 --- M server/bin/eventlogging-reporter 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/server/bin/eventlogging-reporter b/server/bin/eventlogging-reporter index 37e69a1..6e41231 100755 --- a/server/bin/eventlogging-reporter +++ b/server/bin/eventlogging-reporter @@ -85,14 +85,23 @@ def iter_pubs(config_dir): -Discover local EventLogging publishers. +Discover local EventLogging publishers. Assumes really a tcp stream +# TODO Kafka client side stream not reported + publishers = {} +logger = logging.getLogger('Log') + for filename in iter_files(config_dir): name = re.sub(r'[^A-Za-z0-9]+', '_', os.path.basename(filename)) + with open(filename) as f: -raw, valid = re.findall(r'tcp://[^:]+:(\d+)', f.read()) -publishers[('%s.raw' % name, 'overall.raw')] = raw -publishers[('%s.valid' % name, 'overall.valid')] = valid +matches = re.findall(r'tcp://[^:]+:(\d+)', f.read()) +if len(matches) 1: +logger.debug(Reporting metrics for %s, filename) +raw = matches[0] +valid = matches[1] +publishers[('%s.raw' % name, 'overall.raw')] = raw +publishers[('%s.valid' % name, 'overall.valid')] = valid return publishers -- To view, visit https://gerrit.wikimedia.org/r/198254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I515d1362e5c3183d61e4b8cf7f129e2f5fca3348 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Nuria nu...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: force ssl protocol - change (operations/puppet)
John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/198268 Change subject: gdash: force ssl protocol .. gdash: force ssl protocol gdash is behind misc-web Change-Id: I29515ddd327179631eefc2323569ecd6e701e069 --- M templates/apache/sites/gdash.wikimedia.org.erb 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/198268/1 diff --git a/templates/apache/sites/gdash.wikimedia.org.erb b/templates/apache/sites/gdash.wikimedia.org.erb index 7a49588..1468928 100644 --- a/templates/apache/sites/gdash.wikimedia.org.erb +++ b/templates/apache/sites/gdash.wikimedia.org.erb @@ -2,6 +2,13 @@ # This file is managed by Puppet. VirtualHost *:80 ServerName gdash.wikimedia.org +ServerAdmin n...@wikimedia.org + +RewriteEngine On +RewriteCond %{HTTP:X-Forwarded-Proto} !https +RewriteCond %{REQUEST_URI} !^/status$ +RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,E=ProtoRedirect] +Header always merge Vary X-Forwarded-Proto env=ProtoRedirect Location / SetHandler uwsgi-handler -- To view, visit https://gerrit.wikimedia.org/r/198268 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29515ddd327179631eefc2323569ecd6e701e069 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis johnflewi...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-VisualEditor-qunit: To trusty/karma/chromium from prec... - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: mwext-VisualEditor-qunit: To trusty/karma/chromium from precise/phantomjs .. mwext-VisualEditor-qunit: To trusty/karma/chromium from precise/phantomjs Omitting other branches until mediawiki-core backports to support that are complete. Not switching to MySQL yet since that requires 'prepare-mediawiki' for extensions to be changed to support it first. Next! Bug: T74063 Change-Id: Ib4f0dcf8eb18a148bf239a5fc12ddf61f2089c90 --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 2 insertions(+), 24 deletions(-) Approvals: Krinkle: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index f4172a7..a5e1dc6 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -151,26 +151,6 @@ # This is a copy of '{name}-{ext-name}-qunit', but with processes ve's submodule # since Zuul cloner does not support git submodules. name: 'mwext-VisualEditor-qunit' -node: contintLabsSlave UbuntuPrecise -concurrent: true -triggers: - - zuul -builders: - - prepare-mediawiki: - ext-name: 'VisualEditor' - dependencies: 'Parsoid' - - shell: | - cd src/extensions/VisualEditor - git submodule update --init - git submodule status - git submodule foreach git clean -xdff -q - - qunit -publishers: - - qunit-cleanup - - mw-teardown - - archive-log-dir -- job-template: -name: 'mwext-VisualEditor-qunit-karma' node: contintLabsSlave UbuntuTrusty concurrent: true triggers: @@ -1244,7 +1224,6 @@ - '{name}-jsduck' - 'mwext-VisualEditor-sync-gerrit' - 'mwext-VisualEditor-qunit' - - 'mwext-VisualEditor-qunit-karma' - project: name: 'mwext-WikiLove' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index d2344f0..3a73dbb 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1764,8 +1764,8 @@ branch: ^(master)$ queue-name: mediawiki - - name: mwext-VisualEditor-qunit-karma -voting: false + - name: mwext-VisualEditor-qunit +branch: ^(master)$ - name: ^mwext-WikibaseJavaScriptApi-qunit$ voting: false @@ -6260,7 +6260,6 @@ test: - mwext-VisualEditor-npm - mwext-VisualEditor-jsduck - - mwext-VisualEditor-qunit-karma gate-and-submit: - mediawiki-gate - mwext-VisualEditor-npm -- To view, visit https://gerrit.wikimedia.org/r/198257 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4f0dcf8eb18a148bf239a5fc12ddf61f2089c90 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use public not isPublic when rendering checkbox - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/198271 Change subject: Use public not isPublic when rendering checkbox .. Use public not isPublic when rendering checkbox The property returned by API is 'public' Bug: T93372 Change-Id: Ie291fec875737fff79a7fb0db0e26cf7fcf69f64 --- M resources/ext.gather.collection.editor/content.hogan 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/71/198271/1 diff --git a/resources/ext.gather.collection.editor/content.hogan b/resources/ext.gather.collection.editor/content.hogan index 9145a97..94a3ab4 100644 --- a/resources/ext.gather.collection.editor/content.hogan +++ b/resources/ext.gather.collection.editor/content.hogan @@ -7,7 +7,7 @@ rows='2'{{description}}/textarea div class=mw-ui-checkbox input type=checkbox id=collection-editor-privacy - {{^isPublic}}checked{{/isPublic}} + {{^public}}checked{{/public}} disabled / label for=collection-editor-privacy{{privateLabel}}/label /div -- To view, visit https://gerrit.wikimedia.org/r/198271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie291fec875737fff79a7fb0db0e26cf7fcf69f64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialJavaScriptTest: Add export feature - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198273 Change subject: SpecialJavaScriptTest: Add export feature .. SpecialJavaScriptTest: Add export feature Add an 'export' subpage to SpecialJavaScriptTest which allows one to request a self-sufficient JavaScript payload that will bootstrap a ResourceLoader client and load the test suites. This is needed for using Karma (which only loads JavaScript, no full html pages). As such elements from the Skin and OutputPage will not exist. While all QUnit tests in MediaWiki core and most extensions I've seen already use #qunit-fixture, this is now required. This to prevent leakage of elements from one test to another, but it also prevents tests from depending on elements provided by the server. (cherry picked from commit ba50b32556fa1f2983c80cc6c06b5908f46f7cf4) Change-Id: I3d4d0df43bb426d9579eb0349b8b5477281a7cfc --- M includes/OutputPage.php M includes/specials/SpecialJavaScriptTest.php M languages/i18n/en.json M languages/i18n/qqq.json M resources/Resources.php M resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js M tests/qunit/QUnitTestResources.php 7 files changed, 190 insertions(+), 89 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/73/198273/1 diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 2f8094a..3568c31 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2743,7 +2743,7 @@ * call rather than a script src='...' tag. * @return string The html script, link and style tags */ - protected function makeResourceLoaderLink( $modules, $only, $useESI = false, + public function makeResourceLoaderLink( $modules, $only, $useESI = false, array $extraQuery = array(), $loadCall = false ) { $modules = (array)$modules; @@ -3153,7 +3153,7 @@ * have to be purged on configuration changes. * @return array */ - private function getJSVars() { + public function getJSVars() { global $wgContLang; $curRevisionId = 0; diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index 0efebb3..e31258a 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -26,12 +26,10 @@ */ class SpecialJavaScriptTest extends SpecialPage { /** -* @var array Mapping of framework ids and their initilizer methods -* in this class. If a framework is requested but not in this array, -* the 'unknownframework' error is served. +* @var array Supported frameworks. */ private static $frameworks = array( - 'qunit' = 'initQUnitTesting', + 'qunit', ); public function __construct() { @@ -44,43 +42,70 @@ $this-setHeaders(); $out-disallowUserJs(); + if ( $par === null ) { + // No framework specified + $out-setStatusCode( 404 ); + $out-setPageTitle( $this-msg( 'javascripttest' ) ); + $out-addHTML( + $this-msg( 'javascripttest-pagetext-noframework' )-parseAsBlock() + . $this-getFrameworkListHtml() + ); + return; + } + + // Determine framework and mode + $pars = explode( '/', $par, 2 ); + + $framework = $pars[0]; + if ( !in_array( $framework, self::$frameworks ) ) { + // Framework not found + $out-setStatusCode( 404 ); + $out-addHTML( + 'div class=error' + . $this-msg( 'javascripttest-pagetext-unknownframework' ) + -plaintextParams( $par )-parseAsBlock() + . '/div' + . $this-getFrameworkListHtml() + ); + return; + } + + // This special page is disabled by default ($wgEnableJavaScriptTest), and contains + // no sensitive data. In order to allow TestSwarm to embed it into a test client window, + // we need to allow iframing of this page. + $out-allowClickjacking(); + $out-setSubtitle( + $this-msg( 'javascripttest-backlink' ) + -rawParams( Linker::linkKnown( $this-getPageTitle() ) ) + ); + + // Custom actions + if ( isset( $pars[1] ) ) { + $action = $pars[1]; + if ( !in_array(
[MediaWiki-commits] [Gerrit] build: Add Karma task for automated QUnit testing in browsers - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198274 Change subject: build: Add Karma task for automated QUnit testing in browsers .. build: Add Karma task for automated QUnit testing in browsers To use, first run 'npm install'. Then run 'grunt qunit' to start the test suite in Chrome. Squashed cherry-picks from master: * 7605f112e4: jquery.mwExtension.test: Fix qunit-fixture conflict * 945c1efe37: build: Add Karma task * 8d92aaf83e: build: Clean up Gruntfile * 0ad7553228: build: Don't run jshint on empty skins dir * 2258f25053: build: Add assert-mw-env task * dcbbc0489c: build: Increase browserNoActivityTimeout to 60s * fa4ba8dbd7: build: Declare grunt-cli dependency Change-Id: I4e96da137340a28789b38940e75d4b6b8bc5d76a --- M Gruntfile.js M includes/specials/SpecialJavaScriptTest.php M package.json M tests/qunit/data/testrunner.js M tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js 5 files changed, 98 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/198274/1 diff --git a/Gruntfile.js b/Gruntfile.js index 375c3a2..f817780 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,6 +6,13 @@ grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-jscs' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-karma' ); + + var wgServer = process.env.MW_SERVER, + wgScriptPath = process.env.MW_SCRIPT_PATH, + karmaProxy = {}; + + karmaProxy[wgScriptPath] = wgServer + wgScriptPath; grunt.initConfig( { pkg: grunt.file.readJSON( 'package.json' ), @@ -15,7 +22,7 @@ }, all: [ '*.js', - '{includes,languages,resources,skins,tests}/**/*.js' + '{includes,languages,resources,tests}/**/*.js' ] }, jscs: { @@ -56,6 +63,29 @@ ], tasks: 'test' }, + karma: { + options: { + proxies: karmaProxy, + files: [ { + pattern: wgServer + wgScriptPath + '/index.php?title=Special:JavaScriptTest/qunit/export', + watched: false, + included: true, + served: false + } ], + frameworks: [ 'qunit' ], + reporters: [ 'dots' ], + singleRun: true, + autoWatch: false, + // Some tests in extensions don't yield for more than the default 10s (T89075) + browserNoActivityTimeout: 60 * 1000 + }, + main: { + browsers: [ 'Chrome' ] + }, + more: { + browsers: [ 'Chrome', 'Firefox' ] + } + }, copy: { jsduck: { src: 'resources/**/*', @@ -68,7 +98,22 @@ } } ); + grunt.registerTask( 'assert-mw-env', function () { + if ( !process.env.MW_SERVER ) { + grunt.log.error( 'Environment variable MW_SERVER must be set.\n' + + 'Set this like $wgServer, e.g. http://localhost;' + ); + } + if ( !process.env.MW_SCRIPT_PATH ) { + grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' + + 'Set this like $wgScriptPath, e.g. /w'); + } + return !!( process.env.MW_SERVER process.env.MW_SCRIPT_PATH ); + } ); + grunt.registerTask( 'lint', ['jshint', 'jscs', 'jsonlint', 'banana'] ); + grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] ); + grunt.registerTask( 'test', ['lint'] ); - grunt.registerTask( 'default', ['test'] ); + grunt.registerTask( 'default', 'test' ); }; diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index e31258a..7d745a5 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -161,7 +161,6 @@ $baseHtml = HTML div class=mw-content-ltr div id=qunit/div -div id=qunit-fixture/div /div HTML; @@ -262,7 +261,6 @@ titleQUnit/title $head div id=qunit/div -div id=qunit-fixture/div HTML;
[MediaWiki-commits] [Gerrit] depool cp1058 be - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: depool cp1058 be .. depool cp1058 be Change-Id: Id40436fdbdfa4296b5001eec5dcc0f9e4cac405c --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 05cf5dd..70270e5 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -197,7 +197,7 @@ 'parsoid' = { 'eqiad' = [ 'cp1045.eqiad.wmnet', - 'cp1058.eqiad.wmnet', # needs-jessie-install + # 'cp1058.eqiad.wmnet', # needs-jessie-install ], 'esams' = [], 'ulsfo' = [] -- To view, visit https://gerrit.wikimedia.org/r/198272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id40436fdbdfa4296b5001eec5dcc0f9e4cac405c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] FieldsetLayout: Add description and example - change (oojs/ui)
Kmenger has uploaded a new change for review. https://gerrit.wikimedia.org/r/198275 Change subject: FieldsetLayout: Add description and example .. FieldsetLayout: Add description and example Change-Id: Ic9a27a7ecff87d84dc9479b7a21f5ad7c3e2aa9f --- M src/layouts/FieldsetLayout.js 1 file changed, 30 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/75/198275/1 diff --git a/src/layouts/FieldsetLayout.js b/src/layouts/FieldsetLayout.js index a3b14f4..1a21e8e 100644 --- a/src/layouts/FieldsetLayout.js +++ b/src/layouts/FieldsetLayout.js @@ -1,7 +1,34 @@ /** - * Layout made of a fieldset and optional legend. + * FieldsetLayouts are composed of one or more {@link OO.ui.FieldLayout FieldLayouts}, + * which each contain an individual widget and, optionally, a label. Each Fieldset can be + * configured with a label as well. For more information and examples, + * please see the [OOjs UI documentation on MediaWiki][1]. * - * Just add OO.ui.FieldLayout items. + * @example + * // Example of a fieldset layout + * var input1 = new OO.ui.TextInputWidget( { + * placeholder: 'A text input field' + * } ); + * + * var input2 = new OO.ui.TextInputWidget( { + * placeholder: 'A text input field' + * } ); + * + * var fieldset = new OO.ui.FieldsetLayout( { + * label: 'Example of a fieldset layout' + * } ); + * + * fieldset.addItems( [ + * new OO.ui.FieldLayout( input1, { + * label: 'Field One' + * } ), + * new OO.ui.FieldLayout( input2, { + * label: 'Field Two' + * } ) + * ] ); + * $( 'body' ).append( fieldset.$element ); + * + * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Layouts/Fields_and_Fieldsets * * @class * @extends OO.ui.Layout @@ -11,7 +38,7 @@ * * @constructor * @param {Object} [config] Configuration options - * @cfg {OO.ui.FieldLayout[]} [items] Items to add + * @cfg {OO.ui.FieldLayout[]} [items] An array of fields to add to the fieldset. See OO.ui.FieldLayout for more information about fields. */ OO.ui.FieldsetLayout = function OoUiFieldsetLayout( config ) { // Configuration initialization -- To view, visit https://gerrit.wikimedia.org/r/198275 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9a27a7ecff87d84dc9479b7a21f5ad7c3e2aa9f Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Kmenger kmen...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce mediawiki.template.hogan in preparation for templa... - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/198277 Change subject: Introduce mediawiki.template.hogan in preparation for templates in core .. Introduce mediawiki.template.hogan in preparation for templates in core This is needed to enable the hogan template module. Change-Id: I4fdde046c0ec06418598eef3042d28e33f5eda2b --- M includes/Resources.php 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/77/198277/1 diff --git a/includes/Resources.php b/includes/Resources.php index 02c4c0e..8412b9c 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -214,7 +214,7 @@ 'mobile-frontend-last-modified-with-user-just-now', ), ), - 'mobile.templates' = $wgMFResourceFileModuleBoilerplate + array( + 'mediawiki.template.hogan' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mediawiki.template', ), @@ -224,6 +224,13 @@ ), ), + // Back-compat alias + // FIXME: Remove when templates in core. + 'mobile.templates' = $wgMFResourceFileModuleBoilerplate + array( + 'dependencies' = array( + 'mediawiki.template.hogan', + ), + ), 'mobile.pagelist.scripts' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.watchstar', -- To view, visit https://gerrit.wikimedia.org/r/198277 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4fdde046c0ec06418598eef3042d28e33f5eda2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix webkit column hack - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/198279 Change subject: Fix webkit column hack .. Fix webkit column hack * Was checking for 'size' (which doesn't exist) instead of 'width' * The default value is 'auto', which isn't falsey. As a result the webkit hack was triggering on all focusables. Bug: T93322 Change-Id: Id361221bba9ea9f20c57eedeea6939bb48107727 (cherry picked from commit 2d14f7acd28787eb4bebc8ae7b02d95122e01cb8) --- M src/ce/ve.ce.FocusableNode.js 1 file changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/79/198279/1 diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js index 42d857c..f9ad510 100644 --- a/src/ce/ve.ce.FocusableNode.js +++ b/src/ce/ve.ce.FocusableNode.js @@ -406,7 +406,7 @@ * Calculate position of highlights */ ve.ce.FocusableNode.prototype.calculateHighlights = function () { - var i, l, $set, + var i, l, $set, columnCount, columnWidth, rects = [], filteredRects = [], webkitColumns = 'webkitColumnCount' in document.createElement( 'div' ).style, @@ -427,27 +427,28 @@ return; } - if ( - webkitColumns - ( $el.css( '-webkit-column-count' ) || $el.css( '-webkit-column-size' ) ) - ) { - // Chrome incorrectly measures children of nodes with columns [1], let's - // just ignore them rather than render a possibly bizarre highlight. They - // will usually not be positioned, because Chrome also doesn't position - // them correctly [2] and so people avoid doing it. - // - // Of course there are other ways to render a node outside the bounding - // box of its parent, like negative margin. We do not handle these cases, - // and the highlight may not correctly cover the entire node if that - // happens. This can't be worked around without implementing CSS - // layouting logic ourselves, which is not worth it. - // - // [1] http://code.google.com/p/chromium/issues/detail?id=391271 - // [2] https://code.google.com/p/chromium/issues/detail?id=291616 + if ( webkitColumns ) { + columnCount = $el.css( '-webkit-column-count' ); + columnWidth = $el.css( '-webkit-column-width' ); + if ( ( columnCount columnCount !== 'auto' ) || ( columnWidth columnWidth !== 'auto' ) ) { + // Chrome incorrectly measures children of nodes with columns [1], let's + // just ignore them rather than render a possibly bizarre highlight. They + // will usually not be positioned, because Chrome also doesn't position + // them correctly [2] and so people avoid doing it. + // + // Of course there are other ways to render a node outside the bounding + // box of its parent, like negative margin. We do not handle these cases, + // and the highlight may not correctly cover the entire node if that + // happens. This can't be worked around without implementing CSS + // layouting logic ourselves, which is not worth it. + // + // [1] https://code.google.com/p/chromium/issues/detail?id=391271 + // [2] https://code.google.com/p/chromium/issues/detail?id=291616 - // jQuery keeps nodes in its collections in document order, so the - // children have not been processed yet and can be safely removed. - $set = $set.not( $el.find( '*' ) ); + // jQuery keeps nodes in its collections in document order, so the + // children have not been processed yet and can be safely removed. + $set = $set.not( $el.find( '*' ) ); + } } clientRects = el.getClientRects(); -- To view, visit https://gerrit.wikimedia.org/r/198279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id361221bba9ea9f20c57eedeea6939bb48107727 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Jforrester
[MediaWiki-commits] [Gerrit] SpecialJavaScriptTest: Add export feature - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: SpecialJavaScriptTest: Add export feature .. SpecialJavaScriptTest: Add export feature Add an 'export' subpage to SpecialJavaScriptTest which allows one to request a self-sufficient JavaScript payload that will bootstrap a ResourceLoader client and load the test suites. This is needed for using Karma (which only loads JavaScript, no full html pages). As such elements from the Skin and OutputPage will not exist. While all QUnit tests in MediaWiki core and most extensions I've seen already use #qunit-fixture, this is now required. This to prevent leakage of elements from one test to another, but it also prevents tests from depending on elements provided by the server. (cherry picked from commit ba50b32556fa1f2983c80cc6c06b5908f46f7cf4) Change-Id: I3d4d0df43bb426d9579eb0349b8b5477281a7cfc --- M includes/OutputPage.php M includes/specials/SpecialJavaScriptTest.php M languages/i18n/en.json M languages/i18n/qqq.json M resources/Resources.php M resources/src/mediawiki.special/mediawiki.special.javaScriptTest.js M tests/qunit/QUnitTestResources.php 7 files changed, 190 insertions(+), 89 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 2f8094a..3568c31 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2743,7 +2743,7 @@ * call rather than a script src='...' tag. * @return string The html script, link and style tags */ - protected function makeResourceLoaderLink( $modules, $only, $useESI = false, + public function makeResourceLoaderLink( $modules, $only, $useESI = false, array $extraQuery = array(), $loadCall = false ) { $modules = (array)$modules; @@ -3153,7 +3153,7 @@ * have to be purged on configuration changes. * @return array */ - private function getJSVars() { + public function getJSVars() { global $wgContLang; $curRevisionId = 0; diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index 0efebb3..e31258a 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -26,12 +26,10 @@ */ class SpecialJavaScriptTest extends SpecialPage { /** -* @var array Mapping of framework ids and their initilizer methods -* in this class. If a framework is requested but not in this array, -* the 'unknownframework' error is served. +* @var array Supported frameworks. */ private static $frameworks = array( - 'qunit' = 'initQUnitTesting', + 'qunit', ); public function __construct() { @@ -44,43 +42,70 @@ $this-setHeaders(); $out-disallowUserJs(); + if ( $par === null ) { + // No framework specified + $out-setStatusCode( 404 ); + $out-setPageTitle( $this-msg( 'javascripttest' ) ); + $out-addHTML( + $this-msg( 'javascripttest-pagetext-noframework' )-parseAsBlock() + . $this-getFrameworkListHtml() + ); + return; + } + + // Determine framework and mode + $pars = explode( '/', $par, 2 ); + + $framework = $pars[0]; + if ( !in_array( $framework, self::$frameworks ) ) { + // Framework not found + $out-setStatusCode( 404 ); + $out-addHTML( + 'div class=error' + . $this-msg( 'javascripttest-pagetext-unknownframework' ) + -plaintextParams( $par )-parseAsBlock() + . '/div' + . $this-getFrameworkListHtml() + ); + return; + } + + // This special page is disabled by default ($wgEnableJavaScriptTest), and contains + // no sensitive data. In order to allow TestSwarm to embed it into a test client window, + // we need to allow iframing of this page. + $out-allowClickjacking(); + $out-setSubtitle( + $this-msg( 'javascripttest-backlink' ) + -rawParams( Linker::linkKnown( $this-getPageTitle() ) ) + ); + + // Custom actions + if ( isset( $pars[1] ) ) { + $action = $pars[1]; + if ( !in_array( $action, array( 'export', 'plain' ) ) ) {
[MediaWiki-commits] [Gerrit] Re-enable mediawiki qunit job for wmf and release branches - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Re-enable mediawiki qunit job for wmf and release branches .. Re-enable mediawiki qunit job for wmf and release branches It was temporarily disabled as the implementation was changed to Karma, which needed backporting to release branches. Supported: * master * 1.25wmf21 * 1.25wmf22 * REL1_24 * REL1_23 Other wmf and release branches are no longer active. Except for 1.19, which is therefore blacklisted. In MediaWiki 1.19 our QUnit test suite was still experimental and did not pass. Change-Id: I82d13cb869c1bc51db8b764f20680e1dbbcb39e6 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3a73dbb..ff0a2fb 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1761,11 +1761,8 @@ queue-name: mediawiki - name: mediawiki-core-qunit -branch: ^(master)$ +branch: (?!REL1_19) queue-name: mediawiki - - - name: mwext-VisualEditor-qunit -branch: ^(master)$ - name: ^mwext-WikibaseJavaScriptApi-qunit$ voting: false -- To view, visit https://gerrit.wikimedia.org/r/198276 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82d13cb869c1bc51db8b764f20680e1dbbcb39e6 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce mediawiki.template.hogan in preparation for templa... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Introduce mediawiki.template.hogan in preparation for templates in core .. Introduce mediawiki.template.hogan in preparation for templates in core This is needed to enable the hogan template module. Change-Id: I4fdde046c0ec06418598eef3042d28e33f5eda2b --- M includes/Resources.php 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 02c4c0e..8412b9c 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -214,7 +214,7 @@ 'mobile-frontend-last-modified-with-user-just-now', ), ), - 'mobile.templates' = $wgMFResourceFileModuleBoilerplate + array( + 'mediawiki.template.hogan' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mediawiki.template', ), @@ -224,6 +224,13 @@ ), ), + // Back-compat alias + // FIXME: Remove when templates in core. + 'mobile.templates' = $wgMFResourceFileModuleBoilerplate + array( + 'dependencies' = array( + 'mediawiki.template.hogan', + ), + ), 'mobile.pagelist.scripts' = $wgMFResourceFileModuleBoilerplate + array( 'dependencies' = array( 'mobile.watchstar', -- To view, visit https://gerrit.wikimedia.org/r/198277 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4fdde046c0ec06418598eef3042d28e33f5eda2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Kaldari rkald...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove util.query and use core functions - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove util.query and use core functions .. Hygiene: Remove util.query and use core functions Don't introduce new functions, which are already in core. This would fix the problem, that you have + as spaces in alphas search bar (alpha without the new header/mobilemenu). mw.util.getParamValue does exactly what we want, is maintained by mediawikic ore team and escapes the values correctly. Change-Id: Iab3963ff32e961e5942007fa733a03120d9032e7 --- M javascripts/modules/editor/init.js M javascripts/modules/search/init.js M javascripts/modules/tutorials/init.js M javascripts/specials/watchlist.js M javascripts/util.js 5 files changed, 9 insertions(+), 41 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/javascripts/modules/editor/init.js b/javascripts/modules/editor/init.js index f8dcd4a..e2634fc 100644 --- a/javascripts/modules/editor/init.js +++ b/javascripts/modules/editor/init.js @@ -2,11 +2,9 @@ var settings = M.require( 'settings' ), - util = M.require( 'util' ), router = M.require( 'router' ), overlayManager = M.require( 'overlayManager' ), loader = M.require( 'loader' ), - query = util.query, Icon = M.require( 'Icon' ), disabledEditIcon = new Icon( { name: 'edit' @@ -126,7 +124,7 @@ function setupEditor( page ) { var isNewPage = page.options.id === 0; - if ( query.undo ) { + if ( mw.util.getParamValue( 'undo' ) ) { window.alert( mw.msg( 'mobile-frontend-editor-undo-unsupported' ) ); } @@ -139,7 +137,7 @@ isAnon: user.isAnon(), isNewPage: isNewPage, isNewEditor: user.getEditCount() === 0, - oldId: query.oldid, + oldId: mw.util.getParamValue( 'oldid' ), funnel: funnel || 'article', // FIXME: cache this selector, it's used more than once contentLang: $( '#content' ).attr( 'lang' ), diff --git a/javascripts/modules/search/init.js b/javascripts/modules/search/init.js index 9c0f924..c97a55e 100644 --- a/javascripts/modules/search/init.js +++ b/javascripts/modules/search/init.js @@ -3,8 +3,6 @@ var SearchOverlay = M.require( 'modules/search/SearchOverlay' ), SchemaMobileWebClickTracking = M.require( 'loggingSchemas/SchemaMobileWebClickTracking' ), uiSchema = new SchemaMobileWebClickTracking( {}, 'MobileWebUIClickTracking' ), - util = M.require( 'util' ), - query = util.query, context = M.require( 'context' ), router = M.require( 'router' ), browser = M.require( 'browser' ); @@ -16,7 +14,7 @@ */ function openSearchOverlay( ev ) { // in alpha we are dealing with an 'a', not an 'input' - var searchTerm = ( context.isAlphaGroupMember() ) ? query.search : $( this ).val(); + var searchTerm = ( context.isAlphaGroupMember() ) ? mw.util.getParamValue( 'search' ) : $( this ).val(); ev.preventDefault(); uiSchema.log( { diff --git a/javascripts/modules/tutorials/init.js b/javascripts/modules/tutorials/init.js index b7c8f07..d18d28c 100644 --- a/javascripts/modules/tutorials/init.js +++ b/javascripts/modules/tutorials/init.js @@ -14,7 +14,6 @@ var PageActionOverlay = M.require( 'modules/tutorials/PageActionOverlay' ), util = M.require( 'util' ), escapeHash = util.escapeHash, - query = util.query, inEditor = window.location.hash.indexOf( '#editor/' ) -1, hash = window.location.hash, editOverlay, target, $target, href; @@ -25,7 +24,7 @@ * @returns {Boolean} */ function shouldShowLeftNavEditTutorial() { - return query.campaign === 'leftNavSignup' + return mw.util.getParamValue( 'campaign' ) === 'leftNavSignup' mw.config.get( 'wgNamespaceNumber' ) === 0 !inEditor; } @@ -35,7 +34,7 @@ * @returns {Boolean} */ function shouldShowTutorial() { - var shouldShowEditTutorial = query.article_action === 'signup-edit' !inEditor; + var shouldShowEditTutorial = mw.util.getParamValue( 'article_action' ) === 'signup-edit' !inEditor; return shouldShowEditTutorial ||
[MediaWiki-commits] [Gerrit] FieldLayout: Clarify description and mark private methods - change (oojs/ui)
Kmenger has uploaded a new change for review. https://gerrit.wikimedia.org/r/198281 Change subject: FieldLayout: Clarify description and mark private methods .. FieldLayout: Clarify description and mark private methods Change-Id: Ic359784bd5de7bf622567741bfde3282d6f9c11c --- M src/layouts/FieldLayout.js 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/198281/1 diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js index 0d50dbd..8638574 100644 --- a/src/layouts/FieldLayout.js +++ b/src/layouts/FieldLayout.js @@ -25,8 +25,9 @@ * @constructor * @param {OO.ui.Widget} fieldWidget Field widget * @param {Object} [config] Configuration options - * @cfg {string} [align='left'] Alignment mode, either 'left', 'right', 'top' or 'inline' - * @cfg {string} [help] Explanatory text shown as a '?' icon. + * @cfg {string} [align='left'] Alignment of the label: 'left', 'right', 'top' or 'inline' + * @cfg {string} [help] Help text. When help text is specified, a help icon will appear + * in the upper-right corner of the rendered field. */ OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) { // Allow passing positional parameters inside the config object @@ -97,6 +98,7 @@ /** * Handle field disable events. * + * @private * @param {boolean} value Field is disabled */ OO.ui.FieldLayout.prototype.onFieldDisable = function ( value ) { @@ -106,6 +108,7 @@ /** * Handle label mouse click events. * + * @private * @param {jQuery.Event} e Mouse click event */ OO.ui.FieldLayout.prototype.onLabelClick = function () { @@ -114,7 +117,7 @@ }; /** - * Get the field. + * Get the widget contained by the field. * * @return {OO.ui.Widget} Field widget */ -- To view, visit https://gerrit.wikimedia.org/r/198281 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic359784bd5de7bf622567741bfde3282d6f9c11c Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Kmenger kmen...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Add Karma task for automated QUnit testing in browsers - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: build: Add Karma task for automated QUnit testing in browsers .. build: Add Karma task for automated QUnit testing in browsers To use, first run 'npm install'. Then run 'grunt qunit' to start the test suite in Chrome. Squashed cherry-picks from master: * 7605f112e4: jquery.mwExtension.test: Fix qunit-fixture conflict * 365b6f3af9: mediawiki.jqueryMsg.test: Fix crazy concurrency * 945c1efe37: build: Add Karma task * 8d92aaf83e: build: Clean up Gruntfile * 0ad7553228: build: Don't run jshint on empty skins dir * 2258f25053: build: Add assert-mw-env task * dcbbc0489c: build: Increase browserNoActivityTimeout to 60s * fa4ba8dbd7: build: Declare grunt-cli dependency Change-Id: I4e96da137340a28789b38940e75d4b6b8bc5d76a --- M Gruntfile.js M includes/specials/SpecialJavaScriptTest.php M package.json M tests/qunit/data/testrunner.js M tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js M tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js 6 files changed, 188 insertions(+), 84 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index 375c3a2..f817780 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,6 +6,13 @@ grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-jscs' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-karma' ); + + var wgServer = process.env.MW_SERVER, + wgScriptPath = process.env.MW_SCRIPT_PATH, + karmaProxy = {}; + + karmaProxy[wgScriptPath] = wgServer + wgScriptPath; grunt.initConfig( { pkg: grunt.file.readJSON( 'package.json' ), @@ -15,7 +22,7 @@ }, all: [ '*.js', - '{includes,languages,resources,skins,tests}/**/*.js' + '{includes,languages,resources,tests}/**/*.js' ] }, jscs: { @@ -56,6 +63,29 @@ ], tasks: 'test' }, + karma: { + options: { + proxies: karmaProxy, + files: [ { + pattern: wgServer + wgScriptPath + '/index.php?title=Special:JavaScriptTest/qunit/export', + watched: false, + included: true, + served: false + } ], + frameworks: [ 'qunit' ], + reporters: [ 'dots' ], + singleRun: true, + autoWatch: false, + // Some tests in extensions don't yield for more than the default 10s (T89075) + browserNoActivityTimeout: 60 * 1000 + }, + main: { + browsers: [ 'Chrome' ] + }, + more: { + browsers: [ 'Chrome', 'Firefox' ] + } + }, copy: { jsduck: { src: 'resources/**/*', @@ -68,7 +98,22 @@ } } ); + grunt.registerTask( 'assert-mw-env', function () { + if ( !process.env.MW_SERVER ) { + grunt.log.error( 'Environment variable MW_SERVER must be set.\n' + + 'Set this like $wgServer, e.g. http://localhost;' + ); + } + if ( !process.env.MW_SCRIPT_PATH ) { + grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' + + 'Set this like $wgScriptPath, e.g. /w'); + } + return !!( process.env.MW_SERVER process.env.MW_SCRIPT_PATH ); + } ); + grunt.registerTask( 'lint', ['jshint', 'jscs', 'jsonlint', 'banana'] ); + grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] ); + grunt.registerTask( 'test', ['lint'] ); - grunt.registerTask( 'default', ['test'] ); + grunt.registerTask( 'default', 'test' ); }; diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index e31258a..7d745a5 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -161,7 +161,6 @@ $baseHtml = HTML div class=mw-content-ltr div id=qunit/div -div id=qunit-fixture/div /div HTML; @@ -262,7
[MediaWiki-commits] [Gerrit] wrong reverse entry for subra - change (operations/dns)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/198282 Change subject: wrong reverse entry for subra .. wrong reverse entry for subra it was cut and paste of suhail and didnt change the name, opps. T93261 Change-Id: Ib455b424a017f90837a86c7e856f4cae6579a53b --- M templates/10.in-addr.arpa 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/82/198282/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index dd6dd81..59e7155 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -2765,7 +2765,7 @@ 121 1H IN PTR eventlog2001.codfw.wmnet. 122 1H IN PTR rdb2003.codfw.wmnet. 123 1H IN PTR rdb2004.codfw.wmnet. -124 1H IN PTR suhail.codfw.wmnet. +124 1H IN PTR subra.codfw.wmnet. $ORIGIN 17.192.{{ zonename }}. 1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/198282 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib455b424a017f90837a86c7e856f4cae6579a53b Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool cp1058 - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/198283 Change subject: repool cp1058 .. repool cp1058 Change-Id: I55c1dba5cd00b2ac1a5f25c5ebf91855ab18b859 --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/83/198283/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 8ee4207..5f2823a 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -197,7 +197,7 @@ 'parsoid' = { 'eqiad' = [ 'cp1045.eqiad.wmnet', - # 'cp1058.eqiad.wmnet', # needs-jessie-install + 'cp1058.eqiad.wmnet', ], 'esams' = [], 'ulsfo' = [] -- To view, visit https://gerrit.wikimedia.org/r/198283 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55c1dba5cd00b2ac1a5f25c5ebf91855ab18b859 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wrong reverse entry for subra - change (operations/dns)
RobH has submitted this change and it was merged. Change subject: wrong reverse entry for subra .. wrong reverse entry for subra it was cut and paste of suhail and didnt change the name, opps. T93261 Change-Id: Ib455b424a017f90837a86c7e856f4cae6579a53b --- M templates/10.in-addr.arpa 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index dd6dd81..59e7155 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -2765,7 +2765,7 @@ 121 1H IN PTR eventlog2001.codfw.wmnet. 122 1H IN PTR rdb2003.codfw.wmnet. 123 1H IN PTR rdb2004.codfw.wmnet. -124 1H IN PTR suhail.codfw.wmnet. +124 1H IN PTR subra.codfw.wmnet. $ORIGIN 17.192.{{ zonename }}. 1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/198282 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib455b424a017f90837a86c7e856f4cae6579a53b Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH r...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Loosen restrictions for certain searches - change (mediawiki...CirrusSearch)
Jdouglas has uploaded a new change for review. https://gerrit.wikimedia.org/r/198284 Change subject: Loosen restrictions for certain searches .. Loosen restrictions for certain searches When searching for intitle:Theophan intitle:R* and expecting to find Theophan the Recluse, we need to relax restrictions for results to come back: It is too restrictive to *both* rewrite a multi term query to include only the top 128 terms *and* require all the terms (via boolean AND operations), so we need to pick only one of the two. This patch makes two changes: 1. The filters favor the latter, dropping the rewrite. 2. The text queries retain the rewrite, but allow a default OR Change-Id: I6c5529a1e5ea08eac71c7365a4681a9fd8770ec6 --- M includes/Search/Filters.php M includes/Searcher.php 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/84/198284/1 diff --git a/includes/Search/Filters.php b/includes/Search/Filters.php index 45f5c96..dc8d7a1 100644 --- a/includes/Search/Filters.php +++ b/includes/Search/Filters.php @@ -146,7 +146,6 @@ $query-setDefaultOperator( 'AND' ); $query-setAllowLeadingWildcard( false ); $query-setFuzzyPrefixLength( 2 ); - $query-setRewrite( 'top_terms_128' ); $wrappedQuery = $searcher-wrapInSaferIfPossible( $query, false ); $updateReferences = diff --git a/includes/Searcher.php b/includes/Searcher.php index 2c0ba8a..6045caf 100644 --- a/includes/Searcher.php +++ b/includes/Searcher.php @@ -1150,7 +1150,6 @@ $query-setFields( $fields ); $query-setAutoGeneratePhraseQueries( true ); $query-setPhraseSlop( $phraseSlop ); - $query-setDefaultOperator( 'AND' ); $query-setAllowLeadingWildcard( false ); $query-setFuzzyPrefixLength( 2 ); $query-setRewrite( 'top_terms_128' ); -- To view, visit https://gerrit.wikimedia.org/r/198284 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c5529a1e5ea08eac71c7365a4681a9fd8770ec6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Jdouglas jdoug...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zoom out PayPal integration tests - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Zoom out PayPal integration tests .. Zoom out PayPal integration tests Use the doPayment API rather than specific APIs, to test one more level of context. Change-Id: Ia6630a90156d7f982201f6539de1bd5d0a9e9ee7 --- M tests/Adapter/PayPal/PayPalTest.php M tests/includes/test_gateway/TestingPaypalAdapter.php 2 files changed, 32 insertions(+), 15 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/Adapter/PayPal/PayPalTest.php b/tests/Adapter/PayPal/PayPalTest.php index ed40434..9a95484 100644 --- a/tests/Adapter/PayPal/PayPalTest.php +++ b/tests/Adapter/PayPal/PayPalTest.php @@ -33,6 +33,12 @@ $this-testAdapterClass = 'TestingPaypalAdapter'; } + public function tearDown() { + TestingPaypalAdapter::$fakeGlobals = array(); + + parent::tearDown(); + } + /** * Integration test to verify that the Donate transaction works as expected when all necessary data is present. */ @@ -40,8 +46,8 @@ $init = $this-getDonorTestData(); $gateway = $this-getFreshGatewayObject( $init ); - $ret = $gateway-do_transaction( 'Donate' ); - parse_str( parse_url( $ret['redirect'], PHP_URL_QUERY ), $res ); + $ret = $gateway-doPayment(); + parse_str( parse_url( $ret-getRedirect(), PHP_URL_QUERY ), $res ); $expected = array ( 'amount' = $init['amount'], @@ -66,13 +72,12 @@ * Integration test to verify that the DonateRecurring transaction works as expected when all necessary data is present. */ function testDoTransactionDonateRecurring() { - global $wgPaypalGatewayRecurringLength; - $init = $this-getDonorTestData(); + $init['recurring'] = '1'; $gateway = $this-getFreshGatewayObject( $init ); - $ret = $gateway-do_transaction( 'DonateRecurring' ); - parse_str( parse_url( $ret['redirect'], PHP_URL_QUERY ), $res ); + $ret = $gateway-doPayment(); + parse_str( parse_url( $ret-getRedirect(), PHP_URL_QUERY ), $res ); $expected = array ( 'a3' = $init['amount'], //obviously. @@ -101,10 +106,15 @@ */ function testDoTransactionDonateXclick() { $init = $this-getDonorTestData(); + + TestingPaypalAdapter::$fakeGlobals = array( + 'XclickCountries' = array( $init['country'] ), + ); + $gateway = $this-getFreshGatewayObject( $init ); - $ret = $gateway-do_transaction( 'DonateXclick' ); - parse_str( parse_url( $ret['redirect'], PHP_URL_QUERY ), $res ); + $ret = $gateway-doPayment(); + parse_str( parse_url( $ret-getRedirect(), PHP_URL_QUERY ), $res ); $expected = array ( 'amount' = $init['amount'], @@ -151,7 +161,6 @@ */ function testShowFormOnError() { $init = $this-getDonorTestData(); - $init['OTT'] = 'SALT123456789'; $init['amount'] = '-100.00'; $_SESSION['Donor'] = $init; $errorMessage = wfMessage('donate_interface-error-msg-field-correction', wfMessage('donate_interface-error-msg-amount')-text())-text(); @@ -175,8 +184,8 @@ $this-setLanguage( $language ); $gateway = $this-getFreshGatewayObject( $init ); $donateText = wfMessage( 'donate_interface-donation-description' )-inLanguage( $language )-text(); - $ret = $gateway-do_transaction( 'Donate' ); - parse_str( parse_url( $ret['redirect'], PHP_URL_QUERY ), $res ); + $ret = $gateway-doPayment(); + parse_str( parse_url( $ret-getRedirect(), PHP_URL_QUERY ), $res ); $expected = array ( 'amount' = $init['amount'], @@ -209,8 +218,8 @@ $this-setLanguage( $language ); $gateway = $this-getFreshGatewayObject( $init ); $donateText = wfMessage( 'donate_interface-donation-description' )-inLanguage( $language )-text(); - $ret = $gateway-do_transaction( 'Donate' ); - parse_str( parse_url( $ret['redirect'], PHP_URL_QUERY ), $res ); + $ret = $gateway-doPayment(); + parse_str( parse_url( $ret-getRedirect(), PHP_URL_QUERY ), $res ); $expected = array ( 'amount' = $init['amount'], @@ -239,8 +248,8 @@ $this-setLanguage( 'it' ); $gateway = $this-getFreshGatewayObject( $init ); $donateText = wfMessage(
[MediaWiki-commits] [Gerrit] build: Increase qunit browserNoActivityTimeout from 10s to 60s - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: build: Increase qunit browserNoActivityTimeout from 10s to 60s .. build: Increase qunit browserNoActivityTimeout from 10s to 60s Bug: T89075 Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac (cherry picked from commit dcbbc0489c5239a8dc4f21da3ff1037368f60e45) --- M Gruntfile.js 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index a292d0b..f3183e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,7 +76,9 @@ frameworks: [ 'qunit' ], reporters: [ 'dots' ], singleRun: true, - autoWatch: false + autoWatch: false, + // Some tests in extensions don't yield for more than the default 10s (T89075) + browserNoActivityTimeout: 60 * 1000 }, main: { browsers: [ 'Chrome' ] -- To view, visit https://gerrit.wikimedia.org/r/198260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Increase qunit browserNoActivityTimeout from 10s to 60s - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: build: Increase qunit browserNoActivityTimeout from 10s to 60s .. build: Increase qunit browserNoActivityTimeout from 10s to 60s Bug: T89075 Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac (cherry picked from commit dcbbc0489c5239a8dc4f21da3ff1037368f60e45) --- M Gruntfile.js 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index a292d0b..f3183e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,7 +76,9 @@ frameworks: [ 'qunit' ], reporters: [ 'dots' ], singleRun: true, - autoWatch: false + autoWatch: false, + // Some tests in extensions don't yield for more than the default 10s (T89075) + browserNoActivityTimeout: 60 * 1000 }, main: { browsers: [ 'Chrome' ] -- To view, visit https://gerrit.wikimedia.org/r/198259 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Declare grunt-cli dependency - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: build: Declare grunt-cli dependency .. build: Declare grunt-cli dependency A long time ago, npm did not support using command line programs within 'npm test' (not unless harcoding a path to node_modules/bin/... within packages.json/scripts/test). But this has been long supported. Declaring a (dev)dependency will provide its binaries to the PATH used by the subshell 'npm test' creates internally. Add grunt-cli so that developers don't have to manually install it. Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 (cherry picked from commit fa4ba8dbd7519a817dad75994ed31a3fc34c6f96) --- M package.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 076582b..933212c 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, devDependencies: { grunt: 0.4.5, +grunt-cli: 0.1.13, grunt-banana-checker: 0.2.0, grunt-contrib-copy: 0.8.0, grunt-contrib-jshint: 0.11.0, -- To view, visit https://gerrit.wikimedia.org/r/198264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Allow access to surface through window man... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BREAKING CHANGE] Allow access to surface through window manager .. [BREAKING CHANGE] Allow access to surface through window manager We've been back and forth on this, but we really just need a way for inspectors to be able to open dialogs. Bonus: Re-use the dialog manager for the language inspector's language selection dialog. Change-Id: I3d9caef38755eb39c97e7ce35f7559ee7efdff0b (cherry picked from commit 37ac76370a564e2b987f9e87b4767af7086e456a) --- M .jsduck/eg-iframe.html M build/modules.json M demos/ve/desktop.html M demos/ve/mobile.html M src/ui/inspectors/ve.ui.LanguageInspector.js M src/ui/ve.ui.DesktopContext.js M src/ui/ve.ui.DesktopSurface.js M src/ui/ve.ui.MobileContext.js M src/ui/ve.ui.MobileSurface.js M src/ui/ve.ui.Surface.js M src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js M src/ui/windowmanagers/ve.ui.MobileWindowManager.js A src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js M src/ui/windowmanagers/ve.ui.ToolbarDialogWindowManager.js M tests/index.html 15 files changed, 71 insertions(+), 18 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 00bf7b6..8ce6c4c 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -319,6 +319,7 @@ script src=../src/ui/ve.ui.DataTransferHandlerFactory.js/script script src=../src/ui/ve.ui.DataTransferItem.js/script script src=../src/ui/ve.ui.WindowManager.js/script + script src=../src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js/script script src=../src/ui/actions/ve.ui.AnnotationAction.js/script script src=../src/ui/actions/ve.ui.ContentAction.js/script script src=../src/ui/actions/ve.ui.FormatAction.js/script diff --git a/build/modules.json b/build/modules.json index 7a3b019..2f10281 100644 --- a/build/modules.json +++ b/build/modules.json @@ -343,6 +343,7 @@ src/ui/ve.ui.DataTransferHandlerFactory.js, src/ui/ve.ui.DataTransferItem.js, src/ui/ve.ui.WindowManager.js, + src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js, src/ui/actions/ve.ui.AnnotationAction.js, src/ui/actions/ve.ui.ContentAction.js, src/ui/actions/ve.ui.FormatAction.js, diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 2da040f..25c4679 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -337,6 +337,7 @@ script src=../../src/ui/ve.ui.DataTransferHandlerFactory.js/script script src=../../src/ui/ve.ui.DataTransferItem.js/script script src=../../src/ui/ve.ui.WindowManager.js/script + script src=../../src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js/script script src=../../src/ui/actions/ve.ui.AnnotationAction.js/script script src=../../src/ui/actions/ve.ui.ContentAction.js/script script src=../../src/ui/actions/ve.ui.FormatAction.js/script diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html index 96558fd..80a7c6c 100644 --- a/demos/ve/mobile.html +++ b/demos/ve/mobile.html @@ -338,6 +338,7 @@ script src=../../src/ui/ve.ui.DataTransferHandlerFactory.js/script script src=../../src/ui/ve.ui.DataTransferItem.js/script script src=../../src/ui/ve.ui.WindowManager.js/script + script src=../../src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js/script script src=../../src/ui/actions/ve.ui.AnnotationAction.js/script script src=../../src/ui/actions/ve.ui.ContentAction.js/script script src=../../src/ui/actions/ve.ui.FormatAction.js/script diff --git a/src/ui/inspectors/ve.ui.LanguageInspector.js b/src/ui/inspectors/ve.ui.LanguageInspector.js index ec10259..b72142a 100644 --- a/src/ui/inspectors/ve.ui.LanguageInspector.js +++ b/src/ui/inspectors/ve.ui.LanguageInspector.js @@ -72,7 +72,10 @@ ve.ui.LanguageInspector.super.prototype.initialize.call( this ); // Properties - this.languageInput = new ve.ui.LanguageInputWidget( { $: this.$ } ); + this.languageInput = new ve.ui.LanguageInputWidget( { + $: this.$, + dialogManager: this.manager.getSurface().getDialogs() + } ); // Initialization this.form.$element.append( this.languageInput.$element ); diff --git a/src/ui/ve.ui.DesktopContext.js b/src/ui/ve.ui.DesktopContext.js index 0847187..1c78fc4 100644 --- a/src/ui/ve.ui.DesktopContext.js +++ b/src/ui/ve.ui.DesktopContext.js @@ -124,7 +124,7 @@ * @inheritdoc */
[MediaWiki-commits] [Gerrit] Add directionality classes to window manager - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/198266 Change subject: Add directionality classes to window manager .. Add directionality classes to window manager Many of the icon settings require the directionality class in order to feature icons that can be flipped between ltr/rtl. Those icons don't show inside dialogs and inspectors unless the wrapping window manager holds those classes. In this fix we set the directionality of SurfaceWindowManager based on the surface, and the directionality of the WindowManager based on the body element direction. Change-Id: Ibf29417a2eb64d966417cfa96a0d4417e3d80efd (cherry picked from commit dafeb22c6a9115520438169f93b54f3b49c43aaa) --- M src/ui/ve.ui.WindowManager.js M src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/66/198266/1 diff --git a/src/ui/ve.ui.WindowManager.js b/src/ui/ve.ui.WindowManager.js index a44fa6d..8749da2 100644 --- a/src/ui/ve.ui.WindowManager.js +++ b/src/ui/ve.ui.WindowManager.js @@ -23,6 +23,9 @@ // Properties this.overlay = config.overlay || null; + + this.$element + .addClass( 've-ui-dir-block-' + this.getDir() ); }; /* Inheritance */ @@ -32,6 +35,14 @@ /* Methods */ /** + * Get directionality + * @return {string} UI directionality + */ +ve.ui.WindowManager.prototype.getDir = function () { + return $( 'body' ).css( 'direction' ); +}; + +/** * Get overlay for menus. * * @return {ve.ui.Overlay|null} Menu overlay, null if none was configured diff --git a/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js b/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js index 4625da8..8c5b7c1 100644 --- a/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js +++ b/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js @@ -32,6 +32,18 @@ /* Methods */ /** + * Override the window manager's directionality method to get the + * directionality from the surface. The surface sometimes does not + * have a directionality set; fallback to direction from the document. + * @return {string} UI directionality + */ +ve.ui.SurfaceWindowManager.prototype.getDir = function () { + return this.surface.getDir() || + // Fallback to parent method + ve.ui.SurfaceWindowManager.super.prototype.getDir.call( this ); +}; + +/** * Get surface. * * @return {ve.ui.Surface} Surface this belongs to -- To view, visit https://gerrit.wikimedia.org/r/198266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf29417a2eb64d966417cfa96a0d4417e3d80efd Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Mooeypoo mor...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add directionality classes to window manager - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Add directionality classes to window manager .. Add directionality classes to window manager Many of the icon settings require the directionality class in order to feature icons that can be flipped between ltr/rtl. Those icons don't show inside dialogs and inspectors unless the wrapping window manager holds those classes. In this fix we set the directionality of SurfaceWindowManager based on the surface, and the directionality of the WindowManager based on the body element direction. Change-Id: Ibf29417a2eb64d966417cfa96a0d4417e3d80efd (cherry picked from commit dafeb22c6a9115520438169f93b54f3b49c43aaa) --- M src/ui/ve.ui.WindowManager.js M src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ui/ve.ui.WindowManager.js b/src/ui/ve.ui.WindowManager.js index a44fa6d..8749da2 100644 --- a/src/ui/ve.ui.WindowManager.js +++ b/src/ui/ve.ui.WindowManager.js @@ -23,6 +23,9 @@ // Properties this.overlay = config.overlay || null; + + this.$element + .addClass( 've-ui-dir-block-' + this.getDir() ); }; /* Inheritance */ @@ -32,6 +35,14 @@ /* Methods */ /** + * Get directionality + * @return {string} UI directionality + */ +ve.ui.WindowManager.prototype.getDir = function () { + return $( 'body' ).css( 'direction' ); +}; + +/** * Get overlay for menus. * * @return {ve.ui.Overlay|null} Menu overlay, null if none was configured diff --git a/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js b/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js index 4625da8..8c5b7c1 100644 --- a/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js +++ b/src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js @@ -32,6 +32,18 @@ /* Methods */ /** + * Override the window manager's directionality method to get the + * directionality from the surface. The surface sometimes does not + * have a directionality set; fallback to direction from the document. + * @return {string} UI directionality + */ +ve.ui.SurfaceWindowManager.prototype.getDir = function () { + return this.surface.getDir() || + // Fallback to parent method + ve.ui.SurfaceWindowManager.super.prototype.getDir.call( this ); +}; + +/** * Get surface. * * @return {ve.ui.Surface} Surface this belongs to -- To view, visit https://gerrit.wikimedia.org/r/198266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf29417a2eb64d966417cfa96a0d4417e3d80efd Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Mooeypoo mor...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove widgets from boards - change (wikimedia...dash)
Ssmith has uploaded a new change for review. https://gerrit.wikimedia.org/r/198255 Change subject: Remove widgets from boards .. Remove widgets from boards WIP need to add to the others tomorrow Change-Id: I81fa1551af5fbbd36361c22e0172d353c2d0e4ca --- M src/bower_modules M src/components/app-content/app-content.js M src/components/widgets/x-by-y/x-by-y.html M src/components/widgets/x-by-y/x-by-y.js 4 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/55/198255/1 diff --git a/src/bower_modules b/src/bower_modules index 1323394..2a4a5f0 16 --- a/src/bower_modules +++ b/src/bower_modules -Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f +Subproject commit 2a4a5f03b54988ec09e76ef69362c39655481918 diff --git a/src/components/app-content/app-content.js b/src/components/app-content/app-content.js index 2624c2c..95e3998 100644 --- a/src/components/app-content/app-content.js +++ b/src/components/app-content/app-content.js @@ -72,6 +72,16 @@ }; +self.removeWidgetFromBoard = function( event, data ){ +$.ajax({ +method: 'DELETE', +url: '/board/' + self.userdata().defaultBoard + '/widgets/' + event.instanceID, +success: function(stuff) { +alert( JSON.stringify( stuff ) ); +} +}) +}; + self.setDisplayPage = function( e, data ){ var pages = [ 'Library', 'Profile', 'Home' ], view = data.target.id; diff --git a/src/components/widgets/x-by-y/x-by-y.html b/src/components/widgets/x-by-y/x-by-y.html index a65b3df..2af5887 100644 --- a/src/components/widgets/x-by-y/x-by-y.html +++ b/src/components/widgets/x-by-y/x-by-y.html @@ -15,6 +15,7 @@ ul class=dropdown-menu role=menu aria-labelledby=savedCharts id=savedChartsMenu data-bind=foreach: presetTitles, style: { width: '300px'} li data-bind=text: $data/li /ul -- + button type=button class=btn btn-default dropdown-toggle data-toggle=modal data-target=#removeModali class=fa fa-times/i/button /div /div @@ -159,3 +160,17 @@ /div!-- /.modal-content -- /div /div + +div class=modal fade id=removeModal + div class=modal-dialog modal-sm + div class=modal-content + div class=modal-header + h2Remove this widget from the board?/h2 + /div + div class=modal-body + button class=btn btn-lg btn-success pull-right data-dismiss=modal data-bind=click: $parents[2].removeWidgetFromBoard OK/button + button class=btn btn-lg btn-danger pull-right data-dismiss=modal Cancel/button + /div + /div!-- /.modal-content -- + /div +/div diff --git a/src/components/widgets/x-by-y/x-by-y.js b/src/components/widgets/x-by-y/x-by-y.js index 01eaeac..3487941 100644 --- a/src/components/widgets/x-by-y/x-by-y.js +++ b/src/components/widgets/x-by-y/x-by-y.js @@ -13,6 +13,7 @@ WidgetBase.call( this, params ); var self = this, wasSaved = self.chartSaved(); //populateChoices() may overwrite + console.log('params: ', params); self.showSlice= ko.observable(); self.bySlice = ko.observable(); -- To view, visit https://gerrit.wikimedia.org/r/198255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81fa1551af5fbbd36361c22e0172d353c2d0e4ca Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ssmith ssm...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-VisualEditor-qunit: To trusty/karma/chromium from prec... - change (integration/config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198257 Change subject: mwext-VisualEditor-qunit: To trusty/karma/chromium from precise/phantomjs .. mwext-VisualEditor-qunit: To trusty/karma/chromium from precise/phantomjs Omitting other branches until mediawiki-core backports to support that are complete. Not switching to MySQL yet since that requires 'prepare-mediawiki' for extensions to be changed to support it first. Next! Change-Id: Ib4f0dcf8eb18a148bf239a5fc12ddf61f2089c90 --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 2 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/57/198257/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index f4172a7..03cb472 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -151,26 +151,6 @@ # This is a copy of '{name}-{ext-name}-qunit', but with processes ve's submodule # since Zuul cloner does not support git submodules. name: 'mwext-VisualEditor-qunit' -node: contintLabsSlave UbuntuPrecise -concurrent: true -triggers: - - zuul -builders: - - prepare-mediawiki: - ext-name: 'VisualEditor' - dependencies: 'Parsoid' - - shell: | - cd src/extensions/VisualEditor - git submodule update --init - git submodule status - git submodule foreach git clean -xdff -q - - qunit -publishers: - - qunit-cleanup - - mw-teardown - - archive-log-dir -- job-template: -name: 'mwext-VisualEditor-qunit-karma' node: contintLabsSlave UbuntuTrusty concurrent: true triggers: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index d2344f0..3a73dbb 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1764,8 +1764,8 @@ branch: ^(master)$ queue-name: mediawiki - - name: mwext-VisualEditor-qunit-karma -voting: false + - name: mwext-VisualEditor-qunit +branch: ^(master)$ - name: ^mwext-WikibaseJavaScriptApi-qunit$ voting: false @@ -6260,7 +6260,6 @@ test: - mwext-VisualEditor-npm - mwext-VisualEditor-jsduck - - mwext-VisualEditor-qunit-karma gate-and-submit: - mediawiki-gate - mwext-VisualEditor-npm -- To view, visit https://gerrit.wikimedia.org/r/198257 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4f0dcf8eb18a148bf239a5fc12ddf61f2089c90 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add general citations dialog - change (mediawiki...VisualEditor)
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/198261 Change subject: Add general citations dialog .. Add general citations dialog Add a dialog to group the possible citation types and allow the user to choose the right citation dialog for them. Depends on Ibf29417 in VE-core; useless without I3d9caef in VE-core. Bug: T62768 Change-Id: I22a64265475b1b4c94b46c5af196bd08331a05e7 (cherry picked from commit 73356c333a7272c1e156beef630c00b7e1c89281) --- M VisualEditor.php M extension.json M modules/ve-mw/i18n/en.json M modules/ve-mw/i18n/qqq.json A modules/ve-mw/ui/dialogs/ve.ui.MWGeneralReferenceDialog.js A modules/ve-mw/ui/styles/dialogs/ve.ui.MWGeneralReferenceDialog.css 6 files changed, 224 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/61/198261/1 diff --git a/VisualEditor.php b/VisualEditor.php index 6c4a2b9..1ba8cc6 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -1295,6 +1295,7 @@ 'modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js', 'modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js', 'modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js', + 'modules/ve-mw/ui/dialogs/ve.ui.MWGeneralReferenceDialog.js', 'modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js', 'modules/ve-mw/ui/tools/ve.ui.MWCitationDialogTool.js', @@ -1307,6 +1308,7 @@ 'modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css', 'modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css', 'modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css', + 'modules/ve-mw/ui/styles/dialogs/ve.ui.MWGeneralReferenceDialog.css', ), 'dependencies' = array( 'ext.visualEditor.mwreference.core', @@ -1314,6 +1316,8 @@ 'ext.visualEditor.mediawiki' ), 'messages' = array( + 'visualeditor-dialog-generalreference-intro', + 'visualeditor-dialog-generalreference-title', 'visualeditor-dialog-reference-editing-reused', 'visualeditor-dialog-reference-options-group-label', 'visualeditor-dialog-reference-options-group-placeholder', @@ -1321,11 +1325,13 @@ 'visualeditor-dialog-reference-options-section', 'visualeditor-dialog-reference-title', 'visualeditor-dialog-reference-useexisting-label', + 'visualeditor-dialog-reference-useexisting-full-label', 'visualeditor-dialog-reference-useexisting-tool', 'visualeditor-dialog-referenceslist-contextitem-description-general', 'visualeditor-dialog-referenceslist-contextitem-description-named', 'visualeditor-dialog-referenceslist-title', 'visualeditor-dialogbutton-reference-tooltip', + 'visualeditor-dialogbutton-reference-full-label', 'visualeditor-dialogbutton-referenceslist-tooltip', 'visualeditor-reference-input-placeholder', ), diff --git a/extension.json b/extension.json index 4ee0733..4079670 100644 --- a/extension.json +++ b/extension.json @@ -1322,6 +1322,7 @@ modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js, modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js, modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js, + modules/ve-mw/ui/dialogs/ve.ui.MWGeneralReferenceDialog.js, modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js, modules/ve-mw/ui/tools/ve.ui.MWCitationDialogTool.js, modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js, @@ -1331,7 +1332,8 @@ styles: [ modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css, modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css, - modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css + modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css, + modules/ve-mw/ui/styles/dialogs/ve.ui.MWGeneralReferenceDialog.css ], dependencies: [
[MediaWiki-commits] [Gerrit] build: Declare grunt-cli dependency - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: build: Declare grunt-cli dependency .. build: Declare grunt-cli dependency A long time ago, npm did not support using command line programs within 'npm test' (not unless harcoding a path to node_modules/bin/... within packages.json/scripts/test). But this has been long supported. Declaring a (dev)dependency will provide its binaries to the PATH used by the subshell 'npm test' creates internally. Add grunt-cli so that developers don't have to manually install it. Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 (cherry picked from commit fa4ba8dbd7519a817dad75994ed31a3fc34c6f96) --- M package.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 076582b..933212c 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, devDependencies: { grunt: 0.4.5, +grunt-cli: 0.1.13, grunt-banana-checker: 0.2.0, grunt-contrib-copy: 0.8.0, grunt-contrib-jshint: 0.11.0, -- To view, visit https://gerrit.wikimedia.org/r/198262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dhcp: correct entry for mw2184 - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: dhcp: correct entry for mw2184 .. dhcp: correct entry for mw2184 Change-Id: Id00579ba11d5b38395ab8e581a6b5d3e6558ced1 --- M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 6662fd4..0940c95 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -5016,7 +5016,7 @@ } host mw2184 { - hardware ethernet B0:83:FE:DB:E6:7F; + hardware ethernet B0:83:FE:DE:FD:E5; fixed-address mw2184.codfw.wmnet; } -- To view, visit https://gerrit.wikimedia.org/r/198241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id00579ba11d5b38395ab8e581a6b5d3e6558ced1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add placeholder for Amount field in proposals - change (wikimedia/iegreview)
jenkins-bot has submitted this change and it was merged. Change subject: Add placeholder for Amount field in proposals .. Add placeholder for Amount field in proposals Bug: T93252 Change-Id: Ie0045a6de323cf042f09ad6e092c772bc2ea64b8 --- M data/i18n/en.json M data/i18n/qqq.json M data/templates/inc/forms.html M data/templates/proposals/edit.html 4 files changed, 5 insertions(+), 3 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/data/i18n/en.json b/data/i18n/en.json index 7935a4f..e2af9ad 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -128,6 +128,7 @@ proposals-edit-theme-empty: Please select, proposals-edit-theme-error: Select a theme from the list., proposals-edit-amount: Amount, + proposals-edit-amount-placeholder: USD, proposals-edit-amount-error: Amount must be numeric., proposals-edit-description: Description, proposals-edit-notes: Notes, diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json index 00a18fc..1534f15 100644 --- a/data/i18n/qqq.json +++ b/data/i18n/qqq.json @@ -101,6 +101,7 @@ privacy-page: Privacy policy page content., proposal-summary: Section title, proposals-edit-amount: Input label, followed ty text box., + proposals-edit-amount-placeholder: Placeholder for input text box, proposals-edit-amount-error: Error message, proposals-edit-description: Input label, followed by text box., proposals-edit-error: Error message shown when proposal addition fails., diff --git a/data/templates/inc/forms.html b/data/templates/inc/forms.html index 72f02e7..d7f543e 100644 --- a/data/templates/inc/forms.html +++ b/data/templates/inc/forms.html @@ -34,11 +34,11 @@ {% macro input( ctx, type, mesg, name, opts = {} ) %} {% import _self as forms %} -{% set opts = { 'required':false }|merge( opts ) %} +{% set opts = { 'required':false, 'placeholder':'' }|merge( opts ) %} {% set value = opts.value ?: ctx.form.get( name ) %} {{ forms.startElement( ctx, mesg, name, opts ) }} input type={{ type }} class=form-control {{ opts.elmclass ? opts.elmclass -}} id={{ name }} name={{ name }} value={{ value ?: '' }} {{ opts.required ? 'required' }}/ +}} id={{ name }} name={{ name }} value={{ value ?: '' }} placeholder={{ opts.placeholder }} {{ opts.required ? 'required' }}/ {{ forms.endElement( ctx, name, mesg ) }} {% endmacro %} diff --git a/data/templates/proposals/edit.html b/data/templates/proposals/edit.html index 279cf3d..b1c3a3d 100644 --- a/data/templates/proposals/edit.html +++ b/data/templates/proposals/edit.html @@ -28,7 +28,7 @@ {{ forms.text( ctx, 'proposals-edit-title', 'title', { 'required':true } ) }} {{ forms.url( ctx, 'proposals-edit-url', 'url', { 'required':true } ) }} {{ forms.select( ctx, 'proposals-edit-theme', 'theme', { 'online':'theme-online'|message, 'offline':'theme-offline'|message, 'tool':'theme-tool'|message, 'research':'theme-research'|message }, { 'required':true } ) }} - {{ forms.number( ctx, 'proposals-edit-amount', 'amount' ) }} + {{ forms.number( ctx, 'proposals-edit-amount', 'amount', { 'placeholder':'proposals-edit-amount-placeholder'|message } ) }} {{ forms.textArea( ctx, 'proposals-edit-description', 'description', { 'elmclass':'monospace' } ) }} {{ forms.textArea( ctx, 'proposals-edit-notes', 'notes', { 'elmclass':'monospace' } ) }} button type=submit class=btn btn-primary pull-right id=submit name=submit -- To view, visit https://gerrit.wikimedia.org/r/198238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0045a6de323cf042f09ad6e092c772bc2ea64b8 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/iegreview Gerrit-Branch: master Gerrit-Owner: Niharika29 niharikakohl...@gmail.com Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Icinga monitoring for nova-compute process. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/198249 Change subject: Icinga monitoring for nova-compute process. .. Icinga monitoring for nova-compute process. Change-Id: I50c777b692b812952f25e510b99b67cf20fc64b8 --- M modules/openstack/manifests/nova/compute.pp 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/198249/1 diff --git a/modules/openstack/manifests/nova/compute.pp b/modules/openstack/manifests/nova/compute.pp index 3c8bb09..02b2656 100644 --- a/modules/openstack/manifests/nova/compute.pp +++ b/modules/openstack/manifests/nova/compute.pp @@ -136,4 +136,9 @@ require = Package[nova-common]; } } + +nrpe::monitor_service { 'check_nova_compute_process': +description = 'nova-compute process', +nrpe_command = /usr/lib/nagios/plugins/check_procs -c 1: --ereg-argument-array '^/usr/bin/python /usr/bin/nova-compute', +} } -- To view, visit https://gerrit.wikimedia.org/r/198249 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50c777b692b812952f25e510b99b67cf20fc64b8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott abog...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add subra, suhail to netboot. partman/raid1-1part - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/198250 Change subject: add subra,suhail to netboot. partman/raid1-1part .. add subra,suhail to netboot. partman/raid1-1part partman recipe for subra and suhail based on helium and potassium being eqiad poolcounters Bug:T93261 Change-Id: I683fd7739d5f4bbb40904040d5d88ad9b14932f7 --- M modules/install-server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/50/198250/1 diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index ed38f60..d13b868 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -54,7 +54,7 @@ capella|haedus|netmon1001|stat1002|tungsten) echo partman/db.cfg ;; \ bast*) echo partman/lvm.cfg ;; \ boron|chromium|hydrogen) echo partman/lvm.cfg ;; \ - calcium|helium|potassium|tmh1001|tmh1002) echo partman/raid1-1partition.cfg ;; \ + calcium|helium|potassium|subra|suhail|tmh1001|tmh1002) echo partman/raid1-1partition.cfg ;; \ acamar|achernar|baham|cobalt|lead|lithium|polonium) echo partman/raid1-lvm.cfg ;; \ cp1008|cp104[34]|cp300[3-9]|cp301[0-9]|cp302[0-2]) echo partman/varnish-oldssd.cfg ;; \ cp[1234][0-9][0-9][0-9]|dysprosium) echo partman/varnish.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/198250 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I683fd7739d5f4bbb40904040d5d88ad9b14932f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Statsd reporter checks format of processor files - change (mediawiki...EventLogging)
Nuria has uploaded a new change for review. https://gerrit.wikimedia.org/r/198254 Change subject: Statsd reporter checks format of processor files .. Statsd reporter checks format of processor files We added a new processor of files whose format doesn't exactly abide to what the statsd reporter is expecting. The new processor format needs to be added. Now, since reporting of metrics and thus, alarms are broken in prod this change just fixes the reporter so it continues to report the pre-existing metrics. Change-Id: I515d1362e5c3183d61e4b8cf7f129e2f5fca3348 --- M server/bin/eventlogging-reporter 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging refs/changes/54/198254/1 diff --git a/server/bin/eventlogging-reporter b/server/bin/eventlogging-reporter index 37e69a1..387739a 100755 --- a/server/bin/eventlogging-reporter +++ b/server/bin/eventlogging-reporter @@ -85,14 +85,23 @@ def iter_pubs(config_dir): -Discover local EventLogging publishers. +Discover local EventLogging publishers. Assumes really a tcp stream +#TODO Kafka client side stream not reported + publishers = {} +logger = logging.getLogger('Log') + for filename in iter_files(config_dir): +logger.debug(Reporting metrics for %s, filename) name = re.sub(r'[^A-Za-z0-9]+', '_', os.path.basename(filename)) + with open(filename) as f: -raw, valid = re.findall(r'tcp://[^:]+:(\d+)', f.read()) -publishers[('%s.raw' % name, 'overall.raw')] = raw -publishers[('%s.valid' % name, 'overall.valid')] = valid +matches = re.findall(r'tcp://[^:]+:(\d+)', f.read()) +if len(matches) 1: +raw = matches[0] +valid = matches[1] +publishers[('%s.raw' % name, 'overall.raw')] = raw +publishers[('%s.valid' % name, 'overall.valid')] = valid return publishers -- To view, visit https://gerrit.wikimedia.org/r/198254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I515d1362e5c3183d61e4b8cf7f129e2f5fca3348 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Nuria nu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eqiad-prod: add ms-be101[678] - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/198256 Change subject: eqiad-prod: add ms-be101[678] .. eqiad-prod: add ms-be101[678] add new HP machines to eqiad, since we are tight on space for objects the initial weight is intentionally very low to see what effect it has on the rest of the fleet. Next weights will likely be higher. Bug: T1268 Change-Id: Ia5bee076a2110620f1c1c4a4221b8263c0553800 --- M eqiad-prod/account.builder M eqiad-prod/account.dump M eqiad-prod/account.ring.gz M eqiad-prod/container.builder M eqiad-prod/container.dump M eqiad-prod/container.ring.gz M eqiad-prod/object.builder M eqiad-prod/object.dump M eqiad-prod/object.ring.gz 9 files changed, 326 insertions(+), 284 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/56/198256/1 -- To view, visit https://gerrit.wikimedia.org/r/198256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5bee076a2110620f1c1c4a4221b8263c0553800 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-ring Gerrit-Branch: master Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Increase qunit browserNoActivityTimeout from 10s to 60s - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198259 Change subject: build: Increase qunit browserNoActivityTimeout from 10s to 60s .. build: Increase qunit browserNoActivityTimeout from 10s to 60s Bug: T89075 Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac (cherry picked from commit dcbbc0489c5239a8dc4f21da3ff1037368f60e45) --- M Gruntfile.js 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/59/198259/1 diff --git a/Gruntfile.js b/Gruntfile.js index a292d0b..f3183e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,7 +76,9 @@ frameworks: [ 'qunit' ], reporters: [ 'dots' ], singleRun: true, - autoWatch: false + autoWatch: false, + // Some tests in extensions don't yield for more than the default 10s (T89075) + browserNoActivityTimeout: 60 * 1000 }, main: { browsers: [ 'Chrome' ] -- To view, visit https://gerrit.wikimedia.org/r/198259 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add clears to default floats - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/198258 Change subject: Add clears to default floats .. Add clears to default floats Also move @noflip to apply to all rules, including margins. Change-Id: I746abb3c91927c3d32bbccd37a8bfcfaa16b413f --- M src/init/sa/styles/ve.init.sa.css 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/58/198258/1 diff --git a/src/init/sa/styles/ve.init.sa.css b/src/init/sa/styles/ve.init.sa.css index 1010eeb..e021c9b 100644 --- a/src/init/sa/styles/ve.init.sa.css +++ b/src/init/sa/styles/ve.init.sa.css @@ -13,15 +13,17 @@ caption-side: bottom; } +/* @noflip */ .ve-align-right { - /* @noflip */ float: right; + clear: right; margin: 0.5em 0 1em 1em; } +/* @noflip */ .ve-align-left { - /* @noflip */ float: left; + clear: left; margin: 0.5em 1em 1em 0; } -- To view, visit https://gerrit.wikimedia.org/r/198258 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I746abb3c91927c3d32bbccd37a8bfcfaa16b413f Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Increase qunit browserNoActivityTimeout from 10s to 60s - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198260 Change subject: build: Increase qunit browserNoActivityTimeout from 10s to 60s .. build: Increase qunit browserNoActivityTimeout from 10s to 60s Bug: T89075 Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac (cherry picked from commit dcbbc0489c5239a8dc4f21da3ff1037368f60e45) --- M Gruntfile.js 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/60/198260/1 diff --git a/Gruntfile.js b/Gruntfile.js index a292d0b..f3183e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,7 +76,9 @@ frameworks: [ 'qunit' ], reporters: [ 'dots' ], singleRun: true, - autoWatch: false + autoWatch: false, + // Some tests in extensions don't yield for more than the default 10s (T89075) + browserNoActivityTimeout: 60 * 1000 }, main: { browsers: [ 'Chrome' ] -- To view, visit https://gerrit.wikimedia.org/r/198260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ef601a38052e38247cebfb19475a31ac2448eac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Allow access to surface through window man... - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/198263 Change subject: [BREAKING CHANGE] Allow access to surface through window manager .. [BREAKING CHANGE] Allow access to surface through window manager We've been back and forth on this, but we really just need a way for inspectors to be able to open dialogs. Bonus: Re-use the dialog manager for the language inspector's language selection dialog. Change-Id: I3d9caef38755eb39c97e7ce35f7559ee7efdff0b (cherry picked from commit 37ac76370a564e2b987f9e87b4767af7086e456a) --- M .jsduck/eg-iframe.html M build/modules.json M demos/ve/desktop.html M demos/ve/mobile.html M src/ui/inspectors/ve.ui.LanguageInspector.js M src/ui/ve.ui.DesktopContext.js M src/ui/ve.ui.DesktopSurface.js M src/ui/ve.ui.MobileContext.js M src/ui/ve.ui.MobileSurface.js M src/ui/ve.ui.Surface.js M src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js M src/ui/windowmanagers/ve.ui.MobileWindowManager.js A src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js M src/ui/windowmanagers/ve.ui.ToolbarDialogWindowManager.js M tests/index.html 15 files changed, 71 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/63/198263/1 diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 00bf7b6..8ce6c4c 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -319,6 +319,7 @@ script src=../src/ui/ve.ui.DataTransferHandlerFactory.js/script script src=../src/ui/ve.ui.DataTransferItem.js/script script src=../src/ui/ve.ui.WindowManager.js/script + script src=../src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js/script script src=../src/ui/actions/ve.ui.AnnotationAction.js/script script src=../src/ui/actions/ve.ui.ContentAction.js/script script src=../src/ui/actions/ve.ui.FormatAction.js/script diff --git a/build/modules.json b/build/modules.json index 7a3b019..2f10281 100644 --- a/build/modules.json +++ b/build/modules.json @@ -343,6 +343,7 @@ src/ui/ve.ui.DataTransferHandlerFactory.js, src/ui/ve.ui.DataTransferItem.js, src/ui/ve.ui.WindowManager.js, + src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js, src/ui/actions/ve.ui.AnnotationAction.js, src/ui/actions/ve.ui.ContentAction.js, src/ui/actions/ve.ui.FormatAction.js, diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 2da040f..25c4679 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -337,6 +337,7 @@ script src=../../src/ui/ve.ui.DataTransferHandlerFactory.js/script script src=../../src/ui/ve.ui.DataTransferItem.js/script script src=../../src/ui/ve.ui.WindowManager.js/script + script src=../../src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js/script script src=../../src/ui/actions/ve.ui.AnnotationAction.js/script script src=../../src/ui/actions/ve.ui.ContentAction.js/script script src=../../src/ui/actions/ve.ui.FormatAction.js/script diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html index 96558fd..80a7c6c 100644 --- a/demos/ve/mobile.html +++ b/demos/ve/mobile.html @@ -338,6 +338,7 @@ script src=../../src/ui/ve.ui.DataTransferHandlerFactory.js/script script src=../../src/ui/ve.ui.DataTransferItem.js/script script src=../../src/ui/ve.ui.WindowManager.js/script + script src=../../src/ui/windowmanagers/ve.ui.SurfaceWindowManager.js/script script src=../../src/ui/actions/ve.ui.AnnotationAction.js/script script src=../../src/ui/actions/ve.ui.ContentAction.js/script script src=../../src/ui/actions/ve.ui.FormatAction.js/script diff --git a/src/ui/inspectors/ve.ui.LanguageInspector.js b/src/ui/inspectors/ve.ui.LanguageInspector.js index ec10259..b72142a 100644 --- a/src/ui/inspectors/ve.ui.LanguageInspector.js +++ b/src/ui/inspectors/ve.ui.LanguageInspector.js @@ -72,7 +72,10 @@ ve.ui.LanguageInspector.super.prototype.initialize.call( this ); // Properties - this.languageInput = new ve.ui.LanguageInputWidget( { $: this.$ } ); + this.languageInput = new ve.ui.LanguageInputWidget( { + $: this.$, + dialogManager: this.manager.getSurface().getDialogs() + } ); // Initialization this.form.$element.append( this.languageInput.$element ); diff --git a/src/ui/ve.ui.DesktopContext.js b/src/ui/ve.ui.DesktopContext.js index 0847187..1c78fc4 100644 --- a/src/ui/ve.ui.DesktopContext.js +++ b/src/ui/ve.ui.DesktopContext.js @@ -124,7 +124,7 @@ * @inheritdoc */
[MediaWiki-commits] [Gerrit] build: Declare grunt-cli dependency - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198262 Change subject: build: Declare grunt-cli dependency .. build: Declare grunt-cli dependency A long time ago, npm did not support using command line programs within 'npm test' (not unless harcoding a path to node_modules/bin/... within packages.json/scripts/test). But this has been long supported. Declaring a (dev)dependency will provide its binaries to the PATH used by the subshell 'npm test' creates internally. Add grunt-cli so that developers don't have to manually install it. Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 (cherry picked from commit fa4ba8dbd7519a817dad75994ed31a3fc34c6f96) --- M package.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/198262/1 diff --git a/package.json b/package.json index 076582b..933212c 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, devDependencies: { grunt: 0.4.5, +grunt-cli: 0.1.13, grunt-banana-checker: 0.2.0, grunt-contrib-copy: 0.8.0, grunt-contrib-jshint: 0.11.0, -- To view, visit https://gerrit.wikimedia.org/r/198262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf22 Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Declare grunt-cli dependency - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/198264 Change subject: build: Declare grunt-cli dependency .. build: Declare grunt-cli dependency A long time ago, npm did not support using command line programs within 'npm test' (not unless harcoding a path to node_modules/bin/... within packages.json/scripts/test). But this has been long supported. Declaring a (dev)dependency will provide its binaries to the PATH used by the subshell 'npm test' creates internally. Add grunt-cli so that developers don't have to manually install it. Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 (cherry picked from commit fa4ba8dbd7519a817dad75994ed31a3fc34c6f96) --- M package.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/198264/1 diff --git a/package.json b/package.json index 076582b..933212c 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, devDependencies: { grunt: 0.4.5, +grunt-cli: 0.1.13, grunt-banana-checker: 0.2.0, grunt-contrib-copy: 0.8.0, grunt-contrib-jshint: 0.11.0, -- To view, visit https://gerrit.wikimedia.org/r/198264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf21 Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the heading for privacy and terms to 'privacy and terms' - change (apps...wikipedia)
Deskana has submitted this change and it was merged. Change subject: Change the heading for privacy and terms to 'privacy and terms' .. Change the heading for privacy and terms to 'privacy and terms' Alters the header in the menu to read 'Privacy and Terms', for a variety of reasons. The high-level summary is, in ascending order of importance: 1. The current terminology is idiomatic, and it's probably not a good idea to expect every user to understand idioms, particularly US/GB-dominant idioms. 2. The current terminology is patronising; it suggests that how much data you send us and under what (legally binding, criminally enforced) terms you contribute to and use our products, and under what terms we use and reuse and distribute your data, is impossible-to-understand nonsense you shouldn't bother yourself with. 3. The current terminology is offensive, to me and undoubtedly to many others: it originated in British attitudes to African belief structures, and the opinion that they were quaint and ignorant. Android doesn't have this heading (it's under a generalised about) so only iOS needs patching. Change-Id: I98d3da0abdf1cbe39b340d73ae2b3287c01911d6 --- M wikipedia/en.lproj/Localizable.strings 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, but someone else must approve Deskana: Looks good to me, approved diff --git a/wikipedia/en.lproj/Localizable.strings b/wikipedia/en.lproj/Localizable.strings index d6556eb..e54416f 100644 --- a/wikipedia/en.lproj/Localizable.strings +++ b/wikipedia/en.lproj/Localizable.strings @@ -122,7 +122,7 @@ main-menu-terms-of-use = Terms of use; main-menu-rate-app = Rate app; main-menu-heading-zero = Wikipedia Zero; -main-menu-heading-legal = Mumbo jumbo; +main-menu-heading-legal = Privacy and Terms; main-menu-show-today = Today; main-menu-nearby = Nearby; main-menu-more = More...; -- To view, visit https://gerrit.wikimedia.org/r/197288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98d3da0abdf1cbe39b340d73ae2b3287c01911d6 Gerrit-PatchSet: 2 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: OliverKeyes oke...@wikimedia.org Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Deskana dga...@wikimedia.org Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: MSyed ms...@wikimedia.org Gerrit-Reviewer: Mhurd mh...@wikimedia.org Gerrit-Reviewer: OliverKeyes oke...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix widget loader tracking on board switch - change (wikimedia...dash)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/198265 Change subject: Fix widget loader tracking on board switch .. Fix widget loader tracking on board switch Regenerate list of tracking observables whenever displayedBoard changes. TODO: turn displayedBoard.widgets into an observable array and track changes that way. Change-Id: I838ddff5dd48ebc3be1f8d7cb12704e7fa792a5d --- M src/components/boards/generic-board/generic-board.js 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/65/198265/1 diff --git a/src/components/boards/generic-board/generic-board.js b/src/components/boards/generic-board/generic-board.js index 5d28730..fe9da85 100644 --- a/src/components/boards/generic-board/generic-board.js +++ b/src/components/boards/generic-board/generic-board.js @@ -14,17 +14,25 @@ self.sharedContext = {}; self.displayedBoard = params.displayedBoard; -self.widgetLoads = []; -$.each( self.displayedBoard().widgets, function( i, widget ) { -widget.dataLoading = ko.observable( false ); -self.widgetLoads.push( widget.dataLoading ); -} ); +self.widgetLoads = ko.observableArray([]); + function setWidgetLoads() { + self.widgetLoads.removeAll(); + $.each( self.displayedBoard().widgets, function( i, widget ) { + widget.dataLoading = ko.observable( false ); + self.widgetLoads.push( widget.dataLoading ); + } ); + } + setWidgetLoads(); + self.displayedBoard.subscribe( setWidgetLoads ); //This will return true if any child widget is loading self.dataLoading = ko.computed( function() { -var i, widgetCount = self.widgetLoads.length; +var i, + loads = self.widgetLoads(), + widgetCount = loads.length; + for ( i = 0; i widgetCount; i++ ) { -if ( self.widgetLoads[i]() === true ) { +if ( loads[i]() === true ) { $('#loadingModal').modal('show'); //todo: knockout-style! return true; } -- To view, visit https://gerrit.wikimedia.org/r/198265 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I838ddff5dd48ebc3be1f8d7cb12704e7fa792a5d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change welcome email text to use Grants instead of IEG - change (wikimedia/iegreview)
Niharika29 has uploaded a new change for review. https://gerrit.wikimedia.org/r/198243 Change subject: Change welcome email text to use Grants instead of IEG .. Change welcome email text to use Grants instead of IEG Bug: T93245 Change-Id: Id51edd20ee489708cec3aa48fce972149f934825 --- M src/Mailer.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/iegreview refs/changes/43/198243/1 diff --git a/src/Mailer.php b/src/Mailer.php index 3654a80..b06381a 100644 --- a/src/Mailer.php +++ b/src/Mailer.php @@ -48,10 +48,10 @@ 'CharSet' = 'utf-8', 'ContentType' = 'text/plain', 'From' = 'iegra...@wikimedia.org', - 'FromName' = 'Wikimedia IEG', + 'FromName' = 'Wikimedia Grants', 'Mailer' = 'smtp', 'WordWrap' = 72, - 'XMailer' = 'Wikimedia IEG review system', + 'XMailer' = 'Wikimedia Grants review system', ); -- To view, visit https://gerrit.wikimedia.org/r/198243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id51edd20ee489708cec3aa48fce972149f934825 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/iegreview Gerrit-Branch: master Gerrit-Owner: Niharika29 niharikakohl...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dhcp: correct entry for mw2195 - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: dhcp: correct entry for mw2195 .. dhcp: correct entry for mw2195 Change-Id: I1dcc4411bd2dc25e30d74e664cd6fcddcc0b4fcc --- M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 0940c95..63a26fc 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -5072,7 +5072,7 @@ host mw2195 { hardware ethernet B0:83:FE:DF:0E:27; - fixed-address mw21995.codfw.wmnet; + fixed-address mw2195.codfw.wmnet; } host mw2196 { -- To view, visit https://gerrit.wikimedia.org/r/198244 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1dcc4411bd2dc25e30d74e664cd6fcddcc0b4fcc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make text in certain TextViews selectable (for copying) - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Make text in certain TextViews selectable (for copying) .. Make text in certain TextViews selectable (for copying) This allows the user to long-press text fields such as the page title or description, gallery info text, etc. for copying the text to the clipboard of the device. Change-Id: Idbafb9e3fa06006c9922917ae798766ed0bc1120 --- M wikipedia/res/layout/activity_about.xml M wikipedia/res/layout/activity_gallery.xml M wikipedia/res/layout/fragment_page.xml M wikipedia/res/layout/group_bottom_content.xml 4 files changed, 13 insertions(+), 0 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/layout/activity_about.xml b/wikipedia/res/layout/activity_about.xml index e5296f0..755bf32 100644 --- a/wikipedia/res/layout/activity_about.xml +++ b/wikipedia/res/layout/activity_about.xml @@ -48,6 +48,7 @@ android:layout_height=24dp tools:text=2.x-sample-version style=?android:textAppearanceMedium + android:textIsSelectable=true android:gravity=bottom / /LinearLayout @@ -67,6 +68,7 @@ android:layout_width=match_parent android:layout_height=wrap_content android:text=@string/contributors_list style=?android:textAppearanceSmall +android:textIsSelectable=true android:lineSpacingMultiplier=1.2 android:textColor=#555 android:layout_marginBottom=8dp @@ -87,6 +89,7 @@ android:layout_width=match_parent android:layout_height=wrap_content android:text=@string/about_translators_translatewiki style=?android:textAppearanceSmall +android:textIsSelectable=true android:lineSpacingMultiplier=1.2 android:textColor=#555 android:textColorLink=?attr/link_color @@ -107,6 +110,7 @@ android:layout_width=match_parent android:layout_height=wrap_content android:text=@string/libraries_list style=?android:textAppearanceSmall +android:textIsSelectable=true android:lineSpacingMultiplier=1.2 android:textColor=#555 android:textColorLink=?attr/link_color @@ -137,6 +141,7 @@ android:layout_width=0dp android:layout_height=match_parent android:gravity=center_vertical android:text=@string/about_wmf style=?android:textAppearanceSmall + android:textIsSelectable=true android:layout_weight=1 android:textColor=#555 android:textColorLink=?attr/link_color diff --git a/wikipedia/res/layout/activity_gallery.xml b/wikipedia/res/layout/activity_gallery.xml index b7d584b..6dded13 100644 --- a/wikipedia/res/layout/activity_gallery.xml +++ b/wikipedia/res/layout/activity_gallery.xml @@ -47,6 +47,7 @@ android:paddingLeft=@dimen/activity_horizontal_margin android:paddingRight=@dimen/activity_horizontal_margin android:maxHeight=128dp +android:textIsSelectable=true android:scrollbarStyle=insideInset android:scrollbars=vertical android:fadeScrollbars=false @@ -75,6 +76,7 @@ android:layout_height=wrap_content android:paddingLeft=2dp android:paddingRight=2dp +android:textIsSelectable=true tools:text=Credits android:textColor=@color/gallery_license_text android:textColorLink=@color/gallery_license_text diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index 21902bc..e25a911 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -66,6 +66,7 @@ android:id=@+id/page_title_text android:layout_width=match_parent android:layout_height=wrap_content +android:textIsSelectable=true android:fontFamily=serif android:paddingTop=16dp android:paddingBottom=16dp @@ -77,6 +78,7 @@ android:layout_height=wrap_content android:layout_gravity=bottom android:visibility=invisible +android:textIsSelectable=true android:fontFamily=serif
[MediaWiki-commits] [Gerrit] Add support for ReCaptcha 2.0 - change (mediawiki...ConfirmEdit)
Edward Chernenko has uploaded a new change for review. https://gerrit.wikimedia.org/r/198248 Change subject: Add support for ReCaptcha 2.0 .. Add support for ReCaptcha 2.0 Change-Id: Ie04fffc6fe353ff5ca64a0a6beb3057163e173b6 --- A ReCaptcha2.class.php A ReCaptcha2.php A i18n/re2/en.json 3 files changed, 116 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit refs/changes/48/198248/1 diff --git a/ReCaptcha2.class.php b/ReCaptcha2.class.php new file mode 100644 index 000..315392b --- /dev/null +++ b/ReCaptcha2.class.php @@ -0,0 +1,80 @@ +?php + +/** + @file + @author Edward Chernenko edwards...@gmail.com +*/ + +/** + @class + @brief Google reCaptcha 2.0 +*/ +class ReCaptcha2 extends SimpleCaptcha { + + /** + @brief Print the captcha HTML. + */ + function getForm() { + global $wgOut, $wgReCaptchaPublicKey; + + $wgOut-addScriptFile('https://www.google.com/recaptcha/api.js'); + + return Xml::tags('div', array('class' = 'recaptcha'), + Xml::tags('div', array( + 'class' = 'g-recaptcha', + 'data-sitekey' = $wgReCaptchaPublicKey + ), '') + ); + } + + /** + @brief Check if the user entered the captcha correctly or not. + */ + function passCaptcha() { + global $wgReCaptchaPrivateKey, $wgRequest; + + $response = $wgRequest-getVal('g-recaptcha-response'); + if(!$response) { + return false; + } + + $url = wfAppendQuery( + 'https://www.google.com/recaptcha/api/siteverify', + array( + 'secret' = $wgReCaptchaPrivateKey, + 'response' = $response, + 'remoteip' = $wgRequest-getIP() + ) + ); + $res = Http::get($url); + if(!$res) { + return false; + } + + $ret = FormatJson::decode($res, true); + if(!$ret || !array_key_exists('success', $ret)) { + return false; + } + return $ret['success']; + } + + /** + @brief Kindly ask the user to pass the captcha. + */ + function getMessage( $action ) { + $msg = wfMessage('recaptcha2-' . $action); + if($msg-isDisabled()) { + $msg = wfMessage('recaptcha2-edit'); + } + return $msg-text(); + } + + /** + @brief Override SimpleCaptcha::addCaptchaAPI() and do nothing. + @note reCaptcha 2.0 works by analyzing how mouse moves, etc., + so there is no way to show it via API. + */ + function addCaptchaAPI( $resultArr ) { + /* Nothing to do here. */ + } +} diff --git a/ReCaptcha2.php b/ReCaptcha2.php new file mode 100644 index 000..88574b5 --- /dev/null +++ b/ReCaptcha2.php @@ -0,0 +1,27 @@ +?php + +/** + @file + @brief Google reCaptcha 2.0 for Extension:ConfirmEdit. + @author Edward Chernenko edwards...@gmail.com + + See https://developers.google.com/recaptcha/ for details. +*/ + +if (!defined('MEDIAWIKI')) { +echo EOT +To install this extension, put the following line in LocalSettings.php: +require_once( \$IP/extensions/Moderation/Moderation.php ); +EOT; +exit( 1 ); +} + +require_once(__DIR__ . '/ConfirmEdit.php'); +$wgCaptchaClass = 'ReCaptcha2'; + +$wgMessagesDirs['ReCaptcha2'] = __DIR__ . '/i18n/re2'; +$wgAutoloadClasses['ReCaptcha2'] = __DIR__ . '/ReCaptcha2.class.php'; + +/* These parameters must be set in LocalSettings.php */ +$wgReCaptchaPublicKey = ''; +$wgReCaptchaPrivateKey = ''; diff --git a/i18n/re2/en.json b/i18n/re2/en.json new file mode 100644 index 000..274f559 --- /dev/null +++ b/i18n/re2/en.json @@ -0,0 +1,9 @@ +{ + @metadata: { + authors: [ + Edward Chernenko + ] + }, + recaptcha2-desc: reCaptcha 2.0 for ConfirmEdit, + recaptcha2-edit: Please confirm that you're not a robot: +} -- To view, visit https://gerrit.wikimedia.org/r/198248 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie04fffc6fe353ff5ca64a0a6beb3057163e173b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmEdit Gerrit-Branch: master Gerrit-Owner: Edward Chernenko edwards...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] add subra, suhail to netboot. partman/raid1-1part - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: add subra,suhail to netboot. partman/raid1-1part .. add subra,suhail to netboot. partman/raid1-1part partman recipe for subra and suhail based on helium and potassium being eqiad poolcounters Bug:T93261 Change-Id: I683fd7739d5f4bbb40904040d5d88ad9b14932f7 --- M modules/install-server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index ed38f60..d13b868 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -54,7 +54,7 @@ capella|haedus|netmon1001|stat1002|tungsten) echo partman/db.cfg ;; \ bast*) echo partman/lvm.cfg ;; \ boron|chromium|hydrogen) echo partman/lvm.cfg ;; \ - calcium|helium|potassium|tmh1001|tmh1002) echo partman/raid1-1partition.cfg ;; \ + calcium|helium|potassium|subra|suhail|tmh1001|tmh1002) echo partman/raid1-1partition.cfg ;; \ acamar|achernar|baham|cobalt|lead|lithium|polonium) echo partman/raid1-lvm.cfg ;; \ cp1008|cp104[34]|cp300[3-9]|cp301[0-9]|cp302[0-2]) echo partman/varnish-oldssd.cfg ;; \ cp[1234][0-9][0-9][0-9]|dysprosium) echo partman/varnish.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/198250 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I683fd7739d5f4bbb40904040d5d88ad9b14932f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Papaul ptshiba...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test that we are skipping the PP interstitial - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Test that we are skipping the PP interstitial .. Test that we are skipping the PP interstitial Bug: T92705 Change-Id: Id9d1226d53d483f3848b3da628805825ba0697b3 --- M tests/Adapter/PayPal/PayPalTest.php 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/Adapter/PayPal/PayPalTest.php b/tests/Adapter/PayPal/PayPalTest.php index f464868..ed40434 100644 --- a/tests/Adapter/PayPal/PayPalTest.php +++ b/tests/Adapter/PayPal/PayPalTest.php @@ -126,6 +126,27 @@ } /** +* Integration test to verify that the Paypal gateway redirects when validation is successful. +*/ + function testRedirectFormOnValid() { + $init = $this-getDonorTestData(); + $_SESSION['Donor'] = $init; + + $that = $this; + $redirectTest = function( $location ) use ( $that, $init ) { + parse_str( parse_url( $location, PHP_URL_QUERY ), $actual ); + $that-assertEquals( $init['amount'], $actual['amount'] ); + }; + $assertNodes = array( + 'headers' = array( + 'Location' = $redirectTest, + ) + ); + + $this-verifyFormOutput( 'PaypalGateway', $init, $assertNodes, false ); + } + + /** * Integration test to verify that the Paypal gateway shows an error message when validation fails. */ function testShowFormOnError() { -- To view, visit https://gerrit.wikimedia.org/r/197973 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9d1226d53d483f3848b3da628805825ba0697b3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove util.query and use core functions - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/198251 Change subject: Hygiene: Remove util.query and use core functions .. Hygiene: Remove util.query and use core functions Don't introduce new functions, which are already in core. This would fix the problem, that you have + as spaces in alphas search bar (alpha without the new header/mobilemenu). mw.util.getParamValue does exactly what we want, is maintained by mediawikic ore team and escapes the values correctly. Change-Id: Iab3963ff32e961e5942007fa733a03120d9032e7 --- M javascripts/modules/editor/init.js M javascripts/modules/search/init.js M javascripts/modules/tutorials/init.js M javascripts/specials/watchlist.js M javascripts/util.js 5 files changed, 6 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/51/198251/1 diff --git a/javascripts/modules/editor/init.js b/javascripts/modules/editor/init.js index f8dcd4a..d00243c 100644 --- a/javascripts/modules/editor/init.js +++ b/javascripts/modules/editor/init.js @@ -2,7 +2,6 @@ var settings = M.require( 'settings' ), - util = M.require( 'util' ), router = M.require( 'router' ), overlayManager = M.require( 'overlayManager' ), loader = M.require( 'loader' ), @@ -126,7 +125,7 @@ function setupEditor( page ) { var isNewPage = page.options.id === 0; - if ( query.undo ) { + if ( mw.util.getParamValue( 'undo' ) ) { window.alert( mw.msg( 'mobile-frontend-editor-undo-unsupported' ) ); } @@ -139,7 +138,7 @@ isAnon: user.isAnon(), isNewPage: isNewPage, isNewEditor: user.getEditCount() === 0, - oldId: query.oldid, + oldId: mw.util.getParamValue( 'oldid' ), funnel: funnel || 'article', // FIXME: cache this selector, it's used more than once contentLang: $( '#content' ).attr( 'lang' ), diff --git a/javascripts/modules/search/init.js b/javascripts/modules/search/init.js index 9c0f924..c97a55e 100644 --- a/javascripts/modules/search/init.js +++ b/javascripts/modules/search/init.js @@ -3,8 +3,6 @@ var SearchOverlay = M.require( 'modules/search/SearchOverlay' ), SchemaMobileWebClickTracking = M.require( 'loggingSchemas/SchemaMobileWebClickTracking' ), uiSchema = new SchemaMobileWebClickTracking( {}, 'MobileWebUIClickTracking' ), - util = M.require( 'util' ), - query = util.query, context = M.require( 'context' ), router = M.require( 'router' ), browser = M.require( 'browser' ); @@ -16,7 +14,7 @@ */ function openSearchOverlay( ev ) { // in alpha we are dealing with an 'a', not an 'input' - var searchTerm = ( context.isAlphaGroupMember() ) ? query.search : $( this ).val(); + var searchTerm = ( context.isAlphaGroupMember() ) ? mw.util.getParamValue( 'search' ) : $( this ).val(); ev.preventDefault(); uiSchema.log( { diff --git a/javascripts/modules/tutorials/init.js b/javascripts/modules/tutorials/init.js index b7c8f07..d18d28c 100644 --- a/javascripts/modules/tutorials/init.js +++ b/javascripts/modules/tutorials/init.js @@ -14,7 +14,6 @@ var PageActionOverlay = M.require( 'modules/tutorials/PageActionOverlay' ), util = M.require( 'util' ), escapeHash = util.escapeHash, - query = util.query, inEditor = window.location.hash.indexOf( '#editor/' ) -1, hash = window.location.hash, editOverlay, target, $target, href; @@ -25,7 +24,7 @@ * @returns {Boolean} */ function shouldShowLeftNavEditTutorial() { - return query.campaign === 'leftNavSignup' + return mw.util.getParamValue( 'campaign' ) === 'leftNavSignup' mw.config.get( 'wgNamespaceNumber' ) === 0 !inEditor; } @@ -35,7 +34,7 @@ * @returns {Boolean} */ function shouldShowTutorial() { - var shouldShowEditTutorial = query.article_action === 'signup-edit' !inEditor; + var shouldShowEditTutorial = mw.util.getParamValue( 'article_action' ) === 'signup-edit' !inEditor; return shouldShowEditTutorial || shouldShowLeftNavEditTutorial(); } diff --git a/javascripts/specials/watchlist.js
[MediaWiki-commits] [Gerrit] [IMPROV] api: Use query module explicitly - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/198252 Change subject: [IMPROV] api: Use query module explicitly .. [IMPROV] api: Use query module explicitly With a4951559 it's possible to explicitly request a submodule of query which is necessary when there is also an action module and that would've been choosen instead. Change-Id: I9e7f8d15d2b469c312c599437b1d44509e9281a7 --- M pywikibot/data/api.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/52/198252/1 diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 9a9c030..b30ab0b 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1256,7 +1256,7 @@ # for queries check the query module modules = set() for mod_type_name in ('list', 'prop', 'generator'): -modules.update(self._params.get(mod_type_name, [])) +modules.update('query+' + mod for mod in self._params.get(mod_type_name, [])) else: modules = set([self.action]) if modules: @@ -1785,8 +1785,8 @@ # Default values will only cause more requests and make the query # slower. for module in limited_modules: -param = self.site._paraminfo.parameter(module, 'limit') -prefix = self.site._paraminfo[module]['prefix'] +param = self.site._paraminfo.parameter('query+' + module, 'limit') +prefix = self.site._paraminfo['query+' + module]['prefix'] if self.site.logged_in() and self.site.has_right('apihighlimits'): self.request[prefix + 'limit'] = int(param['highmax']) else: @@ -1795,7 +1795,7 @@ self.api_limit = None if self.limited_module: -self.prefix = self.site._paraminfo[self.limited_module]['prefix'] +self.prefix = self.site._paraminfo['query+' + self.limited_module]['prefix'] self._update_limit() if self.api_limit is not None and generator in kwargs: @@ -1852,7 +1852,8 @@ def _update_limit(self): Set query limit for self.module based on api response. -param = self.site._paraminfo.parameter(self.limited_module, 'limit') +param = self.site._paraminfo.parameter('query+' + self.limited_module, + 'limit') if self.site.logged_in() and self.site.has_right('apihighlimits'): self.api_limit = int(param[highmax]) else: @@ -1876,7 +1877,8 @@ if the API module does not support multiple namespaces assert(self.limited_module) # some modules do not have a prefix -param = self.site._paraminfo.parameter(self.limited_module, 'namespace') +param = self.site._paraminfo.parameter('query+' + self.limited_module, + 'namespace') if not param: pywikibot.warning(u'{0} module does not support a namespace ' 'parameter'.format(self.limited_module)) -- To view, visit https://gerrit.wikimedia.org/r/198252 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e7f8d15d2b469c312c599437b1d44509e9281a7 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-qunit: To trusty/hhvm/mysql/chrome from preci... - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: mediawiki-core-qunit: To trusty/hhvm/mysql/chrome from precise/zend/sqlite/phantomjs .. mediawiki-core-qunit: To trusty/hhvm/mysql/chrome from precise/zend/sqlite/phantomjs Using Karma and local npm entry point. Bug: T74063 Change-Id: I5edff10a4f03e01064051b9c31df30380c36efc6 --- M jjb/mediawiki.yaml M zuul/layout.yaml 2 files changed, 0 insertions(+), 35 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 6477265..1089df4 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -21,37 +21,12 @@ - job-template: name: 'mediawiki-core-qunit' -node: contintLabsSlave UbuntuPrecise -concurrent: true -logrotate: -daysToKeep: 15 -triggers: - - zuul -builders: - - zuul-cloner: - projects: - mediawiki/core - mediawiki/vendor - - mw-install-sqlite - - mw-apply-settings - - qunit -publishers: - - qunit-cleanup - - mw-teardown - - archive-log-dir - -- job-template: -# Based on 'mediawiki-core-qunit' but: -# * qunit - qunit-karma (to run npm-install and karma) -# * UbuntuPrecise - UbuntuTrusty (for new local browsers and nodejs version) -name: 'mediawiki-core-qunit-karma' node: contintLabsSlave UbuntuTrusty concurrent: true logrotate: daysToKeep: 15 triggers: - zuul - builders: - zuul-cloner: projects: @@ -346,7 +321,6 @@ jobs: - 'mediawiki-core-jslint' - 'mediawiki-core-qunit' - - 'mediawiki-core-qunit-karma' - 'mediawiki-core-jsduck' - '{name}-npm' - 'mediawiki-core-jsduck-publish' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b576438..d2344f0 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1761,16 +1761,8 @@ queue-name: mediawiki - name: mediawiki-core-qunit -# Doesn't work in MediaWiki REL1_19 -# (times out or doesn't start in the first place). -branch: (?!REL1_19) -queue-name: mediawiki - - - name: mediawiki-core-qunit-karma -# @since MediaWiki 1.25-alpha branch: ^(master)$ queue-name: mediawiki -voting: false - name: mwext-VisualEditor-qunit-karma voting: false @@ -2056,7 +2048,6 @@ - mediawiki-phpunit-hhvm #- mediawiki-phpunit-zend (disabled, slow, Icac172b16) - mediawiki-core-qunit - - mediawiki-core-qunit-karma - mediawiki-core-bundle-rubocop - mediawiki-core-ruby1.9.3lint - php-composer-package-validate -- To view, visit https://gerrit.wikimedia.org/r/198210 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5edff10a4f03e01064051b9c31df30380c36efc6 Gerrit-PatchSet: 5 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Admin can hide a public list in Special:GatherLists - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review. https://gerrit.wikimedia.org/r/198246 Change subject: WIP: Admin can hide a public list in Special:GatherLists .. WIP: Admin can hide a public list in Special:GatherLists TODO * SpecialGatherLists.php: Implement function canHideLists * ext.gather.lists/init.js: Call API for editing the list * Show toasts for success/failure Bug: T91444 Change-Id: Icbd114a7473aa2361abdb989282ab0e95f1bd78a --- M extension.json M i18n/en.json M i18n/qqq.json M includes/specials/SpecialGatherLists.php M resources/Resources.php A resources/ext.gather.lists/init.js M resources/ext.gather.styles/lists.less 7 files changed, 93 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/46/198246/1 diff --git a/extension.json b/extension.json index e009af5..85cdc6a 100644 --- a/extension.json +++ b/extension.json @@ -236,6 +236,12 @@ ], styles: [ ext.gather.styles/lists.less + ], + messages: [ + gather-lists-hide-collection + ], + scripts: [ + ext.gather.lists/init.js ] } }, diff --git a/i18n/en.json b/i18n/en.json index c7823a5..bd32f4c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6,6 +6,7 @@ gather-lists-collection-title: Title, gather-lists-collection-description: Description, gather-lists-collection-count: Count, + gather-lists-hide-collection: Do you want to hide list \$1\ by \$2\?, gather-edit-collection-heading: Edit collection, gather-edit-collection-label-name: Name, gather-edit-collection-label-description: Description, diff --git a/i18n/qqq.json b/i18n/qqq.json index 0380b4c..3aef897 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -9,6 +9,7 @@ gather-lists-collection-title: Label for title of collection on list of all collections, gather-lists-collection-description: Label for description of collection on list of all collections, gather-lists-collection-count: Label for count of collection on list of all collections, + gather-lists-hide-collection: Label asking for confirmation when hiding a user's collection for moderation purposes. Parameters:\n* $1 - Title of the collection.\n* $2 - User name of the owner., gather-edit-collection-heading: Heading for collection editor overlay, gather-edit-collection-label-name: Label above input field for name of collection\n{{Identical|Name}}, gather-edit-collection-label-description: Label above input field for description of collection\n{{Identical|Description}}, diff --git a/includes/specials/SpecialGatherLists.php b/includes/specials/SpecialGatherLists.php index d29bd7b..d8cf9d3 100644 --- a/includes/specials/SpecialGatherLists.php +++ b/includes/specials/SpecialGatherLists.php @@ -10,6 +10,7 @@ use ApiMain; use FauxRequest; use Html; +use Gather\views\helpers\CSS; /** * Render a collection of articles. @@ -69,8 +70,11 @@ . Html::element( 'span', array(), wfMessage( 'gather-lists-collection-owner' ) ) . Html::element( 'span', array(), wfMessage( 'gather-lists-collection-title' ) ) . Html::element( 'span', array(), wfMessage( 'gather-lists-collection-description' ) ) - . Html::element( 'span', array(), wfMessage( 'gather-lists-collection-count' ) ) - . Html::closeElement( 'li' ); + . Html::element( 'span', array(), wfMessage( 'gather-lists-collection-count' ) ); + if ( $this-canHideLists() ) { + $html .= Html::element( 'span', array(), '' ); + } + $html .= Html::closeElement( 'li' ); foreach ( $lists as $list ) { $html .= $this-row( $list ); } @@ -80,21 +84,59 @@ $out-addHTML( $html ); } + /** +* Returns if the current user can hide public lists +* @return bool +*/ + private function canHideLists() { + // FIXME: Check permissions to see if $this-getUser() can make lists + // private + return true; + } + + /** +* Renders a html row of data +* @param array $data +* @return string +*/ private function row( $data ) { - return Html::openElement( 'li', array( 'class' = $additionalClasses ) ) + $html = Html::openElement( 'li', array( 'class' = $additionalClasses ) ) . $this-userLink( $data['owner'] ) . $this-collectionLink( $data['label'], $data['owner'],
[MediaWiki-commits] [Gerrit] add hosts subra and suhail to DHCP (poolcounter) - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: add hosts subra and suhail to DHCP (poolcounter) .. add hosts subra and suhail to DHCP (poolcounter) These are going to be the poolcounter servers for codfw. mgmt DNS was up (thx Rob), MAC addresses from racadm getsysinfo. Bug:T93261 Change-Id: I213232d51e0444f7e5c4216a8f5907562ee183e4 --- M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 63a26fc..a41cdfc 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -5491,6 +5491,16 @@ fixed-address strontium.eqiad.wmnet; } +host subra { + hardware ethernet D4:AE:52:AD:62:75; + fixed-address subra.codfw.wmnet; +} + +host suhail { + hardware ethernet 90:B1:1C:00:AE:28; + fixed-address suhail.codfw.wmnet; +} + host tellurium { hardware ethernet 00:10:18:E4:1E:26; fixed-address tellurium.eqiad.wmnet; -- To view, visit https://gerrit.wikimedia.org/r/198245 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I213232d51e0444f7e5c4216a8f5907562ee183e4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Papaul ptshiba...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] JP Morgan: don't allow empty rows; update filename detection - change (wikimedia...crm)
Ejegg has submitted this change and it was merged. Change subject: JP Morgan: don't allow empty rows; update filename detection .. JP Morgan: don't allow empty rows; update filename detection Change-Id: I5400d27050b58a016ba447fe8025ed93d97768d2 --- M sites/all/modules/offline2civicrm/JpMorganFile.php M sites/all/modules/offline2civicrm/upload_form.js 2 files changed, 2 insertions(+), 10 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/offline2civicrm/JpMorganFile.php b/sites/all/modules/offline2civicrm/JpMorganFile.php index 84f97f3..c1802dd 100644 --- a/sites/all/modules/offline2civicrm/JpMorganFile.php +++ b/sites/all/modules/offline2civicrm/JpMorganFile.php @@ -55,21 +55,13 @@ ); } -protected function parseRow( $data ) { -// Empty rows are acceptable for this file -if ( empty( $data['ACCOUNT NAME'] ) and empty( $data['REFERENCE'] ) ) { -throw new EmptyRowException(); -} - -return parent::parseRow( $data ); -} - protected function mungeMessage( $msg ) { // Approximate value in USD $msg['gross'] = exchange_rate_convert( $msg['original_currency'], $msg['original_gross'], $msg['settlement_date'] ); +// TODO: We can remove this once MG uses smart groups instead of this label. // Flag as big-time if over $1000 if ( $msg['gross'] 1000 ) { $msg['gift_source'] = 'Benefactor Gift'; diff --git a/sites/all/modules/offline2civicrm/upload_form.js b/sites/all/modules/offline2civicrm/upload_form.js index ead0b43..166e6b4 100644 --- a/sites/all/modules/offline2civicrm/upload_form.js +++ b/sites/all/modules/offline2civicrm/upload_form.js @@ -13,7 +13,7 @@ if ( /Coinbase|Orders-Report|\(Orders\)/.test( uploadFile ) ) { fileType = coinbase; -} else if ( /JPMorgan/.test( uploadFile ) ) { +} else if ( /JPM/.test( uploadFile ) ) { fileType = jpmorgan; } else if ( /Paypal/.test( uploadFile ) ) { fileType = paypal; -- To view, visit https://gerrit.wikimedia.org/r/198085 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5400d27050b58a016ba447fe8025ed93d97768d2 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-qunit-karma: Use mysql instead of sqlite - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: mediawiki-core-qunit-karma: Use mysql instead of sqlite .. mediawiki-core-qunit-karma: Use mysql instead of sqlite Bug: T57788 Change-Id: Ib9ffa55636a5d1b5d82c303e4b2aa14b1bf382fa --- M jjb/macro.yaml M jjb/mediawiki.yaml 2 files changed, 19 insertions(+), 6 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/macro.yaml b/jjb/macro.yaml index 4a4bbf5..c64beae 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -194,7 +194,7 @@ name: assert-phpflavor builders: - shell: | -#!/bin/bash -e -u +#!/bin/bash -eu PHP_VERSION=`php --version` case {phpflavor} in @@ -404,14 +404,17 @@ builders: - shell: /srv/deployment/integration/slave-scripts/bin/mw-setup.sh -# Shell script backed macro installing MediaWiki with a SQLite backend -# -# # ALWAYS pair with 'mw-teardown' publisher to ensure we don't leave temporary files behind - builder: name: mw-install-sqlite builders: - shell: /srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh + +# ALWAYS pair with 'mw-teardown-mysql' publisher to ensure we don't leave temporary files behind +- builder: +name: mw-install-mysql +builders: + - shell: /srv/deployment/integration/slave-scripts/bin/mw-install-mysql.sh - publisher: name: mw-teardown @@ -423,6 +426,16 @@ onsuccess: False onfailure: False +- publisher: +name: mw-teardown-mysql +publishers: + - postbuildscript: + builders: + - shell: /srv/deployment/integration/slave-scripts/bin/mw-teardown-mysql.sh + # Postbuild options are confusing, setting both to false ensures the script always runs. + onsuccess: False + onfailure: False + # This macro is OBSOLETE # # Instead one should use Zuul cloner: diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 8949b22..6477265 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -57,12 +57,12 @@ projects: mediawiki/core mediawiki/vendor - - mw-install-sqlite + - mw-install-mysql - mw-apply-settings - qunit-karma publishers: - qunit-cleanup - - mw-teardown + - mw-teardown-mysql - archive-log-dir - job-template: -- To view, visit https://gerrit.wikimedia.org/r/197958 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9ffa55636a5d1b5d82c303e4b2aa14b1bf382fa Gerrit-PatchSet: 8 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: fix team-services contact name - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/198253 Change subject: icinga: fix team-services contact name .. icinga: fix team-services contact name Using underscores caused issues on Icinga, replace _ with -. for contact name. Adjusted in private repo. Change-Id: Iaea4443fd8cf8b46c5e20d6d14a94979712534f6 --- M modules/icinga/files/contactgroups.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/198253/1 diff --git a/modules/icinga/files/contactgroups.cfg b/modules/icinga/files/contactgroups.cfg index ad30925..36d2c25 100644 --- a/modules/icinga/files/contactgroups.cfg +++ b/modules/icinga/files/contactgroups.cfg @@ -26,7 +26,7 @@ define contactgroup { contactgroup_name parsoid -members rkattouw,jamesf,mobrovac,team_services +members rkattouw,jamesf,mobrovac,team-services } define contactgroup { -- To view, visit https://gerrit.wikimedia.org/r/198253 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaea4443fd8cf8b46c5e20d6d14a94979712534f6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply a Ken Burns effect to the lead image. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Apply a Ken Burns effect to the lead image. .. Apply a Ken Burns effect to the lead image. (only for non-production for now) Change-Id: Ic4f9eadc173a16e5e1b25175874e783b13d60631 --- A wikipedia/res/anim/lead_image_zoom.xml M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/anim/lead_image_zoom.xml b/wikipedia/res/anim/lead_image_zoom.xml new file mode 100644 index 000..a94ed91 --- /dev/null +++ b/wikipedia/res/anim/lead_image_zoom.xml @@ -0,0 +1,9 @@ +?xml version=1.0 encoding=utf-8? +scale xmlns:android=http://schemas.android.com/apk/res/android; +android:duration=2000 +android:fromXScale=1 +android:fromYScale=1 +android:pivotX=50% +android:pivotY=50% +android:toXScale=1.07 +android:toYScale=1.07 / \ No newline at end of file diff --git a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java index 8c69402..b017205 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java @@ -13,6 +13,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.view.animation.Transformation; import android.webkit.WebView; import android.widget.FrameLayout; @@ -287,6 +288,14 @@ // fade in the new image! ViewAnimations.crossFade(imagePlaceholder, image1); + +if (WikipediaApp.getInstance().getReleaseType() != WikipediaApp.RELEASE_PROD) { +// and perform a subtle Ken Burns animation... +Animation anim = AnimationUtils.loadAnimation(parentFragment.getActivity(), + R.anim.lead_image_zoom); +anim.setFillAfter(true); +image1.startAnimation(anim); +} } }); } -- To view, visit https://gerrit.wikimedia.org/r/198082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4f9eadc173a16e5e1b25175874e783b13d60631 Gerrit-PatchSet: 3 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: BearND bsitzm...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add hosts subra and suhail to DHCP (poolcounter) - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/198245 Change subject: add hosts subra and suhail to DHCP (poolcounter) .. add hosts subra and suhail to DHCP (poolcounter) These are going to be the poolcounter servers for codfw. mgmt DNS was up (thx Rob), MAC addresses from racadm getsysinfo. Bug:T93261 Change-Id: I213232d51e0444f7e5c4216a8f5907562ee183e4 --- M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/198245/1 diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 index 63a26fc..cbab762 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -5491,6 +5491,16 @@ fixed-address strontium.eqiad.wmnet; } +host subra { +hardware ethernet D4:AE:52:AD:62:75; +fixed-address subra.codfw.wmnet; +} + +host suhail { +hardware ethernet 90:B1:1C:00:AE:28; +fixed-address suhail.codfw.wmnet; +} + host tellurium { hardware ethernet 00:10:18:E4:1E:26; fixed-address tellurium.eqiad.wmnet; -- To view, visit https://gerrit.wikimedia.org/r/198245 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I213232d51e0444f7e5c4216a8f5907562ee183e4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove table header from Special:Tags when there are no tags - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove table header from Special:Tags when there are no tags .. Remove table header from Special:Tags when there are no tags The table header shows up even when there are no tags to be listed in the table. This patch fixes the same Bug: T92728 Change-Id: I22d2c0435bc365f65354cea604b1c87905c769f8 --- M includes/specials/SpecialTags.php 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php index ff263b6..0b8147e 100644 --- a/includes/specials/SpecialTags.php +++ b/includes/specials/SpecialTags.php @@ -114,6 +114,12 @@ $showActions = $user-isAllowed( 'managechangetags' ); // Write the headers + $tagUsageStatistics = ChangeTags::tagUsageStatistics(); + + // Show header only if there exists atleast one tag + if ( !$tagUsageStatistics ) { + return; + } $html = Xml::tags( 'tr', null, Xml::tags( 'th', null, $this-msg( 'tags-tag' )-parse() ) . Xml::tags( 'th', null, $this-msg( 'tags-display-header' )-parse() ) . Xml::tags( 'th', null, $this-msg( 'tags-description-header' )-parse() ) . @@ -134,7 +140,7 @@ $this-extensionActivatedTags = array_fill_keys( ChangeTags::listExtensionActivatedTags(), true ); - foreach ( ChangeTags::tagUsageStatistics() as $tag = $hitcount ) { + foreach ( $tagUsageStatistics as $tag = $hitcount ) { $html .= $this-doTagRow( $tag, $hitcount, $showActions ); } -- To view, visit https://gerrit.wikimedia.org/r/197119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22d2c0435bc365f65354cea604b1c87905c769f8 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tinaj1234 tinajohnson.1...@gmail.com Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Qgil q...@wikimedia.org Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits