[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2034
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332218 ) Change subject: db-codfw.php: Repool db2034 .. db-codfw.php: Repool db2034 After almost 3 months out, db2034 looks fixed now. Bug: T149553 Change-Id: I9cf8a79453dbe3ad47e656469378d796bd9bfab0 --- M wmf-config/db-codfw.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/18/332218/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 9fe4bbf..f4a8b98 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -94,9 +94,9 @@ 'sectionLoads' => [ 's1' => [ 'db2016' => 0, # 2.9TB 96GB, master -# 'db2034' => 50, # 2.9TB 160GB, rc, log #Maintenance - T149553 + 'db2034' => 50, # 2.9TB 160GB, rc, log 'db2042' => 50, # 2.9TB 160GB, rc, log -# 'db2048' => 400, # 2.9TB 160GB #Temporary depool - T149553 + 'db2048' => 400, # 2.9TB 160GB 'db2055' => 50, # 3.3TB 160GB, dump (inactive), vslow 'db2062' => 100, # 3.3TB 160GB, api 'db2069' => 100, # 3.3TB 160GB, api @@ -218,23 +218,23 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'recentchanges' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'recentchangeslinked' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'contributions' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'logpager' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'dump' => [ -- To view, visit https://gerrit.wikimedia.org/r/332218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cf8a79453dbe3ad47e656469378d796bd9bfab0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticBundle[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331976 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Iebf632f4a48b06b5ca9f36f2f14f5e002a79b5f3 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index c0a9432..286516b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .* *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iebf632f4a48b06b5ca9f36f2f14f5e002a79b5f3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticBundle Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticExpressiveness[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331978 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I694020c87c4cbad55546aacc369bb5e5d72e8535 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I694020c87c4cbad55546aacc369bb5e5d72e8535 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticExpressiveness Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Daniel Werner Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecureSessions[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331972 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I6d33c6bc39de7238bed678730dab06c037b74871 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 13ec05b..d6ac391 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +node_modules/ +vendor/ + .svn *~ diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331972 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d33c6bc39de7238bed678730dab06c037b74871 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SecureSessions Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Parent5446 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...SecurePasswords[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331971 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Ief0ee1fbdba86f6a63e387e80f1626855c73870d --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331971 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief0ee1fbdba86f6a63e387e80f1626855c73870d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SecurePasswords Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Skizzerz Gerrit-Reviewer: Umherirrender 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...SemanticFormsInputs[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331979 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Iaf8ad94a6fe228c4296b6d02fa18cdecd2714c84 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf8ad94a6fe228c4296b6d02fa18cdecd2714c84 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticFormsInputs Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jeroen De Dauw Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Yaron Koren 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...SelectCategory[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331981 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I7d70662ef963a7a3eb7c68edc1f24e5bfd004142 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d70662ef963a7a3eb7c68edc1f24e5bfd004142 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SelectCategory Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticACL[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331975 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I8b8d219ffa8cb95dca97c966afeaa1fb1ec78efc --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331975 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b8d219ffa8cb95dca97c966afeaa1fb1ec78efc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticACL Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Werdna 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...SelectTag[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331974 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Id42373bb9f50b01f6d01e8627d55064a897a1756 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id42373bb9f50b01f6d01e8627d55064a897a1756 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SelectTag Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Khaled El Mansoury Gerrit-Reviewer: Paladox Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Spark] Add npm and composer test
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332172 ) Change subject: [Spark] Add npm and composer test .. [Spark] Add npm and composer test Source: I8f7e37b3dc911d0e49ecda97ab9197d782de6173 Change-Id: Icc155a2ca1a1eecedf799cdbb4063ea853b7c119 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a7bcdc1..f10d857 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6795,9 +6795,12 @@ - name: mediawiki/extensions/Spark template: + - name: composer-test - name: jshint - - name: jsonlint - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/Special404 template: -- To view, visit https://gerrit.wikimedia.org/r/332172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc155a2ca1a1eecedf799cdbb4063ea853b7c119 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SoundManager2Button] Add npm and composer tests
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332165 ) Change subject: [SoundManager2Button] Add npm and composer tests .. [SoundManager2Button] Add npm and composer tests Source: I0388ff0842b42b7881a38ec9324a3322b19ac960 Change-Id: I38d5dc9e53fe8ec4eb3b11785e6c21ecf1349013 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index bacded3..7ce2ef5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6778,8 +6778,11 @@ - name: mediawiki/extensions/SoundManager2Button template: - - name: jsonlint + - name: composer-test - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/SpamRegex template: -- To view, visit https://gerrit.wikimedia.org/r/332165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38d5dc9e53fe8ec4eb3b11785e6c21ecf1349013 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Special404] Add npm and composer tests
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332174 ) Change subject: [Special404] Add npm and composer tests .. [Special404] Add npm and composer tests Source: Iea5fcce2acd09b439fa13ace384d656b1377e92e Change-Id: I4df4ba51a30ee87d254c91486015aaed08885e1c --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index f10d857..b60bd45 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6804,9 +6804,12 @@ - name: mediawiki/extensions/Special404 template: + - name: composer-test - name: jshint - - name: jsonlint - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/SpellingApi template: -- To view, visit https://gerrit.wikimedia.org/r/332174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4df4ba51a30ee87d254c91486015aaed08885e1c Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SpamRegex] Add npm and composer tests
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332168 ) Change subject: [SpamRegex] Add npm and composer tests .. [SpamRegex] Add npm and composer tests Source: If1627b1aa6abaf113b95edcc9d39fb742477e104 Change-Id: I5b8dc7e705d20e37c2c90e60417360321ac6a226 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 7ce2ef5..a7bcdc1 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6786,9 +6786,12 @@ - name: mediawiki/extensions/SpamRegex template: + - name: composer-test - name: jshint - - name: jsonlint - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/Spark template: -- To view, visit https://gerrit.wikimedia.org/r/332168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b8dc7e705d20e37c2c90e60417360321ac6a226 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SpellingApi] Add npm and composer test
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332176 ) Change subject: [SpellingApi] Add npm and composer test .. [SpellingApi] Add npm and composer test Source: Ic8e09836a442772e2ddc0385cbd051ff0d277560 Change-Id: I713af613d6d036526b551a68fd3ceb2b2dfdd63e --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b60bd45..348f40a 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6813,9 +6813,12 @@ - name: mediawiki/extensions/SpellingApi template: + - name: composer-test - name: jshint - - name: jsonlint - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/SpellingDictionary template: -- To view, visit https://gerrit.wikimedia.org/r/332176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I713af613d6d036526b551a68fd3ceb2b2dfdd63e Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SolrStore] Add npm and composer test
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332163 ) Change subject: [SolrStore] Add npm and composer test .. [SolrStore] Add npm and composer test Source: I43fede082f283a0caaf939bd88ae45bd9b9628ae Change-Id: Ib2a16fa8bd784a4e8f364f885f670346954cffb8 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 07bac32..bacded3 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6769,9 +6769,12 @@ - name: mediawiki/extensions/SolrStore template: + - name: composer-test - name: jshint - - name: jsonlint - name: extension-unittests-non-voting + - name: npm +check: + - jsonlint - name: mediawiki/extensions/SoundManager2Button template: -- To view, visit https://gerrit.wikimedia.org/r/332163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2a16fa8bd784a4e8f364f885f670346954cffb8 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...Spark[master]: Add npm and composer entry point's
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332169 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I8f7e37b3dc911d0e49ecda97ab9197d782de6173 --- A Gruntfile.js A composer.json A package.json 3 files changed, 42 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f7e37b3dc911d0e49ecda97ab9197d782de6173 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Spark Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Chad Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender 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...Special404[master]: Add npm and composer entry point
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332173 ) Change subject: Add npm and composer entry point .. Add npm and composer entry point Change-Id: Iea5fcce2acd09b439fa13ace384d656b1377e92e --- M .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..9b29323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/node_modules/ +/vendor/ +/composer.lock .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea5fcce2acd09b439fa13ace384d656b1377e92e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Special404 Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy 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...BlueSpiceSubPageTree[master]: Refactoring extension name
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332216 ) Change subject: Refactoring extension name .. Refactoring extension name Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761 --- M BlueSpiceSubPageTree.class.php D bluespice.subpagetree.js M extension.json A resources/bluespice.subpagetree.js 4 files changed, 41 insertions(+), 26 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php index 197ebdf..ea6e284 100644 --- a/BlueSpiceSubPageTree.class.php +++ b/BlueSpiceSubPageTree.class.php @@ -1,4 +1,5 @@ getOutput()->addModules("ext.bluespice.subpagetree"); - $treeRoot = ""; + $sTreeRoot = ""; if( !empty( $args["root"] ) ){ - $treeRoot = $args["root"]; - }else{ - global $bsgPageTreeRoot; - $treeRoot = $bsgPageTreeRoot; + $sTreeRoot = $args["root"]; } - if( strpos( $treeRoot, ":" ) === false ){ - $treeRoot = ":" . $treeRoot; + else { + global $bsgSubPageTreeRoot; + $sTreeRoot = $bsgSubPageTreeRoot; } - return ""; + if( strpos( $sTreeRoot, ":" ) === false ){ + $sTreeRoot = ":" . $sTreeRoot; + } + + return Html::element( + 'div', + array( + 'class' => 'bs-subpagetree', + 'data-root' => $sTreeRoot + ), + '' + ); } - } diff --git a/bluespice.subpagetree.js b/bluespice.subpagetree.js deleted file mode 100644 index 8b8ac0b..000 --- a/bluespice.subpagetree.js +++ /dev/null @@ -1,13 +0,0 @@ -var treeNodes = Ext.query('.pagetree'); - -treeNodes.forEach(function(node){ - Ext.create('BS.tree.WikiSubPages', { - renderTo: node,//this div is created by BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit) - treeRootPath: node.getAttribute("root"), - listeners: { - itemclick: function( obj, record, item, index, e, eOpts ){ - window.location.href = mw.util.wikiGetlink( record.internalId ) ; - } - } - }); -}); diff --git a/extension.json b/extension.json index df8c706..9bf1bda 100644 --- a/extension.json +++ b/extension.json @@ -3,7 +3,7 @@ "version": "2.27.1-alpha", "url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;, "author": "Leonid Verhovskij", - "descriptionmsg": "bs-pagetreee-desc", + "descriptionmsg": "bs-subagetreee-desc", "type": "bluespice", "AutoloadClasses": { "BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php" @@ -19,8 +19,8 @@ } }, "ResourceFileModulePaths": { - "localBasePath": "", - "remoteExtPath": "BlueSpiceSubPageTree" + "localBasePath": "resources", + "remoteExtPath": "BlueSpiceSubPageTree/resources" }, "bsgExtensions": { "BlueSpiceSubPageTree": { diff --git a/resources/bluespice.subpagetree.js b/resources/bluespice.subpagetree.js new file mode 100644 index 000..c231f64 --- /dev/null +++ b/resources/bluespice.subpagetree.js @@ -0,0 +1,11 @@ +$( '.bs-subpagetree' ).each( function() { + Ext.create('BS.tree.WikiSubPages', { + renderTo: this,//this div is created by BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit) + treeRootPath: $(this).data( 'root' ), + listeners: { + itemclick: function( obj, record, item, index, e, eOpts ){ + window.location.href = mw.util.wikiGetlink( record.internalId ) ; + } + } + }); +}); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/332216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree Gerrit-Branch: master Gerrit-Owner: Robert VogelGerrit-Reviewer: Robert Vogel 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...BlueSpiceSubPageTree[master]: Refactoring extension name
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332216 ) Change subject: Refactoring extension name .. Refactoring extension name Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761 --- M BlueSpiceSubPageTree.class.php D bluespice.subpagetree.js M extension.json A resources/bluespice.subpagetree.js 4 files changed, 41 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSubPageTree refs/changes/16/332216/1 diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php index 197ebdf..ea6e284 100644 --- a/BlueSpiceSubPageTree.class.php +++ b/BlueSpiceSubPageTree.class.php @@ -1,4 +1,5 @@ getOutput()->addModules("ext.bluespice.subpagetree"); - $treeRoot = ""; + $sTreeRoot = ""; if( !empty( $args["root"] ) ){ - $treeRoot = $args["root"]; - }else{ - global $bsgPageTreeRoot; - $treeRoot = $bsgPageTreeRoot; + $sTreeRoot = $args["root"]; } - if( strpos( $treeRoot, ":" ) === false ){ - $treeRoot = ":" . $treeRoot; + else { + global $bsgSubPageTreeRoot; + $sTreeRoot = $bsgSubPageTreeRoot; } - return ""; + if( strpos( $sTreeRoot, ":" ) === false ){ + $sTreeRoot = ":" . $sTreeRoot; + } + + return Html::element( + 'div', + array( + 'class' => 'bs-subpagetree', + 'data-root' => $sTreeRoot + ), + '' + ); } - } diff --git a/bluespice.subpagetree.js b/bluespice.subpagetree.js deleted file mode 100644 index 8b8ac0b..000 --- a/bluespice.subpagetree.js +++ /dev/null @@ -1,13 +0,0 @@ -var treeNodes = Ext.query('.pagetree'); - -treeNodes.forEach(function(node){ - Ext.create('BS.tree.WikiSubPages', { - renderTo: node,//this div is created by BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit) - treeRootPath: node.getAttribute("root"), - listeners: { - itemclick: function( obj, record, item, index, e, eOpts ){ - window.location.href = mw.util.wikiGetlink( record.internalId ) ; - } - } - }); -}); diff --git a/extension.json b/extension.json index df8c706..9bf1bda 100644 --- a/extension.json +++ b/extension.json @@ -3,7 +3,7 @@ "version": "2.27.1-alpha", "url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;, "author": "Leonid Verhovskij", - "descriptionmsg": "bs-pagetreee-desc", + "descriptionmsg": "bs-subagetreee-desc", "type": "bluespice", "AutoloadClasses": { "BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php" @@ -19,8 +19,8 @@ } }, "ResourceFileModulePaths": { - "localBasePath": "", - "remoteExtPath": "BlueSpiceSubPageTree" + "localBasePath": "resources", + "remoteExtPath": "BlueSpiceSubPageTree/resources" }, "bsgExtensions": { "BlueSpiceSubPageTree": { diff --git a/resources/bluespice.subpagetree.js b/resources/bluespice.subpagetree.js new file mode 100644 index 000..c231f64 --- /dev/null +++ b/resources/bluespice.subpagetree.js @@ -0,0 +1,11 @@ +$( '.bs-subpagetree' ).each( function() { + Ext.create('BS.tree.WikiSubPages', { + renderTo: this,//this div is created by BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit) + treeRootPath: $(this).data( 'root' ), + listeners: { + itemclick: function( obj, record, item, index, e, eOpts ){ + window.location.href = mw.util.wikiGetlink( record.internalId ) ; + } + } + }); +}); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/332216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e96bdcef82e1bf5f8679f26207bff8345c30761 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree Gerrit-Branch: master Gerrit-Owner: Robert Vogel___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Ratings] unconfigure extension
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332219 ) Change subject: [Ratings] unconfigure extension .. [Ratings] unconfigure extension Bug: T155047 Change-Id: Ic26560c94f20ace50967bf6103d535bff71d8605 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/19/332219/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 86d4aa3..e5289fd 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6409,12 +6409,6 @@ - name: extension-unittests-generic - name: npm - - name: mediawiki/extensions/Ratings -template: - - name: jsonlint - - name: extension-unittests-non-voting - - name: npm - - name: mediawiki/extensions/ReassignEdits template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/332219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic26560c94f20ace50967bf6103d535bff71d8605 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add npm jobs
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331982 ) Change subject: Add npm jobs .. Add npm jobs Related changes: SecurePasswords: Ief0ee1fbdba86f6a63e387e80f1626855c73870d SecureSessions: I6d33c6bc39de7238bed678730dab06c037b74871 SelectCategory: I7d70662ef963a7a3eb7c68edc1f24e5bfd004142 SelectTag: Id42373bb9f50b01f6d01e8627d55064a897a1756 SemanticACL: I8b8d219ffa8cb95dca97c966afeaa1fb1ec78efc SemanticBundle: Iebf632f4a48b06b5ca9f36f2f14f5e002a79b5f3 SemanticDependency: I5ab166ff57e59a500f6cded7e51082b2662b SemanticExpressiveness: I694020c87c4cbad55546aacc369bb5e5d72e8535 SemanticFormsInputs: Iaf8ad94a6fe228c4296b6d02fa18cdecd2714c84 SemanticGenealogy: If3193ac2c6c1aa945e15c5d5a0ea5d61eb432837 Change-Id: Ib6516c48183eaa697f10c63bb2d76d1f2dc871e3 --- M zuul/layout.yaml 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e5289fd..d2a4221 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6555,12 +6555,14 @@ - name: jshint - name: jsonlint - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SecureSessions template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SearchStats template: @@ -6571,12 +6573,14 @@ template: - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SelectTag template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SemanticComments template: @@ -7602,6 +7606,7 @@ - name: mediawiki/extensions/SemanticDependency template: - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SimpleSAMLphp template: @@ -8018,8 +8023,11 @@ - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticBundle +template: + - name: npm check: _jobs - jshint - jsonlint @@ -8047,6 +8055,7 @@ template: - name: jsonlint - name: mw-checks-test + - name: npm # Depends on SemanticForms which is on GitHub - name: mediawiki/extensions/SemanticFormsInputs @@ -8054,12 +8063,14 @@ - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticGenealogy template: - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticImageAnnotator template: -- To view, visit https://gerrit.wikimedia.org/r/331982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6516c48183eaa697f10c63bb2d76d1f2dc871e3 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add npm jobs
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332148 ) Change subject: Add npm jobs .. Add npm jobs Related changes: ShoutBox: I01d1b8c629114592c5546998c620c732952b2cb7 SideBarMenu: Icf3f6d45c77db3b1375c2ccf9553672a12c24644 SidebarDonateBox: I5552d3afe2a977c3fad204a2ca1ee13d9bcd1a1d SignWritingMediaWikiPlugin: I8c1b74a731674bcc7d6c7c2701a19e7664e1b374 SimpleChanges: I882a62b285f4c96fa20190a6e08b860143e81ac1 SimpleFarm: I438812507738846e35066c129bcb7f521dad8846 SimpleSAMLphp: Iea8f6dfeaef5758f82b8473fb5dcbae88ee21058 SimpleSecurity: I6b54fe7dd527e4c71023cf15906da610d3e2dd53 SimpleSort: I12f9417b9804c2250d07985291a41aeea9f04497 SiteMetrics: I8f0ccfa0af6a932e2ce9ea554611fbf742cd9652 Change-Id: I8bf88959dbdfe84e9a9fe11bb700e0ec694a1e8d --- M zuul/layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 22d765d..b0ef735 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6631,6 +6631,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/ShoutWikiAds template: @@ -6654,28 +6655,33 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SignWritingMediaWikiPlugin template: - name: jsonlint - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SimpleChanges template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SimpleSecurity template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SimpleSort template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/SimpleSurvey template: @@ -6686,6 +6692,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SiteSettings template: @@ -7617,6 +7624,7 @@ template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/SiteScout template: @@ -8174,6 +8182,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SiteMatrix template: @@ -8310,6 +8319,7 @@ - name: jsonlint - name: jshint - name: extension-unittests-composer + - name: npm - name: mediawiki/extensions/SyntaxHighlight_GeSHi template: -- To view, visit https://gerrit.wikimedia.org/r/332148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bf88959dbdfe84e9a9fe11bb700e0ec694a1e8d Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add npm jobs
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332064 ) Change subject: Add npm jobs .. Add npm jobs Related changes: SemanticHighcharts: I05719dba3099e3137cbf634dc986922a31c85d52 SemanticInternalObjects: Id64a4aee241459dbc45cad6a869d2f71d7dd3710 SemanticPageSeries: I062643d82e58e93b11d655ee2532d3e617222e1e SemanticRating: I08608fafee94a55c6cd871d83e527f741092ee80 SemanticSifter: I048a27e5101707d1ab4050bad3bb9552024fe7cd SemanticTasks: Ieaf4fe2012c44f1fbbea6fa67f330441e1319369 SemanticTitle: Ia5f4b0b77c03e750f05c04538bff9605dccc3f53 SemanticUpdateOnPurge: I62c031040ba518a180e4482c2af10205da9550f0 SemanticWebBrowser: I1d8bfdc07f3d9c8ca44b6b2f3b55a2c2297281e7 SharedCssJs: I84d7dec7b54d6f021a356b48834f34eb5f4f008f Change-Id: I19728a6c7a49ebedb12476b61d0dec51d2f5827c --- M zuul/layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index d2a4221..22d765d 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6591,30 +6591,35 @@ template: - name: jsonlint - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SemanticRating template: - name: jshint - name: jsonlint - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SemanticSifter template: - name: jsonlint - name: jshint - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SemanticWebBrowser template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SharedCssJs template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SharedHelpPages template: @@ -8091,6 +8096,7 @@ - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticMediaWiki template: @@ -8109,24 +8115,28 @@ - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticTasks template: - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticTitle template: - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/SemanticUpdateOnPurge template: - name: mw-checks-test - name: jshint - name: jsonlint + - name: npm - name: mediawiki/extensions/Sentry template: -- To view, visit https://gerrit.wikimedia.org/r/332064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19728a6c7a49ebedb12476b61d0dec51d2f5827c Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticInternalObjects[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332055 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Id64a4aee241459dbc45cad6a869d2f71d7dd3710 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id64a4aee241459dbc45cad6a869d2f71d7dd3710 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticInternalObjects Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Yaron Koren 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...SemanticHighcharts[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332054 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I05719dba3099e3137cbf634dc986922a31c85d52 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index d1502b0..8ec4b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +node_modules/ vendor/ composer.lock diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05719dba3099e3137cbf634dc986922a31c85d52 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticHighcharts Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Netbrain 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...SemanticDependency[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331977 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I5ab166ff57e59a500f6cded7e51082b2662b --- A .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7abe44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +vendor/ + diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/331977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ab166ff57e59a500f6cded7e51082b2662b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDependency Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Cicalese Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NamespacePopups[master]: Fix build
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331904 ) Change subject: Fix build .. Fix build Similar to I215fabe129933a04644e05eb541cbf3b34699095 Update .gitignore to ignore package manager material (node_modules, vendor and composer.lock). Set manifest_version to 2 and use schema for "requires" PHP_CodeSniffer: Fix up white spaces after comment character. Add spaces next to parentheses. PagePopups.hooks.php Reindent with tabulations npm: Bump grunt to 1.x which now ship with a grunt CLI utility. Hence remove grunt-cli which is no more needed. Remove jscsc task. It does not pass yet, see BoilerPlates extension to add it later. Comment out 'banana' since there is no i18n files yet. Change-Id: I25fdd0d99dfab483cc7bedd8c7b4e26dcc136978 --- M .gitignore M Gruntfile.js M NamespacePopups.hooks.php M NamespacePopups.php M extension.json M package.json 6 files changed, 81 insertions(+), 50 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index b25c15b..abae72d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +/node_modules +/vendor +/composer.lock *~ diff --git a/Gruntfile.js b/Gruntfile.js index 6ad5e33..dbe381d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,7 +3,6 @@ grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); - grunt.loadNpmTasks( 'grunt-jscs' ); grunt.initConfig( { jshint: { @@ -26,6 +25,6 @@ } } ); - grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', /* 'banana' */ ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/NamespacePopups.hooks.php b/NamespacePopups.hooks.php index 71c76b2..005231f 100644 --- a/NamespacePopups.hooks.php +++ b/NamespacePopups.hooks.php @@ -3,69 +3,97 @@ // use MediaWiki\Title; class NamespacePopupsHooks { - public static function onHtmlPageLinkRendererEnd( $renderer, $target, $isKnown, &$text, &$attribs, &$ret ) { -global $wgNamespacePopupsNamespaceMap, $wgNamespacePopupsAnchor; + public static function onHtmlPageLinkRendererEnd( $renderer, $target, $isKnown, &$text, + &$attribs, &$ret + ) { + global $wgNamespacePopupsNamespaceMap, $wgNamespacePopupsAnchor; -if(!$wgNamespacePopupsNamespaceMap) return true; + if ( !$wgNamespacePopupsNamespaceMap ) { + return true; + } -// It does not work with $target instanceof TitleValue (as in "search for this page title") -// $linkNS = $target->getSubjectNsText(); + // It does not work with $target instanceof TitleValue (as in "search for this page title") + // $linkNS = $target->getSubjectNsText(); global $wgContLang; $linkNS = $wgContLang->getNsText( MWNamespace::getSubject( $target->getNamespace() ) ); -if(!$linkNS) $linkNS = ''; // needed? + if ( !$linkNS ) { + $linkNS = ''; // needed? + } -$popupNS = isset($wgNamespacePopupsNamespaceMap[$linkNS]) ? $wgNamespacePopupsNamespaceMap[$linkNS] : null; -if(!$popupNS) $popupNS = isset($wgNamespacePopupsNamespaceMap['*']) ? $wgNamespacePopupsNamespaceMap['*'] : null; -if(!$popupNS) return true; -if($popupNS === '*') $popupNS = $linkNS; + $popupNS = isset( $wgNamespacePopupsNamespaceMap[$linkNS] ) + ? $wgNamespacePopupsNamespaceMap[$linkNS] : null; + if ( !$popupNS ) { + $popupNS = isset( $wgNamespacePopupsNamespaceMap['*'] ) + ? $wgNamespacePopupsNamespaceMap['*'] : null; + } + + if ( !$popupNS ) { + return true; + } + + if ( $popupNS === '*' ) { + $popupNS = $linkNS; + } $remains = $target->getDBkey(); -$anchor = $wgNamespacePopupsAnchor ? $wgNamespacePopupsAnchor : ''; -$page = $popupNS === '' ? $remains : "$popupNS:$remains"; + $anchor = $wgNamespacePopupsAnchor ? $wgNamespacePopupsAnchor : ''; + $page = $popupNS === '' ? $remains : "$popupNS:$remains"; $title = Title::newFromText( $page ); - if(!$title) return true; -$url = $title->getLocalUrl(); + + if ( !$title ) { + return true; + } + + $url = $title->getLocalUrl(); $html =
[MediaWiki-commits] [Gerrit] mediawiki...NamespacePopups[master]: Remove non-exist descriptionmsg key
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331901 ) Change subject: Remove non-exist descriptionmsg key .. Remove non-exist descriptionmsg key There are no message files at all Change-Id: I6532230b535516ac799a3ffd1526b4b00d383a66 --- M extension.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index df84c36..b628af7 100644 --- a/extension.json +++ b/extension.json @@ -5,7 +5,6 @@ "Victor Porton" ], "url": "https://www.mediawiki.org/wiki/Extension:NamespacePopups;, - "descriptionmsg": "namespacepopups-desc", "license-name": "GPL-2.0+", "type": "other", "requires": { -- To view, visit https://gerrit.wikimedia.org/r/331901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6532230b535516ac799a3ffd1526b4b00d383a66 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/NamespacePopups Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SpellingApi[master]: Fix extension SpellingApi failing tests
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332032 ) Change subject: Fix extension SpellingApi failing tests .. Fix extension SpellingApi failing tests Extension SpellingApi failing tests due to missing apihelp messages Bug: T155032 Change-Id: I9d3147214f80f0edd321753bdeb58850d38b879d --- M api/ApiQuerySpellcheck.php M i18n/en.json M i18n/qqq.json 3 files changed, 9 insertions(+), 14 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/api/ApiQuerySpellcheck.php b/api/ApiQuerySpellcheck.php index 0019043..7b0eace 100644 --- a/api/ApiQuerySpellcheck.php +++ b/api/ApiQuerySpellcheck.php @@ -68,15 +68,4 @@ ), ); } - - public function getDescription() { - return 'Check the spelling of a text string.'; - } - - public function getParamDescription() { - return array( - 'text' => 'Text, the spelling of which you want to check.', - 'langcode' => 'Language code. The default is the the code of $wgContLang.', - ); - } } diff --git a/i18n/en.json b/i18n/en.json index f62e28b..e65cb21 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4,5 +4,8 @@ "Amire80" ] }, - "spellingapi-desc": "Provides an API module for checking spelling" + "spellingapi-desc": "Provides an API module for checking spelling", + "apihelp-spellingapi-description": "Check the spelling of a text string.", + "apihelp-spellingapi-param-text": "Text, the spelling of which you want to check.", + "apihelp-spellingapi-param-langcode": "Language code. The default is the the code of $wgContLang." } diff --git a/i18n/qqq.json b/i18n/qqq.json index b5f24fe..c762ba9 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -7,5 +7,8 @@ "Umherirrender" ] }, - "spellingapi-desc": "{{desc|name=Spelling Api|url=https://www.mediawiki.org/wiki/Extension:SpellingApi}}; -} + "spellingapi-desc": "{{desc|name=Spelling Api|url=https://www.mediawiki.org/wiki/Extension:SpellingApi}};, + "apihelp-spellingapi-description": "{{doc-apihelp-description|spellingapi}}", + "apihelp-spellingapi-param-text": "{{doc-apihelp-param|spellingapi|text}}", + "apihelp-spellingapi-param-langcode": "{{doc-apihelp-param|spellingapi|langcode}}" +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/332032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d3147214f80f0edd321753bdeb58850d38b879d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpellingApi Gerrit-Branch: master Gerrit-Owner: DatGuyGerrit-Reviewer: Hashar Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Umherirrender 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...BlueSpiceSubPageTree[master]: Refactoring extension name
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332215 ) Change subject: Refactoring extension name .. Refactoring extension name commit 58413486b4b1bafc08a9f14337f93f1c18a5be79 Author: rvogelDate: Wed Jan 11 10:17:26 2017 +0100 Refactoring extension name Change-Id: I8b582966eee3f975068b95f35d07f28573de1b54 Change-Id: I55a572ae6c2bf7bfc17cc78b963cdfb4a1745afb --- M BlueSpiceSubPageTree.class.php D bluespice.subpagetree.js M extension.json A resources/bluespice.subpagetree.js 4 files changed, 41 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSubPageTree refs/changes/15/332215/1 diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php index 197ebdf..ea6e284 100644 --- a/BlueSpiceSubPageTree.class.php +++ b/BlueSpiceSubPageTree.class.php @@ -1,4 +1,5 @@ getOutput()->addModules("ext.bluespice.subpagetree"); - $treeRoot = ""; + $sTreeRoot = ""; if( !empty( $args["root"] ) ){ - $treeRoot = $args["root"]; - }else{ - global $bsgPageTreeRoot; - $treeRoot = $bsgPageTreeRoot; + $sTreeRoot = $args["root"]; } - if( strpos( $treeRoot, ":" ) === false ){ - $treeRoot = ":" . $treeRoot; + else { + global $bsgSubPageTreeRoot; + $sTreeRoot = $bsgSubPageTreeRoot; } - return ""; + if( strpos( $sTreeRoot, ":" ) === false ){ + $sTreeRoot = ":" . $sTreeRoot; + } + + return Html::element( + 'div', + array( + 'class' => 'bs-subpagetree', + 'data-root' => $sTreeRoot + ), + '' + ); } - } diff --git a/bluespice.subpagetree.js b/bluespice.subpagetree.js deleted file mode 100644 index 8b8ac0b..000 --- a/bluespice.subpagetree.js +++ /dev/null @@ -1,13 +0,0 @@ -var treeNodes = Ext.query('.pagetree'); - -treeNodes.forEach(function(node){ - Ext.create('BS.tree.WikiSubPages', { - renderTo: node,//this div is created by BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit) - treeRootPath: node.getAttribute("root"), - listeners: { - itemclick: function( obj, record, item, index, e, eOpts ){ - window.location.href = mw.util.wikiGetlink( record.internalId ) ; - } - } - }); -}); diff --git a/extension.json b/extension.json index df8c706..9bf1bda 100644 --- a/extension.json +++ b/extension.json @@ -3,7 +3,7 @@ "version": "2.27.1-alpha", "url": "https://help.bluespice.com/index.php/BlueSpiceSubPageTree;, "author": "Leonid Verhovskij", - "descriptionmsg": "bs-pagetreee-desc", + "descriptionmsg": "bs-subagetreee-desc", "type": "bluespice", "AutoloadClasses": { "BlueSpiceSubPageTree": "BlueSpiceSubPageTree.class.php" @@ -19,8 +19,8 @@ } }, "ResourceFileModulePaths": { - "localBasePath": "", - "remoteExtPath": "BlueSpiceSubPageTree" + "localBasePath": "resources", + "remoteExtPath": "BlueSpiceSubPageTree/resources" }, "bsgExtensions": { "BlueSpiceSubPageTree": { diff --git a/resources/bluespice.subpagetree.js b/resources/bluespice.subpagetree.js new file mode 100644 index 000..c231f64 --- /dev/null +++ b/resources/bluespice.subpagetree.js @@ -0,0 +1,11 @@ +$( '.bs-subpagetree' ).each( function() { + Ext.create('BS.tree.WikiSubPages', { + renderTo: this,//this div is created by BlueSpiceSubPageTree::renderPageTree (ParserFirstCallInit) + treeRootPath: $(this).data( 'root' ), + listeners: { + itemclick: function( obj, record, item, index, e, eOpts ){ + window.location.href = mw.util.wikiGetlink( record.internalId ) ; + } + } + }); +}); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/332215 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55a572ae6c2bf7bfc17cc78b963cdfb4a1745afb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] integration/config[master]: [SkinPerNamespace] Add npm and composer test
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332158 ) Change subject: [SkinPerNamespace] Add npm and composer test .. [SkinPerNamespace] Add npm and composer test Source: If1700983705037f03b9af4d02e904a44253cf46d Change-Id: Iffa9c906ab87d8892cd95b090e3393931934b205 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index de1ccbe..07bac32 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6711,9 +6711,12 @@ - name: mediawiki/extensions/SkinPerNamespace template: + - name: composer-test - name: jshint - - name: jsonlint - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/SlimboxThumbs template: -- To view, visit https://gerrit.wikimedia.org/r/332158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffa9c906ab87d8892cd95b090e3393931934b205 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2034
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332218 ) Change subject: db-codfw.php: Repool db2034 .. db-codfw.php: Repool db2034 After almost 3 months out, db2034 looks fixed now. Bug: T149553 Change-Id: I9cf8a79453dbe3ad47e656469378d796bd9bfab0 --- M wmf-config/db-codfw.php 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 9fe4bbf..f4a8b98 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -94,9 +94,9 @@ 'sectionLoads' => [ 's1' => [ 'db2016' => 0, # 2.9TB 96GB, master -# 'db2034' => 50, # 2.9TB 160GB, rc, log #Maintenance - T149553 + 'db2034' => 50, # 2.9TB 160GB, rc, log 'db2042' => 50, # 2.9TB 160GB, rc, log -# 'db2048' => 400, # 2.9TB 160GB #Temporary depool - T149553 + 'db2048' => 400, # 2.9TB 160GB 'db2055' => 50, # 3.3TB 160GB, dump (inactive), vslow 'db2062' => 100, # 3.3TB 160GB, api 'db2069' => 100, # 3.3TB 160GB, api @@ -218,23 +218,23 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'recentchanges' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'recentchangeslinked' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'contributions' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'logpager' => [ -# 'db2034' => 1, + 'db2034' => 1, 'db2042' => 1, ], 'dump' => [ -- To view, visit https://gerrit.wikimedia.org/r/332218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cf8a79453dbe3ad47e656469378d796bd9bfab0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarosteguiGerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Ratings] unconfigure extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332219 ) Change subject: [Ratings] unconfigure extension .. [Ratings] unconfigure extension Bug: T155047 Change-Id: Ic26560c94f20ace50967bf6103d535bff71d8605 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 86d4aa3..e5289fd 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6409,12 +6409,6 @@ - name: extension-unittests-generic - name: npm - - name: mediawiki/extensions/Ratings -template: - - name: jsonlint - - name: extension-unittests-non-voting - - name: npm - - name: mediawiki/extensions/ReassignEdits template: - name: jshint -- To view, visit https://gerrit.wikimedia.org/r/332219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic26560c94f20ace50967bf6103d535bff71d8605 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SharedCssJs[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332063 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I84d7dec7b54d6f021a356b48834f34eb5f4f008f --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84d7dec7b54d6f021a356b48834f34eb5f4f008f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SharedCssJs Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Tim Weyer 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...SemanticSifter[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332058 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I048a27e5101707d1ab4050bad3bb9552024fe7cd --- A .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7abe44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +vendor/ + diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I048a27e5101707d1ab4050bad3bb9552024fe7cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticSifter Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Netbrain 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...SemanticRating[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332057 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I08608fafee94a55c6cd871d83e527f741092ee80 --- A .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7abe44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +vendor/ + diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08608fafee94a55c6cd871d83e527f741092ee80 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticRating Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Cicalese Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticWebBrowser[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332062 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I1d8bfdc07f3d9c8ca44b6b2f3b55a2c2297281e7 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 3a22afb..c369f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + # Editors *.kate-swp *~ diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d8bfdc07f3d9c8ca44b6b2f3b55a2c2297281e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticWebBrowser Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Denny Vrandecic Gerrit-Reviewer: Hashar Gerrit-Reviewer: bkaempgen 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...SemanticTitle[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332060 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Ia5f4b0b77c03e750f05c04538bff9605dccc3f53 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5f4b0b77c03e750f05c04538bff9605dccc3f53 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticTitle Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Cicalese Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticUpdateOnPurge[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332061 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I62c031040ba518a180e4482c2af10205da9550f0 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62c031040ba518a180e4482c2af10205da9550f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticUpdateOnPurge Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticTasks[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332059 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Ieaf4fe2012c44f1fbbea6fa67f330441e1319369 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieaf4fe2012c44f1fbbea6fa67f330441e1319369 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticTasks Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Ryan Lane Gerrit-Reviewer: jenkins-bot <> Gerrit-Reviewer: tosfos ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageSeries[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332056 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I062643d82e58e93b11d655ee2532d3e617222e1e --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I062643d82e58e93b11d655ee2532d3e617222e1e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticPageSeries Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Foxtrott Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mediawiki-strapping[master]: Add StrappingTemplate to autoloader
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332127 ) Change subject: Add StrappingTemplate to autoloader .. Add StrappingTemplate to autoloader Change-Id: I03bcde38dfef3caff009cc8e4ebc46462d1725d5 --- M strapping.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/strapping.php b/strapping.php index 580c692..81d8311 100644 --- a/strapping.php +++ b/strapping.php @@ -19,6 +19,7 @@ $wgValidSkinNames['strapping'] = 'Strapping'; $wgAutoloadClasses['SkinStrapping'] = __DIR__ . '/Strapping.skin.php'; +$wgAutoloadClasses['StrappingTemplate'] = __DIR__ . '/Strapping.skin.php'; $wgMessagesDirs['SkinStrapping'] = __DIR__ . '/i18n'; $wgResourceModules['skins.strapping'] = array( -- To view, visit https://gerrit.wikimedia.org/r/332127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03bcde38dfef3caff009cc8e4ebc46462d1725d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/mediawiki-strapping Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: GallerySlideshow: Don't open MultimediaViewer when a thumbna...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332220 ) Change subject: GallerySlideshow: Don't open MultimediaViewer when a thumbnail is clicked .. GallerySlideshow: Don't open MultimediaViewer when a thumbnail is clicked Bug: T140595 Change-Id: Ie18a9049eee552cb4519c5608a642044119f677c --- M resources/src/mediawiki/page/gallery-slideshow.js 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/332220/1 diff --git a/resources/src/mediawiki/page/gallery-slideshow.js b/resources/src/mediawiki/page/gallery-slideshow.js index e651c9c..7647393 100644 --- a/resources/src/mediawiki/page/gallery-slideshow.js +++ b/resources/src/mediawiki/page/gallery-slideshow.js @@ -39,10 +39,13 @@ ); // Disable thumbnails' link, instead show the image in the carousel - this.$galleryBox.on( 'click', function ( e ) { - this.$currentImage = $( e.currentTarget ); - this.showCurrentImage(); - return false; + this.$galleryBox // We want the entire list item to be clickable + .add( '.gallerybox a' ) // Specific selector so that MMV doesn't open + .on( 'click', function ( e ) { + this.$currentImage = $( e.currentTarget ).closest( '.gallerybox' ); + this.showCurrentImage(); + e.stopImmediatePropagation(); // Don't let MMV open + return false; }.bind( this ) ); }; -- To view, visit https://gerrit.wikimedia.org/r/332220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie18a9049eee552cb4519c5608a642044119f677c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSubPageTree[master]: Added alias
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332217 ) Change subject: Added alias .. Added alias Change-Id: I84744e003f9b0d3ade7792726f6124ce3359944a --- M BlueSpiceSubPageTree.class.php M README.md 2 files changed, 6 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSubPageTree refs/changes/17/332217/1 diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php index ea6e284..6e56ab6 100644 --- a/BlueSpiceSubPageTree.class.php +++ b/BlueSpiceSubPageTree.class.php @@ -5,6 +5,7 @@ public static function onParserSetup( Parser $parser ) { // When the parser sees the tag, it executes BlueSpiceSubPageTree::renderPageTree $parser->setHook( 'pagetree', 'BlueSpiceSubPageTree::renderPageTree' ); + $parser->setHook( 'subpagetree', 'BlueSpiceSubPageTree::renderPageTree' ); return true; } diff --git a/README.md b/README.md index c30d50c..e511c29 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,14 @@ # mediawiki-extensions-BlueSpicePageTree -make pagetree root="Namespace:Rootpage" /> tag available and show extjs tree panel with subpage structure - -## Installation - -Inside of MediaWiki base path: - - git clone https://github.com/ljonka/mediawiki-extensions-BlueSpicePageTree.git extensions/BlueSpicePageTree +make tag available and show extjs tree panel with subpage structure Dependencies: BlueSpiceFoundation -Activate Extension in LocalSettings.php +Activate extension in LocalSettings.php - echo "wfLoadExtension(\"BlueSpicePageTree\");" >> LocalSettings.php + echo "wfLoadExtension(\"BlueSpiceSubPageTree\");" >> LocalSettings.php -Usage in Wiki Editor +Usage in WikiText -or or \ No newline at end of file +or or \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/332217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84744e003f9b0d3ade7792726f6124ce3359944a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree Gerrit-Branch: master Gerrit-Owner: Robert Vogel___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSubPageTree[master]: Added alias
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332217 ) Change subject: Added alias .. Added alias Change-Id: I84744e003f9b0d3ade7792726f6124ce3359944a --- M BlueSpiceSubPageTree.class.php M README.md 2 files changed, 6 insertions(+), 11 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/BlueSpiceSubPageTree.class.php b/BlueSpiceSubPageTree.class.php index ea6e284..6e56ab6 100644 --- a/BlueSpiceSubPageTree.class.php +++ b/BlueSpiceSubPageTree.class.php @@ -5,6 +5,7 @@ public static function onParserSetup( Parser $parser ) { // When the parser sees the tag, it executes BlueSpiceSubPageTree::renderPageTree $parser->setHook( 'pagetree', 'BlueSpiceSubPageTree::renderPageTree' ); + $parser->setHook( 'subpagetree', 'BlueSpiceSubPageTree::renderPageTree' ); return true; } diff --git a/README.md b/README.md index c30d50c..e511c29 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,14 @@ # mediawiki-extensions-BlueSpicePageTree -make pagetree root="Namespace:Rootpage" /> tag available and show extjs tree panel with subpage structure - -## Installation - -Inside of MediaWiki base path: - - git clone https://github.com/ljonka/mediawiki-extensions-BlueSpicePageTree.git extensions/BlueSpicePageTree +make tag available and show extjs tree panel with subpage structure Dependencies: BlueSpiceFoundation -Activate Extension in LocalSettings.php +Activate extension in LocalSettings.php - echo "wfLoadExtension(\"BlueSpicePageTree\");" >> LocalSettings.php + echo "wfLoadExtension(\"BlueSpiceSubPageTree\");" >> LocalSettings.php -Usage in Wiki Editor +Usage in WikiText -or or \ No newline at end of file +or or \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/332217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84744e003f9b0d3ade7792726f6124ce3359944a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSubPageTree Gerrit-Branch: master Gerrit-Owner: Robert VogelGerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Switch swift in esams to systemd-timesyncd
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330404 ) Change subject: Switch swift in esams to systemd-timesyncd .. Switch swift in esams to systemd-timesyncd Test-drive systemd-timesyncd on some selected servers; the swift servers in esams are all jessie and non-critical. Bug: T150257 Change-Id: I40fa61da2e5048c8e4ba015011604ffa914c5b45 --- M hieradata/role/esams/swift/proxy.yaml M hieradata/role/esams/swift/storage.yaml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified Filippo Giunchedi: Looks good to me, but someone else must approve diff --git a/hieradata/role/esams/swift/proxy.yaml b/hieradata/role/esams/swift/proxy.yaml index 52add8d..4d98691 100644 --- a/hieradata/role/esams/swift/proxy.yaml +++ b/hieradata/role/esams/swift/proxy.yaml @@ -5,3 +5,4 @@ value: standard admin::groups: - swift-roots +use_timesyncd: true diff --git a/hieradata/role/esams/swift/storage.yaml b/hieradata/role/esams/swift/storage.yaml index 0d01593..e33a590 100644 --- a/hieradata/role/esams/swift/storage.yaml +++ b/hieradata/role/esams/swift/storage.yaml @@ -3,3 +3,4 @@ value: standard admin::groups: - swift-roots +use_timesyncd: true -- To view, visit https://gerrit.wikimedia.org/r/330404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40fa61da2e5048c8e4ba015011604ffa914c5b45 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MuehlenhoffGerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Muehlenhoff 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...SimpleSAMLphp[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332144 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Iea8f6dfeaef5758f82b8473fb5dcbae88ee21058 --- A .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7abe44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +vendor/ + diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea8f6dfeaef5758f82b8473fb5dcbae88ee21058 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SimpleSAMLphp Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Cicalese Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SimpleChanges[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332142 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I882a62b285f4c96fa20190a6e08b860143e81ac1 --- A .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7abe44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +vendor/ + diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I882a62b285f4c96fa20190a6e08b860143e81ac1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SimpleChanges Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> Gerrit-Reviewer: tosfos ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SimpleFarm[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332143 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I438812507738846e35066c129bcb7f521dad8846 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I438812507738846e35066c129bcb7f521dad8846 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SimpleFarm Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Daniel Werner Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SimpleSecurity[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332145 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I6b54fe7dd527e4c71023cf15906da610d3e2dd53 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b54fe7dd527e4c71023cf15906da610d3e2dd53 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SimpleSecurity Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> Gerrit-Reviewer: nad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SidebarDonateBox[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332139 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I5552d3afe2a977c3fad204a2ca1ee13d9bcd1a1d --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5552d3afe2a977c3fad204a2ca1ee13d9bcd1a1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SidebarDonateBox Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Daniel Friesen Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SideBarMenu[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332140 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Icf3f6d45c77db3b1375c2ccf9553672a12c24644 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 485dee6..039a014 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +node_modules/ +vendor/ + .idea diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf3f6d45c77db3b1375c2ccf9553672a12c24644 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SideBarMenu Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Netbrain 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...SiteMetrics[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332147 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I8f0ccfa0af6a932e2ce9ea554611fbf742cd9652 --- M .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..e62fc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +node_modules/ +vendor/ + .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f0ccfa0af6a932e2ce9ea554611fbf742cd9652 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SiteMetrics Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Jack Phoenix 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...SimpleSort[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332146 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I12f9417b9804c2250d07985291a41aeea9f04497 --- A .gitignore A Gruntfile.js A package.json 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7abe44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules/ +vendor/ + diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..a45071e --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/*jshint node:true */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..bcf5b13 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.5.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12f9417b9804c2250d07985291a41aeea9f04497 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SimpleSort Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Clump Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [UIFeedback] Make unit test voting
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332149 ) Change subject: [UIFeedback] Make unit test voting .. [UIFeedback] Make unit test voting Fixed with I0bfd27071482f69fe3f8e850d1eb1100403c9f06 Change-Id: Ib3b4ada11f70ad2babbe7c81d21b1bf184d7e671 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b0ef735..de1ccbe 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7021,7 +7021,7 @@ - name: mediawiki/extensions/UIFeedback template: - name: jsonlint - - name: extension-unittests-non-voting + - name: extension-unittests-generic - name: mediawiki/extensions/UnCaptcha template: -- To view, visit https://gerrit.wikimedia.org/r/332149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3b4ada11f70ad2babbe7c81d21b1bf184d7e671 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove ShoutBox extension
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332170 ) Change subject: Remove ShoutBox extension .. Remove ShoutBox extension The service has been shutdown and the extension is now ueseless. It should therefore be archived. Bug: T155365 Change-Id: I0fd330e155f301c87d5bbcde73c86af73d7e23c6 --- M .gitmodules D ShoutBox 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index 2d399ee..f663fd2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2266,10 +2266,6 @@ path = ShortUrl url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ShortUrl branch = . -[submodule "ShoutBox"] - path = ShoutBox - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ShoutBox - branch = . [submodule "ShoutWikiAPI"] path = ShoutWikiAPI url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ShoutWikiAPI diff --git a/ShoutBox b/ShoutBox deleted file mode 16 index 76947bf..000 --- a/ShoutBox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76947bfcaa69e9ce148e5ea0afc74d9f9adaa0a2 -- To view, visit https://gerrit.wikimedia.org/r/332170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0fd330e155f301c87d5bbcde73c86af73d7e23c6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: FlorianschmidtwelzowGerrit-Reviewer: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SlimboxThumbs[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332157 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I746617f5003e60bc663efbfe39ba25a389e60e60 --- M .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..9b29323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/node_modules/ +/vendor/ +/composer.lock .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I746617f5003e60bc663efbfe39ba25a389e60e60 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/SlimboxThumbs Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [MediaWiki Vagrant] drop 'yard' publish job
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332223 ) Change subject: [MediaWiki Vagrant] drop 'yard' publish job .. [MediaWiki Vagrant] drop 'yard' publish job mediawiki-vagrant-puppet-doc-publish runs `rake doc` which now generates the puppet documentation AND ruby doc using yard/puppet-strings. Hence running 'yard' is redundant and ends up racing with 'rake doc'. Typically https://doc.wikimedia.org/mediawiki-vagrant/ would only show the ruby doc lacking the puppet one :( Remove: mediawiki-vagrant-bundle-yard-publish Change-Id: I8326c8b9a1bd3bb0e7920de9f19d0087dde9f8d8 --- M jjb/mediawiki-misc.yaml M zuul/layout.yaml 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/23/332223/1 diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml index 1f94262..7dda6c9 100644 --- a/jjb/mediawiki-misc.yaml +++ b/jjb/mediawiki-misc.yaml @@ -30,7 +30,6 @@ jobs: - '{name}-puppet-validate' - 'mediawiki-vagrant-puppet-doc-publish' - - '{name}-bundle-yard-publish' - project: name: 'mediawiki-vendor' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 97f91b7..a08d111 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2148,7 +2148,6 @@ - mediawiki-vagrant-puppet-validate postmerge: - mediawiki-vagrant-puppet-doc-publish - - mediawiki-vagrant-bundle-yard-publish - name: node-rdkafka-statsd template: -- To view, visit https://gerrit.wikimedia.org/r/332223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8326c8b9a1bd3bb0e7920de9f19d0087dde9f8d8 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSEmoticons: Fixed replacing in tags and their attributes
Pwirth has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332226 ) Change subject: BSEmoticons: Fixed replacing in tags and their attributes .. BSEmoticons: Fixed replacing in tags and their attributes Change-Id: I8628d16c273206dc74e11cf9d6ea9d12bdfb6093 --- M Emoticons/Emoticons.class.php 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/26/332226/1 diff --git a/Emoticons/Emoticons.class.php b/Emoticons/Emoticons.class.php index f254d06..3308ed0 100644 --- a/Emoticons/Emoticons.class.php +++ b/Emoticons/Emoticons.class.php @@ -129,7 +129,20 @@ BsCacheHelper::set( $sKey, $aMapping ); } - $sText = str_replace( $aMapping['emoticons'], $aMapping['replacements'], $sText ); + $fCallable = function( $aMatches ) use( $aMapping ) { + return empty( $aMatches[0] ) ? '' : str_replace( + $aMapping['emoticons'], + $aMapping['replacements'], + $aMatches[0] + ); + }; + //only replace in actual text and not in html tags or their attributes! + $sText = preg_replace_callback( + "/(?<=>)[^><]+?(?=<)/", + $fCallable, + $sText + ); + wfProfileOut( 'BS::'.__METHOD__ ); return true; } -- To view, visit https://gerrit.wikimedia.org/r/332226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8628d16c273206dc74e11cf9d6ea9d12bdfb6093 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Pwirth___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove some deleted extensions
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332227 ) Change subject: Remove some deleted extensions .. Remove some deleted extensions https://gerrit.wikimedia.org/r/#/c/332025/ https://gerrit.wikimedia.org/r/#/c/332170/ Change-Id: I37a33c3d6d57086981b1daa502f0a3111ac0b9e3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 10 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index be27964..d22410a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1626,8 +1626,6 @@ Network Auth optional = networkauth-name, networkauth-purltext -# New Talk Global // Archived per T146242 - # ShoutWiki specific #New Signup Page @@ -1908,9 +1906,6 @@ Per Page License -Persona -aliasfile = Persona/Persona.i18n.alias.php - PGF TikZ # Abandoned: https://phabricator.wikimedia.org/T70974#2055323 @@ -2113,8 +2108,6 @@ Section Disqus -Secure HTML - Secure Passwords Secure Poll @@ -2184,9 +2177,6 @@ Short Url aliasfile = ShortUrl/ShortUrl.alias.php - -Shout Box -optional = shoutbox-url, shoutbox-url-with-css #Shout Wiki Ads / very ShoutWiki-specific @@ -2303,6 +2293,8 @@ Stop Forum Spam +# String Functions Escaped // No i18n file + Sub Page List 3 descmsg = spl3-desc -- To view, visit https://gerrit.wikimedia.org/r/332227 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37a33c3d6d57086981b1daa502f0a3111ac0b9e3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond SpekkingGerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove some deleted extensions
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332227 ) Change subject: Remove some deleted extensions .. Remove some deleted extensions https://gerrit.wikimedia.org/r/#/c/332025/ https://gerrit.wikimedia.org/r/#/c/332170/ Change-Id: I37a33c3d6d57086981b1daa502f0a3111ac0b9e3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/27/332227/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index be27964..d22410a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1626,8 +1626,6 @@ Network Auth optional = networkauth-name, networkauth-purltext -# New Talk Global // Archived per T146242 - # ShoutWiki specific #New Signup Page @@ -1908,9 +1906,6 @@ Per Page License -Persona -aliasfile = Persona/Persona.i18n.alias.php - PGF TikZ # Abandoned: https://phabricator.wikimedia.org/T70974#2055323 @@ -2113,8 +2108,6 @@ Section Disqus -Secure HTML - Secure Passwords Secure Poll @@ -2184,9 +2177,6 @@ Short Url aliasfile = ShortUrl/ShortUrl.alias.php - -Shout Box -optional = shoutbox-url, shoutbox-url-with-css #Shout Wiki Ads / very ShoutWiki-specific @@ -2303,6 +2293,8 @@ Stop Forum Spam +# String Functions Escaped // No i18n file + Sub Page List 3 descmsg = spl3-desc -- To view, visit https://gerrit.wikimedia.org/r/332227 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37a33c3d6d57086981b1daa502f0a3111ac0b9e3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SpellingApi[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332175 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Also add missing api help messages. Change-Id: Ic8e09836a442772e2ddc0385cbd051ff0d277560 --- M .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..9b29323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/node_modules/ +/vendor/ +/composer.lock .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8e09836a442772e2ddc0385cbd051ff0d277560 Gerrit-PatchSet: 10 Gerrit-Project: mediawiki/extensions/SpellingApi Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Chad Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [MediaWiki Vagrant] drop 'yard' publish job
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332223 ) Change subject: [MediaWiki Vagrant] drop 'yard' publish job .. [MediaWiki Vagrant] drop 'yard' publish job mediawiki-vagrant-puppet-doc-publish runs `rake doc` which now generates the puppet documentation AND ruby doc using yard/puppet-strings. Hence running 'yard' is redundant and ends up racing with 'rake doc'. Typically https://doc.wikimedia.org/mediawiki-vagrant/ would only show the ruby doc lacking the puppet one :( Remove: mediawiki-vagrant-bundle-yard-publish Change-Id: I8326c8b9a1bd3bb0e7920de9f19d0087dde9f8d8 --- M jjb/mediawiki-misc.yaml M zuul/layout.yaml 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml index 1f94262..7dda6c9 100644 --- a/jjb/mediawiki-misc.yaml +++ b/jjb/mediawiki-misc.yaml @@ -30,7 +30,6 @@ jobs: - '{name}-puppet-validate' - 'mediawiki-vagrant-puppet-doc-publish' - - '{name}-bundle-yard-publish' - project: name: 'mediawiki-vendor' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 97f91b7..a08d111 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2148,7 +2148,6 @@ - mediawiki-vagrant-puppet-validate postmerge: - mediawiki-vagrant-puppet-doc-publish - - mediawiki-vagrant-bundle-yard-publish - name: node-rdkafka-statsd template: -- To view, visit https://gerrit.wikimedia.org/r/332223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8326c8b9a1bd3bb0e7920de9f19d0087dde9f8d8 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add cache to mediawiki-vagrant-puppet-doc-publish
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332225 ) Change subject: Add cache to mediawiki-vagrant-puppet-doc-publish .. Add cache to mediawiki-vagrant-puppet-doc-publish It runs on Jessie Nodepool instances but lacked castor :( Change-Id: I61dc78844ab6598db1cc66546a84672263954fdd --- M jjb/mediawiki-misc.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml index 7dda6c9..e23fc84 100644 --- a/jjb/mediawiki-misc.yaml +++ b/jjb/mediawiki-misc.yaml @@ -6,12 +6,15 @@ triggers: - zuul builders: + - castor-load # BUNDLE_PATH is injected by Zuul - bundle-nodepool: command: 'rake doc' - doc-publish: docsrc: 'doc' docdest: 'mediawiki-vagrant' +publishers: + - castor-save - project: name: 'mediawiki-ruby-api' -- To view, visit https://gerrit.wikimedia.org/r/332225 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61dc78844ab6598db1cc66546a84672263954fdd Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...linux44[master]: Update to 4.4.43
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/33 ) Change subject: Update to 4.4.43 .. Update to 4.4.43 Change-Id: Id6bd3731c7fc6370a0400e73bd53c642038b925f --- M debian/changelog A debian/patches/bugfix/all/stable-4.4.43.patch M debian/patches/series 3 files changed, 701 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux44 refs/changes/22/33/1 diff --git a/debian/changelog b/debian/changelog index 332ff18..3bae0d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ - CVE-2016-9588 [ef85b67385436ddc1998f45f1d6a210f935b3388] * Update to 4.4.42: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.42 + * Update to 4.4.43: +https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.43 -- Moritz MuehlenhoffMon, 16 Jan 2017 11:17:27 +0100 diff --git a/debian/patches/bugfix/all/stable-4.4.43.patch b/debian/patches/bugfix/all/stable-4.4.43.patch new file mode 100644 index 000..edc808d --- /dev/null +++ b/debian/patches/bugfix/all/stable-4.4.43.patch @@ -0,0 +1,698 @@ +diff --git a/Makefile b/Makefile +index b8a90f9a463d..04a2186a4276 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 4 +-SUBLEVEL = 42 ++SUBLEVEL = 43 + EXTRAVERSION = + NAME = Blurry Fish Butt + +diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c +index 65024af169d3..d3c14da7d216 100644 +--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c +@@ -243,10 +243,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) + save_state = 1; + break; + case PWRDM_POWER_RET: +- if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) { ++ if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) + save_state = 0; +- break; +- } ++ break; + default: + /* +* CPUx CSWR is invalid hardware state. Also CPUx OSWR +diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c +index 6f39d03cc27e..0a43143e9ceb 100644 +--- a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c +@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base; + static void __init zynq_memory_init(void) + { + if (!__pa(PAGE_OFFSET)) +- memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir)); ++ memblock_reserve(__pa(PAGE_OFFSET), 0x8); + } + + static struct platform_device zynq_cpuidle_device = { +diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S +index ed3ab509faca..df4efa304b2c 100644 +--- a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S +@@ -313,7 +313,7 @@ _GLOBAL(flush_instruction_cache) + lis r3, KERNELBASE@h + iccci 0,r3 + #endif +-#elif CONFIG_FSL_BOOKE ++#elif defined(CONFIG_FSL_BOOKE) + BEGIN_FTR_SECTION + mfspr r3,SPRN_L1CSR0 + ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC +diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c +index 1b764d1745f3..1689568b597d 100644 +--- a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c +@@ -39,6 +39,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc, + if (!(quirks & CP_RDESC_SWAPPED_MIN_MAX)) + return rdesc; + ++ if (*rsize < 4) ++ return rdesc; ++ + for (i = 0; i < *rsize - 4; i++) + if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) { + rdesc[i] = 0x19; +diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c +index 2a506fe0c8a4..74bf1a17ae7c 100644 +--- a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c +@@ -762,8 +762,10 @@ static int __init ser_gigaset_init(void) + driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, + GIGASET_MODULENAME, GIGASET_DEVNAME, + , THIS_MODULE); +- if (!driver) ++ if (!driver) { ++ rc = -ENOMEM; + goto error; ++ } + + rc = tty_register_ldisc(N_GIGASET_M101, _ldisc); + if (rc != 0) { +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c +index 6cf6d93d8831..ba115ec7aa92 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c +@@ -432,6 +432,13 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) + MLX5_SET(cmd_hca_cap, set_hca_cap, pkey_table_size, +to_fw_pkey_sz(128)); + ++ /* Check log_max_qp from HCA caps to set in current profile */ ++ if (MLX5_CAP_GEN_MAX(dev, log_max_qp) < profile[prof_sel].log_max_qp) {
[MediaWiki-commits] [Gerrit] mediawiki...SolrStore[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332162 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I43fede082f283a0caaf939bd88ae45bd9b9628ae --- M .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..9b29323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/node_modules/ +/vendor/ +/composer.lock .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43fede082f283a0caaf939bd88ae45bd9b9628ae Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/SolrStore Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender 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...SkinPerNamespace[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332156 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: If1700983705037f03b9af4d02e904a44253cf46d --- M .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..9b29323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/node_modules/ +/vendor/ +/composer.lock .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1700983705037f03b9af4d02e904a44253cf46d Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/SkinPerNamespace Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove jobs for ShoutBox extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332167 ) Change subject: Remove jobs for ShoutBox extension .. Remove jobs for ShoutBox extension ShoutBox service was shutdown already, so this extension is useless and should be archived. Bug: T155365 Change-Id: I8a4de7cd6aecabe7882a3ff91691bdb40160e4d2 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 348f40a..3908275 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6626,13 +6626,6 @@ - name: extension-unittests-generic - name: jsonlint - - name: mediawiki/extensions/ShoutBox -template: - - name: jshint - - name: jsonlint - - name: extension-unittests-generic - - name: npm - - name: mediawiki/extensions/ShoutWikiAds template: - name: composer-test -- To view, visit https://gerrit.wikimedia.org/r/332167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a4de7cd6aecabe7882a3ff91691bdb40160e4d2 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: FlorianschmidtwelzowGerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [MediaWiki Vagrant] only publish doc for 'master'
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332224 ) Change subject: [MediaWiki Vagrant] only publish doc for 'master' .. [MediaWiki Vagrant] only publish doc for 'master' Change-Id: I3817353a4ca9fe1fcbace4d24bc00d45d24171b4 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/24/332224/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a08d111..05bc687 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -843,6 +843,9 @@ success-message: 'SUCCESS Change has been deployed on the EQIAD beta cluster' failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ Please contact a member of the beta project to fixup the working directory on the destination server.' + - name: mediawiki-vagrant-puppet-doc-publish +branch: ^master$ + - name: parsoidsvc-source-jsduck-publish branch: ^master$ success-message: 'SUCCESS Deployed documentation to https://doc.wikimedia.org/Parsoid/master/' -- To view, visit https://gerrit.wikimedia.org/r/332224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3817353a4ca9fe1fcbace4d24bc00d45d24171b4 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...linux44[master]: Update to 4.4.43
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/33 ) Change subject: Update to 4.4.43 .. Update to 4.4.43 Change-Id: Id6bd3731c7fc6370a0400e73bd53c642038b925f --- M debian/changelog A debian/patches/bugfix/all/stable-4.4.43.patch M debian/patches/series 3 files changed, 701 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 332ff18..3bae0d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ - CVE-2016-9588 [ef85b67385436ddc1998f45f1d6a210f935b3388] * Update to 4.4.42: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.42 + * Update to 4.4.43: +https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.43 -- Moritz MuehlenhoffMon, 16 Jan 2017 11:17:27 +0100 diff --git a/debian/patches/bugfix/all/stable-4.4.43.patch b/debian/patches/bugfix/all/stable-4.4.43.patch new file mode 100644 index 000..edc808d --- /dev/null +++ b/debian/patches/bugfix/all/stable-4.4.43.patch @@ -0,0 +1,698 @@ +diff --git a/Makefile b/Makefile +index b8a90f9a463d..04a2186a4276 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 4 +-SUBLEVEL = 42 ++SUBLEVEL = 43 + EXTRAVERSION = + NAME = Blurry Fish Butt + +diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c +index 65024af169d3..d3c14da7d216 100644 +--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c +@@ -243,10 +243,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) + save_state = 1; + break; + case PWRDM_POWER_RET: +- if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) { ++ if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) + save_state = 0; +- break; +- } ++ break; + default: + /* +* CPUx CSWR is invalid hardware state. Also CPUx OSWR +diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c +index 6f39d03cc27e..0a43143e9ceb 100644 +--- a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c +@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base; + static void __init zynq_memory_init(void) + { + if (!__pa(PAGE_OFFSET)) +- memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir)); ++ memblock_reserve(__pa(PAGE_OFFSET), 0x8); + } + + static struct platform_device zynq_cpuidle_device = { +diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S +index ed3ab509faca..df4efa304b2c 100644 +--- a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S +@@ -313,7 +313,7 @@ _GLOBAL(flush_instruction_cache) + lis r3, KERNELBASE@h + iccci 0,r3 + #endif +-#elif CONFIG_FSL_BOOKE ++#elif defined(CONFIG_FSL_BOOKE) + BEGIN_FTR_SECTION + mfspr r3,SPRN_L1CSR0 + ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC +diff --git a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c +index 1b764d1745f3..1689568b597d 100644 +--- a/drivers/hid/hid-cypress.c b/drivers/hid/hid-cypress.c +@@ -39,6 +39,9 @@ static __u8 *cp_report_fixup(struct hid_device *hdev, __u8 *rdesc, + if (!(quirks & CP_RDESC_SWAPPED_MIN_MAX)) + return rdesc; + ++ if (*rsize < 4) ++ return rdesc; ++ + for (i = 0; i < *rsize - 4; i++) + if (rdesc[i] == 0x29 && rdesc[i + 2] == 0x19) { + rdesc[i] = 0x19; +diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c +index 2a506fe0c8a4..74bf1a17ae7c 100644 +--- a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c +@@ -762,8 +762,10 @@ static int __init ser_gigaset_init(void) + driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS, + GIGASET_MODULENAME, GIGASET_DEVNAME, + , THIS_MODULE); +- if (!driver) ++ if (!driver) { ++ rc = -ENOMEM; + goto error; ++ } + + rc = tty_register_ldisc(N_GIGASET_M101, _ldisc); + if (rc != 0) { +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c +index 6cf6d93d8831..ba115ec7aa92 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c +@@ -432,6 +432,13 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) + MLX5_SET(cmd_hca_cap, set_hca_cap, pkey_table_size, +to_fw_pkey_sz(128)); + ++ /* Check log_max_qp from HCA caps to set in current profile */ ++ if (MLX5_CAP_GEN_MAX(dev, log_max_qp) < profile[prof_sel].log_max_qp) { ++
[MediaWiki-commits] [Gerrit] integration/config[master]: Add cache to mediawiki-vagrant-puppet-doc-publish
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332225 ) Change subject: Add cache to mediawiki-vagrant-puppet-doc-publish .. Add cache to mediawiki-vagrant-puppet-doc-publish It runs on Jessie Nodepool instances but lacked castor :( Change-Id: I61dc78844ab6598db1cc66546a84672263954fdd --- M jjb/mediawiki-misc.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/25/332225/1 diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml index 7dda6c9..e23fc84 100644 --- a/jjb/mediawiki-misc.yaml +++ b/jjb/mediawiki-misc.yaml @@ -6,12 +6,15 @@ triggers: - zuul builders: + - castor-load # BUNDLE_PATH is injected by Zuul - bundle-nodepool: command: 'rake doc' - doc-publish: docsrc: 'doc' docdest: 'mediawiki-vagrant' +publishers: + - castor-save - project: name: 'mediawiki-ruby-api' -- To view, visit https://gerrit.wikimedia.org/r/332225 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61dc78844ab6598db1cc66546a84672263954fdd Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: Split dbstore role
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332228 ) Change subject: WIP: Split dbstore role .. WIP: Split dbstore role Maybe it is a good idea to split the dbstore role into two. One for codfw and one for eqiad, at least for now that some of the dbstore servers run tokudb and some others do not. Change-Id: I2e87640257fc58ec16a02c825927129cfd4520eb --- M manifests/site.pp A modules/role/manifests/mariadb/dbstore2.pp A templates/mariadb/dbstore2.my.cnf.erb 3 files changed, 213 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/332228/1 diff --git a/manifests/site.pp b/manifests/site.pp index 9bf2cbf..e846586 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -828,7 +828,7 @@ node 'dbstore2001.codfw.wmnet' { # 24h delay on all repl streams -class { 'role::mariadb::dbstore': +class { 'role::mariadb::dbstore2': lag_warn => 9, lag_crit => 18, # Delayed slaves legitimately and cleanly (errno = 0) stop the SQL thread, so diff --git a/modules/role/manifests/mariadb/dbstore2.pp b/modules/role/manifests/mariadb/dbstore2.pp new file mode 100644 index 000..97268d6 --- /dev/null +++ b/modules/role/manifests/mariadb/dbstore2.pp @@ -0,0 +1,49 @@ +# MariaDB 10 slaves replicating all shards +# These are the slaves in codfw +class role::mariadb::dbstore2( +$lag_warn = 300, +$lag_crit = 600, +$warn_stopped = true, +) { + +system::role { 'role::mariadb::dbstore2': +description => 'Delayed Slave', +} + +include mariadb::packages_wmf +include mariadb::service + +include standard +include passwords::misc::scripts + +class { 'role::mariadb::grants::production': +password => $passwords::misc::scripts::mysql_root_pass, +prompt => 'DBSTORE', +} + +include role::mariadb::monitor::dba +include passwords::misc::scripts +include role::mariadb::ferm + +class {'role::mariadb::groups': +mysql_group => 'dbstore', +mysql_role => 'slave', +} + +class { 'mariadb::config': +config => 'mariadb/dbstore2.my.cnf.erb', +datadir => '/srv/sqldata', +tmpdir => '/srv/tmp', +ssl => 'puppet-cert', +p_s => 'off', +} + +mariadb::monitor_replication { +['s1','s2','s3','s4','s5','s6','s7','m2','m3','x1']: +is_critical => false, +contact_group => 'admins', # only show on nagios/irc +lag_warn => $lag_warn, +lag_crit => $lag_crit, +warn_stopped => $warn_stopped, +} +} diff --git a/templates/mariadb/dbstore2.my.cnf.erb b/templates/mariadb/dbstore2.my.cnf.erb new file mode 100644 index 000..80ff776 --- /dev/null +++ b/templates/mariadb/dbstore2.my.cnf.erb @@ -0,0 +1,163 @@ +# dbstore delayed and analytic slaves + +# Please use separate .cnf templates for each type of server. + +[client] +port = 3306 +socket = /tmp/mysql.sock +<% if @ssl == 'on' %> +# ssl +ssl-ca=/etc/mysql/ssl/cacert.pem +ssl-cert=/etc/mysql/ssl/server-cert.pem +ssl-key=/etc/mysql/ssl/server-key.pem +# skip server cert validation until we generate one cert per server +# it would check the cert's common name against the host +# ssl-verify-server-cert +<% elsif @ssl == 'puppet-cert' %> +# ssl +ssl-ca=/etc/ssl/certs/Puppet_Internal_CA.pem +ssl-cert=/etc/mysql/ssl/cert.pem +ssl-key=/etc/mysql/ssl/server.key +ssl-verify-server-cert +<% end %> + +[mysqld] + +skip-external-locking +skip-name-resolve +skip-slave-start +temp-pool + +user = mysql +socket= /tmp/mysql.sock +port = 3306 +datadir = <%= @datadir %> +tmpdir= <%= @tmpdir %> +server_id = <%= @server_id %> +read_only = 0 + +# enable socket authentication +plugin-load = unix_socket=auth_socket.so + +secure_file_priv = /dev/null +max_connections= 250 +max_allowed_packet = 32M +connect_timeout= 3 +query_cache_size = 0 +query_cache_type = 0 +event_scheduler= 1 + +table_open_cache = 5 +table_definition_cache = 5 +default-storage-engine = InnoDB + +# InnoDB file-per-table + TokuDB love those file descriptors +open-files-limit = 40 + +character_set_server = binary +character_set_filesystem = binary +collation_server = binary + +innodb_file_per_table = 1 +innodb_buffer_pool_size= 100G +innodb_log_file_size = 4G +innodb_flush_log_at_trx_commit = 0 +innodb_flush_method= O_DIRECT +innodb_thread_concurrency = 0 +innodb_io_capacity = 1000 +innodb_stats_sample_pages = 16 +innodb_stats_method= nulls_unequal +innodb_locks_unsafe_for_binlog = 1 +aria_pagecache_buffer_size = 16G + +# dump and load innodb buffer at start and stop +innodb_buffer_pool_load_at_startup = 1 +innodb_buffer_pool_dump_at_shutdown = 1 +
[MediaWiki-commits] [Gerrit] mediawiki...SpamRegex[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332166 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Add .gitignore to ignore package manager resources Change-Id: If1627b1aa6abaf113b95edcc9d39fb742477e104 --- A .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 44 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..47e36d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/node_modules/ +/vendor/ +/composer.lock diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..8859cd3 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + // grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + /* banana: { + all: 'i18n/' + } */ + } ); + + grunt.registerTask( 'test', [ 'jsonlint' /* 'banana' */ ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..8528003 --- /dev/null +++ b/package.json @@ -0,0 +1,10 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1627b1aa6abaf113b95edcc9d39fb742477e104 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/SpamRegex Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender 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...SoundManager2Button[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332164 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I0388ff0842b42b7881a38ec9324a3322b19ac960 --- M .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 98b092a..9b29323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/node_modules/ +/vendor/ +/composer.lock .svn *~ *.kate-swp diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ae4e6d7 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,21 @@ +/* eslint-env node */ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + jsonlint: { + all: [ + '*.json', + '**/*.json', + '!node_modules/**' + ] + }, + banana: { + all: 'i18n/' + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..3d55a97 --- /dev/null +++ b/composer.json @@ -0,0 +1,10 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.*" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..31cfda5 --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { +"test": "grunt test" + }, + "devDependencies": { +"grunt": "1.0.1", +"grunt-banana-checker": "0.5.0", +"grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/332164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0388ff0842b42b7881a38ec9324a3322b19ac960 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/SoundManager2Button Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SlimboxThumbs] Add npm and composer test
Hashar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332159 ) Change subject: [SlimboxThumbs] Add npm and composer test .. [SlimboxThumbs] Add npm and composer test Source: I746617f5003e60bc663efbfe39ba25a389e60e60 Change-Id: Iabcc67b0702b2b45cfde6ffe136d4b2371a54079 --- M zuul/layout.yaml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3908275..97f91b7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6713,8 +6713,11 @@ - name: mediawiki/extensions/SlimboxThumbs template: - - name: jsonlint + - name: composer-test - name: extension-unittests-generic + - name: npm +check: + - jsonlint - name: mediawiki/extensions/SmiteSpam template: -- To view, visit https://gerrit.wikimedia.org/r/332159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabcc67b0702b2b45cfde6ffe136d4b2371a54079 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [MediaWiki Vagrant] only publish doc for 'master'
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332224 ) Change subject: [MediaWiki Vagrant] only publish doc for 'master' .. [MediaWiki Vagrant] only publish doc for 'master' Change-Id: I3817353a4ca9fe1fcbace4d24bc00d45d24171b4 --- M zuul/layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a08d111..05bc687 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -843,6 +843,9 @@ success-message: 'SUCCESS Change has been deployed on the EQIAD beta cluster' failure-message: 'FAILURE Failed deployment on the EQIAD beta cluster :-/ Please contact a member of the beta project to fixup the working directory on the destination server.' + - name: mediawiki-vagrant-puppet-doc-publish +branch: ^master$ + - name: parsoidsvc-source-jsduck-publish branch: ^master$ success-message: 'SUCCESS Deployed documentation to https://doc.wikimedia.org/Parsoid/master/' -- To view, visit https://gerrit.wikimedia.org/r/332224 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3817353a4ca9fe1fcbace4d24bc00d45d24171b4 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: BryanDavis Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: "More Wikis" menu: Close when clicked outside the menu
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332203 ) Change subject: "More Wikis" menu: Close when clicked outside the menu .. "More Wikis" menu: Close when clicked outside the menu Bug: T155318 Change-Id: I1618fe256c12665ef9397ca084b90f7889495898 --- M nimbus/Menu.js 1 file changed, 10 insertions(+), 7 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/nimbus/Menu.js b/nimbus/Menu.js index c0ccd08..0c4598e 100644 --- a/nimbus/Menu.js +++ b/nimbus/Menu.js @@ -263,13 +263,11 @@ NimbusSkin.last_displayed = ''; }, - show_more_category: function( el ) { - if ( NimbusSkin.show === 'false' ) { - document.getElementById( el ).style.display = 'block'; - NimbusSkin.show = 'true'; + show_more_category: function( el, toggle ) { + if ( toggle !== undefined ) { + $( '#' + el ).toggle( toggle ); } else { - document.getElementById( el ).style.display = 'none'; - NimbusSkin.show = 'false'; + $( '#' + el ).toggle(); } }, @@ -350,8 +348,13 @@ NimbusSkin.show_actions( 'article-more-container', 'hide' ); } ); - $( '#sw-more-category' ).on( 'click', function() { + $( '#sw-more-category' ).on( 'click', function( e ) { NimbusSkin.show_more_category( 'more-wikis-menu' ); + e.stopPropagation(); + } ); + + $( 'body' ).on( 'click', function () { + NimbusSkin.show_more_category( 'more-wikis-menu', false ); } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/332203 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1618fe256c12665ef9397ca084b90f7889495898 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Nimbus Gerrit-Branch: master Gerrit-Owner: PrtksxnaGerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix broken variable inclusions in API unblock parameter docu...
TTO has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332234 ) Change subject: Fix broken variable inclusions in API unblock parameter documentation .. Fix broken variable inclusions in API unblock parameter documentation Change-Id: I06bf55b3f7f0e05e059f648d92c0cb2d54255d18 --- M includes/api/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/332234/2 diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index b2cecc9..c1fefd6 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -1398,8 +1398,8 @@ "apihelp-tokens-example-emailmove": "Retrieve an email token and a move token.", "apihelp-unblock-description": "Unblock a user.", - "apihelp-unblock-param-id": "ID of the block to unblock (obtained through list=blocks). Cannot be used together with $1user or $luserid.", - "apihelp-unblock-param-user": "Username, IP address or IP address range to unblock. Cannot be used together with $1id or $luserid.", + "apihelp-unblock-param-id": "ID of the block to unblock (obtained through list=blocks). Cannot be used together with $1user or $1userid.", + "apihelp-unblock-param-user": "Username, IP address or IP address range to unblock. Cannot be used together with $1id or $1userid.", "apihelp-unblock-param-userid": "User ID to unblock. Cannot be used together with $1id or $1user.", "apihelp-unblock-param-reason": "Reason for unblock.", "apihelp-unblock-param-tags": "Change tags to apply to the entry in the block log.", -- To view, visit https://gerrit.wikimedia.org/r/332234 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06bf55b3f7f0e05e059f648d92c0cb2d54255d18 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TTO___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set wgBabelMainCategory for cswikiversity to Uživatel %code%
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332046 ) Change subject: Set wgBabelMainCategory for cswikiversity to Uživatel %code% .. Set wgBabelMainCategory for cswikiversity to Uživatel %code% Bug: T155301 Change-Id: I08b2a3abb9af97da91e80253f4b84fff205f6044 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 409e7da..317450f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15531,6 +15531,7 @@ 'cawiktionary' => 'Usuaris %code%', // T49287 'checkuserwiki' => 'User %code%', 'commonswiki' => 'User %code%', + 'cswikiversity' => 'Uživatel %code%', // T15530 'enwiki' => 'User %code%', 'enwikibooks' => 'User %code%', 'enwiktionary' => 'User %code%', -- To view, visit https://gerrit.wikimedia.org/r/332046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08b2a3abb9af97da91e80253f4b84fff205f6044 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: UrbanecmGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix broken variable inclusions in API unblock parameter docu...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332234 ) Change subject: Fix broken variable inclusions in API unblock parameter documentation .. Fix broken variable inclusions in API unblock parameter documentation Change-Id: I06bf55b3f7f0e05e059f648d92c0cb2d54255d18 --- M includes/api/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: TTO: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index b2cecc9..c1fefd6 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -1398,8 +1398,8 @@ "apihelp-tokens-example-emailmove": "Retrieve an email token and a move token.", "apihelp-unblock-description": "Unblock a user.", - "apihelp-unblock-param-id": "ID of the block to unblock (obtained through list=blocks). Cannot be used together with $1user or $luserid.", - "apihelp-unblock-param-user": "Username, IP address or IP address range to unblock. Cannot be used together with $1id or $luserid.", + "apihelp-unblock-param-id": "ID of the block to unblock (obtained through list=blocks). Cannot be used together with $1user or $1userid.", + "apihelp-unblock-param-user": "Username, IP address or IP address range to unblock. Cannot be used together with $1id or $1userid.", "apihelp-unblock-param-userid": "User ID to unblock. Cannot be used together with $1id or $1user.", "apihelp-unblock-param-reason": "Reason for unblock.", "apihelp-unblock-param-tags": "Change tags to apply to the entry in the block log.", -- To view, visit https://gerrit.wikimedia.org/r/332234 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06bf55b3f7f0e05e059f648d92c0cb2d54255d18 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TTOGerrit-Reviewer: TTO Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add anomie (Brad Jorsch) to analytics-privatedata-users
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332323 ) Change subject: Add anomie (Brad Jorsch) to analytics-privatedata-users .. Add anomie (Brad Jorsch) to analytics-privatedata-users No objections within the standard access request timeframe and manager approval is granted. Bug: T155143 Change-Id: I0b0f850829ce02ae140c8187c26e023a60f9b0a8 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 24e5580..66a5543 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -234,7 +234,7 @@ bmansurov, atgomez, amire80, kartik, pcoombe, foks, mpany, hjiang, jsamra, bcohn, jdlrobson, chelsyx, ovasileva, mtizzoni, panisson, paolotti, ciro, psinger, flemmerich, mkroetzsch, akrausetud, filippo, nschaaf, pmiazga, faidon, - zareen, piccardi, fdans, eevans] + zareen, piccardi, fdans, eevans, anomie] analytics-admins: gid: 732 description: Admin access to analytics cluster. -- To view, visit https://gerrit.wikimedia.org/r/332323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b0f850829ce02ae140c8187c26e023a60f9b0a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MuehlenhoffGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Namespace aliases on Bhojpuri Wikipedia (bhwiki)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332015 ) Change subject: Namespace aliases on Bhojpuri Wikipedia (bhwiki) .. Namespace aliases on Bhojpuri Wikipedia (bhwiki) Bug: T155278 Change-Id: I430519c3d349bb4865fde01f225a0ac9eb300a60 --- M wmf-config/InitialiseSettings.php 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 317450f..cbb230b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2799,6 +2799,16 @@ 'Author' => 100, 'Author_talk' => 101, ], + '+bhwiki' => [ // T155278 + 'बिसेस' => NS_SPECIAL, + 'सदस्य' => NS_USER, + 'स' => NS_USER, + 'सदस्य' => NS_USER, + 'U' => NS_USER, + 'वि' => NS_PROJECT, + 'वि' => NS_PROJECT, + 'WP' => NS_PROJECT, + ], '+bjnwiki' => [ 'Wikipidia_pamandiran' => NS_PROJECT_TALK, ], -- To view, visit https://gerrit.wikimedia.org/r/332015 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I430519c3d349bb4865fde01f225a0ac9eb300a60 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: UrbanecmGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add anomie (Brad Jorsch) to analytics-privatedata-users
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332323 ) Change subject: Add anomie (Brad Jorsch) to analytics-privatedata-users .. Add anomie (Brad Jorsch) to analytics-privatedata-users No objections within the standard access request timeframe and manager approval is granted. Bug: T155143 Change-Id: I0b0f850829ce02ae140c8187c26e023a60f9b0a8 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/23/332323/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 24e5580..66a5543 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -234,7 +234,7 @@ bmansurov, atgomez, amire80, kartik, pcoombe, foks, mpany, hjiang, jsamra, bcohn, jdlrobson, chelsyx, ovasileva, mtizzoni, panisson, paolotti, ciro, psinger, flemmerich, mkroetzsch, akrausetud, filippo, nschaaf, pmiazga, faidon, - zareen, piccardi, fdans, eevans] + zareen, piccardi, fdans, eevans, anomie] analytics-admins: gid: 732 description: Admin access to analytics cluster. -- To view, visit https://gerrit.wikimedia.org/r/332323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b0f850829ce02ae140c8187c26e023a60f9b0a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add one throttle rule + remove obsolete ones
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332134 ) Change subject: Add one throttle rule + remove obsolete ones .. Add one throttle rule + remove obsolete ones Date - Wednesday, 18th January, 2017 Time - 9am to 6pm (9.00hrs to 18.00hrs) IST IP address of Willingdon College, Sangli - 49.248.104.18 No. of Participants - 40 List of wiki's - Marathi Wikipedia, English Wikipedia, Commons User name - [[सदस्य:सुबोध कुलकर्णी]] https://mr.wikipedia.org/s/1osi Link on village pump - https://mr.wikipedia.org/s/1qm Bug: T155345 Change-Id: I6cdcf58bad6026b5529b08121c795ad5883a8d5a --- M wmf-config/throttle.php 1 file changed, 6 insertions(+), 75 deletions(-) Approvals: Luke081515: Looks good to me, but someone else must approve Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 579287f..7014fa1 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -28,75 +28,6 @@ # ]; ## Add throttling definitions below. -/// -/// Maharashtra 'Edit Wikipedia…' workshops — T154312 -/// - -$wmgMaharashtraEventsWikis = [ - "mrwiki", - "mrwiktionary", - "mrwikisource", - "mrwikibooks", - "mrwikiquote", - "enwiki", - "commonswiki", -]; - -$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia…' workshops (Pune) - 'from' => '2017-01-04T07:00 +5:30', - 'to' => '2017-01-04T20:00 +5:30', - 'range' => '196.1.114.0/24', // 196.1.114.200 - 'dbname' => $wmgMaharashtraEventsWikis, - 'value' => 100 // expected participants are unknown -]; - -$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia' workshops (VNGIASS) - 'from' => '2017-01-06T10:00 +5:30', - 'to' => '2017-01-06T20:00 +5:30', - 'range' => '117.211.27.0/24', // 117.211.27.103 - 'dbname' => $wmgMaharashtraEventsWikis, - 'value' => 100 // unknown participants -]; - -$wmgThrottlingExceptions[] = [ // T154312 - Maharashtra 'Edit Wikipedia…' workshops (MPKV) - 'from' => '2017-01-07T07:00 +5:30', - 'to' => '2017-01-07T20:00 +5:30', - 'range' => '14.139.120.144/28', // 14.139.120.152 - 'dbname' => $wmgMaharashtraEventsWikis, - 'value' => 100 // expected participants are unknown -]; - -$wmgThrottlingExceptions[] = [ // T154312 - 'from' => '2017-01-10T10:00 +5:30', - 'to' => '2017-01-10T20:00 +5:30', - 'IP' => '117.200.216.15', - 'dbname' => $wmgMaharashtraEventsWikis, - 'value' => 100 // unknown -]; - -$wmgThrottlingExceptions[] = [ // T154312 - 'from' => '2017-01-12T10:00 +5:30', - 'to' => '2017-01-12T20:00 +5:30', - 'range' => [ - '14.139.125.192/28', - '121.241.25.1/24', - ], - 'dbname' => $wmgMaharashtraEventsWikis, - 'value' => 100 // unknown -]; - -/// -/// Other rules -/// - -$wmgThrottlingExceptions[] = [ // T154245 - 'from' => '2017-01-13T00:00 +0:00', - 'to' => '2017-01-13T23:59 +0:00', - 'range' => [ '161.23.0.0/16', '138.37.0.0/16', '2a01:56c0::/32' ], - 'dbname' => 'enwiki', - 'value' => 50 // 40 expected -]; - $wmgThrottlingExceptions[] = [ // T154245 'from' => '2017-01-20T0:00 +0:00', @@ -106,12 +37,12 @@ 'value' => 50 // 40 expected ]; -$wmgThrottlingExceptions[] = [ // T154568 - 'from' => '2017-01-06T09:00 +5:30', - 'to' => '2017-01-08T0:00 +5:30', - 'IP' => '103.5.18.101', - 'dbname' => [ 'tewiki', 'commonswiki' ], - 'value' => 130 // 100 expected +$wmgThrottlingExceptions[] = [ // T155345 + 'from' => '2017-01-18T09:00 +5:30', + 'to' => '2017-01-18T18:00 +5:30', + 'range' => '49.248.104.0/24', + 'dbname' => [ 'mrwiki', 'enwiki', 'commonswiki' ], + 'value' => 50 // 40 expected ]; ## Add throttling definitions above. -- To view, visit https://gerrit.wikimedia.org/r/332134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cdcf58bad6026b5529b08121c795ad5883a8d5a Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: UrbanecmGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: Luke081515 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't sleep after the last upload in importImages
Dereckson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332334 ) Change subject: Don't sleep after the last upload in importImages .. Don't sleep after the last upload in importImages Change-Id: Ia675f210582c3075e9b59b002a00cb1fc4b44cac --- M maintenance/importImages.php 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/332334/1 diff --git a/maintenance/importImages.php b/maintenance/importImages.php index 7f2a9e1..4a3d2d6 100644 --- a/maintenance/importImages.php +++ b/maintenance/importImages.php @@ -187,6 +187,11 @@ if ( $count > 0 ) { foreach ( $files as $file ) { + + if ( $sleep && ( $processed > 0 ) ) { + sleep( $sleep ); + } + $base = UtfNormal\Validator::cleanUp( wfBaseName( $file ) ); # Validate a title @@ -374,10 +379,6 @@ if ( $limit && $processed >= $limit ) { break; - } - - if ( $sleep ) { - sleep( $sleep ); } } -- To view, visit https://gerrit.wikimedia.org/r/332334 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia675f210582c3075e9b59b002a00cb1fc4b44cac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Remove big gap under own/foreign title
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332326 ) Change subject: Remove big gap under own/foreign title .. Remove big gap under own/foreign title Changed composition of content to avoid line-break gap. (by UX comment) Change-Id: I8829ced1453d6db962ddf8810f65e499f6d0a1a2 --- M includes/TwoColConflictPage.php M modules/ext.TwoColConflict.css 2 files changed, 5 insertions(+), 3 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php index 87189e4..1be2cae 100644 --- a/includes/TwoColConflictPage.php +++ b/includes/TwoColConflictPage.php @@ -233,8 +233,9 @@ $this->context->msg( 'twoColConflict-diffchange-own-title' )->escaped() . '" unselectable="on">' . // used by IE9 '' . + '' . + $changeSet['new'] . ''; - $output[] = $changeSet['new'] . ''; break; case 'delete': $output[] = '' . @@ -246,8 +247,9 @@ )->escaped() . '" unselectable="on">' . // used by IE9 '' . + '' . + $changeSet['old'] . ''; - $output[] = $changeSet['old'] . ''; break; case 'copy': $output[] = '' . diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css index cfad3ac..221ee0c 100644 --- a/modules/ext.TwoColConflict.css +++ b/modules/ext.TwoColConflict.css @@ -122,7 +122,7 @@ .mw-twocolconflict-diffchange-foreign .mw-twocolconflict-diffchange-title { color: white; padding: 1px 2px; - margin-left: -4px; + margin: 0 0 4px -4px; font-weight: bold; font-family: sans-serif; font-size: 0.7em; -- To view, visit https://gerrit.wikimedia.org/r/332326 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8829ced1453d6db962ddf8810f65e499f6d0a1a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: WMDE-FischGerrit-Reviewer: Addshore Gerrit-Reviewer: Andrew-WMDE Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Polish WikidataBot.user_edit_entity
Matěj Suchánek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332333 ) Change subject: Polish WikidataBot.user_edit_entity .. Polish WikidataBot.user_edit_entity - Make the method return bool, just like BaseBot._save_page does. - Don't show the diff when the bot is running without human review but do create it if it's necessary. - Add temporary workaround for T86074. Change-Id: I91bf76085ce19bf191dcdbab73b2fb7c1b5bfac4 --- M pywikibot/bot.py 1 file changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/33/332333/2 diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 82f24ef..da34528 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1313,7 +1313,7 @@ @rtype: bool """ if not self.user_confirm('Do you want to accept these changes?'): -return +return False if 'async' not in kwargs and self.getOption('always'): kwargs['async'] = True @@ -1852,7 +1852,7 @@ u'property ID (e.g. P123) of it:' % property_name).upper() -def user_edit_entity(self, item, data=None, **kwargs): +def user_edit_entity(self, item, data=None, async=None, **kwargs): """ Edit entity with data provided, with user confirmation as required. @@ -1860,10 +1860,11 @@ @type item: ItemPage @param data: data to be saved, or None if the diff should be created automatically +@kwarg async: temporary workaround for T86074 (don't use) @kwarg summary: revision comment, passed to ItemPage.editEntity @type summary: str @kwarg show_diff: show changes between oldtext and newtext (default: - True) + True unless the 'always' is True) @type show_diff: bool @kwarg ignore_server_errors: if True, server errors will be reported and ignored (default: False) @@ -1871,15 +1872,18 @@ @kwarg ignore_save_related_errors: if True, errors related to page save will be reported and ignored (default: False) @type ignore_save_related_errors: bool +@return: whether the item was saved successfully +@rtype: bool """ self.current_page = item -show_diff = kwargs.pop('show_diff', True) +show_diff = kwargs.pop('show_diff', not self.getOption('always')) +diff = None +if data is None: +diff = item.toJSON(diffto=( +item._content if hasattr(item, '_content') else None)) if show_diff: -if data is None: -diff = item.toJSON(diffto=( -item._content if hasattr(item, '_content') else None)) -else: +if not diff: diff = pywikibot.WikibasePage._normalizeData(data) pywikibot.output(json.dumps(diff, indent=4, sort_keys=True)) @@ -1889,7 +1893,8 @@ # TODO async in editEntity should actually have some effect (bug T86074) # TODO PageSaveRelatedErrors should be actually raised in editEntity # (bug T86083) -self._save_page(item, item.editEntity, data, **kwargs) +return self._save_page(item, item.editEntity, data, + async=False, **kwargs) def getSource(self, site): """ -- To view, visit https://gerrit.wikimedia.org/r/332333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91bf76085ce19bf191dcdbab73b2fb7c1b5bfac4 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj SuchánekGerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[REL1_28]: Use fake timer in Echo unit tests
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332335 ) Change subject: Use fake timer in Echo unit tests .. Use fake timer in Echo unit tests Freeze time to avoid a race condition where a second is ticking in the middle of a unit test. Bug: T154188 Change-Id: I6b0c8ae06360e6da016d97361cc2ccdeaf2e4343 --- M tests/qunit/model/test_mw.echo.dm.NotificationItem.js 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/35/332335/1 diff --git a/tests/qunit/model/test_mw.echo.dm.NotificationItem.js b/tests/qunit/model/test_mw.echo.dm.NotificationItem.js index 10ac6c7..1a5d68e 100644 --- a/tests/qunit/model/test_mw.echo.dm.NotificationItem.js +++ b/tests/qunit/model/test_mw.echo.dm.NotificationItem.js @@ -1,5 +1,4 @@ ( function ( mw, $ ) { - /*global moment:false */ var fakeData = { type: 'alert', read: true, @@ -25,9 +24,15 @@ icon: 'speechBubbles' } ] - }; + }, + now = 123456789, + nowFormatted = '2009-02-13T23:31:30Z'; - QUnit.module( 'ext.echo.dm - mw.echo.dm.NotificationItem' ); + QUnit.module( 'ext.echo.dm - mw.echo.dm.NotificationItem', QUnit.newMwEnvironment( { + setup: function () { + this.sandbox.useFakeTimers( now ); + } + } ) ); QUnit.test( 'Constructing items', function ( assert ) { var i, j, itemModel, checkMethods, @@ -41,7 +46,7 @@ isSeen: false, isForeign: false, isBundled: false, - getTimestamp: moment.utc().format( '-MM-DD[T]HH:mm:ss[Z]' ), + getTimestamp: nowFormatted, getPrimaryUrl: undefined, getIconURL: undefined, getIconType: undefined, -- To view, visit https://gerrit.wikimedia.org/r/332335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b0c8ae06360e6da016d97361cc2ccdeaf2e4343 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: REL1_28 Gerrit-Owner: PaladoxGerrit-Reviewer: Sbisson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: More generic "@return ChangeOp" type for EditEntity::getChan...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331609 ) Change subject: More generic "@return ChangeOp" type for EditEntity::getChangeOps .. More generic "@return ChangeOp" type for EditEntity::getChangeOps Bug: T152491 Change-Id: Iad93777db524a1063daac3ffb55da241752f458d --- M repo/includes/Api/EditEntity.php 1 file changed, 8 insertions(+), 12 deletions(-) Approvals: WMDE-leszek: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php index 8210dfd..ee696c1 100644 --- a/repo/includes/Api/EditEntity.php +++ b/repo/includes/Api/EditEntity.php @@ -236,7 +236,7 @@ } } - $changeOps = $this->getChangeOps( $data, $entity ); + $changeOps = $this->getChangeOp( $data, $entity ); $this->applyChangeOp( $changeOps, $entity ); @@ -285,21 +285,17 @@ * @param EntityDocument $entity * * @throws ApiUsageException -* @return ChangeOps +* @return ChangeOp */ - private function getChangeOps( array $changeRequest, EntityDocument $entity ) { - $changeOps = new ChangeOps(); - + private function getChangeOp( array $changeRequest, EntityDocument $entity ) { $type = $entity->getType(); if ( isset( $this->changeOpDeserializerCallbacks[$type] ) ) { - $changeOpDeserializer = call_user_func( - $this->changeOpDeserializerCallbacks[$type] - ); - $changeOp = $changeOpDeserializer->createEntityChangeOp( $changeRequest ); - $changeOps->add( $changeOp ); - // Shorten out - return $changeOps; + $changeOpDeserializer = call_user_func( $this->changeOpDeserializerCallbacks[$type] ); + return $changeOpDeserializer->createEntityChangeOp( $changeRequest ); } + + $changeOps = new ChangeOps(); + //FIXME: Use a ChangeOpBuilder so we can batch fingerprint ops etc, // for more efficient validation! -- To view, visit https://gerrit.wikimedia.org/r/331609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad93777db524a1063daac3ffb55da241752f458d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)Gerrit-Reviewer: Addshore Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: WMDE-leszek 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...Wikibase[master]: Use ChangeOpDeserializer callbacks in Api\EditEntity
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/328357 ) Change subject: Use ChangeOpDeserializer callbacks in Api\EditEntity .. Use ChangeOpDeserializer callbacks in Api\EditEntity Bug: T152491 Change-Id: Id1e5a8f71924fced1a852de86d4e9aee070d1cf6 --- M lib/includes/EntityTypeDefinitions.php M lib/tests/phpunit/EntityTypeDefinitionsTest.php M repo/includes/Api/EditEntity.php M repo/includes/WikibaseRepo.php M repo/tests/phpunit/includes/WikibaseRepoTest.php 5 files changed, 79 insertions(+), 17 deletions(-) Approvals: WMDE-leszek: Looks good to me, but someone else must approve jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, approved diff --git a/lib/includes/EntityTypeDefinitions.php b/lib/includes/EntityTypeDefinitions.php index aae731b..336f534 100644 --- a/lib/includes/EntityTypeDefinitions.php +++ b/lib/includes/EntityTypeDefinitions.php @@ -153,4 +153,15 @@ return $this->getMapForDefinitionField( 'entity-id-composer-callback' ); } + /** +* @return callable[] An array mapping entity type identifiers +* to callables instantiating ChangeOpDeserializer objects +* capable of turning serialization of the change (in array form) +* to a ChangeOp object representing the change. +* Not guaranteed to contain all entity types. +*/ + public function getChangeOpDeserializerCallbacks() { + return $this->getMapForDefinitionField( 'changeop-deserializer-callback' ); + } + } diff --git a/lib/tests/phpunit/EntityTypeDefinitionsTest.php b/lib/tests/phpunit/EntityTypeDefinitionsTest.php index 5c4ca91..d5a8fb0 100644 --- a/lib/tests/phpunit/EntityTypeDefinitionsTest.php +++ b/lib/tests/phpunit/EntityTypeDefinitionsTest.php @@ -32,6 +32,7 @@ 'entity-id-pattern' => 'foo-id-pattern', 'entity-id-builder' => 'new-foo-id', 'entity-id-composer-callback' => 'new-composed-foo-id', + 'changeop-deserializer-callback' => 'new-changeop-deserializer-callback' ), 'bar' => array( 'serializer-factory-callback' => 'bar-serializer', @@ -157,4 +158,13 @@ ], $definitions->getEntityIdComposers() ); } + public function testGetChangeOpDeserializerCallbacks() { + $definitions = new EntityTypeDefinitions( $this->getDefinitions() ); + + $this->assertSame( + [ 'foo' => 'new-changeop-deserializer-callback' ], + $definitions->getChangeOpDeserializerCallbacks() + ); + } + } diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php index 8d22edb..8210dfd 100644 --- a/repo/includes/Api/EditEntity.php +++ b/repo/includes/Api/EditEntity.php @@ -87,6 +87,11 @@ private $entityFactory; /** +* @var callable[] +*/ + private $changeOpDeserializerCallbacks; + + /** * @see ModifyEntity::__construct * * @param ApiMain $mainModule @@ -109,6 +114,7 @@ $this->termChangeOpFactory = $changeOpFactoryProvider->getFingerprintChangeOpFactory(); $this->statementChangeOpFactory = $changeOpFactoryProvider->getStatementChangeOpFactory(); $this->siteLinkChangeOpFactory = $changeOpFactoryProvider->getSiteLinkChangeOpFactory(); + $this->changeOpDeserializerCallbacks = $wikibaseRepo->getChangeOpDeserializerCallbacks(); } /** @@ -274,56 +280,67 @@ } /** -* @param array $data +* @param array $changeRequest an array of data to apply. For example: +*[ 'label' => [ 'zh' => [ 'remove' ], 'de' => [ 'value' => 'Foo' ] ] ] * @param EntityDocument $entity * * @throws ApiUsageException * @return ChangeOps */ - private function getChangeOps( array $data, EntityDocument $entity ) { + private function getChangeOps( array $changeRequest, EntityDocument $entity ) { $changeOps = new ChangeOps(); + $type = $entity->getType(); + if ( isset( $this->changeOpDeserializerCallbacks[$type] ) ) { + $changeOpDeserializer = call_user_func( + $this->changeOpDeserializerCallbacks[$type] + ); + $changeOp = $changeOpDeserializer->createEntityChangeOp( $changeRequest ); + $changeOps->add( $changeOp ); + // Shorten out + return $changeOps; + } //FIXME: Use a ChangeOpBuilder so we can batch fingerprint ops etc,
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Move SiteLinkCommentCreator to RecentChanges namespace
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332337 ) Change subject: Move SiteLinkCommentCreator to RecentChanges namespace .. Move SiteLinkCommentCreator to RecentChanges namespace Two reasons to touch this: Make the namespace PSR-4 compatible. And move it to the more specific "RecentChanges" namespace, because this is used only once anyway. Change-Id: I96921d652481deea3866c120735b0c98b56b35d0 --- M client/includes/RecentChanges/RecentChangeFactory.php R client/includes/RecentChanges/SiteLinkCommentCreator.php M client/includes/WikibaseClient.php M client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php R client/tests/phpunit/includes/RecentChanges/SiteLinkCommentCreatorTest.php 5 files changed, 11 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/37/332337/1 diff --git a/client/includes/RecentChanges/RecentChangeFactory.php b/client/includes/RecentChanges/RecentChangeFactory.php index 316c645..bee44f0 100644 --- a/client/includes/RecentChanges/RecentChangeFactory.php +++ b/client/includes/RecentChanges/RecentChangeFactory.php @@ -9,7 +9,6 @@ use Title; use Wikibase\EntityChange; use Wikibase\ItemChange; -use Wikibase\SiteLinkCommentCreator; use Wikimedia\Assert\Assert; /** diff --git a/client/includes/SiteLinkCommentCreator.php b/client/includes/RecentChanges/SiteLinkCommentCreator.php similarity index 99% rename from client/includes/SiteLinkCommentCreator.php rename to client/includes/RecentChanges/SiteLinkCommentCreator.php index da10b96..f935ec3 100644 --- a/client/includes/SiteLinkCommentCreator.php +++ b/client/includes/RecentChanges/SiteLinkCommentCreator.php @@ -1,6 +1,6 @@ getContentLanguage(), - $this->getSiteLinkCommentCreator() - ); - } - - /** -* @return SiteLinkCommentCreator -*/ - private function getSiteLinkCommentCreator() { - return new SiteLinkCommentCreator( - $this->getContentLanguage(), - $this->siteLookup, - $this->settings->getSetting( 'siteGlobalID' ) + new SiteLinkCommentCreator( + $this->getContentLanguage(), + $this->siteLookup, + $this->settings->getSetting( 'siteGlobalID' ) + ) ); } diff --git a/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php b/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php index 893ab19..d94db33 100644 --- a/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php +++ b/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php @@ -14,7 +14,7 @@ use Wikibase\DataModel\Services\Diff\ItemDiff; use Wikibase\EntityChange; use Wikibase\ItemChange; -use Wikibase\SiteLinkCommentCreator; +use Wikibase\Client\RecentChanges\SiteLinkCommentCreator; /** * @covers Wikibase\Client\RecentChanges\RecentChangeFactory diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php b/client/tests/phpunit/includes/RecentChanges/SiteLinkCommentCreatorTest.php similarity index 97% rename from client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php rename to client/tests/phpunit/includes/RecentChanges/SiteLinkCommentCreatorTest.php index 98f2ad0..da9b8f9 100644 --- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php +++ b/client/tests/phpunit/includes/RecentChanges/SiteLinkCommentCreatorTest.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/332337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96921d652481deea3866c120735b0c98b56b35d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE)___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: ExtendedSearch: readded create page from search
Nasty has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332330 ) Change subject: ExtendedSearch: readded create page from search .. ExtendedSearch: readded create page from search Fixed issue from ERM4026 Change-Id: I526fb0f897613d459fee4abaeb5877ff91645cae --- M ExtendedSearch/views/view.SearchSuggest.php 1 file changed, 45 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/30/332330/1 diff --git a/ExtendedSearch/views/view.SearchSuggest.php b/ExtendedSearch/views/view.SearchSuggest.php index 90bbfb7..eb90401 100644 --- a/ExtendedSearch/views/view.SearchSuggest.php +++ b/ExtendedSearch/views/view.SearchSuggest.php @@ -32,11 +32,24 @@ public function execute( $aParam = false ) { $sSearch = str_replace( BsCore::getForbiddenCharsInArticleTitle(), '', $this->getOption( 'search' ) ); $oTitle = Title::newFromText( $sSearch ); + + $aLinks = []; + if( !$oTitle->exists() ) { + $aLinks['bs-extendedsearch-suggest'] = [ + 'href' => $oTitle->getLocalURL(), + 'title' => wfMessage( 'bs-extendedsearch-create-page', $oTitle->getPrefixedText() )->plain(), + 'text' => wfMessage( 'bs-extendedsearch-create-page', $oTitle->getPrefixedText() )->plain() + ]; + } + + Hooks::run( 'BSExtendedSearchSpecialPageTermLinks', [ &$aLinks ] ); + + $sCreatesuggest = ''; + $sCreatesuggest .= $this->renderList( $aLinks ); + $sSearchUrlencoded = urlencode( $sSearch ); $sSearchHtmlEntities = htmlentities( $sSearch, ENT_QUOTES, 'UTF-8' ); - $sCreatesuggest = ''; - - wfRunHooks( 'BSExtendedSearchAdditionalActions', array( &$sCreatesuggest, &$sSearchUrlencoded, &$sSearchHtmlEntities, &$oTitle ) ); + Hooks::run( 'BSExtendedSearchAdditionalActions', array( &$sCreatesuggest, &$sSearchUrlencoded, &$sSearchHtmlEntities, &$oTitle ), '2.27' ); $sCreatesuggest .= ''; $sCreatesuggest .= ''; @@ -44,4 +57,33 @@ return $sCreatesuggest; } + /** +* Renders a given array to links in list items. +* +* @param $aLinks array An array of links. +* @return string Returns the HTML from the given array. +*/ + private function renderList( $aLinks ) { + $sResult = ''; + + foreach ($aLinks as $sId => $aItem) { + $sResult .= Html::rawElement( + 'li', + array( + ), + Html::element( + 'a', + array( + 'id' => $sId, + 'title' => $aItem['title'], + 'href' => $aItem['href'], + 'text' => $aItem['text'] + ), + $aItem['text'] + ) + ); + } + + return $sResult; + } } -- To view, visit https://gerrit.wikimedia.org/r/332330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I526fb0f897613d459fee4abaeb5877ff91645cae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: Nasty___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove the botadmin group from mlwikisource
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332329 ) Change subject: Remove the botadmin group from mlwikisource .. Remove the botadmin group from mlwikisource This group wasn't used at all and as it grants full sysop rights the "sysop" group can be used instead if needed. Bug: T152296 Change-Id: I5370b15dda9a38f1222f98a4210d610c1739ccf0 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/29/332329/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cbb230b..dc34a8a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8544,12 +8544,6 @@ '+mlwikisource' => [ 'patroller' => [ 'patrol' => true ], 'autopatrolled' => [ 'autopatrol' => true ], - 'botadmin' => [ - 'blockemail' => true, 'block' => true, 'ipblock-exempt' => true, 'protect' => true, 'editprotected' => true, 'createaccount' => true, 'deleterevision' => true, 'delete' => true, 'globalblock-whitelist' => true, 'editusercss' => true, 'edituserjs' => true, - 'autoconfirmed' => true, 'editsemiprotected' => true, 'editinterface' => true, 'autopatrol' => true, 'import' => true, 'patrol' => true, 'markbotedits' => true, 'nuke' => true, 'abusefilter-modify' => true, 'movefile' => true, 'move' => true, 'move-subpages' => true, - 'move-rootuserpages' => true, 'noratelimit' => true, 'suppressredirect' => true, 'reupload-shared' => true, 'override-antispoof' => true, 'tboverride' => true, 'reupload' => true, 'skipcaptcha' => true, 'rollback' => true, 'browsearchive' => true, 'unblockself' => true, - 'undelete' => true, 'upload' => true, 'upload_by_url' => true, 'apihighlimits' => true, 'unwatchedpages' => true, 'deletedhistory' => true, 'deletedtext' => true, 'abusefilter-log-detail' => true, - ], ], '+mlwiktionary' => [ 'botadmin' => [ @@ -9676,7 +9670,6 @@ ], '+mlwikisource' => [ 'sysop' => [ 'patroller', 'autopatrolled' ], - 'bureaucrat' => [ 'botadmin' ], ], '+mlwiktionary' => [ 'bureaucrat' => [ 'botadmin' ], @@ -10383,7 +10376,6 @@ ], '+mlwikisource' => [ 'sysop' => [ 'patroller', 'autopatrolled' ], - 'bureaucrat' => [ 'botadmin' ], ], '+mlwiktionary' => [ 'bureaucrat' => [ 'botadmin' ], -- To view, visit https://gerrit.wikimedia.org/r/332329 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5370b15dda9a38f1222f98a4210d610c1739ccf0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Correct styling regressions for align: 'inline'
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332331 ) Change subject: FieldLayout: Correct styling regressions for align: 'inline' .. FieldLayout: Correct styling regressions for align: 'inline' * Correct spacing between the widget and the label (T155396). * Correct label padding, it was using wrong selector. * Correct 'help' button alignment, it was affected by label padding. Follow-up to 52e1e893e42f197e44c1b0ee589f91d029fb1e6f. As a side effect of this change, trying to put a variable-width widget (like a TextInputWidget) into an inline FieldLayout, which was never a great idea, now *really* does not work (the widget assumes its minimal width, so e.g. for TextInputWidget, no text is visible). This should not be a problem, I hope. For this reason, the new demos from 17a2c26068f0a67c93f65c02cfe211f9c450de85 are corrected to use CheckboxInputWidget there. Bug: T155396 Change-Id: I6fdb7fdfee08bbb921d212ca83518b8775ad90d8 --- M demos/pages/widgets.js M demos/pages/widgets.php M src/styles/layouts/FieldLayout.less M src/themes/apex/layouts.less M src/themes/mediawiki/layouts.less 5 files changed, 17 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/31/332331/1 diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index 0dd890f..689984f 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -2017,7 +2017,7 @@ } ), new OO.ui.ActionFieldLayout( - new OO.ui.TextInputWidget(), + new OO.ui.CheckboxInputWidget( { selected: true } ), new OO.ui.ButtonWidget( { label: 'Button' } ), @@ -2027,7 +2027,7 @@ } ), new OO.ui.FieldLayout( - new OO.ui.TextInputWidget(), + new OO.ui.CheckboxInputWidget( { selected: true } ), { label: 'FieldLayout aligned inline with help', help: loremIpsum, @@ -2035,7 +2035,7 @@ } ), new OO.ui.ActionFieldLayout( - new OO.ui.TextInputWidget(), + new OO.ui.CheckboxInputWidget( { selected: true } ), new OO.ui.ButtonWidget( { label: 'Button' } ), diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php index dcf73c9..192ec9f 100644 --- a/demos/pages/widgets.php +++ b/demos/pages/widgets.php @@ -951,7 +951,7 @@ ] ), new OOUI\ActionFieldLayout( - new OOUI\TextInputWidget(), + new OOUI\CheckboxInputWidget( [ 'selected' => true ] ), new OOUI\ButtonWidget( [ 'label' => 'Button' ] ), @@ -961,7 +961,7 @@ ] ), new OOUI\FieldLayout( - new OOUI\TextInputWidget(), + new OOUI\CheckboxInputWidget( [ 'selected' => true ] ), [ 'label' => 'FieldLayout aligned inline with help', 'help' => $loremIpsum, @@ -969,7 +969,7 @@ ] ), new OOUI\ActionFieldLayout( - new OOUI\TextInputWidget(), + new OOUI\CheckboxInputWidget( [ 'selected' => true ] ), new OOUI\ButtonWidget( [ 'label' => 'Button' ] ), diff --git a/src/styles/layouts/FieldLayout.less b/src/styles/layouts/FieldLayout.less index 455a00b..974a29f 100644 --- a/src/styles/layouts/FieldLayout.less +++ b/src/styles/layouts/FieldLayout.less @@ -38,6 +38,11 @@ display: table-cell; vertical-align: middle; } + + > .oo-ui-fieldLayout-field { + // Since this is a "table cell", this doesn't actually mean 1px, but as narrow as possible + width: 1px; + } } .oo-ui-fieldLayout-help { @@ -53,7 +58,8 @@ } } - &.oo-ui-fieldLayout-align-top { +
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add a new throttle rule
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332324 ) Change subject: Add a new throttle rule .. Add a new throttle rule Bug: T155416 Change-Id: I59789acc92c6605ffc243f0f3ebffcf5304686a0 --- M wmf-config/throttle.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 7014fa1..2a82a24 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -45,6 +45,14 @@ 'value' => 50 // 40 expected ]; +$wmgThrottlingExceptions[] = [ // T155416 + 'from' => '2017-01-19T03:00 +5:30', + 'to' => '2017-01-19T18:00 +5:30', + 'range' => '14.139.121.0/24', + 'dbname' => [ 'mrwiki', 'enwiki', 'commonswiki' ], + 'value' => 50 // 40 expected +]; + ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/332324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59789acc92c6605ffc243f0f3ebffcf5304686a0 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: UrbanecmGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change the NS PROJECT name to "Википедия" on avwiki
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332325 ) Change subject: Change the NS_PROJECT name to "Википедия" on avwiki .. Change the NS_PROJECT name to "Википедия" on avwiki Bug: T155321 Change-Id: Id1a5f582d3dd794b2497692250ac2a17fd502733 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/25/332325/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cbb230b..781caaa 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2130,6 +2130,7 @@ 'aswiki' => 'ৱিকিপিডিয়া', 'aswikisource' => 'ৱিকিউৎস', // T45129 'auditcomwiki' => 'Project', + 'avwiki' => 'Википедия', // T155321 'aywiki' => 'Wikipidiya', 'azwiki' => 'Vikipediya', 'azwikibooks' => 'Vikikitab', // T33068 -- To view, visit https://gerrit.wikimedia.org/r/332325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1a5f582d3dd794b2497692250ac2a17fd502733 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add a new throttle rule
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332324 ) Change subject: Add a new throttle rule .. Add a new throttle rule Bug: T155416 Change-Id: I59789acc92c6605ffc243f0f3ebffcf5304686a0 --- M wmf-config/throttle.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/24/332324/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 579287f..d8e3d7e 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -114,6 +114,14 @@ 'value' => 130 // 100 expected ]; +$wmgThrottlingExceptions[] = [ // T155416 + 'from' => '2017-01-19T03:00 +5:30', + 'to' => '2017-01-19T18:00 +5:30', + 'range' => '14.139.121.0/24', + 'dbname' => [ 'mrwiki', 'enwiki', 'commonswiki' ], + 'value' => 50 // 40 expected +]; + ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/332324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59789acc92c6605ffc243f0f3ebffcf5304686a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: All connector-lines should be contained within the RevisionS...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/327728 ) Change subject: All connector-lines should be contained within the RevisionSlider .. All connector-lines should be contained within the RevisionSlider Bug: T151450 Change-Id: I317a2fc81a85d20cf07b1e45d5501cadaaa0b727 --- M modules/ext.RevisionSlider.PointerLine.js M modules/ext.RevisionSlider.css M modules/ext.RevisionSlider.init.js 3 files changed, 52 insertions(+), 7 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, but someone else must approve WMDE-Fisch: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.RevisionSlider.PointerLine.js b/modules/ext.RevisionSlider.PointerLine.js index e466530..92446d8 100644 --- a/modules/ext.RevisionSlider.PointerLine.js +++ b/modules/ext.RevisionSlider.PointerLine.js @@ -99,7 +99,12 @@ drawLine: function () { var $upperLineDiv = this.$html.find( '.mw-revslider-pointer-line-upper' ), $lowerLineDiv = this.$html.find( '.mw-revslider-pointer-line-lower' ), + $newerUnderLineDiv = this.$html.find( '.mw-revslider-pointer-line-underline' ) + .filter( '.mw-revslider-pointer-newer' ), + $olderUnderLineDiv = this.$html.find( '.mw-revslider-pointer-line-underline' ) + .filter( '.mw-revslider-pointer-older' ), $sourcePointer = this.pointer.getView().getElement(), + $table = $( '.diff-otitle' ), $targetColumn; if ( this.offsetNotAvailable() ) { @@ -110,10 +115,14 @@ if ( this.pointer.getView().isUpperPointer() ) { $lowerLineDiv.removeClass( 'mw-revslider-lower-color' ).addClass( 'mw-revslider-upper-color' ); $upperLineDiv.removeClass( 'mw-revslider-lower-color' ).addClass( 'mw-revslider-upper-color' ); + $newerUnderLineDiv.removeClass( 'mw-revslider-lower-color' ).addClass( 'mw-revslider-upper-color' ); + $olderUnderLineDiv.removeClass( 'mw-revslider-lower-color' ).addClass( 'mw-revslider-upper-color' ); $targetColumn = $( '.diff-ntitle' ); } else { $lowerLineDiv.removeClass( 'mw-revslider-upper-color' ).addClass( 'mw-revslider-lower-color' ); $upperLineDiv.removeClass( 'mw-revslider-upper-color' ).addClass( 'mw-revslider-lower-color' ); + $olderUnderLineDiv.removeClass( 'mw-revslider-upper-color' ).addClass( 'mw-revslider-lower-color' ); + $newerUnderLineDiv.removeClass( 'mw-revslider-upper-color' ).addClass( 'mw-revslider-lower-color' ); $targetColumn = $( '.diff-otitle' ); } @@ -124,9 +133,35 @@ if ( this.targetColumnIsRightFromPointer( $sourcePointer, $targetColumn ) ) { $upperLineDiv.addClass( 'mw-revslider-left-line' ); $lowerLineDiv.addClass( 'mw-revslider-right-line' ); + + $( $newerUnderLineDiv ).css( { + width: $table.width() + 'px', + 'margin-right': -$table.width() / 2 + 'px', + 'margin-left': 0, + 'float': 'right' + } ); + $( $olderUnderLineDiv ).css( { + width: $table.width() + 'px', + 'margin-right': -$table.width() / 2 + 'px', + 'margin-left': 0, + 'float': 'right' + } ); } else { $upperLineDiv.addClass( 'mw-revslider-right-line' ); $lowerLineDiv.addClass( 'mw-revslider-left-line' ); + + $( $newerUnderLineDiv ).css( { + width: $table.width() + 'px', + 'margin-left': -$table.width() / 2 + 'px', + 'margin-right': 0, + 'float': 'left' + } ); + $( $olderUnderLineDiv ).css( { + width: $table.width() + 'px', + 'margin-left':
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Remove big gap under own/foreign title
WMDE-Fisch has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332326 ) Change subject: Remove big gap under own/foreign title .. Remove big gap under own/foreign title Changed composition of content to avoid line-break gap. (by UX comment) Change-Id: I8829ced1453d6db962ddf8810f65e499f6d0a1a2 --- M includes/TwoColConflictPage.php M modules/ext.TwoColConflict.css 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict refs/changes/26/332326/1 diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php index 87189e4..1be2cae 100644 --- a/includes/TwoColConflictPage.php +++ b/includes/TwoColConflictPage.php @@ -233,8 +233,9 @@ $this->context->msg( 'twoColConflict-diffchange-own-title' )->escaped() . '" unselectable="on">' . // used by IE9 '' . + '' . + $changeSet['new'] . ''; - $output[] = $changeSet['new'] . ''; break; case 'delete': $output[] = '' . @@ -246,8 +247,9 @@ )->escaped() . '" unselectable="on">' . // used by IE9 '' . + '' . + $changeSet['old'] . ''; - $output[] = $changeSet['old'] . ''; break; case 'copy': $output[] = '' . diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css index cfad3ac..221ee0c 100644 --- a/modules/ext.TwoColConflict.css +++ b/modules/ext.TwoColConflict.css @@ -122,7 +122,7 @@ .mw-twocolconflict-diffchange-foreign .mw-twocolconflict-diffchange-title { color: white; padding: 1px 2px; - margin-left: -4px; + margin: 0 0 4px -4px; font-weight: bold; font-family: sans-serif; font-size: 0.7em; -- To view, visit https://gerrit.wikimedia.org/r/332326 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8829ced1453d6db962ddf8810f65e499f6d0a1a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...citoid[master]: [WIP] Use marcXML translator instead of dc for oclc
Mvolz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332328 ) Change subject: [WIP] Use marcXML translator instead of dc for oclc .. [WIP] Use marcXML translator instead of dc for oclc Bug:T155161 Change-Id: I1ead6bfd80f61f1685cf8050fcbfad82b77e6c24 --- M lib/CitoidService.js M lib/XMLReader.js M package.json M test/features/scraping/isbn.js 4 files changed, 54 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid refs/changes/28/332328/1 diff --git a/lib/CitoidService.js b/lib/CitoidService.js index 713edfd..555986a 100644 --- a/lib/CitoidService.js +++ b/lib/CitoidService.js @@ -258,7 +258,7 @@ var query = { // Basic query parameters query: 'srw.bn+all+' + cr.idValue, // Don't url encode -recordSchema: 'info%3Asrw%2Fschema%2F1%2Fdc', // Already url encoded +//recordSchema: 'info%3Asrw%2Fschema%2F1%2Fdc', // Already url encoded wskey: citoidService.conf.wskey }; @@ -592,7 +592,7 @@ * @return {Object} BBPromise for CitoidRequest object */ CitoidService.prototype.scrapeXML = function(cr, xml){ -return this.xml.translate(cr, xml); +return this.xml.translateMarcXML(cr, xml); }; module.exports = CitoidService; diff --git a/lib/XMLReader.js b/lib/XMLReader.js index ab26d23..e7740af 100644 --- a/lib/XMLReader.js +++ b/lib/XMLReader.js @@ -9,6 +9,8 @@ var dc = require('./translators/dublinCore.js'); var BBPromise = require('bluebird'); var xml2js = BBPromise.promisifyAll(require('xml2js')); +//var marc4js = BBPromise.promisifyAll(require('marc4js')); +var marc4js = require('marc4js'); /** * XMLReader constructor @@ -83,7 +85,8 @@ return itemType; } -XMLReader.prototype.translate = function(cr, xml){ +// Function to be used for XML in dublin core format +XMLReader.prototype.translateDublinCore = function(cr, xml){ var cit = cr.response.citation[0]; var translate = this.translator.translate; var itemType; @@ -91,6 +94,17 @@ var record; var message = 'Unable to retrieve data from ISBN ' + cr.idValue; var error = {Error: message}; +var options = {format:'marcxml'}; +console.log(xml); + +// marc4js.parse(xml, options).then(function( results ){ +// console.log('s'); +// console.log(results); +// }); + +marc4js.parse(xml, options, function(err, records) { +console.log(records); +}); function reject(){ cr.response.responseCode = 404; @@ -128,4 +142,39 @@ }); }; + +// Function to be used for XML in MARC XML format +XMLReader.prototype.translateMarcXML = function(cr, xml){ +var cit = cr.response.citation[0]; +var translate = this.translator.translate; +var itemType; +var xmlreader = this; +var record; +var message = 'Unable to retrieve data from ISBN ' + cr.idValue; +var error = {Error: message}; +var options = {format:'marcxml'}; + +marc4js.parse(xml, options, function(err, records) { // Library currently doesn't work with PromisifyAll +if (err) { return reject(); } +try { +console.log(records); +return succeed(); +} catch(e){ +return reject(); +} +}); + +function reject(){ +cr.response.responseCode = 404; +cr.response.error = error; +return cr; +} + +function succeed(){ +cr.response.responseCode = 200; +return cr; +} + +}; + exports = module.exports = XMLReader; \ No newline at end of file diff --git a/package.json b/package.json index 269f0a7..5341756 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "iconv-lite": "0.4.15", "ip": "1.1.0", "js-yaml": "3.7.0", +"marc4js": "0.0.8", "preq": "0.5.2", "request": "^2.67.0", "service-runner": "2.1.13", diff --git a/test/features/scraping/isbn.js b/test/features/scraping/isbn.js index 9f1ad09..b394c14 100644 --- a/test/features/scraping/isbn.js +++ b/test/features/scraping/isbn.js @@ -84,7 +84,7 @@ describe('worldcat search api: ', function() { before(function () { return server.start(); }); -it('valid book ISBN - type Text', function() { +it.only('valid book ISBN - type Text', function() { return server.query('978-0-596-51979-7').then(function(res) { assert.status(res, 200); assert.checkCitation(res, 'MediaWiki'); -- To view, visit https://gerrit.wikimedia.org/r/332328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ead6bfd80f61f1685cf8050fcbfad82b77e6c24 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/citoid Gerrit-Branch: master Gerrit-Owner: Mvolz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org