Skip to content

update from upstream #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8,508 commits into from
May 10, 2019
Merged

update from upstream #3

merged 8,508 commits into from
May 10, 2019

Conversation

fsw
Copy link
Owner

@fsw fsw commented May 10, 2019

Description

Fixed Issues (if relevant)

  1. magento/magento2#<issue_number>: Issue title
  2. ...

Manual testing scenarios

  1. ...
  2. ...

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

naydav and others added 30 commits April 29, 2019 10:26
[EngCom] Public Pull Requests - GraphQL
…ave different fields but share the common interface #637

 - Merge Pull Request magento/graphql-ce#637 from magento/graphql-ce:graphql-621
 - Merged commits:
   1. 604e223
# Conflicts:
#	app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
 - Merge Pull Request magento/graphql-ce#634 from osrecio/graphql-ce:PR#631
 - Merged commits:
   1. e8f1369
   2. 035f602
   3. 0cd4e02
   4. 63a740b
…ave different fields but share the common interface #637
…e-payment-test

# Conflicts:
#	app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
#	app/code/Magento/QuoteGraphQl/etc/schema.graphqls
 - Merge Pull Request magento/graphql-ce#632 from pmclain/graphql-ce:feature/offline-payment-test
 - Merged commits:
   1. e73db01
   2. 97c416c
   3. 157f520
   4. bfca73d
   5. 5766e14
…thod' declaration #639

 - Merge Pull Request magento/graphql-ce#639 from magento/graphql-ce:graphql-575
 - Merged commits:
   1. 779f39c
# Conflicts:
#	app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
Fixed issues:
  - MAGETWO-99402: [MFTF] One Page Checkout with Addresses Search - Custom customer address attribute
 - merged latest code from mainline branch
naydav and others added 28 commits May 8, 2019 11:49
…ell product fields #371

 - Merge Pull Request magento/graphql-ce#371 from magento/graphql-ce:198_access_to_related_up-sell_cross_sell_product_fields
 - Merged commits:
   1. d11fda5
   2. 094cf30
   3. 2040d97
   4. cb82210
   5. 42fcf3d
   6. 3a88a35
   7. 4a5b330
   8. 4835285
   9. 92d6feb
 - Merge Pull Request magento/graphql-ce#650 from magento/graphql-ce:graphQL-535-provide-catalog-cofigs-for-pwa
 - Merged commits:
   1. 9d240e3
   2. 8f36cf2
   3. 9f2f5b6
…raphQL API #585

 - Merge Pull Request magento/graphql-ce#585 from magento/graphql-ce:387-test-coverage-cms-page
 - Merged commits:
   1. 7a90599
   2. 8a5b3b7
   3. b8d93d8
   4. 263588a
   5. 81984dc
   6. f4a4a34
   7. aae7428
   8. cf119be
   9. ff658b5
   10. fed22e0
   11. b4ea6b9
   12. 4ee64a5
   13. d7b7a2e
   14. 478f438
   15. 787d31b
…71' into graphql-develop-prs

# Conflicts:
#	composer.lock
[pangolins] Convert MTF tests to MFTF tests
[Magento Community Engineering] Community Contributions - GraphQL
@fsw fsw merged commit e0057b6 into fsw:2.3-develop May 10, 2019
fsw pushed a commit that referenced this pull request Jun 10, 2019
Customer Account Forgot Password page title
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.