This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Sync 2.3.4-develop and resolve merge conflicts #6296
Merged
Conversation
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
* update deprecated description * Revert "update deprecated description" This reverts commit c9b39a0. * GraphQL: update description of deprecated directive (#5213) * update deprecated description * review comments * MC-19250: The stuck deployment on the Cloud because of consumers (#5289) * MC-19250: The stuck deployment on the Cloud because of consumers * Update _includes/config/consumers.md Co-Authored-By: Margaret Eker <[email protected]> * GraphQL: Add layered navigation documentation (#5222) * add filtering example * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * checkpoint * linting errors * fix link * update opening sentence * remove bogus commit * Apply suggestions from code review Co-Authored-By: Erik Marr <[email protected]> * change code gates * final review comments * deprecation notices (#5413) * review draft (#5426) * GraphQL: Add fields and example showing cart rule discounts (#5425) * review draft * minor tweaks * review comment * update example * MC-18725: Write article with clarification of how to use this functionality * MC-18725: Write article with clarification of how customer data works * MC-18725: Write article with clarification of how customer data works * Small grammar changes. * GraphQL: Update pricing schema changes (#5512) * checkpoint * checkpoint * minor updates * review comments * one more review comment * more review comments * correct linting error * remove stray character from TOC * Add store name to store config query schema (#5448) * GraphQL: Add categoryList query (#5562) * checkpoint * review draft * fix linting errors * add to list of cached queries * update example to show usage of * clarify match filters * Apply suggestions from code review Added review comments Co-Authored-By: Jeff Matthews <[email protected]> * update sample * rename file * review comment from Dan * developer feedback * resolve more merge conflicts * linting errors * linting errors
Sync develop with master
* Resolved issue #5179 * Update guides/v2.2/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update guides/v2.2/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update guides/v2.3/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update guides/v2.3/frontend-dev-guide/themes/theme-create.md Co-Authored-By: hguthrie <[email protected]> * Update identity-class.md * Import the correct `Magento\Framework\GraphQl\Query\Resolver\IdentityInterface`. * Clarify what is required and what is an implementation detail. * magento/devdocs#: Add a custom payment method to checkout. Fix Step 4 https://devdocs.magento.com/guides/v2.2/howdoi/checkout/checkout_payment.html https://devdocs.magento.com/guides/v2.3/howdoi/checkout/checkout_payment.html * Fixed infobox * Getting infobox correct * Trying to fix infobox * More finessing. * Debugging * Pipe in command was breaking infobox formatting * Escaped pipe in command * Pipe in command broke formatting. * Removed pipes from command * Trailing space. * trailing space * trailing space * MAGETWO-49336: Publication of breaking changes * Update BICs for 2.2.10 Convert included files to Markdown Add includes to the topic * Fix heading id * MAGETWO-49336: Publication of breaking changes * Update BICs for 2.3.3 Convert included files to Markdown Add the includes to main topic * Fix links (#5690) * fix links add parans * remove duplicate topic * add symlink * remove duplicate projects topic * create symlink * found another problem with a link * magento/devdocs#: Fix links in How Magento implements indexing (#5656) https://devdocs.magento.com/guides/v2.2/extension-dev-guide/indexing.html https://devdocs.magento.com/guides/v2.3/extension-dev-guide/indexing.html * added link to devblog post andfixed broken links in include files * magento/devdocs#: Describes changeCustomerPassword mutation errors - https://devdocs.magento.com/guides/v2.3/graphql/mutations/change-customer-password.html * Markdown linting: Enable rule MD029 (#5698) * Fixed errors in rest, test, and ui comps * Fix errors in release notes * Fixed errors in pattern-library and payment integrations * Fixed errors in marketplace, migration, mrg, and mtf * Fixed errors in install, js-dev, and inventory * Applied peer review edits * Applied peer review edits * Removed forced numbering class * Fixed errors in howdoi * Fixed errors in get-started, graphql * Fixed errors in frontend-dev-guide * Fixed errors in ext-dev * Fixed some errors in config * Fixed some errors in config * Applied edits from peer review * Removed redundant TOC * Fixed errors in config * Fixed errors in coding standards, comp-mgr, contributor * Disable rule * Fixed errors in _vidoes, reporting, arch * Fixed errors in includes (not cloud) * Enable rule * Fixed errors in cloud includes * Fixed errors in cloud * Added page-builder-types to gitignore file (#5708) * spaces of course * move categoryinterface out of category query (#5718) * Fix syntax for paths to run Actions on See https://help.github.com/en/articles/workflow-syntax-for-github-actions#example-including-paths
* update example containing bucket in the output * break out cmsblocks object * add cms-block * review comments
* Add content from PR-5685 to develop * alphabetize field * review comments
Sync develop with master
* deprecate attributes * remove outdated attribute from example
Sync develop with master
Increment RabbitMQ version support for 2.3.4
* create empty files * create empty files * add query/results * review draft * remove mergecarts text * cart_id isn't specific to this query * fix linting error * review comments * more review feedback * removed extraneous description * Update guides/v2.3/graphql/queries/customer-cart.md Co-Authored-By: Erik Marr <[email protected]>
* create empty files * checkpoint * checkpoint * review draft * fix typo * found the elusive linting error * review comment * Update guides/v2.3/graphql/mutations/merge-carts.md Co-Authored-By: Erik Marr <[email protected]> * add links between mutation and query * Change cart_id to id
Sync develop with master
Custom layout updates flow has been changed for 2.3.4 and 2.2.11, here's a guide reflecting those changes
Sync 2.3.4-develop
Add topic for new email template directives
dshevtsov
changed the title
jeff-matthews
approved these changes
Dec 20, 2019
Collaborator
Author
|
running tests |
|
Hi @dshevtsov, thank you for your contribution! |
jeff-matthews
added a commit
that referenced
this pull request
Jan 6, 2020
…lop"" This reverts commit 8eaba49.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 updates 2.3.4-develop with latest updates from master and resolves all merge conflicts that could no be made by automation.