Skip to content
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.

Sign up for GitHub

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

Jump to bottom

merge from magento/magento2 #1

Merged
merged 2,127 commits into from
Mar 25, 2019
Merged

merge from magento/magento2 #1

merged 2,127 commits into from
Mar 25, 2019

Conversation

alexander-aleman
Copy link
Collaborator

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)

Joan He and others added 30 commits March 13, 2019 10:47
Merge remote-tracking branch 'upstream/2.3-develop' into 1-es6-2.3-de…
696162f 
…velop
@naydav
Merge remote-tracking branch 'origin/2.3-develop' into GraphQl-427-ad…
adf0e09 
…just-test-coverage-of-the-shipping-methods

# Conflicts:
#	dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@naydav
GraphQL-427: Test coverage: SetShippingAddressOnCartTest
4748c2d
@magento-engcom-team
ENGCOM-4492: graphQl-427: adjusted code coverage of the set shipping …
f0be116 
…address feature #448

 - Merge Pull Request magento/graphql-ce#448 from magento/graphql-ce:GraphQl-427-adjust-test-coverage-of-the-shipping-methods
 - Merged commits:
   1. e1d5544
   2. 32366e0
   3. 5f3d076
   4. adf0e09
   5. 4748c2d
@nmalevanec
Fix static and functional tests.
a32d27b
@slopukhov
MC-13613: Product mass update
97a4be9
@naydav
GraphQL-420: Test coverage: GetAvailablePaymentMethodsTest for Guest
e24a4c8
@magento-engcom-team
ENGCOM-4493: 420 test coverage get available payment methods guest #450
7a70f5c 
 - Merge Pull Request magento/graphql-ce#450 from magento/graphql-ce:420-test-coverage-getAvailablePaymentMethods-guest
 - Merged commits:
   1. 9b2be29
   2. 9395e76
   3. 8ab0ab3
   4. 2bd07f7
   5. e24a4c8
@nmalevanec
Merge remote-tracking branch 'mainline/2.3-develop' into 2.3-develop#…
c76d248 
…20511
@naydav
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop#408
a984663
@magento-engcom-team
ENGCOM-4405: Sorting by Websites not working in product grid in backo…
bbb357a 
…ffice #20511 #20512

 - Merge Pull Request #20512 from XxXgeoXxX/magento2:2.3-develop#20511
 - Merged commits:
   1. 0dfe0f0
   2. e61b399
   3. fa49579
   4. 8170bd7
   5. f4d1442
   6. 93da772
   7. 5362c5a
   8. f57e5e8
   9. a6f266d
   10. a32d27b
   11. c76d248
@naydav
GraphQL-408: mutations add<Product Type>ProductsToCart dosn't check i…
1daadb8 
…f the cart is active
@magento-engcom-team
ENGCOM-4494: mutations add<Product Type>ProductsToCart dosn't check i…
db2a76c 
…f the cart is active #455

 - Merge Pull Request magento/graphql-ce#455 from XxXgeoXxX/graphql-ce:2.3-develop#408
 - Merged commits:
   1. e431556
   2. 2363896
   3. 4d4a982
   4. a984663
   5. 1daadb8
@irenelagno
MC-15378: Customer visitor model doesn't have all data on first get r…
f14d84d 
…equest
@magento-engcom-team
ENGCOM-4488: Test coverage: Add product to Cart with wrong cart hash #…
04328a6 
…462

 - Merge Pull Request magento/graphql-ce#462 from XxXgeoXxX/graphql-ce:2.3-develop#440
 - Merged commits:
   1. 07c0fbe
   2. 0db761c
@nmalevanec
Fix functional tests.
f59817b
@magento-engcom-team
ENGCOM-4242: [ForwardPort] #18896 Add Mexico Regions #21180
8f26b57 
 - Merge Pull Request #21180 from osrecio/magento2:FP_18896_AddMexicoStates
 - Merged commits:
   1. d09b512
   2. 6d52365
   3. c0f2632
   4. 0605d38
   5. f59817b
@magento-engcom-team
Merge branch 2.3-develop into ENGCOM-4451-magento-magento2-21582
f706fc0
@magento-engcom-team
ENGCOM-4495: graphQl-430: added testReSetPaymentMethod for guest and …
8cde976 
…customer #471

 - Merge Pull Request magento/graphql-ce#471 from magento/graphql-ce:GrqphQL-430-test-testReSetPaymentMethod
 - Merged commits:
   1. 80499c9
@naydav
Merge remote-tracking branch 'origin/2.3-develop' into 424-offline-sh…
005e798 
…ipping-methods-tests
@irenelagno
MC-15378: Customer visitor model doesn't have all data on first get r…
4461e54 
…equest
@sidolov
ENGCOM-4483: [DB] Remove unused variable #21716
f69cfd8
@sidolov
ENGCOM-4480: Fix Broken Tax Rate Search Filter Admin grid #21521 #21701
9e02755
@sidolov
ENGCOM-4469: Spelling Correction #21685
cda0113
@naydav
GraphQL-424: Test coverage: Set OfflineShipping methods on Cart
58831be
@sidolov
ENGCOM-4461: Advanced-Search-layout-not-proper #21611
e08ab9a
@sidolov
ENGCOM-4460: Wishlist review summary #21420
e4aee5f
@sidolov
ENGCOM-4457: Minicart search logo not vertically aligned #21638
112c93f
@sidolov
ENGCOM-4438: Remove Environment emulation for better performance on s…
5f30aeb 
…itemap generation #21542
@sidolov
ENGCOM-4373: Fix Admin Customizable Options Dropdown sort_order issue #…
f23c4bd 
…21371
magento-cicd2 and others added 28 commits March 20, 2019 08:07
@magento-cicd2
merge magento/2.3-develop into magento-helix/MC-6273
5ccc91d
@oshmyheliuk
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
34d5a76
@okolesnyk
Merge branch '648-update-shopping-cart' of github.com:rogyar/magento-…
44439c8 
…functional-tests-migration into community-tests-migration-pr
@duhon
Merge pull request #3918 from magento-performance/MC-13613-PR
2883b82 
[Performance] 
Execution of heavy admin operations in asynchronous flow
Tasks:
- MC-13864 Consumer always read config from memory
- MC-13613 Product mass update
@magento-cicd2
merge magento/2.3-develop into magento-pangolin/MQE-1069
ff32ab4
@okolesnyk
Update test case ids and add minor fixes
989f237
@vgoncharenko
MC-6273: Mysql url_rewrite select make on product view page 170+ time…
0e2a928 
…s per request

- fixed static tests
@okolesnyk
Fix unstable test
ccb284f
@magento-cicd2
merge magento/2.3-develop into magento-helix/MC-6273
704a472
@okolesnyk
Merge pull request #3924 from magento-pangolin/MQE-1069
77297a1 
[Pangolin] Migrate Sample Data tests from MTF to MFTF
@magento-cicd2
merge magento/2.3-develop into magento-trigger/MC-5784
094dc81
@BaDos
MAGETWO-98151: Add support ZooKeeper and flock locks
f8b955c
@BaDos
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-98151
ca987be
@BaDos
MAGETWO-98151: Add support ZooKeeper and flock locks
b5eaa81
@BaDos
MAGETWO-98151: Add support ZooKeeper and flock locks
a2ad442
@oshmyheliuk
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
6b6a281
@irenelagno
Merge pull request #3922 from magento-trigger/MC-5784
497e94a 
- Fixed MC-5784: Image fields using imageUploader UIComponent cannot use gallery image
@magento-cicd2
merge magento/2.3-develop into magento-pangolin/community-tests-migra…
62cf03d 
…tion-pr
@BaDos
MAGETWO-98151: Add support ZooKeeper and flock locks
2d9c915
@BaDos
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-98151
ef79ed0
@BaDos
MAGETWO-98151: Add support ZooKeeper and flock locks
1cb451a
@okolesnyk
Merge pull request #3926 from magento-pangolin/community-tests-migrat…
8f45cf8 
…ion-pr

[Pangolin] Community MTF to MFTF tests migration

 - closes magento-commerce/magento-functional-tests-migration#648
@vgoncharenko
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
b5e4c92 
…nto MC-6273
@duhon
Merge pull request #3912 from magento-helix/MC-6273
06269b7 
[Performance] Mysql url_rewrite select make on product view page 170+ times per request
Bug:
- MC-6273 Mysql url_rewrite select make on product view page 170+ times per request
- MAGETWO-98592 [Elastic] Fix catalog search with elasticsearch6
@oshmyheliuk
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-95675
aa71030
@magento-cicd2
merge magento/2.3-develop into magento-thunder/MAGETWO-98151
abda912
@arhiopterecs
Merge pull request #3904 from magento-thunder/MAGETWO-95675
7270d7e 
Fixed issues:
 - MAGETWO-95675: Error during setup:static-content:deploy: Error while waiting for package deployed
@arhiopterecs
Merge pull request #3933 from magento-thunder/MAGETWO-98151
19e9ada 
Fixed issue:
 - MAGETWO-98151: Add support ZooKeeper and flock locks
@alexander-aleman alexander-aleman self-assigned this Mar 25, 2019
@alexander-aleman alexander-aleman merged commit 1232e6d into XSARUS:2.3-develop Mar 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexander-aleman alexander-aleman

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.