Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Sync 2.4.2-develop #8485

Merged
merged 36 commits into from
Jan 7, 2021
Merged

Sync 2.4.2-develop #8485

merged 36 commits into from
Jan 7, 2021

Conversation

jeff-matthews
Copy link
Contributor

Updating the branch with changes from master.

Resolved the following merge conflict:

CONFLICT (content): Merge conflict in src/guides/v2.4/graphql/authorization-tokens.md

bdenham and others added 30 commits December 10, 2020 12:09
Change the environment variable configuration options.
* correct path for di.xml

* Added the error coverage for redeemGiftCardBalanceAsStoreCredit mutation (#8444)

* added the error coverage for redeemGiftCardBalanceAsStoreCredit mutation

* Update redeem-giftcard-balance.md

Co-authored-by: Kevin Harper <[email protected]>

* added error coverage for remove-store-credit mutation (#8447)

* added the error coverage for removeRewardPointsFromCart mutation (#8448)

* added the error coverage for removeRewardPointsFromCart mutation

* Update remove-reward-points.md

Co-authored-by: Kevin Harper <[email protected]>

* added the errors coverage for apply giftCard mutation (#8449)

* added error coverage for apply giftcard mutation

* lint error

* Update apply-giftcard.md

Co-authored-by: Kevin Harper <[email protected]>

* Added the error coverage for applyStoreCreditToCart mutation (#8450)

* added the error coverage for applyStoreCreditToCart mutation

* added the error coverage for applyStoreCreditToCart mutation

* added the error coverage for applyStoreCreditToCart mutation

* Update apply-store-credit.md

* Update apply-store-credit.md

Co-authored-by: Kevin Harper <[email protected]>

* added the error coverage for pickupLocations query (#8452)

* Added the error coverage for urlResolver query (#8453)

* added error coverage for payflowtoken mutation (#8454)

* added error coverage for payflowtoken mutation

* fixed the lint errors

* Update create-payflow-pro-token.md

Co-authored-by: Kevin Harper <[email protected]>

* added error coverage for apply-reward-points mutation (#8455)

* Added the error coverage for giftCardAccount query (#8456)

* Added the error coverage for giftCardAccount query

* Update giftcard-account.md

Co-authored-by: Kevin Harper <[email protected]>

* Added errors documentation for paypal express token mutation (#8457)

Co-authored-by: Kevin Harper <[email protected]>

* sample-data-update (#8430)

* Token expires info added (#8463)

Co-authored-by: Kristof, Fooman <[email protected]>
Co-authored-by: Dinesh V B <[email protected]>
Co-authored-by: Sathiya Prakash <[email protected]>
Co-authored-by: Rakesh  Jesadiya <[email protected]>
Co-authored-by: Ajith <[email protected]>
…eckout-customize-docs

Use a layout processor rather than plugin in the "Customize the view of a checkout step" docs
* Updates based on review feedback

- Replaced instructions for testing ssh connection
with link to GitHub documentation
- Editorial cleanup

* Updates to ssh key enablement for Cloud projects (#8416)

* Added an additional method regarding adding a SSH key (#8379)

* Added an additional method regarding adding a SSH key

* Apply suggestions from code review

Co-authored-by: Barny Shergold <[email protected]>

* Updates based on review feedback

- Replaced test SSH connection through GitHub instructions
with link to GitHub documentation
- Editorial revision and clean up

Co-authored-by: Sathiya Prakash <[email protected]>
Co-authored-by: Barny Shergold <[email protected]>

Co-authored-by: Sathiya Prakash <[email protected]>
Co-authored-by: Barny Shergold <[email protected]>
…ironment-variables

Update project-webint-basic.md
Added the error coverage for cart query
…overage

Added the error coverage for isEmailAvailable query
…errors-coverage

Added error coverage for createProductReview mutation
@jeff-matthews
Copy link
Contributor Author

running tests

@jeff-matthews jeff-matthews merged commit 788acee into 2.4.2-develop Jan 7, 2021
@ghost
Copy link

ghost commented Jan 7, 2021

Hi @jeff-matthews, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants