Resolve merge conflicts to sync 2.4.9-develop with main#441
Open
dshevtsov wants to merge 183 commits intoAdobeDocs:2.4.9-developfrom
Open
Resolve merge conflicts to sync 2.4.9-develop with main#441dshevtsov wants to merge 183 commits intoAdobeDocs:2.4.9-developfrom
dshevtsov wants to merge 183 commits intoAdobeDocs:2.4.9-developfrom
Conversation
Added `graphql`
Fix: analytics tracking
Bumps the npm_and_yarn group with 1 update: [multer](https://github.com/expressjs/multer). Updates `multer` from 1.4.5-lts.1 to 1.4.5-lts.2 - [Release notes](https://github.com/expressjs/multer/releases) - [Changelog](https://github.com/expressjs/multer/blob/v1.4.5-lts.2/CHANGELOG.md) - [Commits](expressjs/multer@v1.4.5-lts.1...v1.4.5-lts.2) --- updated-dependencies: - dependency-name: multer dependency-version: 1.4.5-lts.2 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-5f5a3b5ddd Bump multer from 1.4.5-lts.1 to 1.4.5-lts.2 in the npm_and_yarn group
Bumps [@adobe/gatsby-theme-aio](https://github.com/adobe/aio-theme) from 4.15.0 to 4.15.1. - [Release notes](https://github.com/adobe/aio-theme/releases) - [Commits](https://github.com/adobe/aio-theme/compare/@adobe/gatsby-theme-aio@4.15.0...@adobe/gatsby-theme-aio@4.15.1) --- updated-dependencies: - dependency-name: "@adobe/gatsby-theme-aio" dependency-version: 4.15.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…rn/adobe/gatsby-theme-aio-4.15.1 Bump @adobe/gatsby-theme-aio from 4.15.0 to 4.15.1
Update version on the Module Reference intro
Bumps the npm_and_yarn group with 1 update: [tar-fs](https://github.com/mafintosh/tar-fs). Updates `tar-fs` from 2.1.2 to 2.1.3 - [Commits](https://github.com/mafintosh/tar-fs/commits) --- updated-dependencies: - dependency-name: tar-fs dependency-version: 2.1.3 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-762d904987 Bump tar-fs from 2.1.2 to 2.1.3 in the npm_and_yarn group
…er-diagram fix: indexer diagram
Bumps the npm_and_yarn group with 1 update: [brace-expansion](https://github.com/juliangruber/brace-expansion). Updates `brace-expansion` from 1.1.11 to 1.1.12 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@1.1.11...v1.1.12) --- updated-dependencies: - dependency-name: brace-expansion dependency-version: 1.1.12 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-6ea9762674 Bump brace-expansion from 1.1.11 to 1.1.12 in the npm_and_yarn group
Bumps the npm_and_yarn group with 1 update: [pbkdf2](https://github.com/crypto-browserify/pbkdf2). Updates `pbkdf2` from 3.1.2 to 3.1.3 - [Changelog](https://github.com/browserify/pbkdf2/blob/master/CHANGELOG.md) - [Commits](browserify/pbkdf2@v3.1.2...v3.1.3) --- updated-dependencies: - dependency-name: pbkdf2 dependency-version: 3.1.3 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com>
…rn/npm_and_yarn-eca7abf8ab Bump pbkdf2 from 3.1.2 to 3.1.3 in the npm_and_yarn group
…-mode Customer grid indexer mode (2.4.8)
--- updated-dependencies: - dependency-name: "@adobe/gatsby-theme-aio" dependency-version: 4.15.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Eds migration new
lower the resolution of the image
Remove obsolete .remarkrc.yml and .yarnrc.yml Regenerate contributors.json
Delete obsolete configs and update contributors
Fix repeated word in hashing explanation - issues/296
Update super-linter version in GitHub Actions workflow
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of this pull request
This pull request (PR) resolves merge conflicts to sync 2.4.9-develop with main.
Summary of what was merged
Conflicts were between HEAD (2.4.9 / devsite) and
main(content updates). Resolution keeps devsite conventions (InlineAlert, relative links,**emphasis) and prefersmainwhere it is more accurate (dynamicdb/amqp/stompresolution, STOMP from 2.4.5, correct filenamequeue_consumer.xmlinstead ofqueue_customer.xml).Files
async-configuration.mdmain(dynamic connections fromenv.php).mainwording + correct filenames + STOMP 2.4.5.bulk-operations-example.mdqueue_publisher.xml” heading.<connection name="amqp" exchange="magento" />.InlineAlert.configuration.mdand 2.4.5 STOMP.configuration.mdmain’s full Connection resolution, Handler processing, Consumer spawning,env.php, and ActiveMQ sections.**For RabbitMQ / STOMP:**labels.index.mdmain’s MQF overview table +InlineAlert.main.product_action_attribute.updateRabbitMQ note and an Example: switch a topic to ActiveMQ Artemis (STOMP) block with theinventory.updateconfig from HEAD.migration.mdmain’s 2.4.4 → 2.4.5+ narrative, shorter tables, Legacy migrations wrapper, em-dash bullets, and 2.4.5+ example labels (dropped “2.4.9 introduced STOMP / backport” wording).Status