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 2.4-develop to forked repo #1

Merged
merged 585 commits into from
Feb 7, 2020
Merged

Merge 2.4-develop to forked repo #1

merged 585 commits into from
Feb 7, 2020

Conversation

sertlab
Copy link
Owner

@sertlab sertlab commented Feb 7, 2020

Description (*)

Fixed Issues (if relevant)

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

Manual testing scenarios (*)

  1. ...
  2. ...

Questions or comments

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 are green)

yaroslavGoncharuk and others added 30 commits January 21, 2020 12:27
@yaroslavGoncharuk
Merge remote-tracking branch 'origin/2.4-develop' into MC-24173-2
4f531de
@magento-engcom-team
ENGCOM-6636: magento/magento2#: GraphQl. DeletePaymentToken. Remove r…
14bb3b6 
…edundant validation logic. Test coverage. #26452

 - Merge Pull Request #26452 from atwixfirster/magento2:graphql-DeletePaymentToken
 - Merged commits:
   1. 33ea535
@magento-engcom-team
ENGCOM-6637: magento/magento2#: GraphQl. RevokeCustomerToken. Test co…
64e20c4 
…verage. #26464

 - Merge Pull Request #26464 from atwixfirster/magento2:unittest-revokeCustomerToken
 - Merged commits:
   1. 1067926
@lenaorobei
ENGCOM-6620: MFTF: Add missing tests annotations #26391
a0d1bd4
@prabhuram93
MC-24172: Fix Skipped MFTF Tests From MC-17140: MC-14770, MC-14771, M…
af8e666 
…C-14772

- add sorting to fix product ordering
@odubovyk
MC-30255: In Stock Alert Email Shows Incorrect Item Pricing
620abb4 
- fixed
- modified tests
- remove redundant ImageProvider
@vzabaznov
Merge pull request #5218 from magento-performance/MC-24173-2
420a8b6 
[performance] Fix Skipped MFTF Tests From MC-17140: MC-28425, MC-28439, MC-28445
@zakdma
Merge remote-tracking branch 'origin/MC-25138' into 2.4-develop-pr5
16771da
@zakdma
Merge remote-tracking branch 'origin/MC-25250' into 2.4-develop-pr5
8d82fe8
@zakdma
Merge remote-tracking branch 'origin/MC-25254' into 2.4-develop-pr5
37868a3
@zakdma
Merge remote-tracking branch 'origin/MC-29864' into 2.4-develop-pr5
f966156
@zakdma
MC-30189: Error Import exported .csv file with small profile generate…
41c6717 
…d data
@zakdma
Merge remote-tracking branch 'origin/MC-30189' into 2.4-develop-pr5
f57193f
Merge remote-tracking branch 'origin/MC-24170' into 2.4-develop-pr5
0ae583d
@serhii-balko
Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-pr9
afc0623
@mykhailomatiola
MC-29690: Layered Navigation with in stock/out of stock products on C…
fd1fe53 
…ategory page
@mykhailomatiola
MC-30562: Storefront: Layered Navigation with configurable product
47c394e
@nikita-shcherbatykh
MC-30391: Category not considered Configurable product in cart rule
5a0bea0
@mykhailomatiola
MC-30564: Storefront: View configurable product with images
205e976
@viktorpetryk
Merge remote-tracking branch 'origin/2.4-develop' into MC-30398
d7363ad
@mykhailomatiola
Merge branch 'MC-29690' into 2.4-develop-com-pr4
16db839
@mykhailomatiola
Merge branch 'MC-30562' into 2.4-develop-com-pr4
0e51710
@mykhailomatiola
Merge branch 'MC-30564' into 2.4-develop-com-pr4
c0c7fe7
@viktym
Merge pull request #5230 from magento-tsg-csl3/2.4-develop-pr9
27076ca 
[TSG-CSL3] For 2.4 (pr9)
Fix confusing phpdoc in curl client
c885c9f
@IvanPletnyov
MC-24879: Admin: Create category with enabled Catalog Category Flat I…
b1f2d8c 
…ndex
@odubovyk
MC-30255: In Stock Alert Email Shows Incorrect Item Pricing
69b3441 
- static
@odubovyk
Merge remote-tracking branch 'mainline/2.4-develop' into MC-30255
8483aed
@lenaorobei
Merge branch '2.4-develop' into 2.4-develop-temporary-five-prs
f649fac
@prabhuram93
Merge remote-tracking branch 'mainline/2.4-develop' into MC-24172-reopen
09792c4
paliarush and others added 29 commits February 4, 2020 08:44
@paliarush
ECP-202: Deprecate Rotation Support in Magento
aaa8c4d
@IvanPletnyov
MC-25170: Combination with different type prices
0dd7f91
@IvanPletnyov
MC-31028: Storefront: Custom options on configurable product page
c482b31
@ysapiga
Merge remote-tracking branch 'origin/MC-31023' into 2.4-develop-com-pr6
3933f65
@buskamuza
Merge pull request #157 from magento-architects/ECP-202-rotation-depr…
d4317c4 
…ecation

ECP-202: Deprecate Rotation Support in Magento
@magento-mts-svc
merge magento/2.4-develop into magento-architects/catalog-image-resizing
3826de0
@IvanPletnyov
Merge remote-tracking branch 'origin/MC-25170' into 2.4-develop-com-pr6
41b5daf
@IvanPletnyov
Merge remote-tracking branch 'origin/MC-31028' into 2.4-develop-com-pr6
6fac1fe
@zakdma
Merge remote-tracking branch 'origin/MC-24906' into 2.4-develop-pr7
16b0f4a
@zakdma
Merge remote-tracking branch 'origin/MC-30398' into 2.4-develop-pr7
dbe38ea
@zakdma
Merge remote-tracking branch 'origin/MC-23633' into 2.4-develop-pr7
18b0026
@zakdma
Merge remote-tracking branch 'origin/MC-23753' into 2.4-develop-pr7
4ce5583
@zakdma
Merge remote-tracking branch 'origin/MC-23870' into 2.4-develop-pr7
82194f3
@mykhailomatiola
MC-31025: Indexer price calculation for configurable product
55337b9
@paliarush
ECP-202 Deprecate Rotation Support in Magento
9ebd3e0 
- Fixed static tests
@magento-mts-svc
merge magento/2.4-develop into magento-obsessive-owls/PR-2.4
aa7a519
@omiroshnichenko
Merge pull request #5262 from magento-obsessive-owls/PR-2.4
7322e87 
[Owls] Bugfix
@magento-mts-svc
merge magento/2.4-develop into magento-honey-badgers/MC-23303
031d27d
@magento-mts-svc
merge magento/2.4-develop into magento-architects/catalog-image-resizing
dae5284
@magento-mts-svc
merge magento/2.4-develop into magento-tsg/2.4-develop-pr7
7482c5e
@mykhailomatiola
Merge branch 'MC-31025' into 2.4-develop-com-pr6
7573375
@paliarush
Merge pull request #5270 from magento-architects/catalog-image-resizing
1eef9bd 
[architecture] ECP-261: Offload Catalog Image Resizing from Magento
@magento-mts-svc
merge magento/2.4-develop into magento-honey-badgers/MC-23303
cf6a3b0
@zakdma
Merge pull request #5288 from magento-tsg/2.4-develop-pr7
7404d9d 
[TSG] Fixes for 2.4 (pr7) (2.4-develop)
@zakdma
Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop-co…
9ccb853 
…m-pr6
@magento-mts-svc
merge magento/2.4-develop into magento-honey-badgers/MC-23303
f762d42
@cpartica
Merge pull request #5261 from magento-honey-badgers/MC-23303
847f941 
[honey] MC-23303: [Forwardport] Support preview for staged data
@magento-mts-svc
merge magento/2.4-develop into magento-tsg/2.4-develop-com-pr6
c0fe751
@zakdma
Merge pull request #5290 from magento-tsg/2.4-develop-com-pr6
ba8fae3 
[TSG-Commerce] Tests for 2.4 (pr6)
@sertlab sertlab merged commit 7e0cbad into sertlab:2.4-dev Feb 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.