[MediaWiki-commits] [Gerrit] conftool: add new jessie api appservers - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: conftool: add new jessie api appservers .. conftool: add new jessie api appservers Change-Id: I48f48a3c2a3ea8c4a54ec1e1c2cc4ad4d2cd15b4 --- M conftool-data/nodes/eqiad.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml index 93c889e..0133f68 100644 --- a/conftool-data/nodes/eqiad.yaml +++ b/conftool-data/nodes/eqiad.yaml @@ -59,6 +59,9 @@ mw1233.eqiad.wmnet: [apache2] mw1234.eqiad.wmnet: [apache2] mw1235.eqiad.wmnet: [apache2] + mw1276.eqiad.wmnet: [apache2] + mw1277.eqiad.wmnet: [apache2] + mw1278.eqiad.wmnet: [apache2] appserver: mw1018.eqiad.wmnet: [apache2] mw1019.eqiad.wmnet: [apache2] -- To view, visit https://gerrit.wikimedia.org/r/294737 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48f48a3c2a3ea8c4a54ec1e1c2cc4ad4d2cd15b4 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe LavagettoGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump deb version - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Bump deb version .. Bump deb version Change-Id: I70bb42d097a2e0f2475c6f706d41e0cdeaa628f4 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 0ae50a9..a94c30d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +toollabs-webservice (0.11) trusty; urgency=low + + * Fix terrible typo with restart state checking + + -- Yuvi PandaThu, 16 Jun 2016 22:30:00 -0800 + toollabs-webservice (0.10) trusty; urgency=low * Introduce concept of backends -- To view, visit https://gerrit.wikimedia.org/r/294878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70bb42d097a2e0f2475c6f706d41e0cdeaa628f4 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix terrible typo in status check for restarts - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Fix terrible typo in status check for restarts .. Fix terrible typo in status check for restarts Change-Id: I95ed91c085fd2b39cd1a420b5e211cee03001b69 --- M scripts/webservice 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/webservice b/scripts/webservice index b415907..d7e1b18 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -125,7 +125,7 @@ update_manifest(job, 'stop') elif args.action == 'restart': -if job.get_state() != Backend.STATE_STOPPED: +if job.get_state() != Backend.STATE_RUNNING: start(job, 'Your job is not running, starting') else: stop(job, 'Restarting webservice') -- To view, visit https://gerrit.wikimedia.org/r/294877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95ed91c085fd2b39cd1a420b5e211cee03001b69 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: YuvipandaGerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump deb version - change (operations...tools-webservice)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294878 Change subject: Bump deb version .. Bump deb version Change-Id: I70bb42d097a2e0f2475c6f706d41e0cdeaa628f4 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice refs/changes/78/294878/1 diff --git a/debian/changelog b/debian/changelog index 0ae50a9..a94c30d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +toollabs-webservice (0.11) trusty; urgency=low + + * Fix terrible typo with restart state checking + + -- Yuvi PandaThu, 16 Jun 2016 22:30:00 -0800 + toollabs-webservice (0.10) trusty; urgency=low * Introduce concept of backends -- To view, visit https://gerrit.wikimedia.org/r/294878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70bb42d097a2e0f2475c6f706d41e0cdeaa628f4 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix terrible typo in status check for restarts - change (operations...tools-webservice)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294877 Change subject: Fix terrible typo in status check for restarts .. Fix terrible typo in status check for restarts Change-Id: I95ed91c085fd2b39cd1a420b5e211cee03001b69 --- M scripts/webservice 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice refs/changes/77/294877/1 diff --git a/scripts/webservice b/scripts/webservice index b415907..d7e1b18 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -125,7 +125,7 @@ update_manifest(job, 'stop') elif args.action == 'restart': -if job.get_state() != Backend.STATE_STOPPED: +if job.get_state() != Backend.STATE_RUNNING: start(job, 'Your job is not running, starting') else: stop(job, 'Restarting webservice') -- To view, visit https://gerrit.wikimedia.org/r/294877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95ed91c085fd2b39cd1a420b5e211cee03001b69 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve HTMLCacheUpdate job CDN purge de-duplication - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/294876 Change subject: Improve HTMLCacheUpdate job CDN purge de-duplication .. Improve HTMLCacheUpdate job CDN purge de-duplication Bug: T124418 Change-Id: I87005f3ffaf73c70f137137849b628217be946d2 --- M includes/jobqueue/jobs/HTMLCacheUpdateJob.php 1 file changed, 9 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/294876/1 diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php index 7acbdf2..a14cdd7 100644 --- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php +++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php @@ -102,18 +102,15 @@ return; } - // The page_touched field will need to be bumped for these pages. - // Only bump it to the present time if no "rootJobTimestamp" was known. - // If it is known, it can be used instead, which avoids invalidating output - // that was in fact generated *after* the relevant dependency change time - // (e.g. template edit). This is particularily useful since refreshLinks jobs - // save back parser output and usually run along side htmlCacheUpdate jobs; - // their saved output would be invalidated by using the current timestamp. - if ( isset( $this->params['rootJobTimestamp'] ) ) { - $touchTimestamp = $this->params['rootJobTimestamp']; - } else { - $touchTimestamp = wfTimestampNow(); - } + // Bump page_touched to the current timestamp. This used to use the root job timestamp + // (e.g. template/file edit time), which was a bit more efficient when template edits are + // rare and don't effect the same pages much. However, this way allows for better + // de-duplication, which is much more useful for wikis with high edit rates. Note that + // RefreshLinksJob, which is enqueued alongside HTMLCacheUpdateJob, saves the parser output + // since it has to parse anyway. We assume that vast majority of the cache jobs finish + // before the link jobs, so using the current timestamp instead of the root timestamp is + // not expected to invalidate these cache entries too often. + $touchTimestamp = wfTimestampNow(); $dbw = wfGetDB( DB_MASTER ); // Update page_touched (skipping pages already touched since the root job). -- To view, visit https://gerrit.wikimedia.org/r/294876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87005f3ffaf73c70f137137849b628217be946d2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump deb version - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Bump deb version .. Bump deb version Change-Id: I58150f29093fe2b13dc617b9f1cf20cc414f0dcd --- M debian/changelog 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 35de4ea..0ae50a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +toollabs-webservice (0.10) trusty; urgency=low + + * Introduce concept of backends + * Introduce a kubernetes backends + * Refactor the gridengine backend so it continues to work with +new backend architecture + + -- Yuvi PandaThu, 16 Jun 2016 10:30:00 -0800 + toollabs-webservice (0.9) trusty; urgency=low * Disable fam for lighttpd -- To view, visit https://gerrit.wikimedia.org/r/294741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58150f29093fe2b13dc617b9f1cf20cc414f0dcd Gerrit-PatchSet: 6 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Exit when given unsupported parameters - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Exit when given unsupported parameters .. Exit when given unsupported parameters Change-Id: I9456d452b6b9f6038539f63a30ef99f630a82782 --- M scripts/webservice 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/webservice b/scripts/webservice index 8fbe255..e0a3102 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -89,6 +89,7 @@ if args.release is not None: print("--release is not implemented for --backend=kubernetes") print("Please just pick an appropriate type instead") +sys.exit(1) if args.type is None: args.type = tool.manifest.get('web', 'php5.6') acceptable_types = KubernetesBackend.CONFIG.keys() @@ -96,6 +97,7 @@ if args.type not in acceptable_types: print("type must be one of ", ','.join(acceptable_types)) +sys.exit(1) if backend == 'gridengine': job = GridEngineBackend(tool, args.type, args.extra_args) -- To view, visit https://gerrit.wikimedia.org/r/294843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9456d452b6b9f6038539f63a30ef99f630a82782 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: YuvipandaGerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup backend: field too when killing webservices - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Cleanup backend: field too when killing webservices .. Cleanup backend: field too when killing webservices Change-Id: I200b855506cb317a15e26df3f767c572ca09c9e0 --- M scripts/webservice 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/webservice b/scripts/webservice index a2aef0f..b415907 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -51,6 +51,7 @@ elif action == 'stop': if 'web' in job.tool.manifest: del job.tool.manifest['web'] +del job.tool.manifest['backend'] job.tool.save_manifest() else: # blow up! -- To view, visit https://gerrit.wikimedia.org/r/294872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I200b855506cb317a15e26df3f767c572ca09c9e0 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: YuvipandaGerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix default 'type' behavior - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Fix default 'type' behavior .. Fix default 'type' behavior Change-Id: I0d95a54673477cc71967816279b892d21f15dc95 --- M scripts/webservice 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/webservice b/scripts/webservice index e0a3102..a2aef0f 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -61,8 +61,7 @@ args = argparser.parse_args() tool = Tool.from_currentuser() -if args.type is None: -args.type = tool.manifest.get('web', 'lighttpd') + # We use this logic rather than setting defaults in argparse. # This allows us to default to spec in service.manifest but override @@ -84,6 +83,8 @@ else: print("--release is deprecated and has no effect, using trusty...") args.release = 'trusty' +if args.type is None: +args.type = tool.manifest.get('web', 'lighttpd') acceptable_types = GridEngineBackend.CONFIG.keys() elif backend == 'kubernetes': if args.release is not None: -- To view, visit https://gerrit.wikimedia.org/r/294844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d95a54673477cc71967816279b892d21f15dc95 Gerrit-PatchSet: 2 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: YuvipandaGerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove no-longer needed backported class from phpunit - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294875 Change subject: Remove no-longer needed backported class from phpunit .. Remove no-longer needed backported class from phpunit Since we finally upgraded our phpunit version, we no longer need a copy of this phpunit matcher. Change-Id: I9bf3db344a2e8789a264a453e4e6d87fedc4dc49 (cherry picked from commit 7ca37f1585226822ff3aad453d96940ad6692872) --- M tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php D tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php D tests/phpunit/includes/phpunit/LICENSE D tests/phpunit/includes/phpunit/README 4 files changed, 0 insertions(+), 162 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/75/294875/1 diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php index e29d207..68ce640 100644 --- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php +++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php @@ -23,9 +23,6 @@ use MediaWikiTestCase; use Monolog\Logger; -// not available in the version of phpunit mw uses, so copied into repo -require_once __DIR__ . '/../../../phpunit/ConsecutiveParametersMatcher.php'; - class KafkaHandlerTest extends MediaWikiTestCase { protected function setUp() { diff --git a/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php b/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php deleted file mode 100644 index 8de467f..000 --- a/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php +++ /dev/null @@ -1,124 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -/** - * Invocation matcher which looks for sets of specific parameters in the invocations. - * - * Checks the parameters of the incoming invocations, the parameter list is - * checked against the defined constraints in $parameters. If the constraint - * is met it will return true in matches(). - * - * It takes a list of match groups and and increases a call index after each invocation. - * So the first invocation uses the first group of constraints, the second the next and so on. - */ -class PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation -{ -/** - * @var array - */ -private $_parameterGroups = array(); - -/** - * @var array - */ -private $_invocations = array(); - -/** - * @param array $parameterGroups - */ -public function __construct(array $parameterGroups) -{ -foreach ($parameterGroups as $index => $parameters) { -foreach ($parameters as $parameter) { -if (!($parameter instanceof \PHPUnit_Framework_Constraint)) { -$parameter = new \PHPUnit_Framework_Constraint_IsEqual($parameter); -} -$this->_parameterGroups[$index][] = $parameter; -} -} -} - -/** - * @return string - */ -public function toString() -{ -$text = 'with consecutive parameters'; - -return $text; -} - -/** - * @param PHPUnit_Framework_MockObject_Invocation $invocation - * @return bool - */ -public function matches(PHPUnit_Framework_MockObject_Invocation $invocation) -{ -$this->_invocations[] = $invocation; -$callIndex= count($this->_invocations) - 1; -$this->verifyInvocation($invocation, $callIndex); - -return false; -} - -public function verify() -{ -foreach ($this->_invocations as $callIndex => $invocation) { -$this->verifyInvocation($invocation, $callIndex); -} -} - -/** - * Verify a single invocation - * - * @param PHPUnit_Framework_MockObject_Invocation $invocation - * @param int $callIndex - * @throws PHPUnit_Framework_ExpectationFailedException - */ -private function verifyInvocation(PHPUnit_Framework_MockObject_Invocation $invocation, $callIndex) -{ - -if (isset($this->_parameterGroups[$callIndex])) { -$parameters = $this->_parameterGroups[$callIndex]; -} else { - // no parameter assertion for this call index -return; -} - -if ($invocation === null) { -throw new PHPUnit_Framework_ExpectationFailedException( -'Mocked method does not exist.' -); -} - -if (count($invocation->parameters) < count($parameters)) { -throw new PHPUnit_Framework_ExpectationFailedException( -sprintf( -'Parameter count for
[MediaWiki-commits] [Gerrit] Deploy Compact Language Links as default (Stage 1) - change (operations/mediawiki-config)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/294874 Change subject: Deploy Compact Language Links as default (Stage 1) .. Deploy Compact Language Links as default (Stage 1) * Compact Language Links default for from top 91th to all Wikis. * Default for new users. * Default for anonymous users. Bug: T136677 Change-Id: Ie289f39bd8b80063201b6d3b8875a1f22382be8f --- A dblists/cll-default.dblist M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 3 files changed, 197 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/294874/1 diff --git a/dblists/cll-default.dblist b/dblists/cll-default.dblist new file mode 100644 index 000..d5a5d55 --- /dev/null +++ b/dblists/cll-default.dblist @@ -0,0 +1,193 @@ +fywiki +lmowiki +swwiki +mywiki +anwiki +yowiki +newiki +iowiki +guwiki +scnwiki +ndswiki +bpywiki +pawiki +kuwiki +alswiki +knwiki +quwiki +iawiki +suwiki +barwiki +ckbwiki +bat_smgwiki +mnwiki +arzwiki +napwiki +wawiki +bugwiki +gdwiki +yiwiki +map_bmswiki +amwiki +mznwiki +fowiki +siwiki +nahwiki +liwiki +sahwiki +vecwiki +hsbwiki +orwiki +oswiki +mrjwiki +sawiki +mhrwiki +roa_tarawiki +azbwiki +pamwiki +ilowiki +hifwiki +pswiki +sewiki +miwiki +bhwiki +emlwiki +bclwiki +diqwiki +xmfwiki +hakwiki +ganwiki +sdwiki +glkwiki +vlswiki +nds_nlwiki +ruewiki +bowiki +fiu_vrowiki +cowiki +scwiki +tkwiki +lrcwiki +csbwiki +vepwiki +wuuwiki +kmwiki +szlwiki +gvwiki +crhwiki +kvwiki +frrwiki +zh_classicalwiki +zeawiki +aswiki +sowiki +aywiki +kwwiki +udmwiki +stqwiki +nsowiki +cdowiki +nrmwiki +koiwiki +iewiki +rmwiki +mtwiki +furwiki +pcdwiki +myvwiki +ladwiki +acewiki +gnwiki +lijwiki +dsbwiki +dvwiki +cbk_zamwiki +extwiki +kabwiki +kshwiki +angwiki +lezwiki +gagwiki +mwlwiki +maiwiki +lnwiki +ugwiki +gomwiki +piwiki +pagwiki +snwiki +nvwiki +frpwiki +avwiki +pflwiki +hawwiki +xalwiki +krcwiki +kaawiki +rwwiki +pdcwiki +bxrwiki +towiki +klwiki +novwiki +arcwiki +kbdwiki +lowiki +bjnwiki +papwiki +hawiki +tetwiki +kiwiki +tpiwiki +tyvwiki +nawiki +lbewiki +igwiki +jbowiki +roa_rupwiki +tywiki +zawiki +jamwiki +mdfwiki +kgwiki +wowiki +srnwiki +lgwiki +abwiki +ltgwiki +zuwiki +smwiki +chrwiki +omwiki +chywiki +rmywiki +tnwiki +cuwiki +twwiki +tumwiki +xhwiki +rnwiki +pihwiki +biwiki +gotwiki +sswiki +pntwiki +bmwiki +chwiki +mowiki +tswiki +adywiki +iuwiki +eewiki +stwiki +nywiki +kswiki +fjwiki +akwiki +ikwiki +sgwiki +vewiki +dzwiki +ffwiki +tiwiki +crwiki diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index ba0b8b1..2a23d39 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -166,7 +166,7 @@ foreach ( [ 'private', 'fishbowl', 'special', 'closed', 'flow', 'flaggedrevs', 'small', 'medium', 'large', 'wikimania', 'wikidata', 'wikidataclient', 'visualeditor-default', 'commonsuploads', 'nonbetafeatures', 'group0', 'group1', 'group2', 'wikipedia', 'nonglobal', - 'wikitech', 'nonecho' + 'wikitech', 'nonecho', 'cll-default' ] as $tag ) { $dblist = MWWikiversions::readDbListFile( $tag ); if ( in_array( $wgDBname, $dblist ) ) { diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9f3630b..f654cc5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12635,6 +12635,7 @@ 'testwiki' => false, 'test2wiki' => false, 'nonbetafeatures' => false, + 'cll-default' => false, ], // BetaFeatures end --- @@ -15957,11 +15958,13 @@ // Whether Compact Links is enabled for new accounts *by default* 'wmgULSCompactLinksForNewAccounts' => [ 'default' => false, + 'cll-default' => true, ], // Whether Compact Links is enabled for anonymous users *by default* 'wmgULSCompactLinksEnableAnon' => [ 'default' => false, + 'cll-default' => true, ], 'wmgWikibaseCachePrefix' => [ -- To view, visit https://gerrit.wikimedia.org/r/294874 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie289f39bd8b80063201b6d3b8875a1f22382be8f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: KartikMistry___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Checker: properly check if a page is a redirect - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Checker: properly check if a page is a redirect .. Checker: properly check if a page is a redirect The Checker class only checked WikiPage::isRedirect() to determine if a page is a redirect. Unfortunately this value can be inconsistent and is not the one used by Update jobs. Checker will now load and parse the page content so that it's consistent with what the update jobs will do. Added a --fastCheck option to the maint script to use the old behavior. Change-Id: Iaf2d5d3c4272d21069da7947fcf4108c8e6d104e --- M includes/Sanity/Checker.php M maintenance/saneitize.php 2 files changed, 42 insertions(+), 6 deletions(-) Approvals: Smalyshev: Looks good to me, but someone else must approve Cindy-the-browser-test-bot: Looks good to me, but someone else must approve EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Sanity/Checker.php b/includes/Sanity/Checker.php index ab99cb1..ea5cf0e 100644 --- a/includes/Sanity/Checker.php +++ b/includes/Sanity/Checker.php @@ -50,6 +50,12 @@ private $logSane; /** +* @var bool inspect WikiPage::isRedirect() instead of WikiPage::getContent()->isRedirect() +* Faster since it does not need to fetch the content but inconsistent in some cases. +*/ + private $fastRedirectCheck; + + /** * Build the checker. * @param Connection $connection * @param Remediator $remediator the remediator to which to send titles @@ -57,11 +63,12 @@ * @param Searcher $searcher searcher to use for fetches * @param bool $logSane should we log sane ids */ - public function __construct( Connection $connection, Remediator $remediator, Searcher $searcher, $logSane ) { + public function __construct( Connection $connection, Remediator $remediator, Searcher $searcher, $logSane, $fastRedirectCheck ) { $this->connection = $connection; $this->remediator = $remediator; $this->searcher = $searcher; $this->logSane = $logSane; + $this->fastRedirectCheck = $fastRedirectCheck; } /** @@ -111,7 +118,7 @@ */ private function checkExisitingPage( $pageId, $page, $fromIndex ) { $inIndex = count( $fromIndex ) > 0; - if ( $page->isRedirect() ) { + if ( $this->checkIfRedirect( $page ) ) { if ( $inIndex ) { $this->remediator->redirectInIndex( $page ); return true; @@ -124,6 +131,26 @@ } $this->remediator->pageNotInIndex( $page ); return true; + } + + /** +* Check if the page is a redirect +* @param WikiPage $page the page +* @return bool true if $page is a redirect +*/ + private function checkIfRedirect( $page ) { + if ( $this->fastRedirectCheck ) { + return $page->isRedirect(); + } + + $content = $page->getContent(); + if ( $content == null ) { + return false; + } + if( is_object ( $content ) ) { + return $content->isRedirect(); + } + return false; } /** @@ -197,7 +224,7 @@ __METHOD__ ); foreach ( $res as $row ) { - $page = WikiPage::newFromRow( $row, $dbr ); + $page = WikiPage::newFromRow( $row ); $pages[$page->getId()] = $page; } return $pages; @@ -213,7 +240,7 @@ if ( !$status->isOK() ) { throw new \Exception( 'Cannot fetch ids from index' ); } - /** @var \Elastica\ResultSet $indexInfo */ + /** @var \Elastica\ResultSet $dataFromIndex */ $dataFromIndex = $status->getValue(); $indexedPages = array(); diff --git a/maintenance/saneitize.php b/maintenance/saneitize.php index e8a20e7..9d51aa2 100644 --- a/maintenance/saneitize.php +++ b/maintenance/saneitize.php @@ -46,6 +46,11 @@ private $toId; /** +* @var bool true to enable fast but inconsistent redirect checks +*/ + private $fastCheck; + + /** * @var Checker Checks is the index is insane, and calls on a Remediator * instance to do something about it. The remediator may fix the issue, * log about it, or do a combination. @@ -60,6 +65,7 @@ $this->addOption( 'toId', 'Stop sanitizing at a specific page_id. Default to the maximum id in the db + 100.', false, true );
[MediaWiki-commits] [Gerrit] Provide CategoryAfterPageRemoved hook handlers with deleted ... - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/294873 Change subject: Provide CategoryAfterPageRemoved hook handlers with deleted page IDs .. Provide CategoryAfterPageRemoved hook handlers with deleted page IDs Since this updates happens post-send or via the job queue, the page object will be for a non-existing or newer page/redirect. Change-Id: I20b583948157dccceca6eb1fbd25121822bf1b2f --- M docs/hooks.txt M includes/deferred/LinksDeletionUpdate.php M includes/page/Article.php M includes/page/WikiPage.php 4 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/73/294873/1 diff --git a/docs/hooks.txt b/docs/hooks.txt index 44f2551..f20c5b8 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -919,6 +919,7 @@ 'CategoryAfterPageRemoved': After a page is removed from a category. $category: Category that page was removed from $wikiPage: WikiPage that was removed +$id: the page ID (original ID in case of page deletions) 'CategoryPageView': Before viewing a categorypage in CategoryPage::view. &$catpage: CategoryPage instance diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksDeletionUpdate.php index 2f17729..a7c39ca 100644 --- a/includes/deferred/LinksDeletionUpdate.php +++ b/includes/deferred/LinksDeletionUpdate.php @@ -73,7 +73,7 @@ ); $catBatches = array_chunk( $cats, $batchSize ); foreach ( $catBatches as $catBatch ) { - $this->page->updateCategoryCounts( [], $catBatch ); + $this->page->updateCategoryCounts( [], $catBatch, $id ); if ( count( $catBatches ) > 1 ) { $this->mDb->commit( __METHOD__, 'flush' ); wfGetLBFactory()->waitForReplication( [ 'wiki' => $this->mDb->getWikiID() ] ); diff --git a/includes/page/Article.php b/includes/page/Article.php index eccf36f..1f1e8d6 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -2601,8 +2601,8 @@ * Call to WikiPage function for backwards compatibility. * @see WikiPage::updateCategoryCounts */ - public function updateCategoryCounts( array $added, array $deleted ) { - return $this->mPage->updateCategoryCounts( $added, $deleted ); + public function updateCategoryCounts( array $added, array $deleted, $id = 0 ) { + return $this->mPage->updateCategoryCounts( $added, $deleted, $id ); } /** diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 8d9d5a8..5b515aa 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -3427,16 +3427,15 @@ * * @param array $added The names of categories that were added * @param array $deleted The names of categories that were deleted +* @param integer $id Page ID (this should be the original deleted page ID) */ - public function updateCategoryCounts( array $added, array $deleted ) { - $that = $this; - $method = __METHOD__; + public function updateCategoryCounts( array $added, array $deleted, $id = 0 ) { + $id = $id ?: $this->getId(); $dbw = wfGetDB( DB_MASTER ); - // Do this at the end of the commit to reduce lock wait timeouts $dbw->onTransactionPreCommitOrIdle( - function () use ( $dbw, $that, $method, $added, $deleted ) { - $ns = $that->getTitle()->getNamespace(); + function () use ( $dbw, $added, $deleted, $id ) { + $ns = $this->getTitle()->getNamespace(); $addFields = [ 'cat_pages = cat_pages + 1' ]; $removeFields = [ 'cat_pages = cat_pages - 1' ]; @@ -3484,7 +3483,7 @@ $insertRows, [ 'cat_title' ], $addFields, - $method + __METHOD__ ); } } @@ -3494,18 +3493,18 @@ 'category', $removeFields, [ 'cat_title' => $deleted ], - $method + __METHOD__ ); } foreach (
[MediaWiki-commits] [Gerrit] Remove no-longer needed backported class from phpunit - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove no-longer needed backported class from phpunit .. Remove no-longer needed backported class from phpunit Since we finally upgraded our phpunit version, we no longer need a copy of this phpunit matcher. Change-Id: I9bf3db344a2e8789a264a453e4e6d87fedc4dc49 --- M tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php D tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php D tests/phpunit/includes/phpunit/LICENSE D tests/phpunit/includes/phpunit/README 4 files changed, 0 insertions(+), 162 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php index e29d207..68ce640 100644 --- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php +++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php @@ -23,9 +23,6 @@ use MediaWikiTestCase; use Monolog\Logger; -// not available in the version of phpunit mw uses, so copied into repo -require_once __DIR__ . '/../../../phpunit/ConsecutiveParametersMatcher.php'; - class KafkaHandlerTest extends MediaWikiTestCase { protected function setUp() { diff --git a/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php b/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php deleted file mode 100644 index 8de467f..000 --- a/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php +++ /dev/null @@ -1,124 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -/** - * Invocation matcher which looks for sets of specific parameters in the invocations. - * - * Checks the parameters of the incoming invocations, the parameter list is - * checked against the defined constraints in $parameters. If the constraint - * is met it will return true in matches(). - * - * It takes a list of match groups and and increases a call index after each invocation. - * So the first invocation uses the first group of constraints, the second the next and so on. - */ -class PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation -{ -/** - * @var array - */ -private $_parameterGroups = array(); - -/** - * @var array - */ -private $_invocations = array(); - -/** - * @param array $parameterGroups - */ -public function __construct(array $parameterGroups) -{ -foreach ($parameterGroups as $index => $parameters) { -foreach ($parameters as $parameter) { -if (!($parameter instanceof \PHPUnit_Framework_Constraint)) { -$parameter = new \PHPUnit_Framework_Constraint_IsEqual($parameter); -} -$this->_parameterGroups[$index][] = $parameter; -} -} -} - -/** - * @return string - */ -public function toString() -{ -$text = 'with consecutive parameters'; - -return $text; -} - -/** - * @param PHPUnit_Framework_MockObject_Invocation $invocation - * @return bool - */ -public function matches(PHPUnit_Framework_MockObject_Invocation $invocation) -{ -$this->_invocations[] = $invocation; -$callIndex= count($this->_invocations) - 1; -$this->verifyInvocation($invocation, $callIndex); - -return false; -} - -public function verify() -{ -foreach ($this->_invocations as $callIndex => $invocation) { -$this->verifyInvocation($invocation, $callIndex); -} -} - -/** - * Verify a single invocation - * - * @param PHPUnit_Framework_MockObject_Invocation $invocation - * @param int $callIndex - * @throws PHPUnit_Framework_ExpectationFailedException - */ -private function verifyInvocation(PHPUnit_Framework_MockObject_Invocation $invocation, $callIndex) -{ - -if (isset($this->_parameterGroups[$callIndex])) { -$parameters = $this->_parameterGroups[$callIndex]; -} else { - // no parameter assertion for this call index -return; -} - -if ($invocation === null) { -throw new PHPUnit_Framework_ExpectationFailedException( -'Mocked method does not exist.' -); -} - -if (count($invocation->parameters) < count($parameters)) { -throw new PHPUnit_Framework_ExpectationFailedException( -sprintf( -'Parameter count for invocation %s is too low.', -$invocation->toString() -) -); -
[MediaWiki-commits] [Gerrit] DumpUploads: output local path instead of mwstore path - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: DumpUploads: output local path instead of mwstore path .. DumpUploads: output local path instead of mwstore path Since a while, getPath() returns the internal mwstore:// path instead of the real file path. This is not useful for sysadmins that want to backup their images using this script. Bug: T75157 Change-Id: I237d1a138a9d68d3aa4ea60971a2addb35ff5917 --- M maintenance/dumpUploads.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/dumpUploads.php b/maintenance/dumpUploads.php index 64884d5..e79afba 100644 --- a/maintenance/dumpUploads.php +++ b/maintenance/dumpUploads.php @@ -111,7 +111,7 @@ function outputItem( $name, $shared ) { $file = wfFindFile( $name ); if ( $file && $this->filterItem( $file, $shared ) ) { - $filename = $file->getPath(); + $filename = $file->getLocalRefPath(); $rel = wfRelativePath( $filename, $this->mBasePath ); $this->output( "$rel\n" ); } else { -- To view, visit https://gerrit.wikimedia.org/r/268417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I237d1a138a9d68d3aa4ea60971a2addb35ff5917 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: SouthparkfanGerrit-Reviewer: Aude 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] Cleanup backend: field too when killing webservices - change (operations...tools-webservice)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294872 Change subject: Cleanup backend: field too when killing webservices .. Cleanup backend: field too when killing webservices Change-Id: I200b855506cb317a15e26df3f767c572ca09c9e0 --- M scripts/webservice 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice refs/changes/72/294872/1 diff --git a/scripts/webservice b/scripts/webservice index a2aef0f..b415907 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -51,6 +51,7 @@ elif action == 'stop': if 'web' in job.tool.manifest: del job.tool.manifest['web'] +del job.tool.manifest['backend'] job.tool.save_manifest() else: # blow up! -- To view, visit https://gerrit.wikimedia.org/r/294872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I200b855506cb317a15e26df3f767c572ca09c9e0 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove no-longer needed backported class from phpunit - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294871 Change subject: Remove no-longer needed backported class from phpunit .. Remove no-longer needed backported class from phpunit Since we finally upgraded our phpunit version, we no longer need a copy of this phpunit matcher. Change-Id: I9bf3db344a2e8789a264a453e4e6d87fedc4dc49 --- D tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php D tests/phpunit/includes/phpunit/LICENSE D tests/phpunit/includes/phpunit/README 3 files changed, 0 insertions(+), 159 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/294871/1 diff --git a/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php b/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php deleted file mode 100644 index 8de467f..000 --- a/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php +++ /dev/null @@ -1,124 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -/** - * Invocation matcher which looks for sets of specific parameters in the invocations. - * - * Checks the parameters of the incoming invocations, the parameter list is - * checked against the defined constraints in $parameters. If the constraint - * is met it will return true in matches(). - * - * It takes a list of match groups and and increases a call index after each invocation. - * So the first invocation uses the first group of constraints, the second the next and so on. - */ -class PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation -{ -/** - * @var array - */ -private $_parameterGroups = array(); - -/** - * @var array - */ -private $_invocations = array(); - -/** - * @param array $parameterGroups - */ -public function __construct(array $parameterGroups) -{ -foreach ($parameterGroups as $index => $parameters) { -foreach ($parameters as $parameter) { -if (!($parameter instanceof \PHPUnit_Framework_Constraint)) { -$parameter = new \PHPUnit_Framework_Constraint_IsEqual($parameter); -} -$this->_parameterGroups[$index][] = $parameter; -} -} -} - -/** - * @return string - */ -public function toString() -{ -$text = 'with consecutive parameters'; - -return $text; -} - -/** - * @param PHPUnit_Framework_MockObject_Invocation $invocation - * @return bool - */ -public function matches(PHPUnit_Framework_MockObject_Invocation $invocation) -{ -$this->_invocations[] = $invocation; -$callIndex= count($this->_invocations) - 1; -$this->verifyInvocation($invocation, $callIndex); - -return false; -} - -public function verify() -{ -foreach ($this->_invocations as $callIndex => $invocation) { -$this->verifyInvocation($invocation, $callIndex); -} -} - -/** - * Verify a single invocation - * - * @param PHPUnit_Framework_MockObject_Invocation $invocation - * @param int $callIndex - * @throws PHPUnit_Framework_ExpectationFailedException - */ -private function verifyInvocation(PHPUnit_Framework_MockObject_Invocation $invocation, $callIndex) -{ - -if (isset($this->_parameterGroups[$callIndex])) { -$parameters = $this->_parameterGroups[$callIndex]; -} else { - // no parameter assertion for this call index -return; -} - -if ($invocation === null) { -throw new PHPUnit_Framework_ExpectationFailedException( -'Mocked method does not exist.' -); -} - -if (count($invocation->parameters) < count($parameters)) { -throw new PHPUnit_Framework_ExpectationFailedException( -sprintf( -'Parameter count for invocation %s is too low.', -$invocation->toString() -) -); -} - -foreach ($parameters as $i => $parameter) { -$parameter->evaluate( -$invocation->parameters[$i], -sprintf( -'Parameter %s for invocation #%d %s does not match expected ' . -'value.', -$i, -$callIndex, -$invocation->toString() -) -); -} -} -} diff --git a/tests/phpunit/includes/phpunit/LICENSE b/tests/phpunit/includes/phpunit/LICENSE deleted file mode 100644 index fe178b0..000 --- a/tests/phpunit/includes/phpunit/LICENSE +++ /dev/null @@ -1,33 +0,0
[MediaWiki-commits] [Gerrit] Add pygments/AUTHORS file - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged. Change subject: Add pygments/AUTHORS file .. Add pygments/AUTHORS file Since it's mentioned in the PYGMENTS_LICENSE file Change-Id: I02a19e3a36fdb6e7cb52bb9a672261c74b4351d9 (cherry picked from commit 907e8cddb78849799347bbd3d3ad95ac4426ba5a) --- A pygments/AUTHORS 1 file changed, 202 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pygments/AUTHORS b/pygments/AUTHORS new file mode 100644 index 000..9318d43 --- /dev/null +++ b/pygments/AUTHORS @@ -0,0 +1,202 @@ +Pygments is written and maintained by Georg Brandl. + +Major developers are Tim Hatch and Armin Ronacher + . + +Other contributors, listed alphabetically, are: + +* Sam Aaron -- Ioke lexer +* Ali Afshar -- image formatter +* Thomas Aglassinger -- Easytrieve, JCL and Rexx lexers +* Muthiah Annamalai -- Ezhil lexer +* Kumar Appaiah -- Debian control lexer +* Andreas Amann -- AppleScript lexer +* Timothy Armstrong -- Dart lexer fixes +* Jeffrey Arnold -- R/S, Rd, BUGS, Jags, and Stan lexers +* Jeremy Ashkenas -- CoffeeScript lexer +* José Joaquín Atria -- Praat lexer +* Stefan Matthias Aust -- Smalltalk lexer +* Lucas Bajolet -- Nit lexer +* Ben Bangert -- Mako lexers +* Max Battcher -- Darcs patch lexer +* Thomas Baruchel -- APL lexer +* Tim Baumann -- (Literate) Agda lexer +* Paul Baumgart, 280 North, Inc. -- Objective-J lexer +* Michael Bayer -- Myghty lexers +* Thomas Beale -- Archetype lexers +* John Benediktsson -- Factor lexer +* Trevor Bergeron -- mIRC formatter +* Vincent Bernat -- LessCSS lexer +* Christopher Bertels -- Fancy lexer +* Sébastien Bigaret -- QVT Operational lexer +* Jarrett Billingsley -- MiniD lexer +* Adam Blinkinsop -- Haskell, Redcode lexers +* Frits van Bommel -- assembler lexers +* Pierre Bourdon -- bugfixes +* chebee7i -- Python traceback lexer improvements +* Hiram Chirino -- Scaml and Jade lexers +* Ian Cooper -- VGL lexer +* David Corbett -- Inform, Jasmin, and TADS 3 lexers +* Leaf Corcoran -- MoonScript lexer +* Christopher Creutzig -- MuPAD lexer +* Daniël W. Crompton -- Pike lexer +* Pete Curry -- bugfixes +* Bryan Davis -- EBNF lexer +* Bruno Deferrari -- Shen lexer +* Giedrius Dubinskas -- HTML formatter improvements +* Owen Durni -- Haxe lexer +* Alexander Dutton, Oxford University Computing Services -- SPARQL lexer +* James Edwards -- Terraform lexer +* Nick Efford -- Python 3 lexer +* Sven Efftinge -- Xtend lexer +* Artem Egorkine -- terminal256 formatter +* Matthew Fernandez -- CAmkES lexer +* Michael Ficarra -- CPSA lexer +* James H. Fisher -- PostScript lexer +* William S. Fulton -- SWIG lexer +* Carlos Galdino -- Elixir and Elixir Console lexers +* Michael Galloy -- IDL lexer +* Naveen Garg -- Autohotkey lexer +* Laurent Gautier -- R/S lexer +* Alex Gaynor -- PyPy log lexer +* Richard Gerkin -- Igor Pro lexer +* Alain Gilbert -- TypeScript lexer +* Alex Gilding -- BlitzBasic lexer +* Bertrand Goetzmann -- Groovy lexer +* Krzysiek Goj -- Scala lexer +* Matt Good -- Genshi, Cheetah lexers +* Michał Górny -- vim modeline support +* Alex Gosse -- TrafficScript lexer +* Patrick Gotthardt -- PHP namespaces support +* Olivier Guibe -- Asymptote lexer +* Jordi Gutiérrez Hermoso -- Octave lexer +* Florian Hahn -- Boogie lexer +* Martin Harriman -- SNOBOL lexer +* Matthew Harrison -- SVG formatter +* Steven Hazel -- Tcl lexer +* Dan Michael Heggø -- Turtle lexer +* Aslak Hellesøy -- Gherkin lexer +* Greg Hendershott -- Racket lexer +* Justin Hendrick -- ParaSail lexer +* David Hess, Fish Software, Inc. -- Objective-J lexer +* Varun Hiremath -- Debian control lexer +* Rob Hoelz -- Perl 6 lexer +* Doug Hogan -- Mscgen lexer +* Ben Hollis -- Mason lexer +* Max Horn -- GAP lexer +* Alastair Houghton -- Lexer inheritance facility +* Tim Howard -- BlitzMax lexer +* Dustin Howett -- Logos lexer +* Ivan Inozemtsev -- Fantom lexer +* Hiroaki Itoh -- Shell console rewrite, Lexers for PowerShell session, MSDOS session, BC +* Brian R. Jackson -- Tea lexer +* Christian Jann -- ShellSession lexer +* Dennis Kaarsemaker -- sources.list lexer +* Dmitri Kabak -- Inferno Limbo lexer +* Igor Kalnitsky -- vhdl lexer +* Alexander Kit -- MaskJS lexer +* Pekka Klärck -- Robot Framework lexer +* Gerwin Klein -- Isabelle lexer +* Eric Knibbe -- Lasso lexer +* Stepan Koltsov -- Clay lexer +* Adam Koprowski -- Opa lexer +* Benjamin Kowarsch -- Modula-2 lexer +* Domen Kožar -- Nix lexer +* Oleh Krekel -- Emacs Lisp lexer +* Alexander Kriegisch -- Kconfig and AspectJ lexers +* Marek Kubica -- Scheme lexer +* Jochen Kupperschmidt -- Markdown processor +* Gerd Kurzbach -- Modelica lexer +* Jon Larimer, Google Inc. -- Smali lexer +* Olov Lassus -- Dart lexer +* Matt Layman -- TAP lexer +* Sylvestre Ledru -- Scilab lexer +* Mark Lee -- Vala lexer +* Valentin Lorentz -- C++ lexer
[MediaWiki-commits] [Gerrit] Fix parser tests for core commit ee4d5c6eed (removal $wgWell... - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged. Change subject: Fix parser tests for core commit ee4d5c6eed (removal $wgWellFormedXML) .. Fix parser tests for core commit ee4d5c6eed (removal $wgWellFormedXML) Change-Id: Iac351ced0154c0c3c61f47a0e8ef0b9166fc0811 (cherry picked from commit f85be74e3364446c1d5d19fbe6ce290d2f6087f4) --- M tests/parserTests.txt 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 5d5038c..5b93444 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -27,13 +27,12 @@ !! test No language specified (no wellformed xml) !! config -wgWellFormedXml=false !! wikitext bar !! html -bar +bar !! end -- To view, visit https://gerrit.wikimedia.org/r/294870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac351ced0154c0c3c61f47a0e8ef0b9166fc0811 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: REL1_27 Gerrit-Owner: LegoktmGerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix parser tests for core commit ee4d5c6eed (removal $wgWell... - change (mediawiki...SyntaxHighlight_GeSHi)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294870 Change subject: Fix parser tests for core commit ee4d5c6eed (removal $wgWellFormedXML) .. Fix parser tests for core commit ee4d5c6eed (removal $wgWellFormedXML) Change-Id: Iac351ced0154c0c3c61f47a0e8ef0b9166fc0811 (cherry picked from commit f85be74e3364446c1d5d19fbe6ce290d2f6087f4) --- M tests/parserTests.txt 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/70/294870/1 diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 5d5038c..5b93444 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -27,13 +27,12 @@ !! test No language specified (no wellformed xml) !! config -wgWellFormedXml=false !! wikitext bar !! html -bar +bar !! end -- To view, visit https://gerrit.wikimedia.org/r/294870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac351ced0154c0c3c61f47a0e8ef0b9166fc0811 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: REL1_27 Gerrit-Owner: LegoktmGerrit-Reviewer: Brian Wolff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add pygments/AUTHORS file - change (mediawiki...SyntaxHighlight_GeSHi)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294869 Change subject: Add pygments/AUTHORS file .. Add pygments/AUTHORS file Since it's mentioned in the PYGMENTS_LICENSE file Change-Id: I02a19e3a36fdb6e7cb52bb9a672261c74b4351d9 (cherry picked from commit 907e8cddb78849799347bbd3d3ad95ac4426ba5a) --- A pygments/AUTHORS 1 file changed, 202 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/69/294869/1 diff --git a/pygments/AUTHORS b/pygments/AUTHORS new file mode 100644 index 000..9318d43 --- /dev/null +++ b/pygments/AUTHORS @@ -0,0 +1,202 @@ +Pygments is written and maintained by Georg Brandl. + +Major developers are Tim Hatch and Armin Ronacher + . + +Other contributors, listed alphabetically, are: + +* Sam Aaron -- Ioke lexer +* Ali Afshar -- image formatter +* Thomas Aglassinger -- Easytrieve, JCL and Rexx lexers +* Muthiah Annamalai -- Ezhil lexer +* Kumar Appaiah -- Debian control lexer +* Andreas Amann -- AppleScript lexer +* Timothy Armstrong -- Dart lexer fixes +* Jeffrey Arnold -- R/S, Rd, BUGS, Jags, and Stan lexers +* Jeremy Ashkenas -- CoffeeScript lexer +* José Joaquín Atria -- Praat lexer +* Stefan Matthias Aust -- Smalltalk lexer +* Lucas Bajolet -- Nit lexer +* Ben Bangert -- Mako lexers +* Max Battcher -- Darcs patch lexer +* Thomas Baruchel -- APL lexer +* Tim Baumann -- (Literate) Agda lexer +* Paul Baumgart, 280 North, Inc. -- Objective-J lexer +* Michael Bayer -- Myghty lexers +* Thomas Beale -- Archetype lexers +* John Benediktsson -- Factor lexer +* Trevor Bergeron -- mIRC formatter +* Vincent Bernat -- LessCSS lexer +* Christopher Bertels -- Fancy lexer +* Sébastien Bigaret -- QVT Operational lexer +* Jarrett Billingsley -- MiniD lexer +* Adam Blinkinsop -- Haskell, Redcode lexers +* Frits van Bommel -- assembler lexers +* Pierre Bourdon -- bugfixes +* chebee7i -- Python traceback lexer improvements +* Hiram Chirino -- Scaml and Jade lexers +* Ian Cooper -- VGL lexer +* David Corbett -- Inform, Jasmin, and TADS 3 lexers +* Leaf Corcoran -- MoonScript lexer +* Christopher Creutzig -- MuPAD lexer +* Daniël W. Crompton -- Pike lexer +* Pete Curry -- bugfixes +* Bryan Davis -- EBNF lexer +* Bruno Deferrari -- Shen lexer +* Giedrius Dubinskas -- HTML formatter improvements +* Owen Durni -- Haxe lexer +* Alexander Dutton, Oxford University Computing Services -- SPARQL lexer +* James Edwards -- Terraform lexer +* Nick Efford -- Python 3 lexer +* Sven Efftinge -- Xtend lexer +* Artem Egorkine -- terminal256 formatter +* Matthew Fernandez -- CAmkES lexer +* Michael Ficarra -- CPSA lexer +* James H. Fisher -- PostScript lexer +* William S. Fulton -- SWIG lexer +* Carlos Galdino -- Elixir and Elixir Console lexers +* Michael Galloy -- IDL lexer +* Naveen Garg -- Autohotkey lexer +* Laurent Gautier -- R/S lexer +* Alex Gaynor -- PyPy log lexer +* Richard Gerkin -- Igor Pro lexer +* Alain Gilbert -- TypeScript lexer +* Alex Gilding -- BlitzBasic lexer +* Bertrand Goetzmann -- Groovy lexer +* Krzysiek Goj -- Scala lexer +* Matt Good -- Genshi, Cheetah lexers +* Michał Górny -- vim modeline support +* Alex Gosse -- TrafficScript lexer +* Patrick Gotthardt -- PHP namespaces support +* Olivier Guibe -- Asymptote lexer +* Jordi Gutiérrez Hermoso -- Octave lexer +* Florian Hahn -- Boogie lexer +* Martin Harriman -- SNOBOL lexer +* Matthew Harrison -- SVG formatter +* Steven Hazel -- Tcl lexer +* Dan Michael Heggø -- Turtle lexer +* Aslak Hellesøy -- Gherkin lexer +* Greg Hendershott -- Racket lexer +* Justin Hendrick -- ParaSail lexer +* David Hess, Fish Software, Inc. -- Objective-J lexer +* Varun Hiremath -- Debian control lexer +* Rob Hoelz -- Perl 6 lexer +* Doug Hogan -- Mscgen lexer +* Ben Hollis -- Mason lexer +* Max Horn -- GAP lexer +* Alastair Houghton -- Lexer inheritance facility +* Tim Howard -- BlitzMax lexer +* Dustin Howett -- Logos lexer +* Ivan Inozemtsev -- Fantom lexer +* Hiroaki Itoh -- Shell console rewrite, Lexers for PowerShell session, MSDOS session, BC +* Brian R. Jackson -- Tea lexer +* Christian Jann -- ShellSession lexer +* Dennis Kaarsemaker -- sources.list lexer +* Dmitri Kabak -- Inferno Limbo lexer +* Igor Kalnitsky -- vhdl lexer +* Alexander Kit -- MaskJS lexer +* Pekka Klärck -- Robot Framework lexer +* Gerwin Klein -- Isabelle lexer +* Eric Knibbe -- Lasso lexer +* Stepan Koltsov -- Clay lexer +* Adam Koprowski -- Opa lexer +* Benjamin Kowarsch -- Modula-2 lexer +* Domen Kožar -- Nix lexer +* Oleh Krekel -- Emacs Lisp lexer +* Alexander Kriegisch -- Kconfig and AspectJ lexers +* Marek Kubica -- Scheme lexer +* Jochen Kupperschmidt -- Markdown processor +* Gerd Kurzbach -- Modelica lexer +* Jon Larimer, Google Inc. -- Smali lexer +* Olov Lassus -- Dart lexer +* Matt Layman -- TAP lexer +* Sylvestre Ledru --
[MediaWiki-commits] [Gerrit] Add pygments/AUTHORS file - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged. Change subject: Add pygments/AUTHORS file .. Add pygments/AUTHORS file Since it's mentioned in the PYGMENTS_LICENSE file Change-Id: I02a19e3a36fdb6e7cb52bb9a672261c74b4351d9 --- A pygments/AUTHORS 1 file changed, 202 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/pygments/AUTHORS b/pygments/AUTHORS new file mode 100644 index 000..9318d43 --- /dev/null +++ b/pygments/AUTHORS @@ -0,0 +1,202 @@ +Pygments is written and maintained by Georg Brandl. + +Major developers are Tim Hatch and Armin Ronacher + . + +Other contributors, listed alphabetically, are: + +* Sam Aaron -- Ioke lexer +* Ali Afshar -- image formatter +* Thomas Aglassinger -- Easytrieve, JCL and Rexx lexers +* Muthiah Annamalai -- Ezhil lexer +* Kumar Appaiah -- Debian control lexer +* Andreas Amann -- AppleScript lexer +* Timothy Armstrong -- Dart lexer fixes +* Jeffrey Arnold -- R/S, Rd, BUGS, Jags, and Stan lexers +* Jeremy Ashkenas -- CoffeeScript lexer +* José Joaquín Atria -- Praat lexer +* Stefan Matthias Aust -- Smalltalk lexer +* Lucas Bajolet -- Nit lexer +* Ben Bangert -- Mako lexers +* Max Battcher -- Darcs patch lexer +* Thomas Baruchel -- APL lexer +* Tim Baumann -- (Literate) Agda lexer +* Paul Baumgart, 280 North, Inc. -- Objective-J lexer +* Michael Bayer -- Myghty lexers +* Thomas Beale -- Archetype lexers +* John Benediktsson -- Factor lexer +* Trevor Bergeron -- mIRC formatter +* Vincent Bernat -- LessCSS lexer +* Christopher Bertels -- Fancy lexer +* Sébastien Bigaret -- QVT Operational lexer +* Jarrett Billingsley -- MiniD lexer +* Adam Blinkinsop -- Haskell, Redcode lexers +* Frits van Bommel -- assembler lexers +* Pierre Bourdon -- bugfixes +* chebee7i -- Python traceback lexer improvements +* Hiram Chirino -- Scaml and Jade lexers +* Ian Cooper -- VGL lexer +* David Corbett -- Inform, Jasmin, and TADS 3 lexers +* Leaf Corcoran -- MoonScript lexer +* Christopher Creutzig -- MuPAD lexer +* Daniël W. Crompton -- Pike lexer +* Pete Curry -- bugfixes +* Bryan Davis -- EBNF lexer +* Bruno Deferrari -- Shen lexer +* Giedrius Dubinskas -- HTML formatter improvements +* Owen Durni -- Haxe lexer +* Alexander Dutton, Oxford University Computing Services -- SPARQL lexer +* James Edwards -- Terraform lexer +* Nick Efford -- Python 3 lexer +* Sven Efftinge -- Xtend lexer +* Artem Egorkine -- terminal256 formatter +* Matthew Fernandez -- CAmkES lexer +* Michael Ficarra -- CPSA lexer +* James H. Fisher -- PostScript lexer +* William S. Fulton -- SWIG lexer +* Carlos Galdino -- Elixir and Elixir Console lexers +* Michael Galloy -- IDL lexer +* Naveen Garg -- Autohotkey lexer +* Laurent Gautier -- R/S lexer +* Alex Gaynor -- PyPy log lexer +* Richard Gerkin -- Igor Pro lexer +* Alain Gilbert -- TypeScript lexer +* Alex Gilding -- BlitzBasic lexer +* Bertrand Goetzmann -- Groovy lexer +* Krzysiek Goj -- Scala lexer +* Matt Good -- Genshi, Cheetah lexers +* Michał Górny -- vim modeline support +* Alex Gosse -- TrafficScript lexer +* Patrick Gotthardt -- PHP namespaces support +* Olivier Guibe -- Asymptote lexer +* Jordi Gutiérrez Hermoso -- Octave lexer +* Florian Hahn -- Boogie lexer +* Martin Harriman -- SNOBOL lexer +* Matthew Harrison -- SVG formatter +* Steven Hazel -- Tcl lexer +* Dan Michael Heggø -- Turtle lexer +* Aslak Hellesøy -- Gherkin lexer +* Greg Hendershott -- Racket lexer +* Justin Hendrick -- ParaSail lexer +* David Hess, Fish Software, Inc. -- Objective-J lexer +* Varun Hiremath -- Debian control lexer +* Rob Hoelz -- Perl 6 lexer +* Doug Hogan -- Mscgen lexer +* Ben Hollis -- Mason lexer +* Max Horn -- GAP lexer +* Alastair Houghton -- Lexer inheritance facility +* Tim Howard -- BlitzMax lexer +* Dustin Howett -- Logos lexer +* Ivan Inozemtsev -- Fantom lexer +* Hiroaki Itoh -- Shell console rewrite, Lexers for PowerShell session, MSDOS session, BC +* Brian R. Jackson -- Tea lexer +* Christian Jann -- ShellSession lexer +* Dennis Kaarsemaker -- sources.list lexer +* Dmitri Kabak -- Inferno Limbo lexer +* Igor Kalnitsky -- vhdl lexer +* Alexander Kit -- MaskJS lexer +* Pekka Klärck -- Robot Framework lexer +* Gerwin Klein -- Isabelle lexer +* Eric Knibbe -- Lasso lexer +* Stepan Koltsov -- Clay lexer +* Adam Koprowski -- Opa lexer +* Benjamin Kowarsch -- Modula-2 lexer +* Domen Kožar -- Nix lexer +* Oleh Krekel -- Emacs Lisp lexer +* Alexander Kriegisch -- Kconfig and AspectJ lexers +* Marek Kubica -- Scheme lexer +* Jochen Kupperschmidt -- Markdown processor +* Gerd Kurzbach -- Modelica lexer +* Jon Larimer, Google Inc. -- Smali lexer +* Olov Lassus -- Dart lexer +* Matt Layman -- TAP lexer +* Sylvestre Ledru -- Scilab lexer +* Mark Lee -- Vala lexer +* Valentin Lorentz -- C++ lexer improvements +* Ben Mabey -- Gherkin lexer +* Angus MacArthur --
[MediaWiki-commits] [Gerrit] Add pygments/AUTHORS file - change (mediawiki...SyntaxHighlight_GeSHi)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294868 Change subject: Add pygments/AUTHORS file .. Add pygments/AUTHORS file Since it's mentioned in the PYGMENTS_LICENSE file Change-Id: I02a19e3a36fdb6e7cb52bb9a672261c74b4351d9 --- A pygments/AUTHORS 1 file changed, 202 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/68/294868/1 diff --git a/pygments/AUTHORS b/pygments/AUTHORS new file mode 100644 index 000..9318d43 --- /dev/null +++ b/pygments/AUTHORS @@ -0,0 +1,202 @@ +Pygments is written and maintained by Georg Brandl. + +Major developers are Tim Hatch and Armin Ronacher + . + +Other contributors, listed alphabetically, are: + +* Sam Aaron -- Ioke lexer +* Ali Afshar -- image formatter +* Thomas Aglassinger -- Easytrieve, JCL and Rexx lexers +* Muthiah Annamalai -- Ezhil lexer +* Kumar Appaiah -- Debian control lexer +* Andreas Amann -- AppleScript lexer +* Timothy Armstrong -- Dart lexer fixes +* Jeffrey Arnold -- R/S, Rd, BUGS, Jags, and Stan lexers +* Jeremy Ashkenas -- CoffeeScript lexer +* José Joaquín Atria -- Praat lexer +* Stefan Matthias Aust -- Smalltalk lexer +* Lucas Bajolet -- Nit lexer +* Ben Bangert -- Mako lexers +* Max Battcher -- Darcs patch lexer +* Thomas Baruchel -- APL lexer +* Tim Baumann -- (Literate) Agda lexer +* Paul Baumgart, 280 North, Inc. -- Objective-J lexer +* Michael Bayer -- Myghty lexers +* Thomas Beale -- Archetype lexers +* John Benediktsson -- Factor lexer +* Trevor Bergeron -- mIRC formatter +* Vincent Bernat -- LessCSS lexer +* Christopher Bertels -- Fancy lexer +* Sébastien Bigaret -- QVT Operational lexer +* Jarrett Billingsley -- MiniD lexer +* Adam Blinkinsop -- Haskell, Redcode lexers +* Frits van Bommel -- assembler lexers +* Pierre Bourdon -- bugfixes +* chebee7i -- Python traceback lexer improvements +* Hiram Chirino -- Scaml and Jade lexers +* Ian Cooper -- VGL lexer +* David Corbett -- Inform, Jasmin, and TADS 3 lexers +* Leaf Corcoran -- MoonScript lexer +* Christopher Creutzig -- MuPAD lexer +* Daniël W. Crompton -- Pike lexer +* Pete Curry -- bugfixes +* Bryan Davis -- EBNF lexer +* Bruno Deferrari -- Shen lexer +* Giedrius Dubinskas -- HTML formatter improvements +* Owen Durni -- Haxe lexer +* Alexander Dutton, Oxford University Computing Services -- SPARQL lexer +* James Edwards -- Terraform lexer +* Nick Efford -- Python 3 lexer +* Sven Efftinge -- Xtend lexer +* Artem Egorkine -- terminal256 formatter +* Matthew Fernandez -- CAmkES lexer +* Michael Ficarra -- CPSA lexer +* James H. Fisher -- PostScript lexer +* William S. Fulton -- SWIG lexer +* Carlos Galdino -- Elixir and Elixir Console lexers +* Michael Galloy -- IDL lexer +* Naveen Garg -- Autohotkey lexer +* Laurent Gautier -- R/S lexer +* Alex Gaynor -- PyPy log lexer +* Richard Gerkin -- Igor Pro lexer +* Alain Gilbert -- TypeScript lexer +* Alex Gilding -- BlitzBasic lexer +* Bertrand Goetzmann -- Groovy lexer +* Krzysiek Goj -- Scala lexer +* Matt Good -- Genshi, Cheetah lexers +* Michał Górny -- vim modeline support +* Alex Gosse -- TrafficScript lexer +* Patrick Gotthardt -- PHP namespaces support +* Olivier Guibe -- Asymptote lexer +* Jordi Gutiérrez Hermoso -- Octave lexer +* Florian Hahn -- Boogie lexer +* Martin Harriman -- SNOBOL lexer +* Matthew Harrison -- SVG formatter +* Steven Hazel -- Tcl lexer +* Dan Michael Heggø -- Turtle lexer +* Aslak Hellesøy -- Gherkin lexer +* Greg Hendershott -- Racket lexer +* Justin Hendrick -- ParaSail lexer +* David Hess, Fish Software, Inc. -- Objective-J lexer +* Varun Hiremath -- Debian control lexer +* Rob Hoelz -- Perl 6 lexer +* Doug Hogan -- Mscgen lexer +* Ben Hollis -- Mason lexer +* Max Horn -- GAP lexer +* Alastair Houghton -- Lexer inheritance facility +* Tim Howard -- BlitzMax lexer +* Dustin Howett -- Logos lexer +* Ivan Inozemtsev -- Fantom lexer +* Hiroaki Itoh -- Shell console rewrite, Lexers for PowerShell session, MSDOS session, BC +* Brian R. Jackson -- Tea lexer +* Christian Jann -- ShellSession lexer +* Dennis Kaarsemaker -- sources.list lexer +* Dmitri Kabak -- Inferno Limbo lexer +* Igor Kalnitsky -- vhdl lexer +* Alexander Kit -- MaskJS lexer +* Pekka Klärck -- Robot Framework lexer +* Gerwin Klein -- Isabelle lexer +* Eric Knibbe -- Lasso lexer +* Stepan Koltsov -- Clay lexer +* Adam Koprowski -- Opa lexer +* Benjamin Kowarsch -- Modula-2 lexer +* Domen Kožar -- Nix lexer +* Oleh Krekel -- Emacs Lisp lexer +* Alexander Kriegisch -- Kconfig and AspectJ lexers +* Marek Kubica -- Scheme lexer +* Jochen Kupperschmidt -- Markdown processor +* Gerd Kurzbach -- Modelica lexer +* Jon Larimer, Google Inc. -- Smali lexer +* Olov Lassus -- Dart lexer +* Matt Layman -- TAP lexer +* Sylvestre Ledru -- Scilab lexer +* Mark Lee -- Vala lexer +* Valentin Lorentz -- C++ lexer
[MediaWiki-commits] [Gerrit] Use UNION ALL in EntityUsageTable::getUsedEntityIdStrings - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Use UNION ALL in EntityUsageTable::getUsedEntityIdStrings .. Use UNION ALL in EntityUsageTable::getUsedEntityIdStrings Will yield the same results due to the nature of the query. Bug: T137972 Change-Id: Ia51237668ab8abaaae50525464915e04a58704f9 --- M client/includes/Usage/Sql/EntityUsageTable.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/Usage/Sql/EntityUsageTable.php b/client/includes/Usage/Sql/EntityUsageTable.php index b70a777..ba1268d 100644 --- a/client/includes/Usage/Sql/EntityUsageTable.php +++ b/client/includes/Usage/Sql/EntityUsageTable.php @@ -362,7 +362,7 @@ $values = []; if ( $this->connection->getType() === 'mysql' ) { // On MySQL we can UNION all queries and run them at once - $sql = $this->connection->unionQueries( $subQueries, false ); + $sql = $this->connection->unionQueries( $subQueries, true ); $res = $this->connection->query( $sql, __METHOD__ ); foreach ( $res as $row ) { -- To view, visit https://gerrit.wikimedia.org/r/294865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia51237668ab8abaaae50525464915e04a58704f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo manGerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Aude Gerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Hoo man Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rewrite rules for git.wikimedia.org - change (operations/puppet)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/294867 Change subject: Rewrite rules for git.wikimedia.org .. Rewrite rules for git.wikimedia.org Redirect gitblit urls to phabricator (diffusion) equivalents. Bug: T137224 Change-Id: I67ad308f9e6373e5234cb2d83006457d6f467bf8 --- M modules/phabricator/manifests/init.pp A modules/phabricator/templates/gitblit_vhost.conf.erb 2 files changed, 106 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/294867/1 diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index ae712f6..a5df0ba 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -120,6 +120,20 @@ require => $base_requirements, } +# git.wikimedia.org hosts rewrite rules to redirect old gitblit urls to +# equivilent diffusion urls. + +file { '/srv/git.wikimedia.org': +ensure => 'directory', +owner => 'root', +group => 'root', +} + +apache::site { 'git.wikimedia.org': +content => template('phabricator/gitblit_vhost.conf.erb'), +require => File['/srv/git.wikimedia.org'], +} + # Robots.txt disallowing to crawl the alias domain if $serveralias { file {"${phabdir}/robots.txt": diff --git a/modules/phabricator/templates/gitblit_vhost.conf.erb b/modules/phabricator/templates/gitblit_vhost.conf.erb new file mode 100644 index 000..4b5cc25 --- /dev/null +++ b/modules/phabricator/templates/gitblit_vhost.conf.erb @@ -0,0 +1,92 @@ + + ServerName git.wikimedia.org + DocumentRoot /srv/git.wikimedia.org + + # https://git.wikimedia.org -> https://phabricator.wikimedia.org/diffusion redirects + # @author [[meta:User:Danny B.]] +# Maniphest Task: https://phabricator.wikimedia.org/T137224 + + ### Directives + + # logging + LogLevel warn + ErrorLog /var/log/apache2/git.wikimedia.org_error.log + CustomLog /var/log/apache2/git.wikimedia.org_access.log wmf + ServerSignature Off + + # don't decode "%2F" in URL to "/" + AllowEncodedSlashes NoDecode + + # allow URL rewriting + RewriteEngine On + + ### Static links + + # home page + RewriteRule ^/$ https://phabricator.wikimedia.org/diffusion [L,R=301] + + # searches & lists + RewriteRule ^/activity/?$ https://phabricator.wikimedia.org/diffusion/query/active/ [L,R=301] + RewriteRule ^/lucene/?$ https://phabricator.wikimedia.org/diffusion/query/advanced/ [L,R=301] + RewriteRule ^/(projects|repositories)/?$ https://phabricator.wikimedia.org/diffusion/query/all/ [L,R=301] + + + ### Preformat + + # ?r= -> / + RewriteCond %{QUERY_STRING} ^(.*&)?r=([0-9A-Za-z/_\.-]+).git(&.*)?$ + RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/$ /$1/%2.git [NE] + + # remove "refs%2Fheads%2F" and "refs%2Fremotes%2Forigin%2F" + RewriteRule ^(.*)refs\%2[Ff](heads|remotes\%2[Ff]origin)\%2[Ff](.*)$ $1$3 + + #-> + RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\%2[Ff](.*)\.git(.*)$ /$1/$2/$3.git$4 [N] + + # -> + RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\.git/([0-9A-Za-z_\.-]+)\%2[Ff]([^/]+)(.*)$ /$1/$2.git/$3\%25252F$4$5 [N] + + # -> + RewriteRule ^/(blame|blob|commit|commitdiff|docs|history|log|patch|summary|tree)/([0-9A-Za-z/_\.-]+)\.git/([^/]+)/([0-9A-Za-z/_\.-]+)\%2[Ff]([^/]*)$ /$1/$2.git/$3/$4/$5 [N] + + + ### /commit/ + ### /commitdiff/ + ### /patch/ + + # https://git.wikimedia.org/ / .git/ + # -> https://git.wikimedia.org/ /.git/ + # ---> https://phabricator.wikimedia.org/r/<(commit|patch)>/; + RewriteRule ^/(commit|patch)(diff)?/([0-9A-Za-z/_\.-]+)\.git/([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])$ https://phabricator.wikimedia.org/r/$1/$3;$4 [NE,L,R=301] + + + ### /blame/ + ### /blob/ + ### /docs/ + ### /history/ + ### /log/ + ### /summary/ + ### /tree/ + + # translate Gitblit actions to Diffusion actions + RewriteRule ^/(blame|blob|docs|tree)/(.*)$ /browse/$2 [NE] + RewriteRule ^/log/(.*)$ /history/$1 [NE] + RewriteRule ^/summary/(.*)$ /$1 [NE] + + #
[MediaWiki-commits] [Gerrit] adding install params for ms-be202[2-7] Bug:T136630 - change (operations/puppet)
Papaul has uploaded a new change for review. https://gerrit.wikimedia.org/r/294866 Change subject: adding install params for ms-be202[2-7] Bug:T136630 .. adding install params for ms-be202[2-7] Bug:T136630 Change-Id: I2fcf039a40d0f636944385d60c8d802b99601a3a --- M modules/install_server/files/autoinstall/netboot.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/294866/1 diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index c06d15b..07884bd 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -109,7 +109,7 @@ ms-be100[0-9]|ms-be101[0-5]) echo partman/ms-be-dell.cfg ;; \ ms-be101[6-9]|ms-be102[0-1]) echo partman/ms-be-hp.cfg ;; \ ms-be200[0-9]|ms-be201[0-5]) echo partman/ms-be-dell.cfg ;; \ -ms-be201[6-9]|ms-be202[0-1]) echo partman/ms-be-hp.cfg ;; \ +ms-be201[6-9]|ms-be202[0-7]) echo partman/ms-be-hp.cfg ;; \ ms-be30[0-9][0-9]) echo partman/ms-be-esams.cfg ;; \ ms-fe[1-2]0[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \ ms-fe30[0-9][0-9]) echo partman/flat.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/294866 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2fcf039a40d0f636944385d60c8d802b99601a3a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Papaul___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use UNION ALL in EntityUsageTable::getUsedEntityIdStrings - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/294865 Change subject: Use UNION ALL in EntityUsageTable::getUsedEntityIdStrings .. Use UNION ALL in EntityUsageTable::getUsedEntityIdStrings Will yield the same results due to the nature of the query. Bug: T137972 Change-Id: Ia51237668ab8abaaae50525464915e04a58704f9 --- M client/includes/Usage/Sql/EntityUsageTable.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/65/294865/1 diff --git a/client/includes/Usage/Sql/EntityUsageTable.php b/client/includes/Usage/Sql/EntityUsageTable.php index b70a777..ba1268d 100644 --- a/client/includes/Usage/Sql/EntityUsageTable.php +++ b/client/includes/Usage/Sql/EntityUsageTable.php @@ -362,7 +362,7 @@ $values = []; if ( $this->connection->getType() === 'mysql' ) { // On MySQL we can UNION all queries and run them at once - $sql = $this->connection->unionQueries( $subQueries, false ); + $sql = $this->connection->unionQueries( $subQueries, true ); $res = $this->connection->query( $sql, __METHOD__ ); foreach ( $res as $row ) { -- To view, visit https://gerrit.wikimedia.org/r/294865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia51237668ab8abaaae50525464915e04a58704f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the plaintext GPL - change (at-ease)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294864 Change subject: Use the plaintext GPL .. Use the plaintext GPL Change-Id: I3d6db754cefdc1a14ec1c9524c476159fdc13a67 --- M COPYING 1 file changed, 88 insertions(+), 91 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/at-ease refs/changes/64/294864/1 diff --git a/COPYING b/COPYING index 019694a..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,65 +1,65 @@ -== GNU GENERAL PUBLIC LICENSE == +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 -Version 2, June 1991 + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. +Preamble -=== Preamble === - -The licenses for most software are designed to take away your + The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not + When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. -To protect your rights, we need to make restrictions that forbid + To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. -For example, if you distribute copies of such a program, whether + For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. -We protect your rights with two steps: (1) copyright the software, and + We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. -Also, for each author's protection and ours, we want to make certain + Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. -Finally, any free program is threatened constantly by software + Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. -The precise terms and conditions for copying, distribution and + The precise terms and conditions for copying, distribution and modification follow. -== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION == +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -'''0.''' This License applies to any program or other work which contains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -76,7 +76,7 @@ Program (independent of having been
[MediaWiki-commits] [Gerrit] DHCP: Add MAC address entries for ms-be202[2-7] Bug:T136630 - change (operations/puppet)
Papaul has uploaded a new change for review. https://gerrit.wikimedia.org/r/294863 Change subject: DHCP: Add MAC address entries for ms-be202[2-7] Bug:T136630 .. DHCP: Add MAC address entries for ms-be202[2-7] Bug:T136630 Change-Id: I6ad91a5de91388d8696ec5b01d5205c5c23e7884 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/294863/1 diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 8e464dd..89199ce 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -3796,6 +3796,36 @@ filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0"; } +host ms-be2022 { +hardware ethernet 14:02:ec:3d:50:a0; +fixed-address ms-be2022.codfw.wmnet; +} + +host ms-be2023 { +hardware ethernet 14:02:ec:3c:cf:78; +fixed-address ms-be2022.codfw.wmnet; +} + +host ms-be2024 { +hardware ethernet 14:02:ec:3c:ff:10; +fixed-address ms-be2024.codfw.wmnet; +} + +host ms-be2025 { +hardware ethernet 14:02:ec:3c:6f:98; +fixed-address ms-be2025.codfw.wmnet; +} + +host ms-be2026 { +hardware ethernet 14:02:ec:3c:de:98; +fixed-address ms-be2026.codfw.wmnet; +} + +host ms-be2027 { +hardware ethernet 14:02:ec:3c:3f:e0; +fixed-address ms-be2027.codfw.wmnet; +} + host ms-be3001 { hardware ethernet 24:B6:FD:F6:13:AC; fixed-address ms-be3001.esams.wmnet; -- To view, visit https://gerrit.wikimedia.org/r/294863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ad91a5de91388d8696ec5b01d5205c5c23e7884 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Papaul___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle session reset errors in invalidateSessionsForUser.php - change (mediawiki/core)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/294862 Change subject: Handle session reset errors in invalidateSessionsForUser.php .. Handle session reset errors in invalidateSessionsForUser.php Change-Id: I5a55e4a6f2d296576ee76e212ed379225251e128 --- M maintenance/invalidateUserSessions.php 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/294862/1 diff --git a/maintenance/invalidateUserSessions.php b/maintenance/invalidateUserSessions.php index 4b567ae..b1a0ffe 100644 --- a/maintenance/invalidateUserSessions.php +++ b/maintenance/invalidateUserSessions.php @@ -71,8 +71,12 @@ $i++; $user = User::newFromName( $username ); if ( $user->getId() ) { - $sessionManager->invalidateSessionsForUser( $user ); - $this->output( "Invalidated sessions for user $username\n" ); + try { + $sessionManager->invalidateSessionsForUser( $user ); + $this->output( "Invalidated sessions for user $username\n" ); + } catch ( Exception $e ) { + $this->output( "Failed to invalidate sessions for user $username | " . str_replace( [ "\r", "\n" ], '', $e->getMessage() ) ); + } } else { $this->output( "Could not find user $username\n" ); } -- To view, visit https://gerrit.wikimedia.org/r/294862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a55e4a6f2d296576ee76e212ed379225251e128 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split off basic styles from the JavaScript module 'mediawiki... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Split off basic styles from the JavaScript module 'mediawiki.action.history' .. Split off basic styles from the JavaScript module 'mediawiki.action.history' Since d629541076c the .updatedmarker element was styled via a JavaScript module - which caused a flash of unstyled content on the history page for most users, and was left unstyled for noscript users. Bug: T137383 Change-Id: I362abacf51160a8305b2b0013f65e89deb2ffc93 --- M includes/actions/HistoryAction.php M resources/Resources.php M resources/src/mediawiki.action/mediawiki.action.history.css A resources/src/mediawiki.action/mediawiki.action.history.styles.css 4 files changed, 12 insertions(+), 5 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve VolkerE: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 5ec10e6..63fe97b 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -116,6 +116,7 @@ // Setup page variables. $out->setFeedAppendQuery( 'action=history' ); $out->addModules( 'mediawiki.action.history' ); + $out->addModuleStyles( 'mediawiki.action.history.styles' ); if ( $config->get( 'UseMediaWikiUIEverywhere' ) ) { $out = $this->getOutput(); $out->addModuleStyles( [ diff --git a/resources/Resources.php b/resources/Resources.php index c2724af..e31e77e 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1461,10 +1461,13 @@ ], ], 'mediawiki.action.history' => [ - 'position' => 'top', 'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js', 'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css', ], + 'mediawiki.action.history.styles' => [ + 'position' => 'top', + 'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css', + ], 'mediawiki.action.history.diff' => [ 'position' => 'top', 'styles' => [ diff --git a/resources/src/mediawiki.action/mediawiki.action.history.css b/resources/src/mediawiki.action/mediawiki.action.history.css index 95e92ae..fd5dbc9 100644 --- a/resources/src/mediawiki.action/mediawiki.action.history.css +++ b/resources/src/mediawiki.action/mediawiki.action.history.css @@ -1,8 +1,6 @@ +/* Styles for the JavaScript enhancements of the history page */ + #pagehistory li.before input[name="oldid"], #pagehistory li.after input[name="diff"] { visibility: hidden; -} - -.updatedmarker { - background-color: #b7f430; } diff --git a/resources/src/mediawiki.action/mediawiki.action.history.styles.css b/resources/src/mediawiki.action/mediawiki.action.history.styles.css new file mode 100644 index 000..269db8e --- /dev/null +++ b/resources/src/mediawiki.action/mediawiki.action.history.styles.css @@ -0,0 +1,5 @@ +/* Basic styles for the history page */ + +.updatedmarker { + background-color: #b7f430; +} -- To view, visit https://gerrit.wikimedia.org/r/294701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I362abacf51160a8305b2b0013f65e89deb2ffc93 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz DziewońskiGerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Edokter Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Krinkle Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Use AuthManager data change methods - change (mediawiki...OATHAuth)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/294861 Change subject: [WIP] Use AuthManager data change methods .. [WIP] Use AuthManager data change methods TODO: * token reset * handle returnto * T132329 * make it look less horrible in oouiform * cannot call HtmlForm::setMessagePrefix * T122691 Bug: T110457 Change-Id: I2c1a9bf87ca5643cc7c52acc92955177aa4bdfad Depends-On: I4d796a46d99daa8841fcdcbe76dddf9db46af9ed --- A HTMLOATHField.php M OATHAuth.hooks.php M auth/TOTPAuthenticationRequest.php A auth/TOTPDisableAuthenticationRequest.php A auth/TOTPEnableAuthenticationRequest.php M auth/TOTPSecondaryAuthenticationProvider.php M extension.json M i18n/en.json M i18n/qqq.json 9 files changed, 326 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth refs/changes/61/294861/1 diff --git a/HTMLOATHField.php b/HTMLOATHField.php new file mode 100644 index 000..e727bfd --- /dev/null +++ b/HTMLOATHField.php @@ -0,0 +1,98 @@ +oathKey = $params['oathKey']; + $this->oathUser = $params['oathUser']; + } + + public function hasVisibleOutput() { + return false; + } + + public function getInputHTML( $value ) { + $output = $this->mParent ? $this->mParent->getOutput() : RequestContext::getMain()->getOutput(); + $output->addModules( 'ext.oathauth' ); + $output->addHTML( ResourceLoader::makeInlineScript( Xml::encodeJsCall( 'mw.loader.using', array( + array( 'ext.oathauth' ), + new XmlJsCode( 'function () {' . '$("#qrcode").qrcode("otpauth://totp/' . + rawurlencode( $this->oathUser->getAccount() ) . '?secret=' + . $this->oathKey->getSecret() . '");' . '}' ) + ) ) ) ); + return ''; + } + + public static function getSubFields( OATHAuthKey $oathKey, OATHUser $oathUser ) { + return array( + 'OATHModule' => array( + 'class' => self::class, + 'oathKey' => $oathKey, + 'oathUser' => $oathUser, + ), + 'OATHAppInfo' => array( + 'type' => 'info', + 'default' => wfMessage( 'oathauth-step1-test' )->escaped(), + 'raw' => true, + 'section' => 'step1', + ), + 'OATHQRCode' => array( + 'type' => 'info', + 'default' => '', + 'raw' => true, + 'section' => 'step2', + ), + 'OATHScratchCodes' => array( + 'type' => 'info', + 'label-message' => 'oathauth-step2alt', + 'default' => + '' . wfMessage( 'oathauth-account' )->escaped() . '' + . $oathUser->getAccount() . '' + . '' . wfMessage( 'oathauth-secret' )->escaped() . '' + . $oathKey->getSecret() . '', + 'raw' => true, + 'section' => 'step2', + ), + 'OATHScratchTokens' => array( + 'type' => 'info', + 'default' => + wfMessage( 'openstackmanager-scratchtokens' ) + . self::createResourceList( $oathKey->getScratchTokens() ), + 'raw' => true, + 'section' => 'step3', + ), + 'OATHToken' => array( + 'type' => 'text', + 'default' => '', + 'label-message' => 'oathauth-entertoken', + 'name' => 'token', + 'section' => 'step4', + 'persistent' => false, + ), + ); + } + + /** +* @param $resources array +* @return string +*/ + protected static function createResourceList( $resources ) { + $resourceList = ''; + foreach ( $resources as $resource ) { + $resourceList .= Html::rawElement( 'li', array(), $resource ); + } + return Html::rawElement( 'ul', array(), $resourceList ); + } +} diff --git a/OATHAuth.hooks.php
[MediaWiki-commits] [Gerrit] Add in-process cache for OATHUser lookups - change (mediawiki...OATHAuth)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/294860 Change subject: Add in-process cache for OATHUser lookups .. Add in-process cache for OATHUser lookups Change-Id: I9392b7b1a23944dfd91d690fa30b5a7fdf0f2e51 --- M OATHAuth.hooks.php M OATHUser.php M OATHUserRepository.php 3 files changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth refs/changes/60/294860/1 diff --git a/OATHAuth.hooks.php b/OATHAuth.hooks.php index d500a6e..66fbfd4 100644 --- a/OATHAuth.hooks.php +++ b/OATHAuth.hooks.php @@ -22,7 +22,9 @@ static $service = null; if ( $service == null ) { - $service = new OATHUserRepository( wfGetLB( $wgOATHAuthDatabase ) ); + $service = new OATHUserRepository( wfGetLB( $wgOATHAuthDatabase ), new HashBagOStuff( [ + 'mayKeys' => 5, + ] ) ); } return $service; diff --git a/OATHUser.php b/OATHUser.php index 64efd33..cd899a9 100644 --- a/OATHUser.php +++ b/OATHUser.php @@ -13,7 +13,7 @@ private $key; /** -* Constructor. Can't be called directly. Call one of the static NewFrom* methods +* Constructor. Can't be called directly. Use OATHUserRepository::findByUser instead. * @param User $user * @param OATHAuthKey $key */ diff --git a/OATHUserRepository.php b/OATHUserRepository.php index ed48c51..e44e947 100644 --- a/OATHUserRepository.php +++ b/OATHUserRepository.php @@ -4,21 +4,29 @@ /** @var LoadBalancer */ protected $lb; - public function __construct( LoadBalancer $lb ) { + /** @var BagOStuff */ + protected $cache; + + public function __construct( LoadBalancer $lb, BagOStuff $cache ) { $this->lb = $lb; + $this->cache = $cache; } public function findByUser( User $user ) { - $oathUser = new OATHUser( $user, null ); + $oathUser = $this->cache->get( $user->getName() ); + if ( !$oathUser ) { + $oathUser = new OATHUser( $user, null ); - $uid = CentralIdLookup::factory()->centralIdFromLocalUser( $user ); - $res = $this->getDB( DB_SLAVE ) - ->selectRow( 'oathauth_users', '*', array( 'id' => $uid ), __METHOD__ ); - if ( $res ) { - $key = new OATHAuthKey( $res->secret, explode( ',', $res->scratch_tokens ) ); - $oathUser->setKey( $key ); + $uid = CentralIdLookup::factory()->centralIdFromLocalUser( $user ); + $res = $this->getDB( DB_SLAVE ) + ->selectRow( 'oathauth_users', '*', array( 'id' => $uid ), __METHOD__ ); + if ( $res ) { + $key = new OATHAuthKey( $res->secret, explode( ',', $res->scratch_tokens ) ); + $oathUser->setKey( $key ); + } + + $this->cache->set( $user->getName(), $oathUser ); } - return $oathUser; } @@ -33,6 +41,7 @@ ), __METHOD__ ); + $this->cache->set( $user->getUser()->getName(), $user ); } public function remove( OATHUser $user ) { @@ -41,6 +50,7 @@ array( 'id' => CentralIdLookup::factory()->centralIdFromLocalUser( $user->getUser() ) ), __METHOD__ ); + $this->cache->delete( $user->getUser()->getName() ); } /** -- To view, visit https://gerrit.wikimedia.org/r/294860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9392b7b1a23944dfd91d690fa30b5a7fdf0f2e51 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OATHAuth Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Change/RemoveCredentialsBlacklist as extension registrat... - change (mediawiki/core)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/294859 Change subject: Add Change/RemoveCredentialsBlacklist as extension registration options .. Add Change/RemoveCredentialsBlacklist as extension registration options Change-Id: I4d796a46d99daa8841fcdcbe76dddf9db46af9ed --- M docs/extension.schema.json M includes/registration/ExtensionProcessor.php 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/59/294859/1 diff --git a/docs/extension.schema.json b/docs/extension.schema.json index 1d2b2f0..4eb3135 100644 --- a/docs/extension.schema.json +++ b/docs/extension.schema.json @@ -535,6 +535,14 @@ "type": "object", "description": "Central ID lookup providers" }, + "ChangeCredentialsBlacklist": { + "type": "object", + "description": "AuthenticationRequest classes which can only be used internally for credentials change" + }, + "RemoveCredentialsBlacklist": { + "type": "object", + "description": "AuthenticationRequest classes which can only be used internally for credentials removal" + }, "namespaces": { "type": "array", "description": "Method to add extra namespaces", diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index 78f9370..ac9b526 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -26,6 +26,8 @@ 'SessionProviders', 'AuthManagerAutoConfig', 'CentralIdLookupProviders', + 'ChangeCredentialsBlacklist', + 'RemoveCredentialsBlacklist', 'RateLimits', 'RecentChangesFlags', 'MediaHandlers', -- To view, visit https://gerrit.wikimedia.org/r/294859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d796a46d99daa8841fcdcbe76dddf9db46af9ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release version 8.1.0 to get improvments out to the public - change (mediawiki...MassEditRegex)
jenkins-bot has submitted this change and it was merged. Change subject: Release version 8.1.0 to get improvments out to the public .. Release version 8.1.0 to get improvments out to the public - Add position to the resource loader module - Provide translations done by the community of translatewiki.net - Extend file documentation - Provide CHANGELOG file Change-Id: I3b2457c2320add58976257d6f555443c4dbdc5c7 --- A CHANGELOG M MassEditRegex.php 2 files changed, 78 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved Kghbln: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 000..a793662 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,63 @@ +## MassEditRegex + +MassEditRegex is a MediaWiki extension allowing to use regular expressions for +editing mulitple pages at once. + +This file documents the development changes. + + +### Version 8.1.0 + +Released on 2016-06-14 + +- Hide action tab for users without the "masseditregex" permission +- Add position to the resource loader module +- Replace deprecated setText() call +- Provide translations done by the community of translatewiki.net +- Extend file documentation +- Provide CHANGELOG file + + +### Version 8.0.3 + +Released on 2016-03-11 + +- Define doesWrites() for SpecialPage classes +- Replace depreciated wfMsg* calls / take 2 +- Replace makeKnownLinkObj() +- Replace OutputPage::blockedPage() +- Replace use User::getSkin() +- Internal I18n tweaks +- Provide translations done by the community of translatewiki.net + + +### Version 8.0.2 + +Released on 2015-08-15 + +- Migrate to consistently use the __DIR__ constant +- Switch links to use https +- Provide translations done by the community of translatewiki.net + + +### Version 8.0.1 + +Released on 2015-08-12 + +- Add namemsg and license-name the $wgExtensionCredits +- Add COPYING file containing the extension's license +- Change extension's name to adhere with MW jargon +- Make extension's name translatable +- Add rawcontinue parameter to query +- Replace deprecated $wgSpecialPageGroups +- Provide translations done by the community of translatewiki.net + + +### Version 8.0.0 + +Released on 2015-02-08 + +- Add support for execution to be done on client side +- Internal code cleanup +- Replace depreciated wfMsg* calls / take 1 +- Provide translations done by the community of translatewiki.net diff --git a/MassEditRegex.php b/MassEditRegex.php index 98c0be8..78f91a0 100644 --- a/MassEditRegex.php +++ b/MassEditRegex.php @@ -7,10 +7,14 @@ * @ingroup Extensions * * @link https://www.mediawiki.org/wiki/Extension:MassEditRegex Documentation + * @link https://www.mediawiki.org/wiki/Extension_talk:MassEditRegex Support + * @link https://phabricator.wikimedia.org/diffusion/EMER/ Source Code * * @author Adam Nielsen* @author Kim Eik - * @copyright Copyright © 2009-2015 Adam Nielsen + * + * @copyright Copyright © 2009-2016 Adam Nielsen + * * @license https://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ @@ -24,7 +28,7 @@ 'path' => __FILE__, 'name' => 'MassEditRegex', 'namemsg' => 'masseditregex-extensionname', - 'version' => '8.0.3', + 'version' => '8.1.0', 'author' => array( 'Adam Nielsen', '...' @@ -34,21 +38,29 @@ 'license-name' => 'GPL-2.0+' ); +// Register extension messages and other localisation $wgMessagesDirs['MassEditRegex'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['MassEditRegex'] = __DIR__ . '/MassEditRegex.i18n.php'; $wgExtensionMessagesFiles['MassEditRegexAlias'] = __DIR__ . '/MassEditRegex.alias.php'; + +// Register extension classes $wgAutoloadClasses['MassEditRegex'] = __DIR__ . '/MassEditRegex.class.php'; $wgAutoloadClasses['MassEditRegexSpecialPage'] = __DIR__ . '/MassEditRegex.special.php'; $wgAutoloadClasses['MassEditRegexAPI'] = __DIR__ . '/MassEditRegex.api.php'; + +// Register special page into MediaWiki $wgSpecialPages['MassEditRegex'] = 'MassEditRegexSpecialPage'; -// Required permission to use Special:MassEditRegex +// Create new right to use Special:MassEditRegex $wgAvailableRights[] = 'masseditregex'; +// Register hooks $wgHooks['SkinTemplateNavigation::Universal'][] = 'MassEditRegexSpecialPage::efSkinTemplateNavigationUniversal'; $wgHooks['BaseTemplateToolbox'][] = 'MassEditRegexSpecialPage::efBaseTemplateToolbox'; +// Register ResourcesLoaderModules $wgResourceModules['MassEditRegex'] = array( + 'position' => 'top', 'scripts' => array( 'MassEditRegex.js' ), -- To view, visit https://gerrit.wikimedia.org/r/294296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b2457c2320add58976257d6f555443c4dbdc5c7
[MediaWiki-commits] [Gerrit] Add license information and other small tweaks - change (mediawiki...AccessControl)
jenkins-bot has submitted this change and it was merged. Change subject: Add license information and other small tweaks .. Add license information and other small tweaks * Provide COPYING file containing license information per https://www.mediawiki.org/wiki/Project:WikiProject_Extensions/Projects/Recovery/Candidate1 * Add license label to show on "Special:Version" * Improve and extend file documentation * Go https for links * Add info about version 2.6 to changelog Bug: T123943 Change-Id: Ibc2dcfaeb8810ed1e19c5eb65cfd705907bc180e --- M AccessControl.php A COPYING M changelog.txt 3 files changed, 373 insertions(+), 16 deletions(-) Approvals: Legoktm: Looks good to me, approved Kghbln: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/AccessControl.php b/AccessControl.php index dc4ab55..9c3b317 100644 --- a/AccessControl.php +++ b/AccessControl.php @@ -1,42 +1,56 @@ http://blog.pagansoft.de) based into - * version 1.3 on accesscontrol.php by Josh Greenberg. - * Version 2.0 for MediaWiki >= 1.18 rewrited completly by Aleš Kapica. +/** + * MediaWiki extension that enables group access restriction on a page-by-page + * basis + * + * Version pre-0.1 (2005-05-03) by Josh Greenberg + * Version 0.1 to 0.9 (2010-06-27) by Martin Gondermann + * Version 1.0 to 2.5 by Aleš Kapica + * Version 2.6 by Siebrand Mazeland and Thomas Mulhall + * * @package MediaWiki * @subpackage Extensions * @author Aleš Kapica * @copyright 2008-2014 Aleš Kapica - * @licence GNU General Public Licence + * @license GNU General Public Licence 2.0 or later */ +// Ensure that the script cannot be executed outside of MediaWiki if ( !defined( 'MEDIAWIKI' ) ) { echo "This file is an extension to the MediaWiki software and cannot be used standalone.\n"; die(); } -// sysop users can read all restricted pages -$wgAdminCanReadAll = true; -$wgAccessControlRedirect = true; - +// Register extension with MediaWiki $wgExtensionCredits['parserhook'][] = [ 'path' => __FILE__, 'name' => 'AccessControl', - 'author' => [ '[https://www.mediawiki.org/wiki/m:User:Want Aleš Kapica]' ], - 'url' => 'http://www.mediawiki.org/wiki/Extension:AccessControl', + 'author' => [ + '[https://www.mediawiki.org/wiki/m:User:Want Aleš Kapica]' + ], + 'url' => 'https://www.mediawiki.org/wiki/Extension:AccessControl', 'version' => '2.6', - 'descriptionmsg' => 'accesscontrol-desc' + 'descriptionmsg' => 'accesscontrol-desc', + 'license-name' => 'GPL-2.0+' ]; +// Set extension specific parameters +// sysop users can read all restricted pages +$wgAdminCanReadAll = true; +// do not redirect from page in search results to restricted pages +$wgAccessControlRedirect = true; + +// Load extension's class $wgAutoloadClasses['AccessControlHooks'] = __DIR__ . '/AccessControl.hooks.php'; -$wgHooks['ParserFirstCallInit'][] = 'AccessControlHooks::accessControlExtension'; - +// Register extension's messages $wgMessagesDirs['AccessControl'] = __DIR__ . '/i18n'; +// Register hooks +// Hook the ParserFirstCallInit for +$wgHooks['ParserFirstCallInit'][] = 'AccessControlHooks::accessControlExtension'; // Hook the userCan function for bypassing the cache $wgHooks['userCan'][] = 'AccessControlHooks::onUserCan'; - // Hook the UnknownAction function for information user about restrictions $wgHooks['UnknownAction'][] = 'AccessControlHooks::onUnknownAction'; diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get
[MediaWiki-commits] [Gerrit] searchSatisfaction: extraParams field only takes strings - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: searchSatisfaction: extraParams field only takes strings .. searchSatisfaction: extraParams field only takes strings Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 (cherry picked from commit c120b17f24fc8aa0b7bbe825a265186d2abd4b65) --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index 6e9e5af..a2a1435 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -453,7 +453,7 @@ position: index, // specific to textcat subtest. Links starting with // point to // an alternate wiki. - extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? 1 : 0 + extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? '1' : '0' } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/294858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: EBernhardsonGerrit-Reviewer: EBernhardson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] searchSatisfaction: extraParams field only takes strings - change (mediawiki...WikimediaEvents)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/294858 Change subject: searchSatisfaction: extraParams field only takes strings .. searchSatisfaction: extraParams field only takes strings Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 (cherry picked from commit c120b17f24fc8aa0b7bbe825a265186d2abd4b65) --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/58/294858/1 diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index 6e9e5af..a2a1435 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -453,7 +453,7 @@ position: index, // specific to textcat subtest. Links starting with // point to // an alternate wiki. - extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? 1 : 0 + extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? '1' : '0' } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/294858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] searchSatisfaction: extraParams field only takes strings - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: searchSatisfaction: extraParams field only takes strings .. searchSatisfaction: extraParams field only takes strings Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index 6e9e5af..a2a1435 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -453,7 +453,7 @@ position: index, // specific to textcat subtest. Links starting with // point to // an alternate wiki. - extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? 1 : 0 + extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? '1' : '0' } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/294857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: EBernhardsonGerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] searchSatisfaction: extraParams field only takes strings - change (mediawiki...WikimediaEvents)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/294857 Change subject: searchSatisfaction: extraParams field only takes strings .. searchSatisfaction: extraParams field only takes strings Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/57/294857/1 diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index 6e9e5af..990fb3f 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -453,7 +453,7 @@ position: index, // specific to textcat subtest. Links starting with // point to // an alternate wiki. - extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? 1 : 0 + extraParams: $target.attr( 'href' ).substr( 0, 2 ) === '//' ? "1" : "0" } ); } ); -- To view, visit https://gerrit.wikimedia.org/r/294857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30dc8bda82e50f61b15bb4c38843dda2d22bb985 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search: Dependent config for textcat AB test. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: search: Dependent config for textcat AB test. .. search: Dependent config for textcat AB test. Sets up the necessary configuration for the textcat AB test implemented in I95ba0a932. This patch must be deployed before that one. Change-Id: I02a83aa886b3b11b8a42015de78d124c0a8de055 --- M wmf-config/InitialiseSettings.php 1 file changed, 28 insertions(+), 11 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3a740e1..9f3630b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16456,9 +16456,9 @@ 'wmgCirrusSearchUserTesting' => [ + // Only being utilized on some wiki's, but because this requires a special query parameter + // to trigger it is safe to use everywhere rather than duplicate the config. 'default' => [ - ], - 'enwiki' => [ 'textcat1' => [ // Test only activated via query string trigger 'sampleRate' => 0, @@ -16468,34 +16468,30 @@ 'wgCirrusSearchLanguageDetectors' => [ 'textcat' => 'CirrusSearch\\LanguageDetector\\TextCat', ], - 'wgCirrusSearchTextcatLanguages' => [ - 'en', 'es', 'zh', 'pt', 'ar', 'ru', 'fa', 'ko', - 'bn', 'bg', 'hi', 'el', 'ja', 'ta', 'th', 'he' - ] ], 'buckets' => [ // control bucket. setup threshold and detector but don't turn on the // language query 'a' => [ - 'trigger' => 'textcat1:a', + 'trigger' => 'textcat2:a', 'globals' => [ 'wgCirrusSearchEnableAltLanguage' => false, ], ], // test bucket. try textcat and append results when < 3 results found 'b' => [ - 'trigger' => 'textcat1:b', + 'trigger' => 'textcat2:b', 'globals' => [ 'wgCirrusSearchEnableAltLanguage' => true, - 'wgCirrusSearchInterwikiProv' => 'iwsw6', + 'wgCirrusSearchInterwikiProv' => 'iwsw8', ], ], // test bucket. try accept-language, fallback to textcat 'c' => [ - 'trigger' => 'textcat1:c', + 'trigger' => 'textcat2:c', 'globals' => [ 'wgCirrusSearchEnableAltLanguage' => true, - 'wgCirrusSearchInterwikiProv' => 'iwsw7', + 'wgCirrusSearchInterwikiProv' => 'iwsw9', 'wgCirrusSearchLanguageDetectors' => [ 'accept-lang' => 'CirrusSearch\\LanguageDetector\\HttpAccept', 'textcat' => 'CirrusSearch\\LanguageDetector\\TextCat', @@ -16507,6 +16503,27 @@ ], ], +'wgCirrusSearchTextcatLanguages' => [ + 'default' => [ + 'en', 'es', 'zh', 'pt', 'ar', 'ru', 'fa', 'ko', + 'bn', 'bg', 'hi', 'el', 'ja', 'ta', 'th', 'he' + ], + 'frwiki' => [ + 'fr', 'en', 'ar', 'ru', 'zh', 'th', 'el', 'hy', + 'he', 'ko', + ], + 'eswiki' => [ + 'es', 'en', 'ru', 'zh', 'ar', 'ja', + ], + 'itwiki' => [ + 'it', 'en', 'ru', 'ar', 'zh', 'ja', 'el', 'ko', + ], + 'dewiki' => [ + 'de', 'en', 'zh', 'el', 'ru', 'ar', 'hi', 'th', + 'ko', 'ja', + ], +], + // Enable interwiki search by language detection. The list of language // detected and their corresponding wiki is defined by // wmgCirrusSearchLanguageToWikiMap and wmgCirrusSearchWikiToNameMap -- To view, visit https://gerrit.wikimedia.org/r/294739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
[MediaWiki-commits] [Gerrit] Two permission changes at urwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Two permission changes at urwiki .. Two permission changes at urwiki * Assigned tboverride-account and override-antispoof to accountcreators * create filemover group with movefile * Allow sysops to add or remove these two groups from users Bug: T137888 Change-Id: I6e48d84c7fa615052817c0250ca2e06bc09b5177 --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index f1ce204..3a740e1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8746,8 +8746,10 @@ 'autoeditor' => [ 'autoreview' => true ], ], 'urwiki' => [ - 'rollbacker' => [ 'rollback' => true ], // T47642 + 'accountcreator' => [ 'tboverride-account' => true, 'override-antispoof' => true ], // T137888 + 'filemover' => [ 'movefile' => true ], // T137888 'interface-editor' => [ 'editinterface' => true ], // T120348 + 'rollbacker' => [ 'rollback' => true ], // T47642 ], 'vecwiki' => [ 'flood' => [ 'bot' => true ], @@ -9551,7 +9553,7 @@ ], '+urwiki' => [ 'bureaucrat' => [ 'import', 'confirmed', 'abusefilter', 'rollbacker' ], // T44737 and T47643 - 'sysop' => [ 'confirmed', 'abusefilter', 'rollbacker', 'interface-editor' ], // T44737, T47643 and T120348 + 'sysop' => [ 'confirmed', 'abusefilter', 'rollbacker', 'interface-editor', 'accountcreator', 'filemover' ], // T44737, T47643, T120348 and T137888 ], '+viwiki' => [ 'sysop' => [ @@ -10242,7 +10244,7 @@ ], '+urwiki' => [ 'bureaucrat' => [ 'import', 'confirmed', 'abusefilter', 'rollbacker' ], // T44737 and T47643 - 'sysop' => [ 'confirmed', 'interface-editor' ], // T44737 and T120348 + 'sysop' => [ 'confirmed', 'interface-editor', 'accountcreator', 'filemover' ], // T44737, T120348 and T137888 ], '+viwiki' => [ 'sysop' => [ -- To view, visit https://gerrit.wikimedia.org/r/294652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e48d84c7fa615052817c0250ca2e06bc09b5177 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Luke081515Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Textcat search satisfaction subtest for multiple wikis - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: Textcat search satisfaction subtest for multiple wikis .. Textcat search satisfaction subtest for multiple wikis This patch re-adds the textcat subtest with a few changes from the last iteration: * Records if the clicked link is an interwiki result. This is done by only recording the 3 value textcat parameters to extraParams for the searchResultPage event. The click event now records an integer 1 or 0 in the extraParams field. 1 indicates an interwiki click, 0 indicates a local result click. * extraParams for the fulltext searchResultPage event now always has 3 values, although some may be blank. If no values are available the extraParams field will be: ',,'. When split by later analytics processing on the , that would become ['','','']. * The third field of extraParams now correctly records a 0, rather than being empty, when the query was run against an alternate wiki but no results were found. Identified as not being incorrect. * The third value of extraParams should always be <= hitsReturned. In our logging of results this is not always the case. This turns out to be because users in the control group run the query, report the number of results, but are not shown the results. As such no fix was done here it was only a problem with how to interpret the data. Depends-On: I02a83aa88 Bug: T121543 Bug: T137163 Bug: T137167 Change-Id: I95ba0a932292c46a8de633ab027645343617fd6d --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 48 insertions(+), 7 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index e32762b..6e9e5af 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -99,9 +99,11 @@ * @private */ function initialize( session ) { - var sessionId = session.get( 'sessionId' ), - sampleSize = 200, + haveSubTest = [ + 'enwiki', 'frwiki', 'eswiki', 'itwiki', 'dewiki' + ].indexOf( mw.config.get( 'wgDBname' ) ) !== -1, + sampleSize = haveSubTest ? 100 : 200, /** * Determines whether the user is part of the population size. * @@ -150,6 +152,15 @@ // have a search session id, generate one. if ( !session.set( 'sessionId', randomToken() ) ) { return false; + } + + // Assign 50% of users to subTest + if ( haveSubTest && oneIn( 2 ) ) { + session.set( 'subTest', chooseBucket( [ + 'textcat2:a', + 'textcat2:b', + 'textcat2:c' + ] ) ); } } @@ -383,6 +394,10 @@ evt.articleId = articleId; } + if ( mw.config.get( 'wgCirrusSearchRequestSetToken' ) ) { + evt.searchToken = mw.config.get( 'wgCirrusSearchRequestSetToken' ); + } + // add any schema specific data if ( extraData ) { $.extend( evt, extraData ); @@ -406,6 +421,7 @@ */ function setupSearchTest( session ) { var params, + textCatExtra = [], logEvent = genLogEventFn( 'fulltext', session ); if ( isSearchResultPage ) { @@ -425,19 +441,39 @@ .find( '[data-serp-pos]' ) .data( 'serp-pos' ); - if ( index !== undefined ) { + // If wprov is already defined it must have come from the + // backend interwiki test. Don't override it. This means we + // won't get a visitPage event, but we can't collect those + // for interwiki anyways. + if ( index !== undefined && uri.query.wprov === undefined ) {
[MediaWiki-commits] [Gerrit] Fix four bugs in search satisfaction fulltext clicks imprope... - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: Fix four bugs in search satisfaction fulltext clicks improperly recorded .. Fix four bugs in search satisfaction fulltext clicks improperly recorded * Autocomplete was calling SessionState.prototype.has, but the function did not exist. Add the function. * The code to re-send events that were put into local storage due to not being sucesfully delivered was expecting the url to be the value in the object, but the key is what has the url. Adjust to recognize that the key is the appropriate url to visit. * Clicks to sub links in search results, like a section title or redirect page, were not properly updating the wprov parameter. The click events were properly collected but not the visitPage events on the other side. Additionally the click events wern't collecting the position clicked. * Depending on network speed events sent by our extended event log implementation that suppors non-sendBeacon enabled browsers can result in duplicate events. Add a uniqueId field back to the schema to allow de-duplicating when running analysis. Bug: T137262 Change-Id: I7955e1d9b94f54b1e63bc5362bfa5c90d904c20c (cherry picked from commit 3178eba79f290fb018d33930d5cd0e2fca176369) --- M extension.json M modules/ext.wikimediaEvents.searchSatisfaction.js 2 files changed, 39 insertions(+), 39 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 5e1d2ad..dc86d30 100644 --- a/extension.json +++ b/extension.json @@ -114,7 +114,7 @@ "schema.TestSearchSatisfaction2": { "class": "ResourceLoaderSchemaModule", "schema": "TestSearchSatisfaction2", - "revision": 15644862 + "revision": 15700292 }, "schema.GeoFeatures": { "class": "ResourceLoaderSchemaModule", diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index 0a1caa1..e32762b 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -48,6 +48,16 @@ return res; } + /** +* Generate a unique token. Appends timestamp in base 36 to increase +* uniqueness of the token. +* +* @return {string} +*/ + function randomToken() { + return mw.user.generateRandomSessionId() + new Date().getTime().toString( 36 ); + } + search = initFromWprov( 'srpw1_' ); autoComplete = initFromWprov( 'acrw1_' ); // with no position appended indicates the user submitted the @@ -80,16 +90,6 @@ */ function key( type ) { return storageNamespace + '-' + type; - } - - /** -* Generate a unique token. Appends timestamp in base 36 to increase -* uniqueness of the token. -* -* @return {string} -*/ - function randomToken() { - return mw.user.generateRandomSessionId() + new Date().getTime().toString( 36 ); } /** @@ -160,6 +160,10 @@ return true; } + this.has = function ( type ) { + return this.get( type ) !== null; + }; + this.get = function ( type ) { if ( !state.hasOwnProperty( type ) ) { if ( ttl.hasOwnProperty( type ) ) { @@ -201,24 +205,6 @@ state.enabled = initialize( this ); return this; - } - - /** -* Adds an attribute to the link to track the offset -* of the result in the SERP. -* -* Expects to be run with an html anchor as `this`. -* -* @param {Event} evt jQuery Event object -* @private -*/ - function updateSearchHref( evt ) { - var uri = new mw.Uri( evt.target.href ), - offset = $( evt.target ).data( 'serp-pos' ); - if ( offset ) { - uri.query.wprov = evt.data.wprovPrefix + offset; - evt.target.href = uri.toString(); - } } /** @@ -319,15 +305,15 @@ // might be reducing our deliverability. Not sure the best way to // handle. $( document ).ready( function () { - var queue, key, + var queue, url, jsonQueue = mw.storage.get( queueKey ); if ( jsonQueue ) {
[MediaWiki-commits] [Gerrit] Prepare Wikidata descriptions on mobile for production rollout - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Prepare Wikidata descriptions on mobile for production rollout .. Prepare Wikidata descriptions on mobile for production rollout * Enable on beta cluster * Note: A follow-up deployment will happen on Monday to disable * this by default on production. It is not included in * this patch in order to minimize the time in prod-beta * without wikibase descriptions. Bug: T127250 Change-Id: I8e40a6c344f71560e8504c6eb12db06b1cfd4f98 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 4da0632..4f1551b 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -653,5 +653,10 @@ 'wmgUsePageAssessments' => [ 'default' => true, ], + + // Test Wikidata descriptions on mobile: T127250 + 'wmgMFUseWikibaseDescription' => [ + 'default' => true, + ], ]; } # wmflLabsSettings() -- To view, visit https://gerrit.wikimedia.org/r/293883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e40a6c344f71560e8504c6eb12db06b1cfd4f98 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: JhobsGerrit-Reviewer: Bmansurov Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated style based on forum suggestions - change (mediawiki...Kartographer)
jenkins-bot has submitted this change and it was merged. Change subject: Updated style based on forum suggestions .. Updated style based on forum suggestions https://en.wikivoyage.org/w/index.php?title=Wikivoyage:Travellers%27_pub=3010283=3010282 This style has already been deployed to en.wikivoyage, so take a look at it there. Change-Id: I11c266c9c56d522544a163daf64a42d1fc1c6242 (cherry picked from commit 77e99308b8aff5a95607124007241e8965480033) --- M styles/kartographer.less 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/styles/kartographer.less b/styles/kartographer.less index ef05f50..9abf55b 100644 --- a/styles/kartographer.less +++ b/styles/kartographer.less @@ -38,10 +38,19 @@ cursor: pointer; } -.mw-kartographer-autostyled { - padding: 0 0.35em; +a.mw-kartographer-autostyled { + display: inline-block; + vertical-align: middle; + position: relative; + top: -0.08em; + box-sizing: content-box; + height: 0.85em; + padding: 0.24em 0.42em; + border-radius: 1px; color: #fff; font-weight: bold; + font-size: 0.85em; + line-height: 1; text-align: center; } -- To view, visit https://gerrit.wikimedia.org/r/294855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11c266c9c56d522544a163daf64a42d1fc1c6242 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: YurikGerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mapframe not displaying properly when placed inside a co... - change (mediawiki...Kartographer)
jenkins-bot has submitted this change and it was merged. Change subject: Fix mapframe not displaying properly when placed inside a collapsible container. .. Fix mapframe not displaying properly when placed inside a collapsible container. Bug: T137815 Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 (cherry picked from commit f94c31cfc2114c02fd88d5f195fec6d3d95b2e1d) --- M modules/kartographer.js 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/kartographer.js b/modules/kartographer.js index ec934df..206ca96 100644 --- a/modules/kartographer.js +++ b/modules/kartographer.js @@ -576,6 +576,17 @@ mw.kartographer.openFullscreenMap( map, getMapPosition( map ) ); } } ); + + // Special case for collapsible maps. + // When the container is hidden Leaflet is not able to + // calculate the expected size when visible. We need to force + // updating the map to the new container size on `expand`. + if ( !$container.is( ':visible' ) ) { + $container.closest( '.mw-collapsible' ) + .on( 'afterExpand.mw-collapsible', function () { + map.invalidateSize(); + } ); + } } } ); -- To view, visit https://gerrit.wikimedia.org/r/294856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: YurikGerrit-Reviewer: JGirault Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Kartographer on Commons and Wikidata - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable Kartographer on Commons and Wikidata .. Enable Kartographer on Commons and Wikidata Bug: T138029 Bug: T138030 Change-Id: Id9df1345ac29abf05e956c0aba305bcd9a3d7cf9 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved Yurik: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3e0e28f..f1ce204 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12173,7 +12173,7 @@ 'museudaimigracao.org.br', // Immigration museum in Brazil - T134566 '*.tasnimnews.com', // CC-BY 4.0 content - T134472 '*.khamenei.ir',// CC-BY 4.0 content - T134472 - 'images.nypl.org' // New York Public Library - T137687 + 'images.nypl.org' // New York Public Library - T137687 ], ], @@ -17015,8 +17015,11 @@ 'wmgUseKartographer' => [ 'default' => false, 'wikivoyage' => true, + 'commonswiki' => true, + 'wikidatawiki' => true, 'testwiki' => true, 'test2wiki' => true, + 'testwikidatawiki' => true, 'mediawikiwiki' => true, 'plwikimedia' => true, // T132510 ], -- To view, visit https://gerrit.wikimedia.org/r/294854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9df1345ac29abf05e956c0aba305bcd9a3d7cf9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSemGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: MaxSem Gerrit-Reviewer: Yurik Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mapframe not displaying properly when placed inside a co... - change (mediawiki...Kartographer)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/294856 Change subject: Fix mapframe not displaying properly when placed inside a collapsible container. .. Fix mapframe not displaying properly when placed inside a collapsible container. Bug: T137815 Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 (cherry picked from commit f94c31cfc2114c02fd88d5f195fec6d3d95b2e1d) --- M modules/kartographer.js 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/56/294856/1 diff --git a/modules/kartographer.js b/modules/kartographer.js index ec934df..206ca96 100644 --- a/modules/kartographer.js +++ b/modules/kartographer.js @@ -576,6 +576,17 @@ mw.kartographer.openFullscreenMap( map, getMapPosition( map ) ); } } ); + + // Special case for collapsible maps. + // When the container is hidden Leaflet is not able to + // calculate the expected size when visible. We need to force + // updating the map to the new container size on `expand`. + if ( !$container.is( ':visible' ) ) { + $container.closest( '.mw-collapsible' ) + .on( 'afterExpand.mw-collapsible', function () { + map.invalidateSize(); + } ); + } } } ); -- To view, visit https://gerrit.wikimedia.org/r/294856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: YurikGerrit-Reviewer: JGirault ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated style based on forum suggestions - change (mediawiki...Kartographer)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/294855 Change subject: Updated style based on forum suggestions .. Updated style based on forum suggestions https://en.wikivoyage.org/w/index.php?title=Wikivoyage:Travellers%27_pub=3010283=3010282 This style has already been deployed to en.wikivoyage, so take a look at it there. Change-Id: I11c266c9c56d522544a163daf64a42d1fc1c6242 (cherry picked from commit 77e99308b8aff5a95607124007241e8965480033) --- M styles/kartographer.less 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/55/294855/1 diff --git a/styles/kartographer.less b/styles/kartographer.less index ef05f50..9abf55b 100644 --- a/styles/kartographer.less +++ b/styles/kartographer.less @@ -38,10 +38,19 @@ cursor: pointer; } -.mw-kartographer-autostyled { - padding: 0 0.35em; +a.mw-kartographer-autostyled { + display: inline-block; + vertical-align: middle; + position: relative; + top: -0.08em; + box-sizing: content-box; + height: 0.85em; + padding: 0.24em 0.42em; + border-radius: 1px; color: #fff; font-weight: bold; + font-size: 0.85em; + line-height: 1; text-align: center; } -- To view, visit https://gerrit.wikimedia.org/r/294855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11c266c9c56d522544a163daf64a42d1fc1c6242 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: Yurik___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Kartographer on Commons and Wikidata - change (operations/mediawiki-config)
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/294854 Change subject: Enable Kartographer on Commons and Wikidata .. Enable Kartographer on Commons and Wikidata Bug: T138029 Bug: T138030 Change-Id: Id9df1345ac29abf05e956c0aba305bcd9a3d7cf9 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/54/294854/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3e0e28f..f1ce204 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12173,7 +12173,7 @@ 'museudaimigracao.org.br', // Immigration museum in Brazil - T134566 '*.tasnimnews.com', // CC-BY 4.0 content - T134472 '*.khamenei.ir',// CC-BY 4.0 content - T134472 - 'images.nypl.org' // New York Public Library - T137687 + 'images.nypl.org' // New York Public Library - T137687 ], ], @@ -17015,8 +17015,11 @@ 'wmgUseKartographer' => [ 'default' => false, 'wikivoyage' => true, + 'commonswiki' => true, + 'wikidatawiki' => true, 'testwiki' => true, 'test2wiki' => true, + 'testwikidatawiki' => true, 'mediawikiwiki' => true, 'plwikimedia' => true, // T132510 ], -- To view, visit https://gerrit.wikimedia.org/r/294854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9df1345ac29abf05e956c0aba305bcd9a3d7cf9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix LegacyHookPreAuthenticationProvider::testUserForCreation - change (mediawiki/core)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/294853 Change subject: Fix LegacyHookPreAuthenticationProvider::testUserForCreation .. Fix LegacyHookPreAuthenticationProvider::testUserForCreation Simply testing shouldn't call AbortNewAccount, we only want to do that when the account is actually being created. Change-Id: Icb3d1ce63a2691aa232b4564ed88fee6d50d7ab7 --- M includes/auth/LegacyHookPreAuthenticationProvider.php M tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php 2 files changed, 11 insertions(+), 74 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/53/294853/1 diff --git a/includes/auth/LegacyHookPreAuthenticationProvider.php b/includes/auth/LegacyHookPreAuthenticationProvider.php index c98a184..cab6e32 100644 --- a/includes/auth/LegacyHookPreAuthenticationProvider.php +++ b/includes/auth/LegacyHookPreAuthenticationProvider.php @@ -106,27 +106,6 @@ $user, $user, LoginForm::ABORTED, $abortError, 'AbortAutoAccount' ); } - } else { - $abortError = ''; - $abortStatus = null; - if ( !\Hooks::run( 'AbortNewAccount', [ $user, &$abortError, &$abortStatus ] ) ) { - // Hook point to add extra creation throttles and blocks - $this->logger->debug( __METHOD__ . ': a hook blocked creation' ); - if ( $abortStatus === null ) { - // Report back the old string as a raw message status. - // This will report the error back as 'createaccount-hook-aborted' - // with the given string as the message. - // To return a different error code, return a StatusValue object. - $msg = wfMessage( 'createaccount-hook-aborted' )->rawParams( $abortError ); - return StatusValue::newFatal( $msg ); - } else { - // For MediaWiki 1.23+ and updated hooks, return the Status object - // returned from the hook. - $ret = StatusValue::newGood(); - $ret->merge( $abortStatus ); - return $ret; - } - } } return StatusValue::newGood(); diff --git a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php index edee6fc..3548002 100644 --- a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php @@ -334,22 +334,23 @@ * @param string|null $failMsg */ public function testTestUserForCreation( $error, $failMsg ) { + $testUser = self::getTestUser()->getUser(); + $provider = $this->getProvider(); + $options = [ 'flags' => \User::READ_LOCKING, 'creating' => true ]; + $this->hook( 'AbortNewAccount', $this->never() ); $this->hook( 'AbortAutoAccount', $this->once() ) - ->will( $this->returnCallback( function ( $user, &$abortError ) use ( $error ) { + ->will( $this->returnCallback( function ( $user, &$abortError ) use ( $testUser, $error ) { $this->assertInstanceOf( 'User', $user ); - $this->assertSame( 'UTSysop', $user->getName() ); + $this->assertSame( $testUser->getName(), $user->getName() ); $abortError = $error; return $error === null; } ) ); - - $status = $this->getProvider()->testUserForCreation( - \User::newFromName( 'UTSysop' ), AuthManager::AUTOCREATE_SOURCE_SESSION + $status = $provider->testUserForCreation( + $testUser, AuthManager::AUTOCREATE_SOURCE_SESSION, $options ); - $this->unhook( 'AbortNewAccount' ); $this->unhook( 'AbortAutoAccount' ); - if ( $failMsg === null ) { $this->assertEquals( \StatusValue::newGood(), $status, 'should succeed' ); } else { @@ -360,54 +361,11 @@ } $this->hook( 'AbortAutoAccount', $this->never() ); - $this->hook( 'AbortNewAccount',
[MediaWiki-commits] [Gerrit] Add $options parameter for testUserForCreation() - change (mediawiki...AbuseFilter)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/294850 Change subject: Add $options parameter for testUserForCreation() .. Add $options parameter for testUserForCreation() In the future this will likely be useful for T136621. Change-Id: I063cbdfbd9a223bf2391fce2b714ab82ddd3272f --- M AbuseFilterPreAuthenticationProvider.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/50/294850/1 diff --git a/AbuseFilterPreAuthenticationProvider.php b/AbuseFilterPreAuthenticationProvider.php index d1e2f4f..9058c6e 100644 --- a/AbuseFilterPreAuthenticationProvider.php +++ b/AbuseFilterPreAuthenticationProvider.php @@ -7,7 +7,7 @@ return $this->testUser( $user, $creator, false ); } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { // if this is not an autocreation, testForAccountCreation already handled it if ( $autocreate ) { return $this->testUser( $user, $user, true ); -- To view, visit https://gerrit.wikimedia.org/r/294850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I063cbdfbd9a223bf2391fce2b714ab82ddd3272f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add $options parameter for testUserForCreation() - change (mediawiki...TitleBlacklist)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/294851 Change subject: Add $options parameter for testUserForCreation() .. Add $options parameter for testUserForCreation() Also use it to only log the title blacklist hit when running for real, not when testing a username. Change-Id: Ie9639a15d04b387be0e72754301eb6d91cd8adc2 --- M TitleBlacklistPreAuthenticationProvider.php 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist refs/changes/51/294851/1 diff --git a/TitleBlacklistPreAuthenticationProvider.php b/TitleBlacklistPreAuthenticationProvider.php index 19bd3c2..b2371ca 100644 --- a/TitleBlacklistPreAuthenticationProvider.php +++ b/TitleBlacklistPreAuthenticationProvider.php @@ -37,12 +37,14 @@ return TitleBlacklistHooks::testUserName( $user->getName(), $creator, $override, true ); } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { $sv = StatusValue::newGood(); $creator = RequestContext::getMain()->getUser(); - if ( !$autocreate || $this->blockAutoAccountCreation ) { - $sv->merge( TitleBlacklistHooks::testUserName( $user->getName(), $creator, true, true ) ); + if ( !$autocreate && empty( $options['creating'] ) || $this->blockAutoAccountCreation ) { + $sv->merge( TitleBlacklistHooks::testUserName( + $user->getName(), $creator, true, (bool)$autocreate + ) ); } return $sv; } -- To view, visit https://gerrit.wikimedia.org/r/294851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9639a15d04b387be0e72754301eb6d91cd8adc2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TitleBlacklist Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add $options parameter for testUserForCreation() - change (mediawiki/core)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/294852 Change subject: Add $options parameter for testUserForCreation() .. Add $options parameter for testUserForCreation() This will allow providers to know whether the call is just for testing (from ApiQueryUsers) or for actual creation, and skip duplicate work when testForAccountCreation() is going to be called. Change-Id: Id3ef713fd377135d78f66e5100dedd4689293b59 Depends-On: I4af8b3b692f60c42f8685b90be5936da7ba4e2e2 Depends-On: Ie9639a15d04b387be0e72754301eb6d91cd8adc2 Depends-On: I063cbdfbd9a223bf2391fce2b714ab82ddd3272f Depends-On: I7c67512634f6e72251911238f083857da9fd3f84 --- M includes/auth/AbstractPreAuthenticationProvider.php M includes/auth/AbstractPrimaryAuthenticationProvider.php M includes/auth/AbstractSecondaryAuthenticationProvider.php M includes/auth/AuthManager.php M includes/auth/CheckBlocksSecondaryAuthenticationProvider.php M includes/auth/LegacyHookPreAuthenticationProvider.php M includes/auth/PreAuthenticationProvider.php M includes/auth/PrimaryAuthenticationProvider.php M includes/auth/SecondaryAuthenticationProvider.php 9 files changed, 54 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/52/294852/1 diff --git a/includes/auth/AbstractPreAuthenticationProvider.php b/includes/auth/AbstractPreAuthenticationProvider.php index 48a9c88..d997dbb 100644 --- a/includes/auth/AbstractPreAuthenticationProvider.php +++ b/includes/auth/AbstractPreAuthenticationProvider.php @@ -45,7 +45,7 @@ return \StatusValue::newGood(); } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { return \StatusValue::newGood(); } diff --git a/includes/auth/AbstractPrimaryAuthenticationProvider.php b/includes/auth/AbstractPrimaryAuthenticationProvider.php index 2e0d669..ea3dfa3 100644 --- a/includes/auth/AbstractPrimaryAuthenticationProvider.php +++ b/includes/auth/AbstractPrimaryAuthenticationProvider.php @@ -91,7 +91,7 @@ public function postAccountCreation( $user, $creator, AuthenticationResponse $response ) { } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { return \StatusValue::newGood(); } diff --git a/includes/auth/AbstractSecondaryAuthenticationProvider.php b/includes/auth/AbstractSecondaryAuthenticationProvider.php index 89fd6f9..00493bc 100644 --- a/includes/auth/AbstractSecondaryAuthenticationProvider.php +++ b/includes/auth/AbstractSecondaryAuthenticationProvider.php @@ -77,7 +77,7 @@ public function postAccountCreation( $user, $creator, AuthenticationResponse $response ) { } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { return \StatusValue::newGood(); } diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php index 7ca9c6a..f7be2d7 100644 --- a/includes/auth/AuthManager.php +++ b/includes/auth/AuthManager.php @@ -878,10 +878,21 @@ /** * Determine whether a particular account can be created * @param string $username -* @param int $flags Bitfield of User:READ_* constants +* @param array $options +* - flags: (int) Bitfield of User:READ_* constants, default User::READ_NORMAL * @return Status */ - public function canCreateAccount( $username, $flags = User::READ_NORMAL ) { + public function canCreateAccount( $username, $options = [] ) { + // Back compat + if ( is_int( $options ) ) { + $options = [ 'flags' => $options ]; + } + $options += [ + 'flags' => User::READ_NORMAL, + 'creating' => false, + ]; + $flags = $options['flags']; + if ( !$this->canCreateAccounts() ) { return Status::newFatal( 'authmanager-create-disabled' ); } @@ -905,7 +916,7 @@ $this->getPrimaryAuthenticationProviders() + $this->getSecondaryAuthenticationProviders(); foreach ( $providers as $provider ) { - $status = $provider->testUserForCreation( $user, false ); + $status = $provider->testUserForCreation( $user, false, $options ); if ( !$status->isGood() ) { return Status::wrap( $status ); } @@ -1010,7 +1021,9 @@ return AuthenticationResponse::newFail(
[MediaWiki-commits] [Gerrit] Improve provider's canCreateAccount logic - change (mediawiki...CentralAuth)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/294849 Change subject: Improve provider's canCreateAccount logic .. Improve provider's canCreateAccount logic Do anti-spoof checks in testUserForCreation() too so the provider can signal failure to API list=allusers=cancreate. Assumes the creator will override if they can. Change-Id: I7c67512634f6e72251911238f083857da9fd3f84 --- M AntiSpoof/CentralAuthAntiSpoofHooks.php M includes/CentralAuthPrimaryAuthenticationProvider.php 2 files changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/49/294849/1 diff --git a/AntiSpoof/CentralAuthAntiSpoofHooks.php b/AntiSpoof/CentralAuthAntiSpoofHooks.php index 1a54f29..18affa6 100644 --- a/AntiSpoof/CentralAuthAntiSpoofHooks.php +++ b/AntiSpoof/CentralAuthAntiSpoofHooks.php @@ -1,5 +1,7 @@ getNormalized(); $conflicts = $spoof->getConflicts(); if ( empty( $conflicts ) ) { - wfDebugLog( 'antispoof', "{$mode}PASS new account '$name' [$normalized]" ); + $logger->info( "{$mode}PASS new account '$name' [$normalized]" ); } else { - wfDebugLog( 'antispoof', "{$mode}CONFLICT new account '$name' [$normalized] spoofs " . implode( ',', $conflicts ) ); + $logger->info( "{$mode}CONFLICT new account '$name' [$normalized] spoofs " . implode( ',', $conflicts ) ); if ( $active ) { $numConflicts = count( $conflicts ); @@ -63,7 +70,7 @@ } } else { $error = $spoof->getError(); - wfDebugLog( 'antispoof', "{$mode}ILLEGAL new account '$name' $error" ); + $logger->info( "{$mode}ILLEGAL new account '$name' $error" ); if ( $active ) { return StatusValue::newFatal( 'antispoof-name-illegal', $name, $error ); } diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php b/includes/CentralAuthPrimaryAuthenticationProvider.php index a79e522..6321158 100644 --- a/includes/CentralAuthPrimaryAuthenticationProvider.php +++ b/includes/CentralAuthPrimaryAuthenticationProvider.php @@ -340,10 +340,10 @@ return self::TYPE_CREATE; } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { global $wgCentralAuthEnableGlobalRenameRequest; - $status = parent::testUserForCreation( $user, $autocreate ); + $status = parent::testUserForCreation( $user, $autocreate, $options ); if ( !$status->isOk() ) { return $status; } @@ -379,6 +379,16 @@ } } + // Check CentralAuthAntiSpoof, if applicable. Assume the user will override if they can. + if ( $this->antiSpoofAccounts && class_exists( 'AntiSpoofAuthenticationRequest' ) && + empty( $options['creating'] ) && + !RequestContext::getMain()->getUser()->isAllowed( 'override-antispoof' ) + ) { + $status->merge( CentralAuthAntiSpoofHooks::testNewAccount( + $user, new User, true, false, new \Psr\Log\NullLogger + ) ); + } + return $status; } -- To view, visit https://gerrit.wikimedia.org/r/294849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c67512634f6e72251911238f083857da9fd3f84 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add $options parameter for testUserForCreation() - change (mediawiki...AntiSpoof)
Anomie has uploaded a new change for review. https://gerrit.wikimedia.org/r/294848 Change subject: Add $options parameter for testUserForCreation() .. Add $options parameter for testUserForCreation() And use it to skip the check when it indicates testForAccountCreation() is going to be called for a more thorough check. Change-Id: I4af8b3b692f60c42f8685b90be5936da7ba4e2e2 --- M AntiSpoofPreAuthenticationProvider.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof refs/changes/48/294848/1 diff --git a/AntiSpoofPreAuthenticationProvider.php b/AntiSpoofPreAuthenticationProvider.php index f61de77..ede77ae 100644 --- a/AntiSpoofPreAuthenticationProvider.php +++ b/AntiSpoofPreAuthenticationProvider.php @@ -94,12 +94,12 @@ return StatusValue::newGood(); } - public function testUserForCreation( $user, $autocreate ) { + public function testUserForCreation( $user, $autocreate, array $options = [] ) { $sv = StatusValue::newGood(); // For "cancreate" checks via the API, test if the current user could // create the username. - if ( $this->antiSpoofAccounts && !$autocreate && + if ( $this->antiSpoofAccounts && !$autocreate && empty( $options['creating'] ) && !RequestContext::getMain()->getUser()->isAllowed( 'override-antispoof' ) ) { $sv->merge( $this->testUserInternal( $user, false, new NullLogger ) ); -- To view, visit https://gerrit.wikimedia.org/r/294848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4af8b3b692f60c42f8685b90be5936da7ba4e2e2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiSpoof Gerrit-Branch: master Gerrit-Owner: Anomie___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.action.edit: Merge with mediawiki.action.edit.stash - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: mediawiki.action.edit: Merge with mediawiki.action.edit.stash .. mediawiki.action.edit: Merge with mediawiki.action.edit.stash This module isn't used anywhere else. It was probably put into a separate module due to the conditional loading. Though that can be done client-side just as easily. If we want to make it loaded conditionally, we could make the module composition conditionally (which is straight-forward since the condition doesn't vary on anything within the wiki). * Follow-up 3a6c9d36: Remove 'jquery.getAttrs' from dependencies (unused). Change-Id: Ic32da6f9b1c85eb106394b412fab9b22e0928323 --- M includes/EditPage.php M resources/Resources.php M resources/src/mediawiki.action/mediawiki.action.edit.stash.js 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/EditPage.php b/includes/EditPage.php index 66ee161..3292f70 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -2242,10 +2242,6 @@ $wgOut->addModules( 'mediawiki.action.edit.editWarning' ); } - if ( $wgAjaxEditStash ) { - $wgOut->addModules( 'mediawiki.action.edit.stash' ); - } - # Enabled article-related sidebar, toplinks, etc. $wgOut->setArticleRelated( true ); @@ -2273,7 +2269,10 @@ $wgOut->setPageTitle( wfMessage( $msg, $displayTitle ) ); # Transmit the name of the message to JavaScript for live preview # Keep Resources.php/mediawiki.action.edit.preview in sync with the possible keys - $wgOut->addJsConfigVars( 'wgEditMessage', $msg ); + $wgOut->addJsConfigVars( [ + 'wgEditMessage' => $msg, + 'wgAjaxEditStash' => $wgAjaxEditStash, + ] ); } /** diff --git a/resources/Resources.php b/resources/Resources.php index 150b8d3..c2724af 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1408,12 +1408,16 @@ /* MediaWiki Action */ 'mediawiki.action.edit' => [ - 'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js', + 'scripts' => [ + 'resources/src/mediawiki.action/mediawiki.action.edit.js', + 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js', + ], 'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css', 'dependencies' => [ 'mediawiki.action.edit.styles', 'jquery.textSelection', 'jquery.byteLimit', + 'mediawiki.api', ], 'position' => 'top', ], @@ -1454,13 +1458,6 @@ 'subject-preview', 'parentheses', 'previewerrortext', - ], - ], - 'mediawiki.action.edit.stash' => [ - 'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js', - 'dependencies' => [ - 'jquery.getAttrs', - 'mediawiki.api', ], ], 'mediawiki.action.history' => [ diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js index 297f814..2069ac5 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js +++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js @@ -2,6 +2,10 @@ * Scripts for pre-emptive edit preparing on action=edit */ ( function ( mw, $ ) { + if ( !mw.config.get( 'wgAjaxEditStash' ) ) { + return; + } + $( function () { var idleTimeout = 3000, api = new mw.Api(), -- To view, visit https://gerrit.wikimedia.org/r/293564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic32da6f9b1c85eb106394b412fab9b22e0928323 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Edokter Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Tpt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add logic to show the Page/FeedFragment - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/294847 Change subject: Add logic to show the Page/FeedFragment .. Add logic to show the Page/FeedFragment Bug: T136961 Change-Id: I62e21c1222c8390a0fbc6ffa3076ecb62004e347 --- M app/src/main/java/org/wikipedia/MainActivity.java M app/src/main/java/org/wikipedia/feed/FeedFragment.java M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java M app/src/main/java/org/wikipedia/page/PageFragment.java M app/src/main/java/org/wikipedia/page/PageLoadStrategy.java M app/src/main/java/org/wikipedia/settings/Prefs.java M app/src/main/res/values/preference_keys.xml M app/src/main/res/xml/developer_preferences.xml 8 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/47/294847/1 diff --git a/app/src/main/java/org/wikipedia/MainActivity.java b/app/src/main/java/org/wikipedia/MainActivity.java index b21868d..b05da0f 100644 --- a/app/src/main/java/org/wikipedia/MainActivity.java +++ b/app/src/main/java/org/wikipedia/MainActivity.java @@ -54,6 +54,7 @@ import org.wikipedia.events.ChangeTextSizeEvent; import org.wikipedia.events.ThemeChangeEvent; import org.wikipedia.events.WikipediaZeroStateChangeEvent; +import org.wikipedia.feed.FeedActivity; import org.wikipedia.history.HistoryEntry; import org.wikipedia.interlanguage.LangLinksActivity; import org.wikipedia.login.LoginActivity; @@ -83,6 +84,8 @@ import org.wikipedia.views.WikiDrawerLayout; import org.wikipedia.widgets.WidgetProviderFeaturedPage; import org.wikipedia.zero.ZeroConfig; + +import java.util.concurrent.TimeUnit; import static org.wikipedia.util.DeviceUtil.hideSoftKeyboard; import static org.wikipedia.util.DeviceUtil.isBackKeyUp; @@ -451,6 +454,13 @@ } else if (intent.hasExtra(EXTRA_FEATURED_ARTICLE_FROM_WIDGET)) { new IntentFunnel(app).logFeaturedArticleWidgetTap(); loadMainPageInForegroundTab(); +} else if (Prefs.enableFeed() && TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - Prefs.pageLastShown()) > 0) { +launchFeedActivity(); + +// Uncommenting the following line gives the desired back button behavior but there's +// currently no way to open a page from the Feed. todo: uncomment once the Feed is +// interactive. +// finish(); } else { loadMainPageIfNoTabs(); } @@ -1047,4 +1057,8 @@ widgetIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids); sendBroadcast(widgetIntent); } + +private void launchFeedActivity() { +startActivity(FeedActivity.newIntent(this)); +} } \ No newline at end of file diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java b/app/src/main/java/org/wikipedia/feed/FeedFragment.java index 9fa61f2..4239e20 100644 --- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java +++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java @@ -13,6 +13,7 @@ import org.wikipedia.activity.FragmentUtil; import org.wikipedia.feed.model.Card; import org.wikipedia.feed.view.FeedView; +import org.wikipedia.settings.Prefs; import java.util.List; @@ -36,6 +37,7 @@ super.onCreate(savedInstanceState); app = WikipediaApp.getInstance(); coordinator = new FeedCoordinator(getContext()); +Prefs.pageLastShown(0); } @Nullable @Override public View onCreateView(LayoutInflater inflater, diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java index 128df3e..1c0ffb5 100644 --- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java +++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java @@ -236,6 +236,10 @@ return false; } +@Override public boolean backStackEmpty() { +return backStack.isEmpty(); +} + @Override public void onHidePageContent() { bottomContentHandler.hide(); diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java b/app/src/main/java/org/wikipedia/page/PageFragment.java index 14cb19e..31fbdfa 100755 --- a/app/src/main/java/org/wikipedia/page/PageFragment.java +++ b/app/src/main/java/org/wikipedia/page/PageFragment.java @@ -463,6 +463,11 @@ super.onPause(); Prefs.setTabs(tabList); closePageScrollFunnel(); + +long time = tabList.size() >= 1 && !pageLoadStrategy.backStackEmpty() +? System.currentTimeMillis() +: 0; +Prefs.pageLastShown(time); } @Override diff --git a/app/src/main/java/org/wikipedia/page/PageLoadStrategy.java b/app/src/main/java/org/wikipedia/page/PageLoadStrategy.java index 459035f..6650aea 100644 --- a/app/src/main/java/org/wikipedia/page/PageLoadStrategy.java +++
[MediaWiki-commits] [Gerrit] Hygiene: move less often used dev settings down - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/294846 Change subject: Hygiene: move less often used dev settings down .. Hygiene: move less often used dev settings down Change-Id: I568e5aabf053118c1d9aed0b74e82719c6a9416a --- M app/src/main/res/xml/developer_preferences.xml 1 file changed, 25 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/46/294846/1 diff --git a/app/src/main/res/xml/developer_preferences.xml b/app/src/main/res/xml/developer_preferences.xml index 93cdc2e..77fd264 100644 --- a/app/src/main/res/xml/developer_preferences.xml +++ b/app/src/main/res/xml/developer_preferences.xml @@ -56,31 +56,6 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -191,4 +190,4 @@ - + \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/294846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I568e5aabf053118c1d9aed0b74e82719c6a9416a Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: remove redundant lint suppression - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/294845 Change subject: Hygiene: remove redundant lint suppression .. Hygiene: remove redundant lint suppression Android Studio v2.1.2 no longer seems to incorrectly lint Preference styles. Remove the suppressions. Change-Id: I0729a2fdd6b45deab81bf5b37f74bb96dd0409d9 --- M app/src/main/res/xml/developer_preferences.xml 1 file changed, 1 insertion(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/45/294845/1 diff --git a/app/src/main/res/xml/developer_preferences.xml b/app/src/main/res/xml/developer_preferences.xml index 7c20c1f..93cdc2e 100644 --- a/app/src/main/res/xml/developer_preferences.xml +++ b/app/src/main/res/xml/developer_preferences.xml @@ -20,19 +20,16 @@ android:key="@string/preference_key_use_restbase" android:title="@string/preference_key_use_restbase" /> - - - - - - - - - - - - - - + - https://gerrit.wikimedia.org/r/294845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0729a2fdd6b45deab81bf5b37f74bb96dd0409d9 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set explicit default for args.type - change (operations...tools-webservice)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294844 Change subject: Set explicit default for args.type .. Set explicit default for args.type Change-Id: I0d95a54673477cc71967816279b892d21f15dc95 --- M scripts/webservice 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice refs/changes/44/294844/1 diff --git a/scripts/webservice b/scripts/webservice index e0a3102..fa5fbf5 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -12,7 +12,7 @@ argparser = argparse.ArgumentParser() argparser.add_argument('type', help='Type of webservice to start', - nargs='?') + nargs='?', default=None) argparser.add_argument('--backend', help='Which cluster backend to use run the webservice', choices=['gridengine', 'kubernetes']) argparser.add_argument('action', help='Action to perform', -- To view, visit https://gerrit.wikimedia.org/r/294844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d95a54673477cc71967816279b892d21f15dc95 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Exit when given unsupported parameters - change (operations...tools-webservice)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294843 Change subject: Exit when given unsupported parameters .. Exit when given unsupported parameters Change-Id: I9456d452b6b9f6038539f63a30ef99f630a82782 --- M scripts/webservice 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice refs/changes/43/294843/1 diff --git a/scripts/webservice b/scripts/webservice index 8fbe255..e0a3102 100755 --- a/scripts/webservice +++ b/scripts/webservice @@ -89,6 +89,7 @@ if args.release is not None: print("--release is not implemented for --backend=kubernetes") print("Please just pick an appropriate type instead") +sys.exit(1) if args.type is None: args.type = tool.manifest.get('web', 'php5.6') acceptable_types = KubernetesBackend.CONFIG.keys() @@ -96,6 +97,7 @@ if args.type not in acceptable_types: print("type must be one of ", ','.join(acceptable_types)) +sys.exit(1) if backend == 'gridengine': job = GridEngineBackend(tool, args.type, args.extra_args) -- To view, visit https://gerrit.wikimedia.org/r/294843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9456d452b6b9f6038539f63a30ef99f630a82782 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add appropriate dependencies to package - change (operations...tools-webservice)
Yuvipanda has submitted this change and it was merged. Change subject: Add appropriate dependencies to package .. Add appropriate dependencies to package Union of webservice and pykube deps Change-Id: I5b9b756f7391cdc80da0e0367da4c7fc8265246a --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/control b/debian/control index cedee53..2e5f599 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: python Priority: optional Build-Depends: python-setuptools, python-all, debhelper (>= 9) +Depends: python-jsonpatch, python-six, python-requests, python-yaml Standards-Version: 3.9.5 Package: toollabs-webservice -- To view, visit https://gerrit.wikimedia.org/r/294837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b9b756f7391cdc80da0e0367da4c7fc8265246a Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: YuvipandaGerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Add express checkout identifier to order_id" - change (mediawiki...DonationInterface)
Cdentinger has uploaded a new change for review. https://gerrit.wikimedia.org/r/294842 Change subject: Revert "Add express checkout identifier to order_id" .. Revert "Add express checkout identifier to order_id" This reverts commit 75311d4b7873484b6c38630f3592ece16b65ba43. Not a good solution, needs more ground work. Change-Id: Id784f7511a5fc6613343c8f02170adbcc77d52cd --- D paypal_gateway/express_checkout/PaypalExpressOrderId.php M paypal_gateway/express_checkout/PaypalExpressReturnUrl.php M paypal_gateway/express_checkout/config/transformers.yaml 3 files changed, 1 insertion(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/42/294842/1 diff --git a/paypal_gateway/express_checkout/PaypalExpressOrderId.php b/paypal_gateway/express_checkout/PaypalExpressOrderId.php deleted file mode 100644 index a755df6..000 --- a/paypal_gateway/express_checkout/PaypalExpressOrderId.php +++ /dev/null @@ -1,10 +0,0 @@ -getFullURL( array( - 'order_id' => $staged['order_id'], + 'order_id' => $normalized['order_id'], 'wmf_token' => $adapter->token_getSaltedSessionToken(), ), false, PROTO_CURRENT ); } diff --git a/paypal_gateway/express_checkout/config/transformers.yaml b/paypal_gateway/express_checkout/config/transformers.yaml index 78f6627..e55037c 100644 --- a/paypal_gateway/express_checkout/config/transformers.yaml +++ b/paypal_gateway/express_checkout/config/transformers.yaml @@ -1,6 +1,4 @@ - IsoDate - DonorLocale - # gotta run these two in order because 2nd uses value from 1st -- PaypalExpressOrderId - PaypalExpressReturnUrl - IsoDate -- To view, visit https://gerrit.wikimedia.org/r/294842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id784f7511a5fc6613343c8f02170adbcc77d52cd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Cdentinger___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mapframe not displaying properly when placed inside a co... - change (mediawiki...Kartographer)
jenkins-bot has submitted this change and it was merged. Change subject: Fix mapframe not displaying properly when placed inside a collapsible container. .. Fix mapframe not displaying properly when placed inside a collapsible container. Bug: T137815 Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 --- M modules/kartographer.js 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Yurik: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/kartographer.js b/modules/kartographer.js index ec934df..206ca96 100644 --- a/modules/kartographer.js +++ b/modules/kartographer.js @@ -576,6 +576,17 @@ mw.kartographer.openFullscreenMap( map, getMapPosition( map ) ); } } ); + + // Special case for collapsible maps. + // When the container is hidden Leaflet is not able to + // calculate the expected size when visible. We need to force + // updating the map to the new container size on `expand`. + if ( !$container.is( ':visible' ) ) { + $container.closest( '.mw-collapsible' ) + .on( 'afterExpand.mw-collapsible', function () { + map.invalidateSize(); + } ); + } } } ); -- To view, visit https://gerrit.wikimedia.org/r/294839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: JGiraultGerrit-Reviewer: MaxSem Gerrit-Reviewer: Yurik Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4310eef..7810dd7 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4310eef..7810dd7 .. Syncronize VisualEditor: 4310eef..7810dd7 Change-Id: I4b54146b538800a847493ffea7393fa1e5fb3735 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 4310eef..7810dd7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4310eef86e0d5bb87434fc19f2ef5886f5fd783e +Subproject commit 7810dd74a164afaaf5af5de38ce6bef8caa3f987 -- To view, visit https://gerrit.wikimedia.org/r/294841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b54146b538800a847493ffea7393fa1e5fb3735 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-syncGerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4310eef..7810dd7 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/294841 Change subject: Syncronize VisualEditor: 4310eef..7810dd7 .. Syncronize VisualEditor: 4310eef..7810dd7 Change-Id: I4b54146b538800a847493ffea7393fa1e5fb3735 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/41/294841/1 diff --git a/VisualEditor b/VisualEditor index 4310eef..7810dd7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4310eef86e0d5bb87434fc19f2ef5886f5fd783e +Subproject commit 7810dd74a164afaaf5af5de38ce6bef8caa3f987 -- To view, visit https://gerrit.wikimedia.org/r/294841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b54146b538800a847493ffea7393fa1e5fb3735 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass empty summary to parseAndStash() to avoid warnings - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Pass empty summary to parseAndStash() to avoid warnings .. Pass empty summary to parseAndStash() to avoid warnings Since the summary is not known yet, using "" is fine. Bug: T137995 Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 --- M ApiVisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index 5676b26..c5c863f 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -140,7 +140,7 @@ $page = WikiPage::factory( $title ); $content = ContentHandler::makeContent( $text, $title, CONTENT_MODEL_WIKITEXT ); - $status = ApiStashEdit::parseAndStash( $page, $content, $this->getUser() ); + $status = ApiStashEdit::parseAndStash( $page, $content, $this->getUser(), '' ); if ( $status === ApiStashEdit::ERROR_NONE ) { wfDebugLog( 'StashEdit', "Cached parser output for VE content key '$key'." ); } -- To view, visit https://gerrit.wikimedia.org/r/294750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Aaron SchulzGerrit-Reviewer: Aaron Schulz 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] Update VisualEditor - change (mediawiki/core)
Hashar has submitted this change and it was merged. Change subject: Update VisualEditor .. Update VisualEditor Pass empty summary to parseAndStash() to avoid warnings Bug: T137995 Change-Id: I5d601f8de2e21263be60d758e5880e290fdf79cc --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/extensions/VisualEditor b/extensions/VisualEditor index e8f1f6e..3b14cfc 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit e8f1f6e0add686375c61ddc893138eaf00d3d6f5 +Subproject commit 3b14cfcdb4b783ca7719ca30e6f5f609305e3b0b -- To view, visit https://gerrit.wikimedia.org/r/294840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d601f8de2e21263be60d758e5880e290fdf79cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.28.0-wmf.6 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] Update VisualEditor - change (mediawiki/core)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/294840 Change subject: Update VisualEditor .. Update VisualEditor Pass empty summary to parseAndStash() to avoid warnings Bug: T137995 Change-Id: I5d601f8de2e21263be60d758e5880e290fdf79cc --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/40/294840/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index e8f1f6e..3b14cfc 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit e8f1f6e0add686375c61ddc893138eaf00d3d6f5 +Subproject commit 3b14cfcdb4b783ca7719ca30e6f5f609305e3b0b -- To view, visit https://gerrit.wikimedia.org/r/294840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d601f8de2e21263be60d758e5880e290fdf79cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: Hashar___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mapframe not displaying properly when placed inside a co... - change (mediawiki...Kartographer)
JGirault has uploaded a new change for review. https://gerrit.wikimedia.org/r/294839 Change subject: Fix mapframe not displaying properly when placed inside a collapsible container. .. Fix mapframe not displaying properly when placed inside a collapsible container. Bug: T137815 Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 --- M modules/kartographer.js 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/39/294839/1 diff --git a/modules/kartographer.js b/modules/kartographer.js index ec934df..20f13ff 100644 --- a/modules/kartographer.js +++ b/modules/kartographer.js @@ -551,7 +551,8 @@ $content.find( '.mw-kartographer-interactive' ).each( function ( index ) { var map, data, container = this, - $container = $( this ); + $container = $( this ), + $collapsible; $container.data( 'article-map-id', index ); data = getMapData( container ); @@ -576,6 +577,17 @@ mw.kartographer.openFullscreenMap( map, getMapPosition( map ) ); } } ); + + // Special case for collapsible maps. + // When the container is hidden Leaflet is not able to + // calculate the expected size when visible. We need to force + // updating the map to the new container size on `expand`. + $collapsible = $container.closest( '.mw-collapsible' ); + if ( $collapsible.length ) { + $collapsible.on( 'afterExpand.mw-collapsible', function () { + map.invalidateSize(); + } ); + } } } ); -- To view, visit https://gerrit.wikimedia.org/r/294839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I351d84e4b7dcbdbba87bdc1f8b9c163ce00c12f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: JGirault___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cachedpage.sh script - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/294838 Change subject: Update cachedpage.sh script .. Update cachedpage.sh script Changes: * Add missing documentation * Remove the MEDIAWIKI_URL environment variable in favour of MEDIAWIKI_HOST, which is used to derive the page and asset URLs * Fix the asset URL, which used to 404 when MEDIAWIKI_URL was set to URLs like http://en.wiki.local.wmftest.net:8080/wiki/ Change-Id: I1d4ab0f2a49456f7bfbf5f9115d78e52d2cdd181 --- M dev-scripts/cachedpage.sh 1 file changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/38/294838/1 diff --git a/dev-scripts/cachedpage.sh b/dev-scripts/cachedpage.sh index 5187335..a5f0950 100755 --- a/dev-scripts/cachedpage.sh +++ b/dev-scripts/cachedpage.sh @@ -1,6 +1,16 @@ #!/usr/bin/env bash -#usage ./dev-scripts/cachedpage.sh 1bd5bc53ebb04fff7f508712a29fdf1f1d7fe14f San_Francisco +# cachedpage.sh +# +# Usage: cachedpage.sh [title] +# +# Parameters: +# rev The revision of the Git commit that you want to check out in order to test the new assets +#against. See https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection for a detailed +#explanation of Git revision selection +# +# Options: +# title The title of the page that you're testing [default: Main_Page] if ! git diff --exit-code --quiet # check for unstaged changes @@ -19,14 +29,16 @@ git checkout $1 #go to commit caller requested +HOST=${MEDIAWIKI_HOST:-"http://127.0.0.1:8080"} + +TITLE=${2:-"Main_Page"} + #Generate the 'cached' pages mkdir -p tmp -URL=${MEDIAWIKI_URL:-"http://127.0.0.1:8080/w/index.php/"} -TITLE=${2:="Main_Page"} -echo "Using $URL as a development environment host." -echo "To specify a different host set MEDIAWIKI_URL environment variable" -echo '(e.g. by running "export MEDIAWIKI_URL=http://127.0.0.1:80/w/index.php;)' -wget "$URL$TITLE?useformat=mobile" -O tmp/cached.html +echo "Using ${HOST} as a development environment host." +echo "To specify a different host set MEDIAWIKI_HOST environment variable" +echo '(e.g. by running "export MEDIAWIKI_HOST=http://127.0.0.1:80/;)' +wget "${HOST}/wiki/${TITLE}?useformat=mobile" -O tmp/cached.html #Return to previous branch git checkout $cur_branch @@ -35,7 +47,7 @@ echo echo Cached page generated at following locations echo -echo \* $URL/extensions/MobileFrontend/tmp/cached.html +echo \* ${HOST}/w/extensions/MobileFrontend/tmp/cached.html if [ $stashed_changes ] then -- To view, visit https://gerrit.wikimedia.org/r/294838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d4ab0f2a49456f7bfbf5f9115d78e52d2cdd181 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up 28b553f0fa0, last commit was wrong - change (mediawiki...CollaborationKit)
jenkins-bot has submitted this change and it was merged. Change subject: Follow-up 28b553f0fa0, last commit was wrong .. Follow-up 28b553f0fa0, last commit was wrong Change-Id: I126064f41e5e607101adefa9692d629a55e919ed --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index c267ac7..25861c4 100644 --- a/extension.json +++ b/extension.json @@ -71,7 +71,7 @@ "mediawiki.api", "jquery.spinner", "mediawiki.api.edit", - "oojs" + "oojs-ui" ], "messages": [ "collabkit-list-delete-summary", -- To view, visit https://gerrit.wikimedia.org/r/294836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I126064f41e5e607101adefa9692d629a55e919ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Brian WolffGerrit-Reviewer: Brian Wolff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up 28b553f0fa0, last commit was wrong - change (mediawiki...CollaborationKit)
Brian Wolff has uploaded a new change for review. https://gerrit.wikimedia.org/r/294836 Change subject: Follow-up 28b553f0fa0, last commit was wrong .. Follow-up 28b553f0fa0, last commit was wrong Change-Id: I126064f41e5e607101adefa9692d629a55e919ed --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit refs/changes/36/294836/1 diff --git a/extension.json b/extension.json index c267ac7..25861c4 100644 --- a/extension.json +++ b/extension.json @@ -71,7 +71,7 @@ "mediawiki.api", "jquery.spinner", "mediawiki.api.edit", - "oojs" + "oojs-ui" ], "messages": [ "collabkit-list-delete-summary", -- To view, visit https://gerrit.wikimedia.org/r/294836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I126064f41e5e607101adefa9692d629a55e919ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Brian Wolff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add appropriate dependencies to package - change (operations...tools-webservice)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294837 Change subject: Add appropriate dependencies to package .. Add appropriate dependencies to package Union of webservice and pykube deps Change-Id: I5b9b756f7391cdc80da0e0367da4c7fc8265246a --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice refs/changes/37/294837/1 diff --git a/debian/control b/debian/control index cedee53..2e5f599 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: python Priority: optional Build-Depends: python-setuptools, python-all, debhelper (>= 9) +Depends: python-jsonpatch, python-six, python-requests, python-yaml Standards-Version: 3.9.5 Package: toollabs-webservice -- To view, visit https://gerrit.wikimedia.org/r/294837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b9b756f7391cdc80da0e0367da4c7fc8265246a Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tools-webservice Gerrit-Branch: master Gerrit-Owner: Yuvipanda___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass empty summary to parseAndStash() to avoid warnings - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Pass empty summary to parseAndStash() to avoid warnings .. Pass empty summary to parseAndStash() to avoid warnings Since the summary is not known yet, using "" is fine. Bug: T137995 Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 --- M ApiVisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index 5676b26..c5c863f 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -140,7 +140,7 @@ $page = WikiPage::factory( $title ); $content = ContentHandler::makeContent( $text, $title, CONTENT_MODEL_WIKITEXT ); - $status = ApiStashEdit::parseAndStash( $page, $content, $this->getUser() ); + $status = ApiStashEdit::parseAndStash( $page, $content, $this->getUser(), '' ); if ( $status === ApiStashEdit::ERROR_NONE ) { wfDebugLog( 'StashEdit', "Cached parser output for VE content key '$key'." ); } -- To view, visit https://gerrit.wikimedia.org/r/294833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: HasharGerrit-Reviewer: Aaron Schulz 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] maps caches: remove referrer checks - change (operations/puppet)
Gehel has submitted this change and it was merged. Change subject: maps caches: remove referrer checks .. maps caches: remove referrer checks Bug: T137848 Change-Id: I2a5ff946f3183c6f150aed67a53e5368acf31a0e --- M templates/varnish/maps-frontend.inc.vcl.erb 1 file changed, 1 insertion(+), 13 deletions(-) Approvals: Gehel: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/varnish/maps-frontend.inc.vcl.erb b/templates/varnish/maps-frontend.inc.vcl.erb index 482fb4d..8430c93 100644 --- a/templates/varnish/maps-frontend.inc.vcl.erb +++ b/templates/varnish/maps-frontend.inc.vcl.erb @@ -2,19 +2,7 @@ sub cluster_fe_recv_pre_purge { } -sub cluster_fe_recv { - if (req.http.referer - && req.url != "/" - && req.http.referer !~ "(?i)^https?://([-a-zA-Z0-9.]+\.)?(mediawiki|wikivoyage|wikivoyage-ev|wmflabs|wikidata)\.org(/|$)" - && req.http.referer !~ "(?i)^https?://(maps|phabricator|wikitech|incubator|pl)\.(m\.)?wikimedia\.org(/|$)" - && req.http.referer !~ "(?i)^https?://test2?\.(m\.)?wikipedia\.org(/|$)" - // Vagrant support - && req.http.referer !~ "(?i)^https?://([-a-zA-Z0-9.]+\.)?wmftest\.net(:\d+)?(/|$)" - && req.http.referer !~ "(?i)^https?://(localhost|127\.0\.0\.1)(:\d+)?(/|$)" - ) { - return (synth(403, "Access Denied")); - } -} +sub cluster_fe_recv { } sub cluster_fe_hash { } sub cluster_fe_hit { } -- To view, visit https://gerrit.wikimedia.org/r/294390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a5ff946f3183c6f150aed67a53e5368acf31a0e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MaxSemGerrit-Reviewer: BBlack Gerrit-Reviewer: Ema Gerrit-Reviewer: Gehel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki...WikimediaIncubator)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/294835 Change subject: Test .. Test Change-Id: I1c72c10529a569d997b3cf95a725e1ad6e810368 --- M i18n/es.json M i18n/ksh.json 2 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator refs/changes/35/294835/1 diff --git a/i18n/es.json b/i18n/es.json index 7b83447..4bd2f49 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -11,7 +11,8 @@ "Savh", "Translationista", "Vivaelcelta", - "Macofe" + "Macofe", + "Indiralena" ] }, "wminc-desc": "Sistema de wiki de prueba para Wikimedia Incubator", @@ -19,7 +20,7 @@ "wminc-listwikis": "Lista de wikis", "wminc-testwiki": "Wiki de prueba:", "wminc-testwiki-code": "Idioma del wiki de pruebas:", - "wminc-testwiki-none": "Ninguno/Todo", + "wminc-testwiki-none": "Ninguno/Todos", "wminc-testwiki-site": "(Mantenimiento)", "wminc-recentchanges-all": "Todos los cambios recientes", "wminc-prefinfo-language": "Tu idioma de interface - independiente de tu wiki de prueba", @@ -52,13 +53,13 @@ "wminc-search-nocreate-nopref": "Hizo una búsqueda de \"$1\". ¡Configure sus [[Special:Preferences|preferencias del wiki de pruebas]] de forma que podamos decirle qué la página que puede crear!", "wminc-search-nocreate-suggest": "Buscaste \"$1\". Puedes crear una página en tu wiki en [[$3]]!", "wminc-searchwiki": "Búsqueda de un wiki", - "wminc-searchwiki-noproject": "No ha seleccionado un proyecto.", + "wminc-searchwiki-noproject": "No has seleccionado un proyecto.", "wminc-searchwiki-noresults": "No hay resultados. Puede buscar por códigos de idioma, nombres nativos y nombres en el idioma de su interfaz o en inglés.", "wminc-searchwiki-selectproject": "Buscar por:", "wminc-searchwiki-inputlanguage": "En idioma:", "wminc-searchwiki-go": "Ir", - "wminc-searchwiki-multiplematches": "Su búsqueda coincide en los siguientes idiomas:", - "wminc-searchwiki-match-langcode": "\"$1\" es un código de idioma ISO 639 para $2 .", + "wminc-searchwiki-multiplematches": "Tu búsqueda coincide en los siguientes idiomas:", + "wminc-searchwiki-match-langcode": "\"$1\" es un código de idioma ISO 639 para $2.", "wminc-searchwiki-match-userlangname": "$1 es el nombre de un idioma.", "wminc-searchwiki-match-englishname": "«$1» es el nombre de $2 en inglés.", "wminc-searchwiki-match-nativename": "«$1» es el nombre de $2 en ese idioma.", @@ -99,7 +100,7 @@ "wminc-infopage-createmainpage": "Escribe las palabras «Página principal» en este idioma:", "wminc-infopage-contribute": "¡Si entiendes esta lengua, te animamos a contribuir!", "wminc-infopage-status-open": "Este es un wiki abierto de Wikimedia Incubator.", - "wminc-infopage-status-imported": "Este wiki de la Incubadora se importó desde $1 después de que el wiki fuera cerrado.", + "wminc-infopage-status-imported": "Este wiki de la Incubadora se importó desde $1 después de que fuera cerrado.", "wminc-infopage-status-closedsister": "Este subdominio se cerró. Ir a $2 para contribuir a este wiki.", "wminc-infopage-status-approved": "Esta incubadora de wiki ha sido aprobada por el [[meta:Special:MyLanguage/Language_committee|comité de idioma]] y será creada pronto.", "wminc-infopage-status-created": "Este proyecto ha sido aprobado por el Comité de idiomas y ahora está disponible en $1.", diff --git a/i18n/ksh.json b/i18n/ksh.json index 8c81e91..a73a586 100644 --- a/i18n/ksh.json +++ b/i18n/ksh.json @@ -70,7 +70,7 @@ "wminc-fs-startwiki-exists-text": "Dä Vörsaz för Ding Wiki es $1.\nDäm sing Houpsigg es op $2.\nDo kann jäz met Andere zesamme werke, di Ding Schprohch künne un esu en Jemeinschaff opboue.\nWann De en Sigg aanlääje wells, jif einfach dä iere Nahme en däm Söhkfäld bovve en un kleck dä Lengk, dä De dann kreß.", "wminc-infopage-enter": "jangk op de Houpsigg", "wminc-unknownlang": "(Schprohche-Köözel onbikannt)", - "wminc-infopage-title-p": "Wikkipedija op $1", + "wminc-infopage-title-p": "Wikkipehdija op $1", "wminc-infopage-title-b": "Bööscherwiki op $1", "wminc-infopage-title-t": "Wikiwööterbooch op $1", "wminc-infopage-title-q": "Zitaatewiki op $1", -- To view, visit https://gerrit.wikimedia.org/r/294835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c72c10529a569d997b3cf95a725e1ad6e810368 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaIncubator Gerrit-Branch: REL1_27
[MediaWiki-commits] [Gerrit] labspuppetbackend: Make sure to propogate errors to uwsgi log - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: labspuppetbackend: Make sure to propogate errors to uwsgi log .. labspuppetbackend: Make sure to propogate errors to uwsgi log Change-Id: Ied85159bbb2cf2b1ab791c7c19f1426509e087e3 --- M modules/labspuppetbackend/files/labspuppetbackend.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/labspuppetbackend/files/labspuppetbackend.py b/modules/labspuppetbackend/files/labspuppetbackend.py index 45188ad..6a00dbd 100644 --- a/modules/labspuppetbackend/files/labspuppetbackend.py +++ b/modules/labspuppetbackend/files/labspuppetbackend.py @@ -5,6 +5,8 @@ import json app = Flask(__name__) +# Propogate exceptions to the uwsgi log +app.config['PROPAGATE_EXCEPTIONS'] = True @app.before_request -- To view, visit https://gerrit.wikimedia.org/r/294834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied85159bbb2cf2b1ab791c7c19f1426509e087e3 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: YuvipandaGerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test: basic test for ApiStashEdit - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: test: basic test for ApiStashEdit .. test: basic test for ApiStashEdit At least execute the main entry point. Change-Id: I0788c9a7bf93b5365f4e510dff4e11fe6ffa3558 --- A tests/phpunit/includes/api/ApiStashEditTest.php 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php new file mode 100644 index 000..e2462c6 --- /dev/null +++ b/tests/phpunit/includes/api/ApiStashEditTest.php @@ -0,0 +1,28 @@ +doLogin(); + $apiResult = $this->doApiRequestWithToken( + [ + 'action' => 'stashedit', + 'title' => 'ApistashEdit_Page', + 'contentmodel' => 'wikitext', + 'contentformat' => 'text/x-wiki', + 'text' => 'Text for ' . __METHOD__ . ' page', + 'baserevid' => 0, + ] + ); + $apiResult = $apiResult[0]; + $this->assertArrayHasKey( 'stashedit', $apiResult ); + $this->assertEquals( 'stashed', $apiResult['stashedit']['status'] ); + } + +} -- To view, visit https://gerrit.wikimedia.org/r/294800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0788c9a7bf93b5365f4e510dff4e11fe6ffa3558 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: HasharGerrit-Reviewer: Aaron Schulz 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] labspuppetbackend: Make sure to propogate errors to uwsgi log - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/294834 Change subject: labspuppetbackend: Make sure to propogate errors to uwsgi log .. labspuppetbackend: Make sure to propogate errors to uwsgi log Change-Id: Ied85159bbb2cf2b1ab791c7c19f1426509e087e3 --- M modules/labspuppetbackend/files/labspuppetbackend.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/294834/1 diff --git a/modules/labspuppetbackend/files/labspuppetbackend.py b/modules/labspuppetbackend/files/labspuppetbackend.py index 45188ad..f861453 100644 --- a/modules/labspuppetbackend/files/labspuppetbackend.py +++ b/modules/labspuppetbackend/files/labspuppetbackend.py @@ -5,7 +5,8 @@ import json app = Flask(__name__) - +# Propogate exceptions to the uwsgi log +app.config['PROPAGATE_EXCEPTIONS'] = True @app.before_request def before_request(): -- To view, visit https://gerrit.wikimedia.org/r/294834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied85159bbb2cf2b1ab791c7c19f1426509e087e3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 57dd565..4310eef - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 57dd565..4310eef .. Syncronize VisualEditor: 57dd565..4310eef Change-Id: I9b45afe13235569fff1a955dd040a0f5194ead1e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 57dd565..4310eef 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 57dd56591dab10aed573d5662b62178a79b963e5 +Subproject commit 4310eef86e0d5bb87434fc19f2ef5886f5fd783e -- To view, visit https://gerrit.wikimedia.org/r/294831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b45afe13235569fff1a955dd040a0f5194ead1e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-syncGerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass empty summary to parseAndStash() to avoid warnings - change (mediawiki...VisualEditor)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/294833 Change subject: Pass empty summary to parseAndStash() to avoid warnings .. Pass empty summary to parseAndStash() to avoid warnings Since the summary is not known yet, using "" is fine. Bug: T137995 Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 --- M ApiVisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/33/294833/1 diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index 5676b26..c5c863f 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -140,7 +140,7 @@ $page = WikiPage::factory( $title ); $content = ContentHandler::makeContent( $text, $title, CONTENT_MODEL_WIKITEXT ); - $status = ApiStashEdit::parseAndStash( $page, $content, $this->getUser() ); + $status = ApiStashEdit::parseAndStash( $page, $content, $this->getUser(), '' ); if ( $status === ApiStashEdit::ERROR_NONE ) { wfDebugLog( 'StashEdit', "Cached parser output for VE content key '$key'." ); } -- To view, visit https://gerrit.wikimedia.org/r/294833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.28.0-wmf.6 Gerrit-Owner: HasharGerrit-Reviewer: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Team-interactive receives maps alerts - change (operations/puppet)
Gehel has submitted this change and it was merged. Change subject: Team-interactive receives maps alerts .. Team-interactive receives maps alerts Adding team-interactive to the following alerts: * service check on kartotherian * service check on tilerator * service check on tileratorui * LVS check on kartotherian service Bug: T137869 Bug: T137851 Change-Id: I02fca2da8ac90366d6be1c67d1e985c1b2c46228 --- M hieradata/role/common/maps/server.yaml M modules/kartotherian/manifests/init.pp M modules/lvs/manifests/monitor_services.pp M modules/tilerator/manifests/init.pp M modules/tilerator/manifests/ui.pp 5 files changed, 67 insertions(+), 15 deletions(-) Approvals: Gehel: Looks good to me, approved Yurik: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/role/common/maps/server.yaml b/hieradata/role/common/maps/server.yaml index 0249efa..1586e40 100644 --- a/hieradata/role/common/maps/server.yaml +++ b/hieradata/role/common/maps/server.yaml @@ -12,3 +12,7 @@ - tilerator-admin service::configuration::logstash_host: logstash1001.eqiad.wmnet service::configuration::statsd_host: statsd.eqiad.wmnet + +kartotherian::contact_groups: 'admins,team-interactive' +tilerator::contact_groups: 'admins,team-interactive' +tilerator::ui::contact_groups: 'admins,team-interactive' diff --git a/modules/kartotherian/manifests/init.pp b/modules/kartotherian/manifests/init.pp index 0638390..2f00788 100644 --- a/modules/kartotherian/manifests/init.pp +++ b/modules/kartotherian/manifests/init.pp @@ -6,8 +6,23 @@ # accomodate future kartotherian needs that are not suited for the service module # classes as well as conform to a de-facto standard of having a module for every # service +# +# === Parameters +# +# [*conf_sources*] +# Sources that will be added to the configuration file of the service. This +# defines the data transformation pipeline for the tile services. The actual +# file is loaded from the root of the source code directory. +# (/srv/deployment/kartotherian/deploy/src/) +# Default: 'sources.prod.yaml' +# +# [*contact_groups*] +# Contact groups for alerting. +# Default: 'admins' +# class kartotherian( -$conf_sources = 'sources.prod.yaml', +$conf_sources = 'sources.prod.yaml', +$contact_groups = 'admins', ) { $cassandra_kartotherian_user = 'kartotherian' @@ -21,5 +36,6 @@ deployment => 'scap3', has_spec=> true, healthcheck_url => '', +contact_groups => $contact_groups, } } diff --git a/modules/lvs/manifests/monitor_services.pp b/modules/lvs/manifests/monitor_services.pp index c92281f..7d39a28 100644 --- a/modules/lvs/manifests/monitor_services.pp +++ b/modules/lvs/manifests/monitor_services.pp @@ -106,8 +106,9 @@ host => 'kartotherian.svc.codfw.wmnet', group => 'lvs', description => 'Kartotherian LVS codfw', -check_command => -'check_wmf_service!http://kartotherian.svc.codfw.wmnet:6533!15', +check_command => 'check_wmf_service!http://kartotherian.svc.codfw.wmnet:6533!15', +contact_group => 'admins,team-interactive', +critical => true, } } diff --git a/modules/tilerator/manifests/init.pp b/modules/tilerator/manifests/init.pp index 80c97c4..967843e 100644 --- a/modules/tilerator/manifests/init.pp +++ b/modules/tilerator/manifests/init.pp @@ -6,10 +6,24 @@ # accomodate future tilerator needs that are not suited for the service module # classes as well as conform to a de-facto standard of having a module for every # service +# +# === Parameters +# +# [*conf_sources*] +# Sources that will be added to the configuration file of the service. This +# defines the data transformation pipeline for the tile services. The actual +# file is loaded from the root of the source code directory. +# (/srv/deployment/tilerator/deploy/src/) +# Default: 'sources.prod.yaml' +# +# [*contact_groups*] +# Contact groups for alerting. +# Default: 'admins' class tilerator( -$conf_sources = 'sources.prod.yaml', +$conf_sources = 'sources.prod.yaml', +$contact_groups = 'admins', ) { -include tilerator::ui +include ::tilerator::ui $cassandra_tilerator_user = 'tilerator' $cassandra_tilerator_pass = hiera('maps::cassandra_tilerator_pass') @@ -22,9 +36,10 @@ # So there will never be LVS or anything else than health check requests to # this port service::node { 'tilerator': -port => 6534, -config => template('tilerator/config.yaml.erb'), -no_workers => $::processorcount / 2, -deployment => 'scap3', +port => 6534, +config => template('tilerator/config.yaml.erb'), +no_workers => $::processorcount / 2, +deployment => 'scap3', +contact_groups => $contact_groups,
[MediaWiki-commits] [Gerrit] Fix handling of error messages from the 'SpecialPasswordRese... - change (mediawiki/core)
PleaseStand has uploaded a new change for review. https://gerrit.wikimedia.org/r/294832 Change subject: Fix handling of error messages from the 'SpecialPasswordResetOnSubmit' hook .. Fix handling of error messages from the 'SpecialPasswordResetOnSubmit' hook $error might be an array of key + values, but wfMessage() treats that as an array of alternative message keys instead so the values are lost. Message::newFromSpecifier(), on the other hand, does exactly what we want. Change-Id: I25765869f6888ac793c2af9caaa9bbdf2224d51a (cherry picked from commit b6487447463de476ad1b8bc0eff3d4972c9d44b8) --- M includes/user/PasswordReset.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/294832/1 diff --git a/includes/user/PasswordReset.php b/includes/user/PasswordReset.php index 60144bb..bc87cd0 100644 --- a/includes/user/PasswordReset.php +++ b/includes/user/PasswordReset.php @@ -153,7 +153,7 @@ 'Capture' => $displayPassword ? '1' : null, ]; if ( !Hooks::run( 'SpecialPasswordResetOnSubmit', [ &$users, $data, &$error ] ) ) { - return StatusValue::newFatal( wfMessage( $error ) ); + return StatusValue::newFatal( Message::newFromSpecifier( $error ) ); } if ( !$users ) { -- To view, visit https://gerrit.wikimedia.org/r/294832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25765869f6888ac793c2af9caaa9bbdf2224d51a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_27 Gerrit-Owner: PleaseStandGerrit-Reviewer: Anomie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 57dd565..4310eef - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/294831 Change subject: Syncronize VisualEditor: 57dd565..4310eef .. Syncronize VisualEditor: 57dd565..4310eef Change-Id: I9b45afe13235569fff1a955dd040a0f5194ead1e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/31/294831/1 diff --git a/VisualEditor b/VisualEditor index 57dd565..4310eef 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 57dd56591dab10aed573d5662b62178a79b963e5 +Subproject commit 4310eef86e0d5bb87434fc19f2ef5886f5fd783e -- To view, visit https://gerrit.wikimedia.org/r/294831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b45afe13235569fff1a955dd040a0f5194ead1e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test: basic test for ApiStashEdit - change (mediawiki/core)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/294800 Change subject: test: basic test for ApiStashEdit .. test: basic test for ApiStashEdit At least execute the main entry point. Change-Id: I0788c9a7bf93b5365f4e510dff4e11fe6ffa3558 --- A tests/phpunit/includes/api/ApiStashEditTest.php 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/294800/1 diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php new file mode 100644 index 000..e2462c6 --- /dev/null +++ b/tests/phpunit/includes/api/ApiStashEditTest.php @@ -0,0 +1,28 @@ +doLogin(); + $apiResult = $this->doApiRequestWithToken( + [ + 'action' => 'stashedit', + 'title' => 'ApistashEdit_Page', + 'contentmodel' => 'wikitext', + 'contentformat' => 'text/x-wiki', + 'text' => 'Text for ' . __METHOD__ . ' page', + 'baserevid' => 0, + ] + ); + $apiResult = $apiResult[0]; + $this->assertArrayHasKey( 'stashedit', $apiResult ); + $this->assertEquals( 'stashed', $apiResult['stashedit']['status'] ); + } + +} -- To view, visit https://gerrit.wikimedia.org/r/294800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0788c9a7bf93b5365f4e510dff4e11fe6ffa3558 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] Add gitblit compatibility apache vhost to phabricator - change (operations/puppet)
JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/294784 Change subject: Add gitblit compatibility apache vhost to phabricator .. Add gitblit compatibility apache vhost to phabricator TODO add rewrite rules Bug: T137224 Change-Id: Id3603fbc29eaf594fa1ff0ed72d440688b25af50 --- M modules/phabricator/manifests/init.pp A modules/phabricator/templates/gitblit-compatibility.conf.erb M modules/role/manifests/phabricator/main.pp 3 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/84/294784/1 diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index ae712f6..e1c8a31 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -131,6 +131,13 @@ } } +$gitblit_servername = $phab_settings['gitblit.hostname'] + +apache::site { 'gitblit-compatibility': +content => template('phabricator/gitblit-compatibility.conf.erb'), +require => $base_requirements, +} + scap::target { $deploy_target: deploy_user => $deploy_user, key_name=> 'phabricator', diff --git a/modules/phabricator/templates/gitblit-compatibility.conf.erb b/modules/phabricator/templates/gitblit-compatibility.conf.erb new file mode 100644 index 000..bdc8467 --- /dev/null +++ b/modules/phabricator/templates/gitblit-compatibility.conf.erb @@ -0,0 +1,22 @@ +# Apache configuration for Phabricator (<%= @gitblit_servername %>) +# This file is managed by Puppet. + + + ServerName <%= @gitblit_servername %> +<% if !@serveradmin.empty? -%> + ServerAdmin <%= @serveradmin %> +<%- end %> + + +RemoteIPHeader X-Client-IP +RemoteIPInternalProxy <%= @trusted_proxies.join(' ') %> + + + RewriteEngine on + + LogLevel warn + ErrorLog /var/log/apache2/phabricator_error.log + CustomLog /var/log/apache2/phabricator_access.log wmf + ServerSignature Off + + diff --git a/modules/role/manifests/phabricator/main.pp b/modules/role/manifests/phabricator/main.pp index 3cf11ba..d3c39c9 100644 --- a/modules/role/manifests/phabricator/main.pp +++ b/modules/role/manifests/phabricator/main.pp @@ -55,6 +55,7 @@ 'events.listeners' => [], 'diffusion.allow-http-auth' => true, 'diffusion.ssh-host' => 'git-ssh.wikimedia.org', +'gitblit.hostname' => 'git.wikimedia.org', }, } # lint:endignore -- To view, visit https://gerrit.wikimedia.org/r/294784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3603fbc29eaf594fa1ff0ed72d440688b25af50 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: JanZerebecki___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Expose ParserOutput::addWarning() to modules - change (mediawiki...Scribunto)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/294776 Change subject: Expose ParserOutput::addWarning() to modules .. Expose ParserOutput::addWarning() to modules Bug: T137900 Change-Id: Ibdd2506f4ab27f531ae49187bc57ba0d5c56b7cc --- M engines/LuaCommon/LuaCommon.php M engines/LuaCommon/lualib/mw.lua 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/76/294776/1 diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php index 980110f..a7eba2e 100644 --- a/engines/LuaCommon/LuaCommon.php +++ b/engines/LuaCommon/LuaCommon.php @@ -107,6 +107,7 @@ 'isSubsting', 'getFrameTitle', 'setTTL', + 'addWarning', ); $lib = array(); @@ -802,6 +803,15 @@ } /** +* Adds a warning to be displayed upon preview +* +* @param string $text wikitext +*/ + public function addWarning( $text ) { + $this->getParser()->getOutput()->addWarning( $text ); + } + + /** * Return whether the parser is currently substing * * @return array diff --git a/engines/LuaCommon/lualib/mw.lua b/engines/LuaCommon/lualib/mw.lua index 074509f..600017b 100644 --- a/engines/LuaCommon/lualib/mw.lua +++ b/engines/LuaCommon/lualib/mw.lua @@ -648,6 +648,9 @@ php.incrementExpensiveFunctionCount() end +function mw.addWarning( text ) + php.addWarning( text ) +end --- -- Wrapper for mw.loadData. This creates the read-only dummy table for -- accessing the real data. -- To view, visit https://gerrit.wikimedia.org/r/294776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdd2506f4ab27f531ae49187bc57ba0d5c56b7cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Legoktm___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make backcompat 1.26 - change (mediawiki...CollaborationKit)
jenkins-bot has submitted this change and it was merged. Change subject: make backcompat 1.26 .. make backcompat 1.26 Change-Id: Ie55ec238afc94b62659702b94a8952f53d3df6c5 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 16ec273..c267ac7 100644 --- a/extension.json +++ b/extension.json @@ -52,6 +52,7 @@ ] }, "@fixme": "Does having ext.CollaborationKit.list.styles as a dependency double load from addModuleStyles?", + "@todo FIXME": "Should this actually load oojs-ui-core, or something else", "ResourceModules": { "ext.CollaborationKit.edit": { "scripts": "ext.CollaborationKit.edit.js", @@ -70,7 +71,7 @@ "mediawiki.api", "jquery.spinner", "mediawiki.api.edit", - "oojs-ui-core" + "oojs" ], "messages": [ "collabkit-list-delete-summary", -- To view, visit https://gerrit.wikimedia.org/r/294775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie55ec238afc94b62659702b94a8952f53d3df6c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Brian WolffGerrit-Reviewer: Brian Wolff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the SpaceBeforeControlStructureBraceSniff - change (mediawiki...codesniffer)
jenkins-bot has submitted this change and it was merged. Change subject: Add the SpaceBeforeControlStructureBraceSniff .. Add the SpaceBeforeControlStructureBraceSniff Add rules for if, elseif, while, for, foreach, switch, catch statement. - enforce single space between closing parenthesis and opening brace. - no unnecessary empty line between opening brace and the code in statement. It can be tested by run \Tests\files\WhiteSpace\space_before_control_structure_fail.php \Tests\files\WhiteSpace\space_before_control_structure_pass.php Bug: T130004 Change-Id: Ie23b3e30d3d7b743e858f9cb45cc03e702dfdf79 --- M MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php M MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php A MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php M MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php M MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php.expect D MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_fail.php.fixed M MediaWiki/Tests/files/ControlStructures/assignment_in_control_structures_fail.php M MediaWiki/Tests/files/ControlStructures/assignment_in_control_structures_pass.php M MediaWiki/Tests/files/ControlStructures/if_else_structure_fail.php M MediaWiki/Tests/files/ControlStructures/if_else_structure_fail.php.fixed M MediaWiki/Tests/files/ControlStructures/if_else_structure_pass.php M MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php M MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php.expect D MediaWiki/Tests/files/ExtraCharacters/extra_characters_before_phpopen_tag_fail.php.fixed M MediaWiki/Tests/files/NamingConventions/case_global_name_fail.php M MediaWiki/Tests/files/NamingConventions/case_global_name_fail.php.expect D MediaWiki/Tests/files/NamingConventions/case_global_name_fail.php.fixed M MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php M MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php.expect D MediaWiki/Tests/files/NamingConventions/wg_global_name2_fail.php.fixed M MediaWiki/Tests/files/NamingConventions/wg_global_name_fail.php M MediaWiki/Tests/files/NamingConventions/wg_global_name_fail.php.expect M MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php M MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php.expect D MediaWiki/Tests/files/VariableAnalysis/unused_global_variables_fail.php.fixed A MediaWiki/Tests/files/WhiteSpace/space_before_control_structure_fail.php A MediaWiki/Tests/files/WhiteSpace/space_before_control_structure_fail.php.expect A MediaWiki/Tests/files/WhiteSpace/space_before_control_structure_fail.php.fixed A MediaWiki/Tests/files/WhiteSpace/space_before_control_structure_pass.php A MediaWiki/Tests/files/WhiteSpace/space_before_control_structure_pass.php.expect M MediaWiki/Tests/files/WhiteSpace/space_before_parens_fail.php M MediaWiki/Tests/files/WhiteSpace/space_before_parens_fail.php.expect 32 files changed, 313 insertions(+), 156 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php b/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php index 84b5107..6307ba0 100644 --- a/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php +++ b/MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php @@ -16,7 +16,6 @@ * @return array */ public function register() { - return [ T_FUNCTION ]; } @@ -42,8 +41,8 @@ // Check if we already know if the token is namespaced or not and return early if possible. if ( isset( self::$firstNamespaceLocations[$fileName] ) && - $ptr > self::$firstNamespaceLocations[$fileName] ) - { + $ptr > self::$firstNamespaceLocations[$fileName] + ) { return true; } if ( isset( self::$noNamespaceFiles[$fileName] ) ) { @@ -68,8 +67,8 @@ // Return if the token was namespaced. if ( isset( self::$firstNamespaceLocations[$fileName] ) && - $ptr > self::$firstNamespaceLocations[$fileName] ) - { + $ptr > self::$firstNamespaceLocations[$fileName] + ) { return true; } diff --git a/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php b/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php index ad25cf1..cd82eae 100644 --- a/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php +++ b/MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php @@ -48,10 +48,9 @@
[MediaWiki-commits] [Gerrit] make backcompat 1.26 - change (mediawiki...CollaborationKit)
Brian Wolff has uploaded a new change for review. https://gerrit.wikimedia.org/r/294775 Change subject: make backcompat 1.26 .. make backcompat 1.26 Change-Id: Ie55ec238afc94b62659702b94a8952f53d3df6c5 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit refs/changes/75/294775/1 diff --git a/extension.json b/extension.json index 16ec273..c267ac7 100644 --- a/extension.json +++ b/extension.json @@ -52,6 +52,7 @@ ] }, "@fixme": "Does having ext.CollaborationKit.list.styles as a dependency double load from addModuleStyles?", + "@todo FIXME": "Should this actually load oojs-ui-core, or something else", "ResourceModules": { "ext.CollaborationKit.edit": { "scripts": "ext.CollaborationKit.edit.js", @@ -70,7 +71,7 @@ "mediawiki.api", "jquery.spinner", "mediawiki.api.edit", - "oojs-ui-core" + "oojs" ], "messages": [ "collabkit-list-delete-summary", -- To view, visit https://gerrit.wikimedia.org/r/294775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie55ec238afc94b62659702b94a8952f53d3df6c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CollaborationKit Gerrit-Branch: master Gerrit-Owner: Brian Wolff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Disable expensive REVISION* magic words in miser mode - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/294774 Change subject: [WIP] Disable expensive REVISION* magic words in miser mode .. [WIP] Disable expensive REVISION* magic words in miser mode The potential to tank page save time is worse than what little use they have, which is mostly just hacks for things that have nothing to do with the ID/timestamp itself. Bug: T137900 Change-Id: Ieff8423ae3804b42d264f630e1a029199abf5976 --- M includes/parser/Parser.php 1 file changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/74/294774/1 diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 6c84623..8ea2e5a 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -2450,7 +2450,7 @@ * @return string */ public function getVariableValue( $index, $frame = false ) { - global $wgContLang, $wgSitename, $wgServer, $wgServerName; + global $wgContLang, $wgSitename, $wgServer, $wgServerName, $wgMiserMode; global $wgArticlePath, $wgScriptPath, $wgStylePath; if ( is_null( $this->mTitle ) ) { @@ -2462,10 +2462,8 @@ . ' called while parsing (no title set)' ); } - /** -* Some of these require message or data lookups and can be -* expensive to check many times. -*/ + // Some of these require message or data lookups and can be + // expensive to check many times. if ( Hooks::run( 'ParserGetVariableValueVarCache', [ &$this, &$this->mVarCache ] ) ) { if ( isset( $this->mVarCache[$index] ) ) { return $this->mVarCache[$index]; @@ -2475,6 +2473,20 @@ $ts = wfTimestamp( TS_UNIX, $this->mOptions->getTimestamp() ); Hooks::run( 'ParserGetVariableValueTs', [ &$this, &$ts ] ); + // In miser mode, disable words that always cause double-parses on page save (T137900) + static $slowVaryWords = [ + 'revisionid' => true, + 'revisiontimestamp' => true, + 'revisionday' => true, + 'revisionday2' => true, + 'revisionmonth' => true, + 'revisionmonth1' => true, + 'revisionyear' => true + ]; + if ( $wgMiserMode && isset( $slowVaryWords[$index] ) ) { + return ''; + }; + $pageLang = $this->getFunctionLang(); switch ( $index ) { -- To view, visit https://gerrit.wikimedia.org/r/294774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieff8423ae3804b42d264f630e1a029199abf5976 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Textcat search satisfaction subtest for multiple wikis - change (mediawiki...WikimediaEvents)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/294773 Change subject: Textcat search satisfaction subtest for multiple wikis .. Textcat search satisfaction subtest for multiple wikis This patch re-adds the textcat subtest with a few changes from the last iteration: * Records if the clicked link is an interwiki result. This is done by only recording the 3 value textcat parameters to extraParams for the searchResultPage event. The click event now records an integer 1 or 0 in the extraParams field. 1 indicates an interwiki click, 0 indicates a local result click. * extraParams for the fulltext searchResultPage event now always has 3 values, although some may be blank. If no values are available the extraParams field will be: ',,'. When split by later analytics processing on the , that would become ['','','']. * The third field of extraParams now correctly records a 0, rather than being empty, when the query was run against an alternate wiki but no results were found. Identified as not being incorrect. * The third value of extraParams should always be <= hitsReturned. In our logging of results this is not always the case. This turns out to be because users in the control group run the query, report the number of results, but are not shown the results. As such no fix was done here it was only a problem with how to interpret the data. Depends-On: I02a83aa88 Bug: T121543 Bug: T137163 Bug: T137167 Change-Id: I95ba0a932292c46a8de633ab027645343617fd6d --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 48 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/73/294773/1 diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index e32762b..6e9e5af 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -99,9 +99,11 @@ * @private */ function initialize( session ) { - var sessionId = session.get( 'sessionId' ), - sampleSize = 200, + haveSubTest = [ + 'enwiki', 'frwiki', 'eswiki', 'itwiki', 'dewiki' + ].indexOf( mw.config.get( 'wgDBname' ) ) !== -1, + sampleSize = haveSubTest ? 100 : 200, /** * Determines whether the user is part of the population size. * @@ -150,6 +152,15 @@ // have a search session id, generate one. if ( !session.set( 'sessionId', randomToken() ) ) { return false; + } + + // Assign 50% of users to subTest + if ( haveSubTest && oneIn( 2 ) ) { + session.set( 'subTest', chooseBucket( [ + 'textcat2:a', + 'textcat2:b', + 'textcat2:c' + ] ) ); } } @@ -383,6 +394,10 @@ evt.articleId = articleId; } + if ( mw.config.get( 'wgCirrusSearchRequestSetToken' ) ) { + evt.searchToken = mw.config.get( 'wgCirrusSearchRequestSetToken' ); + } + // add any schema specific data if ( extraData ) { $.extend( evt, extraData ); @@ -406,6 +421,7 @@ */ function setupSearchTest( session ) { var params, + textCatExtra = [], logEvent = genLogEventFn( 'fulltext', session ); if ( isSearchResultPage ) { @@ -425,19 +441,39 @@ .find( '[data-serp-pos]' ) .data( 'serp-pos' ); - if ( index !== undefined ) { + // If wprov is already defined it must have come from the + // backend interwiki test. Don't override it. This means we + // won't get a visitPage event, but we can't collect those + // for interwiki anyways. + if ( index !== undefined &&
[MediaWiki-commits] [Gerrit] Pass empty summary to parseAndStash() to avoid warnings - change (mediawiki...VisualEditor)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/294750 Change subject: Pass empty summary to parseAndStash() to avoid warnings .. Pass empty summary to parseAndStash() to avoid warnings Since the summary is not known yet, using "" is fine. Bug: T137995 Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 --- M ApiVisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/50/294750/1 diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index 5ef8e19..4fed35e 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -140,7 +140,7 @@ $page = WikiPage::factory( $title ); $content = ContentHandler::makeContent( $text, $title, CONTENT_MODEL_WIKITEXT ); - $res = ApiStashEdit::parseAndStash( $page, $content, $this->getUser() ); + $res = ApiStashEdit::parseAndStash( $page, $content, $this->getUser(), '' ); if ( $res === ApiStashEdit::ERROR_NONE ) { wfDebugLog( 'StashEdit', "Cached parser output for VE content key '$key'." ); } -- To view, visit https://gerrit.wikimedia.org/r/294750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ef2a6cbe3ffc9be249bfea5e4172159c57698a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Aaron Schulz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Textcat search satisfaction subtest for multiple wikis - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: Textcat search satisfaction subtest for multiple wikis .. Textcat search satisfaction subtest for multiple wikis This patch re-adds the textcat subtest with a few changes from the last iteration: * Records if the clicked link is an interwiki result. This is done by only recording the 3 value textcat parameters to extraParams for the searchResultPage event. The click event now records an integer 1 or 0 in the extraParams field. 1 indicates an interwiki click, 0 indicates a local result click. * extraParams for the fulltext searchResultPage event now always has 3 values, although some may be blank. If no values are available the extraParams field will be: ',,'. When split by later analytics processing on the , that would become ['','','']. * The third field of extraParams now correctly records a 0, rather than being empty, when the query was run against an alternate wiki but no results were found. Identified as not being incorrect. * The third value of extraParams should always be <= hitsReturned. In our logging of results this is not always the case. This turns out to be because users in the control group run the query, report the number of results, but are not shown the results. As such no fix was done here it was only a problem with how to interpret the data. Depends-On: I02a83aa88 Bug: T121543 Bug: T137163 Bug: T137167 Change-Id: I95ba0a932292c46a8de633ab027645343617fd6d --- M modules/ext.wikimediaEvents.searchSatisfaction.js 1 file changed, 48 insertions(+), 7 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index e32762b..6e9e5af 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -99,9 +99,11 @@ * @private */ function initialize( session ) { - var sessionId = session.get( 'sessionId' ), - sampleSize = 200, + haveSubTest = [ + 'enwiki', 'frwiki', 'eswiki', 'itwiki', 'dewiki' + ].indexOf( mw.config.get( 'wgDBname' ) ) !== -1, + sampleSize = haveSubTest ? 100 : 200, /** * Determines whether the user is part of the population size. * @@ -150,6 +152,15 @@ // have a search session id, generate one. if ( !session.set( 'sessionId', randomToken() ) ) { return false; + } + + // Assign 50% of users to subTest + if ( haveSubTest && oneIn( 2 ) ) { + session.set( 'subTest', chooseBucket( [ + 'textcat2:a', + 'textcat2:b', + 'textcat2:c' + ] ) ); } } @@ -383,6 +394,10 @@ evt.articleId = articleId; } + if ( mw.config.get( 'wgCirrusSearchRequestSetToken' ) ) { + evt.searchToken = mw.config.get( 'wgCirrusSearchRequestSetToken' ); + } + // add any schema specific data if ( extraData ) { $.extend( evt, extraData ); @@ -406,6 +421,7 @@ */ function setupSearchTest( session ) { var params, + textCatExtra = [], logEvent = genLogEventFn( 'fulltext', session ); if ( isSearchResultPage ) { @@ -425,19 +441,39 @@ .find( '[data-serp-pos]' ) .data( 'serp-pos' ); - if ( index !== undefined ) { + // If wprov is already defined it must have come from the + // backend interwiki test. Don't override it. This means we + // won't get a visitPage event, but we can't collect those + // for interwiki anyways. + if ( index !== undefined && uri.query.wprov === undefined ) {
[MediaWiki-commits] [Gerrit] Fix four bugs in search satisfaction fulltext clicks imprope... - change (mediawiki...WikimediaEvents)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/294772 Change subject: Fix four bugs in search satisfaction fulltext clicks improperly recorded .. Fix four bugs in search satisfaction fulltext clicks improperly recorded * Autocomplete was calling SessionState.prototype.has, but the function did not exist. Add the function. * The code to re-send events that were put into local storage due to not being sucesfully delivered was expecting the url to be the value in the object, but the key is what has the url. Adjust to recognize that the key is the appropriate url to visit. * Clicks to sub links in search results, like a section title or redirect page, were not properly updating the wprov parameter. The click events were properly collected but not the visitPage events on the other side. Additionally the click events wern't collecting the position clicked. * Depending on network speed events sent by our extended event log implementation that suppors non-sendBeacon enabled browsers can result in duplicate events. Add a uniqueId field back to the schema to allow de-duplicating when running analysis. Bug: T137262 Change-Id: I7955e1d9b94f54b1e63bc5362bfa5c90d904c20c (cherry picked from commit 3178eba79f290fb018d33930d5cd0e2fca176369) --- M extension.json M modules/ext.wikimediaEvents.searchSatisfaction.js 2 files changed, 39 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/72/294772/1 diff --git a/extension.json b/extension.json index 5e1d2ad..dc86d30 100644 --- a/extension.json +++ b/extension.json @@ -114,7 +114,7 @@ "schema.TestSearchSatisfaction2": { "class": "ResourceLoaderSchemaModule", "schema": "TestSearchSatisfaction2", - "revision": 15644862 + "revision": 15700292 }, "schema.GeoFeatures": { "class": "ResourceLoaderSchemaModule", diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js b/modules/ext.wikimediaEvents.searchSatisfaction.js index 0a1caa1..e32762b 100644 --- a/modules/ext.wikimediaEvents.searchSatisfaction.js +++ b/modules/ext.wikimediaEvents.searchSatisfaction.js @@ -48,6 +48,16 @@ return res; } + /** +* Generate a unique token. Appends timestamp in base 36 to increase +* uniqueness of the token. +* +* @return {string} +*/ + function randomToken() { + return mw.user.generateRandomSessionId() + new Date().getTime().toString( 36 ); + } + search = initFromWprov( 'srpw1_' ); autoComplete = initFromWprov( 'acrw1_' ); // with no position appended indicates the user submitted the @@ -80,16 +90,6 @@ */ function key( type ) { return storageNamespace + '-' + type; - } - - /** -* Generate a unique token. Appends timestamp in base 36 to increase -* uniqueness of the token. -* -* @return {string} -*/ - function randomToken() { - return mw.user.generateRandomSessionId() + new Date().getTime().toString( 36 ); } /** @@ -160,6 +160,10 @@ return true; } + this.has = function ( type ) { + return this.get( type ) !== null; + }; + this.get = function ( type ) { if ( !state.hasOwnProperty( type ) ) { if ( ttl.hasOwnProperty( type ) ) { @@ -201,24 +205,6 @@ state.enabled = initialize( this ); return this; - } - - /** -* Adds an attribute to the link to track the offset -* of the result in the SERP. -* -* Expects to be run with an html anchor as `this`. -* -* @param {Event} evt jQuery Event object -* @private -*/ - function updateSearchHref( evt ) { - var uri = new mw.Uri( evt.target.href ), - offset = $( evt.target ).data( 'serp-pos' ); - if ( offset ) { - uri.query.wprov = evt.data.wprovPrefix + offset; - evt.target.href = uri.toString(); - } } /** @@ -319,15 +305,15 @@ // might be reducing our deliverability. Not sure the best way to // handle. $( document ).ready( function () { - var queue, key, + var queue, url, jsonQueue = mw.storage.get( queueKey );
[MediaWiki-commits] [Gerrit] Add empty message "visualeditor-quick-access-characters.json" - change (mediawiki...VisualEditor)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/294748 Change subject: Add empty message "visualeditor-quick-access-characters.json" .. Add empty message "visualeditor-quick-access-characters.json" This way it is listed on Special:AllMessages Change-Id: I9ab12e8148137c4821228a1ffe16836d98d5c1d2 --- M modules/ve-mw/i18n/en.json M modules/ve-mw/i18n/qqq.json 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/48/294748/1 diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json index 2b9f1b8..5fe38ce 100644 --- a/modules/ve-mw/i18n/en.json +++ b/modules/ve-mw/i18n/en.json @@ -336,6 +336,7 @@ "visualeditor-settings-tool": "Page settings", "visualeditor-shortcuts-insert": "Insert", "visualeditor-special-characters-group-other": "Often used", + "visualeditor-quick-access-characters.json": "", "visualeditor-timeout":"It looks like this editor is currently unavailable. Would you like to edit in source mode instead?", "visualeditor-toload": "The editor will now load. If you still see this message after a few seconds, please [$1 reload the page].", "visualeditor-toolbar-savedialog": "Save page", diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json index 5518b2e..bb1476b 100644 --- a/modules/ve-mw/i18n/qqq.json +++ b/modules/ve-mw/i18n/qqq.json @@ -347,6 +347,7 @@ "visualeditor-settings-tool": "Text of tool in the toolbar the lets users set specific page settings.\n{{Identical|Page settings}}", "visualeditor-shortcuts-insert": "Heading for insertion shortcuts\n{{Identical|Insert}}", "visualeditor-special-characters-group-other": "Label of the special character group shown if the wiki has visualeditor-quick-access-characters.json set up.", + "visualeditor-quick-access-characters.json": "JSON page specifying which characters you wish to show and their sequence\n{{ignore}}", "visualeditor-timeout": "Text (JavaScript confirm()) shown when the editor fails to load properly due to a 504 Gateway Timeout error.", "visualeditor-toload": "Text shown to the user in place of the wikitext editor on action=edit/submit when VisualEditor is expected to load.\n\nParameters\n* $1 is the URL which points to a page with a fallback to the wikitext editor if necessary.", "visualeditor-toolbar-savedialog": "Label text for button to open save dialog.\n\nUsed in:\n* {{msg-mw|Guidedtour-tour-gettingstartedtasktoolbarve-click-save-description}}.\n{{Identical|Save page}}", -- To view, visit https://gerrit.wikimedia.org/r/294748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ab12e8148137c4821228a1ffe16836d98d5c1d2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Raimond Spekking___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits