Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 7aa94564d85e408baea01abc5315a0441401c375
Merge: ddf42caaf25 a91cfdece34
Author: mage2-team <[email protected]>
Date:   Tue Oct 8 07:18:53 2019 -0700

    Merge changes from 2.3.3-rc

commit a91cfdece3433d6d93903dff45d806c138329cb3
Author: magento-team <[email protected]>
Date:   Wed Sep 18 14:50:03 2019 -0700

    Updated deprecation doc annotations

commit 51e61a2f4599489056665679b0b37626e4ddac62
Author: mage2-team <[email protected]>
Date:   Wed Sep 18 14:30:59 2019 -0700

    MC-18522: Magento 2.3.3 Publication

     (build 2.3.3.039)

commit 028f59413f24ecc4025c1aabc2270008324dbabe
Merge: 83b0692a288 06ebc664bb2
Author: Lagno Iryna <[email protected]>
Date:   Wed Sep 18 15:09:02 2019 -0500

    Merge pull request #4800 from magento-trigger/MC-20235

commit 06ebc664bb2351e7128f4f8e55e1014e5d548f4e
Author: Iryna Lagno <[email protected]>
Date:   Wed Sep 18 11:41:42 2019 -0500

    MC-20235: [2.3.3]Revert unapproved PR

commit 83b0692a2887974757b1cf1d3fca65e23083baea
Merge: 9372a0f4cbf 6d7daa454c8
Author: Dmytro Horytskyi <[email protected]>
Date:   Mon Sep 16 14:41:45 2019 +0000

    Merge pull request #4778 from magento-tango/MC-19873

    MC-19873: [Sample Data Function Test] Sample data test failed with Incorrect final price

commit 6d7daa454c8f45669e13e17dddddc8ecbfbdd25d
Author: Dmytro Horytskyi <[email protected]>
Date:   Sat Sep 14 05:30:16 2019 +0000

    MC-19873: [Sample Data Function Test] Sample data test failed with Incorrect final price

commit 35f317b91afbe60c27c7a6a6331a3ae4ca7dcfc1
Author: Dmytro Horytskyi <[email protected]>
Date:   Sat Sep 14 06:45:26 2019 +0000

    MC-19873: [Sample Data Function Test] Sample data test failed with Incorrect final price

commit 1d284ef7a3ef63e0a68918c613b935833a8f3794
Author: Dmytro Horytskyi <[email protected]>
Date:   Fri Sep 13 22:31:47 2019 -0700

    MC-19873: [Sample Data Function Test] Sample data test failed with Incorrect final price

commit 9372a0f4cbf078a1825eaada67d426d82f563245
Merge: 8f51e6228f2 7b1e89d31dc
Author: Lagno Iryna <[email protected]>
Date:   Wed Sep 11 16:33:12 2019 -0500

    Merge pull request #4691 from magento-trigger/MC-18532

commit 7b1e89d31dcf6da9444a81701ba532f91a916efe
Merge: 2bdab9af3c6 8f51e6228f2
Author: Magento CICD <[email protected]>
Date:   Wed Sep 11 13:11:12 2019 -0500

    merge magento/2.3.3-develop into magento-trigger/MC-18532

commit 2bdab9af3c6bf0c7df63fb148ce1d396e97ab322
Author: Krissy Hiserote <[email protected]>
Date:   Mon Sep 9 11:56:03 2019 -0500

    MC-18532: Update Changelog based on delivered scope

    - remove reverts and fix minor issues

commit 8f51e6228f267140634f4cdaf895db64bbbd59bb
Merge: 658096c77f9 f577a003344
Author: Max Lesechko <[email protected]>
Date:   Tue Sep 3 15:39:08 2019 -0500

    Merge pull request #4720 from magento-trigger/MC-19740

    [TR] MC-19740: Set of InnoDB tables is converted to Memory tables after setup:upgrade

commit f577a003344330ab97b606117e1f8f92d0ec1faf
Author: Max Lesechko <[email protected]>
Date:   Fri Aug 30 16:55:43 2019 -0500

    MC-19740: Set of InnoDB tables is converted to Memory tables after setup:upgrade

commit 658096c77f9c6c521ecdcfdce46df60bee90b035
Merge: c844e10037b 973eb86f7b4
Author: Alex Kolesnyk <[email protected]>
Date:   Fri Aug 30 16:38:17 2019 -0500

    Merge pull request #4715 from magento-pangolin/MQE-1715

    [Pangolins] .credentials file must exist but it should not have to

commit 973eb86f7b4157e2452201039416f617ae58cdb5
Author: Alex Kolesnyk <[email protected]>
Date:   Fri Aug 30 13:26:20 2019 -0500

    MQE-1715: .credentials file must exist but it should not have to

commit c844e10037b4684525fb26f2b946119519731ce1
Merge: 80d41dfe096 eba1d8dfff6
Author: Max Lesechko <[email protected]>
Date:   Wed Aug 28 17:53:22 2019 -0500

    Merge pull request #4697 from magento-trigger/MC-19684

    [TR] MC-19684: Some minute values cannot be set for Analytics data collection

commit eba1d8dfff69a3c4eef6fa63e593b5f384adda27
Author: Max Lesechko <[email protected]>
Date:   Wed Aug 28 11:41:53 2019 -0500

    MC-19684: Some minute values cannot be set for Analytics data collection

commit bfd31af036aa66fff3a4fcbe9c1f5ce4f66ec6f3
Author: Max Lesechko <[email protected]>
Date:   Wed Aug 28 10:45:22 2019 -0500

    MC-19684: Some minute values cannot be set for Analytics data collection

commit 80d41dfe096d9f211bf40e6d7955f18baa8d851e
Merge: fcca82ebed5 60dc36c70b9
Author: Cari Spruiell <[email protected]>
Date:   Tue Aug 27 23:47:39 2019 -0500

    Merge pull request #4693 from magento-obsessive-owls/MC-19633-2.3.3

    [Owls] MC-19633

commit 60dc36c70b9de9a03bf3554c1f01be9e11bd2818
Author: Cari Spruiell <[email protected]>
Date:   Tue Aug 27 16:48:47 2019 -0500

    MC-19633: Disabled Products Do Not Appear in Search Results of Link Attribute

     - fix test

commit 572926cdfacfdb2b70bb5a9f67ce01a3bdfef956
Merge: 5d7082f2217 fcca82ebed5
Author: Magento CICD <[email protected]>
Date:   Tue Aug 27 10:08:37 2019 -0700

    merge magento/2.3.3-develop into magento-trigger/MC-18532

commit 54d6fa00a60a03049fc2db82193addd0850f5f71
Author: Cari Spruiell <[email protected]>
Date:   Tue Aug 27 09:50:54 2019 -0500

    MC-19633: Disabled Products Do Not Appear in Search Results of Link Attribute

     - update to show all products regardless of status

commit fcca82ebed52aeb811daff08b96dcf965113797c
Merge: a66f4c7fd0b 17b878f82b7
Author: Lagno Iryna <[email protected]>
Date:   Tue Aug 27 09:16:44 2019 -0500

    Merge pull request #4674 from magento-troll/MC-19184

    - fixed  Quick Search is broken

commit 5d7082f2217912839f6684cfe1c8b7639d807c92
Author: Kieu Phan <[email protected]>
Date:   Mon Aug 26 16:39:46 2019 -0500

    MC-18532: Update Changelog based on delivered scope
    Update Changelog for 2.3.3-develop

commit d110db27a979202df882c88c42fc2d0833683659
Author: Kieu Phan <[email protected]>
Date:   Mon Aug 26 16:05:24 2019 -0500

    MC-18532: Update Changelog based on delivered scope
    Update Changelog for 2.3.3-develop

commit 17b878f82b7ba8afcd2ce16395cd61bb149a6e07
Merge: 8c56a75c194 a66f4c7fd0b
Author: Vitaliy Honcharenko <[email protected]>
Date:   Mon Aug 26 14:53:05 2019 -0500

    Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19184

commit a66f4c7fd0b4381e07f7b98834f48ac762db84ca
Merge: f8620b927c0 78fd8117df9
Author: Nathan Smith <[email protected]>
Date:   Mon Aug 26 12:07:24 2019 -0500

    Merge pull request #4685 from magento-borg/MC-19072-2

    [borg] MC-19072: Braintree: Unable to fill "Credit Card Number" and "Expiration Date" fields on Checkout page if "CVV Verification" = No

commit 8c56a75c194fbdb24e434641f2efbcb11da0146c
Merge: 0023dcec912 f8620b927c0
Author: Vitaliy Honcharenko <[email protected]>
Date:   Mon Aug 26 11:41:27 2019 -0500

    Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19184

commit 78fd8117df9a6fc72e51a14786d58eb5504417fb
Author: Nathan Smith <[email protected]>
Date:   Mon Aug 26 10:01:00 2019 -0500

    MC-19072: Braintree: Unable to fill "Credit Card Number" and "Expiration Date" fields on Checkout page if "CVV Verification" = No

commit f8620b927c056efb6108789b60e3d38d77c6290a
Merge: fd0c3d087d2 2c829058761
Author: Zabaznov Vitalii <[email protected]>
Date:   Sun Aug 25 15:48:52 2019 -0500

    Merge pull request #4683 from magento-performance/MC-19612

    MC-19612

commit 2c829058761d68af6a6987f13162bc6aa2381c8b
Merge: 35b8a04d5a0 fd0c3d087d2
Author: Vitalii Zabaznov <[email protected]>
Date:   Sun Aug 25 11:47:54 2019 -0500

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19612

commit fd0c3d087d233161259f46a669cd4e16f517b7c3
Merge: 12e9506487e 6e0291d5b0a
Author: Dmytro Horytskyi <[email protected]>
Date:   Sat Aug 24 16:01:31 2019 -0500

    Merge pull request #4658 from magento-tango/MC-19051

    MC-19051: [backport for 2.3.3] Nightly build jobs were failing lately after un-skipping tests in MC-5777

commit 0023dcec912a1a442d67ab0c8d9cab36490c8be2
Author: Vitaliy Honcharenko <[email protected]>
Date:   Fri Aug 23 16:31:54 2019 -0500

    MC-19184: Quick Search is broken

    - fixed performance tests

commit 6e0291d5b0aacc6fa7a652e63c0b0863e7242af0
Merge: a6225f2dcb7 12e9506487e
Author: Dmytro Horytskyi <[email protected]>
Date:   Fri Aug 23 10:15:09 2019 -0500

    Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19051

commit 35b8a04d5a0f7c919e02c2727bd0a5778fe39e90
Author: Vitalii Zabaznov <[email protected]>
Date:   Fri Aug 23 09:50:54 2019 -0500

    MC-19612: Revert MC-15378

commit 12e9506487e217b7d110800b2cfaf1a1d1484628
Merge: 50144fbab1c 74c17f77ccc
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 23 16:43:09 2019 +0300

    Merge pull request #4670 from magento-tsg/2.3.3-develop-pr73

    [TSG] Fixes for 2.3 (pr73) (2.3.3-develop)

commit 302070f611e884abbda6460cb6231101a2eefcb4
Author: Vitaliy Honcharenko <[email protected]>
Date:   Fri Aug 23 07:56:11 2019 -0500

    MC-19184: Quick Search is broken

    - fixed static tests

commit ebd62c8fee56cad24429d777ba91971df7f137f5
Merge: 7035daca3f6 50144fbab1c
Author: Vitaliy Honcharenko <[email protected]>
Date:   Fri Aug 23 07:54:54 2019 -0500

    Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19184

commit 74c17f77ccc425d51b897705b97e7bdd8f14e70d
Merge: 20f952001ad 50144fbab1c
Author: Magento CICD <[email protected]>
Date:   Thu Aug 22 23:59:34 2019 -0700

    merge magento/2.3.3-develop into magento-tsg/2.3.3-develop-pr73

commit 50144fbab1c8cbaee0a5985a663b8136fef69631
Merge: 2002038d240 397c56912a2
Author: Dmitry Voskoboinikov <[email protected]>
Date:   Thu Aug 22 17:07:28 2019 -0500

    Merge pull request #4665 from magento-qwerty/MC-19145

    Fixed Issues:
    - MC-19145: [CLOUD] Internal error after DHL was configured

commit 7035daca3f6b47038d120813ec7164b76ac4bc94
Author: Vitaliy Honcharenko <[email protected]>
Date:   Thu Aug 22 13:42:48 2019 -0500

    MC-19184: Quick Search is broken

commit 20f952001ad07b94147a3ca03ad2dfd22b4a83d2
Merge: 2002038d240 2c0adb1ebb8
Author: Myroslav Dobra <[email protected]>
Date:   Thu Aug 22 19:40:48 2019 +0300

    Merge remote-tracking branch 'origin/MC-19415' into 2.3.3-develop-pr73

commit 397c56912a2f06d41e3a90d0c787583e07fcb62d
Merge: 4d338c7df9e 2002038d240
Author: Oleksandr Gorkun <[email protected]>
Date:   Thu Aug 22 10:57:45 2019 -0500

    Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19145

commit 4d338c7df9e23c178e7f09bd9a201942113e1152
Author: Oleksandr Gorkun <[email protected]>
Date:   Thu Aug 22 10:57:21 2019 -0500

    MC-19145: [CLOUD] Internal error after DHL was configured

commit 2002038d240f99e01a9a443d1648633f8b4c5c78
Merge: a6e663e1b5b 09f53c728db
Author: Myroslav Dobra <[email protected]>
Date:   Thu Aug 22 16:07:30 2019 +0300

    Merge pull request #4663 from magento-tsg/2.3.3-develop-pr72

    [TSG] Fixes for 2.3 (pr72) (2.3.3-develop)

commit 09f53c728db957024ec294b2b791e8d0a567b192
Merge: fa0bcfd5f0a 3910cacc104
Author: Myroslav Dobra <[email protected]>
Date:   Thu Aug 22 14:42:39 2019 +0300

    Merge remote-tracking branch 'origin/MC-19566' into 2.3.3-develop-pr72

commit 3910cacc104294b5fb92d562034620300461cfc6
Author: Andrii Meysar <[email protected]>
Date:   Thu Aug 22 13:48:36 2019 +0300

    MC-19566: Failing Integration Magento.Catalog.Model.Indexer.Product.Flat.Action.RelationTest.testExecute

commit a6225f2dcb74f608de5d9b2ce3d057102c50d19c
Merge: e81a669dd94 a6e663e1b5b
Author: Magento CICD <[email protected]>
Date:   Wed Aug 21 12:55:03 2019 -0700

    merge magento/2.3.3-develop into magento-tango/MC-19051

commit e81a669dd943159d11b16f239349c2e0ddcac80a
Author: Dmytro Horytskyi <[email protected]>
Date:   Thu Aug 22 04:53:16 2019 +0000

    MC-19051: [backport for 2.3.3] Nightly build jobs were failing lately after un-skipping tests in MC-5777

commit fa973d856dee95787787cd54edf4b1b10d335d5f
Merge: ea487279205 a6e663e1b5b
Author: Magento CICD <[email protected]>
Date:   Wed Aug 21 12:03:04 2019 -0700

    merge magento/2.3.3-develop into magento-qwerty/MC-19145

commit fa0bcfd5f0aa0f49502e4548091bbcbc320aee97
Merge: a6e663e1b5b 1e67a692ec0
Author: Myroslav Dobra <[email protected]>
Date:   Wed Aug 21 20:43:43 2019 +0300

    Merge remote-tracking branch 'origin/MC-19334' into 2.3.3-develop-pr72

commit 1e67a692ec0cb57b5fbed607cfb468eb1d987b7a
Author: Myroslav Dobra <[email protected]>
Date:   Wed Aug 21 18:34:13 2019 +0300

    MC-19334: Reindex error when website have store without store view

commit 2c0adb1ebb865d8a3a34e68fb219f304d78a8755
Merge: 96f56f13547 a6e663e1b5b
Author: Andrii Meysar <[email protected]>
Date:   Wed Aug 21 18:17:20 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19415

commit a6e663e1b5b8c0ab028760673f6bdf770ea27542
Merge: 88b6bcdb6c5 bc581c8e276
Author: Myroslav Dobra <[email protected]>
Date:   Wed Aug 21 17:28:00 2019 +0300

    Merge pull request #4657 from magento-tsg/2.3.3-develop-pr69

    [TSG] Fixes for 2.3 (pr69) (2.3.3-develop)

commit bc581c8e276c8aaad0c03f0ae44808996a1624d0
Merge: 65305731bfd 77d6f4142ae
Author: Myroslav Dobra <[email protected]>
Date:   Wed Aug 21 15:23:17 2019 +0300

    Merge remote-tracking branch 'origin/MC-19218' into 2.3.3-develop-pr69

commit 65305731bfdb0b83eb2a194f098411a98b1b175d
Merge: 90b312879c5 13118ce9be8
Author: Myroslav Dobra <[email protected]>
Date:   Wed Aug 21 15:23:05 2019 +0300

    Merge remote-tracking branch 'origin/MC-19089' into 2.3.3-develop-pr69

commit 90b312879c5dc903213037dda984c7d463090efe
Merge: 88b6bcdb6c5 5686417b9bd
Author: Myroslav Dobra <[email protected]>
Date:   Wed Aug 21 15:22:55 2019 +0300

    Merge remote-tracking branch 'origin/MC-19080' into 2.3.3-develop-pr69

commit 96f56f1354707933aa7f071d05bd6ae4e8cb2c11
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 21 14:16:21 2019 +0300

    MC-19415: Displayed incorrect price
      - revert MC-18009

commit 39504ceabde0a171af102826095a89df2ab9d058
Author: Dmytro Horytskyi <[email protected]>
Date:   Wed Aug 21 06:43:30 2019 +0000

    MC-19051: [backport for 2.3.3] Nightly build jobs were failing lately after un-skipping tests in MC-5777

commit 9c4c3a05c7c14de1c1fd3d28f56bd409cd9f2a39
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 21 09:24:51 2019 +0300

    MC-19415: Displayed incorrect price
      - revert MC-17919

commit 88b6bcdb6c53114a73847c4c9fc9df06ab2b3375
Merge: 8bc73be6bf8 e6cfdb3152d
Author: Zabaznov Vitalii <[email protected]>
Date:   Tue Aug 20 15:05:31 2019 -0500

    Merge pull request #4655 from magento-performance/MC-19500

    MC-19500

commit e6cfdb3152d302c092b3420437e481450e28ea7f
Author: Vitalii Zabaznov <[email protected]>
Date:   Tue Aug 20 13:21:24 2019 -0500

    MC-19500: fix related-product changes affection on third party extensions

commit 5bc42334e00cb5bd508a026e1edc1809a258ec36
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 20 12:44:04 2019 +0300

    MC-19334: Reindex error when website have store without store view

commit 1725caa40ee70df4fcbf376b04ff719412e41923
Merge: 5271f434440 8bc73be6bf8
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 20 11:32:49 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19334

commit 5271f434440d2f589c782a996d8d73bedbb36bc8
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 20 11:32:03 2019 +0300

    MC-19334: Reindex error when website have store without store view

commit 13118ce9be8e570f60bc9f85a055c66fa4604068
Merge: 789ed270d88 8bc73be6bf8
Author: Viktor Petryk <[email protected]>
Date:   Tue Aug 20 09:52:45 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19089

commit 77d6f4142ae53be57e53eb35236f4a7a287b84bf
Merge: e913ce88010 8bc73be6bf8
Author: Viktor Petryk <[email protected]>
Date:   Tue Aug 20 09:28:09 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19218

commit 6bea102d9b46e84b40a258304371ea9f09a3fc4d
Merge: 60fc2086c62 981ec8ec0c6
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 20 07:49:08 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19334

commit 8bc73be6bf8954821b421d660404b3a9d911a6d2
Merge: 730dbceb0c6 26194b4b880
Author: Lagno Iryna <[email protected]>
Date:   Mon Aug 19 17:01:02 2019 -0500

    Merge pull request #4652 from magento-trigger/MC-19338

    - fix MTF UpgradeSystemTest

commit 26194b4b8803dbb31ed21cb63110d40c65638f9c
Merge: d8b3b7fe587 730dbceb0c6
Author: Magento CICD <[email protected]>
Date:   Mon Aug 19 13:15:57 2019 -0700

    merge magento/2.3.3-develop into magento-trigger/MC-19338

commit 730dbceb0c6f3103d6d512c7bc96b19239a62ce8
Merge: 981ec8ec0c6 f71a4bd2e27
Author: Daniel Renaud <[email protected]>
Date:   Mon Aug 19 13:51:23 2019 -0500

    Merge pull request #4636 from magento-honey-badgers/hb-combined-pr

    [honey] MC-19115: Admin Analytics tracking should be enabled by default

commit d8b3b7fe587b532265860e8b7e1ccf56c1a83544
Merge: e999e668380 981ec8ec0c6
Author: Magento CICD <[email protected]>
Date:   Mon Aug 19 10:32:49 2019 -0700

    merge magento/2.3.3-develop into magento-trigger/MC-19338

commit f71a4bd2e277a79a459a060a858173807821d1b3
Merge: 6e13a7285c7 981ec8ec0c6
Author: Prabhu Ram <[email protected]>
Date:   Mon Aug 19 10:52:08 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into hb-combined-pr

commit 981ec8ec0c6c866fc35296b11956dfc2d8789d81
Merge: 2a7895e91ac b2a26bee80c
Author: Myroslav Dobra <[email protected]>
Date:   Sun Aug 18 22:46:47 2019 +0300

    Merge pull request #4649 from magento-tsg/2.3.3-develop-pr68

    [TSG] Fixes for 2.3 (pr68) (2.3.3-develop)

commit b2a26bee80cb44a3dece1d06d7ecf62281f3c7df
Merge: c0833b74d32 2a7895e91ac
Author: Magento CICD <[email protected]>
Date:   Fri Aug 16 13:35:46 2019 -0700

    merge magento/2.3.3-develop into magento-tsg/2.3.3-develop-pr68

commit e999e668380d338ee610cc8a0c010b6a606c3766
Merge: a2397de3e0e 2a7895e91ac
Author: Krissy Hiserote <[email protected]>
Date:   Fri Aug 16 14:35:45 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-19338

commit a2397de3e0e26c8c92143069a104403aaa113b91
Author: Krissy Hiserote <[email protected]>
Date:   Fri Aug 16 14:14:20 2019 -0500

    MC-19338: Fix MTF UpgradeSystemTest

commit ea4872792051c93be3d5fca142d14f700c27cdcc
Merge: 059b5cc7d1d 2a7895e91ac
Author: Oleksandr Gorkun <[email protected]>
Date:   Fri Aug 16 12:09:16 2019 -0500

    Merge branch '2.3.3-develop' of https://github.com/magento/magento2ce into MC-19145

commit 059b5cc7d1d069d870f80e5ecdead1ea54effcf8
Author: Oleksandr Gorkun <[email protected]>
Date:   Fri Aug 16 12:08:39 2019 -0500

    MC-19145: [CLOUD] Internal error after DHL was configured

commit 2a7895e91accedb0f0374b5ee6ef0e94b977ffca
Merge: f488996020c 03632de96b1
Author: Kevin Kozan <[email protected]>
Date:   Fri Aug 16 09:58:59 2019 -0500

    Merge pull request #4641 from magento-pangolin/MFTF-2.4.4-2.3.3

    MQE-1702: Bump MFTF version in Magento

commit 03632de96b1a0a3389fb91fad75efe7237e7ba4a
Merge: 98efddb24cc f488996020c
Author: Kevin Kozan <[email protected]>
Date:   Fri Aug 16 08:45:50 2019 -0500

    Merge remote-tracking branch 'upstream/2.3.3-develop' into MFTF-2.4.4-2.3.3

commit 60fc2086c62398f325426c307d8158ff988eb09a
Author: OlgaVasyltsun <[email protected]>
Date:   Fri Aug 16 15:43:58 2019 +0300

    MC-19334: Reindex error when website have store without store view

commit c0833b74d3234c2d372c1eea8c1d7d97bac5240b
Merge: f498fa595c3 bd8f875b27c
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 16 15:25:54 2019 +0300

    Merge remote-tracking branch 'origin/MC-19132' into 2.3.3-develop-pr68

commit 789ed270d885afd20425da30b71b94cbedb49ce1
Author: DianaRusin <[email protected]>
Date:   Fri Aug 16 14:42:08 2019 +0300

    MC-19089: OnePageCheckoutDeclinedTest fails on Bamboo. Order is placed with incorrect credit card number

commit f498fa595c3ba7d459bd976f8c2e069023a8ec0a
Merge: d80bd41fd1b 3425e788da5
Author: Andrii Meysar <[email protected]>
Date:   Fri Aug 16 10:09:00 2019 +0300

    Merge remote-tracking branch 'origin/MC-19044' into 2.3.3-develop-pr68

commit 3425e788da57fcb49393cafbf29653953babfb36
Merge: c6cc4b23b4b f488996020c
Author: Andrii Meysar <[email protected]>
Date:   Fri Aug 16 10:08:05 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19044

commit 5686417b9bd4bd694c4fd867ce7c24ab43e204e8
Merge: a2f86726b6c f488996020c
Author: Viktor Petryk <[email protected]>
Date:   Fri Aug 16 09:46:17 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19080

commit a2f86726b6c60bf059987ba8fbda7d59c1f1422b
Author: Viktor Petryk <[email protected]>
Date:   Fri Aug 16 09:45:46 2019 +0300

    MC-19080: Incorrect behavior after shipping methods disabled

commit bd8f875b27cd17fafb5d9c62e40870768fc3b448
Merge: 8a4e7c4ca5f f488996020c
Author: Serhii Voloshkov <[email protected]>
Date:   Fri Aug 16 09:10:15 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19132

commit d80bd41fd1bf445261705bbb08388b0e266bfc1c
Merge: 91086cb2beb f488996020c
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 16 00:31:58 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into 2.3.3-develop-pr68

commit 6e13a7285c716cd767c53d3c5bf020c4e34c2605
Merge: 6b6a12b788b f488996020c
Author: Magento CICD <[email protected]>
Date:   Thu Aug 15 14:06:43 2019 -0700

    merge magento/2.3.3-develop into magento-honey-badgers/hb-combined-pr

commit 6b6a12b788bcdd842f13cc8cc3b3aa4040b721ba
Merge: 33456b1d01f fbaecf03e77
Author: Daniel Renaud <[email protected]>
Date:   Thu Aug 15 16:03:18 2019 -0500

    Merge remote-tracking branch 'origin/MC-19194' into hb-combined-pr

commit f488996020c2b6195739446ba88812915776ad06
Merge: 0ccf8280315 0b7857071ed
Author: Lagno Iryna <[email protected]>
Date:   Thu Aug 15 14:59:57 2019 -0500

    Merge pull request #4638 from magento-trigger/MC-18977

    - revert change of ENGCOM-3260

commit b9d468ceb37a9ef32b6ca60e88feac6711e3bb32
Author: Oleksandr Gorkun <[email protected]>
Date:   Thu Aug 15 14:03:32 2019 -0500

    MC-19145: [CLOUD] Internal error after DHL was configured

commit 98efddb24cc787d94113b9c5a83dae4a5771a9f2
Author: Kevin Kozan <[email protected]>
Date:   Thu Aug 15 13:50:28 2019 -0500

    MQE-1702: Bump MFTF version in Magento

    - MFTF Version Bump

commit fbaecf03e77e0e015559bdb3ae2d264f923e1f72
Merge: 2dbf838540b 0ccf8280315
Author: Daniel Renaud <[email protected]>
Date:   Thu Aug 15 13:02:02 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-19194

commit 2dbf838540bf9bc0efbad683eb5b743632877bbe
Author: Daniel Renaud <[email protected]>
Date:   Thu Aug 15 13:00:54 2019 -0500

    MC-19194: UpdateCartItems mutation does not update cart item quantity
    - fix performance issue

commit 0b7857071ed3d3460035d9d434a3894b998c52fa
Merge: 410d421d1d1 0ccf8280315
Author: Magento CICD <[email protected]>
Date:   Thu Aug 15 09:41:44 2019 -0700

    merge magento/2.3.3-develop into magento-trigger/MC-18977

commit 0ccf82803150163b8ca6cc9c165d0a41b20d8db6
Merge: 7063e2a312d cc3c5a4b0ac
Author: Lagno Iryna <[email protected]>
Date:   Thu Aug 15 10:27:50 2019 -0500

    Merge pull request #4633 from magento-trigger/MC-19161

    - revert ENGCOM-2983

commit c6cc4b23b4b357adc925d6ae6ded2b43bf37d791
Author: Myroslav Dobra <[email protected]>
Date:   Thu Aug 15 17:58:49 2019 +0300

    MC-19044: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins

commit 08bbdbf0246a09612f893c12587b3fae0d61efa7
Author: Viktor Petryk <[email protected]>
Date:   Thu Aug 15 14:24:11 2019 +0300

    MC-19080: Incorrect behavior after shipping methods disabled

commit 91086cb2bebca8a4d56398caf4cbddf689872814
Merge: 33ce91a68a6 c50b4daea3c
Author: OlgaVasyltsun <[email protected]>
Date:   Thu Aug 15 12:12:02 2019 +0300

    Merge branch 'MC-19078' into 2.3.3-develop-pr68

commit c50b4daea3c30922d43885f55de1e4885d569ae2
Merge: ccc5074fba3 7063e2a312d
Author: OlgaVasyltsun <[email protected]>
Date:   Thu Aug 15 12:04:30 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19078

commit 33ce91a68a644a1a3f9ae64f6a0cd0a8e04b3d6f
Merge: 5985c6fe7e9 c3f09571296
Author: Viktor Petryk <[email protected]>
Date:   Thu Aug 15 11:20:35 2019 +0300

    Merge remote-tracking branch 'origin/MC-19014' into 2.3.3-develop-pr68

commit c3f095712962e3299fffed3fea33ffd0c393e759
Merge: 9092e5e22c7 7063e2a312d
Author: Viktor Petryk <[email protected]>
Date:   Thu Aug 15 11:18:31 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19014

commit db21eb4b243b88d01aafd134ac89fb047778a578
Merge: 59e76d9a78e 7063e2a312d
Author: Viktor Petryk <[email protected]>
Date:   Thu Aug 15 10:54:35 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19080

commit 59e76d9a78e513730ac920cc785c52b9691796aa
Author: Viktor Petryk <[email protected]>
Date:   Thu Aug 15 09:22:02 2019 +0300

    MC-19080: Incorrect behavior after shipping methods disabled

commit 33456b1d01f62bdc64e0822e668aac1c3b22e99d
Merge: 624bb476552 9532e283542
Author: Daniel Renaud <[email protected]>
Date:   Wed Aug 14 16:39:35 2019 -0500

    Merge remote-tracking branch 'origin/MC-19194' into hb-combined-pr

commit 624bb476552b0449636a8a63c6a1c36daa906e3a
Merge: 7063e2a312d a098f4fe398
Author: Daniel Renaud <[email protected]>
Date:   Wed Aug 14 16:39:19 2019 -0500

    Merge remote-tracking branch 'origin/MC-19115' into hb-combined-pr

commit cc3c5a4b0acbcc5d8740e48aa0afb41f8354b36d
Merge: 2fa2eb9d131 7063e2a312d
Author: Magento CICD <[email protected]>
Date:   Wed Aug 14 14:19:42 2019 -0700

    merge magento/2.3.3-develop into magento-trigger/MC-19161

commit 410d421d1d1879e005beb4e077665c1da5fb92d3
Merge: fe432468b13 7063e2a312d
Author: Krissy Hiserote <[email protected]>
Date:   Wed Aug 14 15:39:28 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-18977

commit 7063e2a312d0b4618abc48d49ee898f8d258d4ab
Merge: d525030137d 7d3042fae6b
Author: Lagno Iryna <[email protected]>
Date:   Wed Aug 14 15:31:01 2019 -0500

    Merge pull request #4626 from magento-trigger/MC-19061_revert

     - Revert ticket MC-17003

commit 2fa2eb9d1314c7177a6a4bd8c9d19f90759fdf23
Author: Max Lesechko <[email protected]>
Date:   Wed Aug 14 14:59:56 2019 -0500

    MC-19161: Revert ENGCOM-2983

commit 9532e283542714364f2ce7b15508ea8c110e4165
Author: Prabhu Ram <[email protected]>
Date:   Wed Aug 14 12:20:56 2019 -0500

    MC-19194: UpdateCartItems mutation does not update cart item quantity
    - Reverted back commit c7d9130289993310992cb3e4a0b5ec7c3dd196bd and modified functional test

commit eb3d1728566f992401bbfb648ab56cf39deecf9b
Author: Viktor Petryk <[email protected]>
Date:   Wed Aug 14 18:02:38 2019 +0300

    MC-19080: Incorrect behavior after shipping methods disabled

commit 8a4e7c4ca5f3e75fd2f158afa5338c39b5132418
Author: OlgaVasyltsun <[email protected]>
Date:   Wed Aug 14 17:22:09 2019 +0300

    MC-19132: Child product image of configurable product not displayed

commit ccc5074fba3d60f132908d6bf7ad2fefad0280dc
Author: Stas Kozar <[email protected]>
Date:   Wed Aug 14 15:07:06 2019 +0300

    MC-19078: Product is missing from shopping cart after payment cancellation

commit e913ce88010bbee69909e2d3e9cdf28816971eb8
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 14 15:03:02 2019 +0300

    MC-19218: Catalog Event created with incorrect start and end dates
     - revert #22463

commit 5985c6fe7e91488d319213e516b270f91c510e3e
Merge: 1a806aa36d9 7f1229bf7eb
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 14 10:23:16 2019 +0300

    Merge remote-tracking branch 'origin/MC-19140' into 2.3.3-develop-pr68

commit 7f1229bf7ebb39559639d0b2fe603d19dc398fee
Merge: ee853472c01 d525030137d
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 14 10:20:18 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19140

commit 1a806aa36d9bd756ba1906ed8a437129ea865698
Merge: fce26a49b12 7c240d94881
Author: Viktor Petryk <[email protected]>
Date:   Wed Aug 14 10:18:08 2019 +0300

    Merge remote-tracking branch 'origin/MC-19023' into 2.3.3-develop-pr68

commit fce26a49b121e0d393693421b8bbf01ea9869818
Merge: ee52bbe016d 47a1ac16dbb
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 14 09:38:44 2019 +0300

    Merge remote-tracking branch 'origin/MC-19075' into 2.3.3-develop-pr68

commit 47a1ac16dbbbcaf952947affaf37166df204f88c
Merge: c5574b8eb9c d525030137d
Author: Serhii Voloshkov <[email protected]>
Date:   Wed Aug 14 09:36:52 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19075

commit 7d3042fae6bfa3b8f7eb2afa6cd23407b0e44353
Author: Kieu Phan <[email protected]>
Date:   Tue Aug 13 14:23:40 2019 -0500

     MC-19061: Revert ticket MC-17003
    Skip MFTF test

commit 6d7e1f714c455764255f654a1b88707a0243e1d8
Author: Max Lesechko <[email protected]>
Date:   Tue Aug 13 11:51:58 2019 -0500

    MC-19161: Revert ENGCOM-2983

commit a098f4fe398be310a46f4cc106efc951b64cc8e8
Author: Prabhu Ram <[email protected]>
Date:   Tue Aug 13 11:13:06 2019 -0500

    MC-19115: Admin Analytics tracking should be enabled by default
    - static fix

commit eb6d625269699de731b2be64098f83cab6a045ab
Author: Iryna Lagno <[email protected]>
Date:   Tue Aug 13 09:58:25 2019 -0500

    MC-19061: Revert ticket MC-17003

commit bc97aedd25622f040ccba347b5dfc3efdacc3827
Author: Viktor Petryk <[email protected]>
Date:   Tue Aug 13 17:51:54 2019 +0300

    MC-19080: Incorrect behavior after shipping methods disabled

commit 2c5fd23470c42e9c92e643bc9025cdc6de0e1a56
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 13 17:00:43 2019 +0300

    MC-19132: Child product image of configurable product not displayed

commit fe432468b13d1f85c301b60ea890abb4bead5c34
Author: Krissy Hiserote <[email protected]>
Date:   Tue Aug 13 08:13:58 2019 -0500

    MC-18977: Revert change of ENGCOM-3260

    - fix static failures

commit 8e3edf17c1e352bbf6320e68c06c9a0a402e2e9e
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 13 15:31:19 2019 +0300

    MC-19132: Child product image of configurable product not displayed

commit 9092e5e22c736aca6dff5e0943c214e293ec1c66
Author: Myroslav Dobra <[email protected]>
Date:   Tue Aug 13 14:14:38 2019 +0300

    MC-19014: QueueManagementTest caused flakiness during nightly build Integration test runs

commit 7c240d94881c76838141dcfb91fe2f6b2208928f
Author: Serhii Voloshkov <[email protected]>
Date:   Tue Aug 13 13:58:07 2019 +0300

    MC-19023: PayPal Express Checkout Payflow Edition don't work (Internal Error)

commit 30c3db8364c85f4e39680a1f63717d8b28709a04
Author: Myroslav Dobra <[email protected]>
Date:   Tue Aug 13 12:26:00 2019 +0300

    MC-19014: QueueManagementTest caused flakiness during nightly build Integration test runs

commit b1c154c29d7d53674b0b760b3462c1cd1319af1e
Merge: 76b668bc8a5 d525030137d
Author: Serhii Voloshkov <[email protected]>
Date:   Tue Aug 13 12:10:30 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19023

commit 76b668bc8a5b0a83bb3414660eaa793d969cf8ff
Author: Serhii Voloshkov <[email protected]>
Date:   Tue Aug 13 12:04:13 2019 +0300

    MC-19023: PayPal Express Checkout Payflow Edition don't work (Internal Error)

commit c5574b8eb9c7f30f59a5e58d85462deb71279e2a
Author: Myroslav Dobra <[email protected]>
Date:   Tue Aug 13 10:20:42 2019 +0300

    MC-19075: Html text are visible on frontend

commit ee52bbe016d6afe072761ef18d5110c7513c26ce
Author: OlgaVasyltsun <[email protected]>
Date:   Tue Aug 13 09:50:11 2019 +0300

    MC-19084: Browser console error after applying gift card account during checkout

commit e115c129f73035ec88391fb454caceab1ed82e9e
Merge: f49f1f5592c d525030137d
Author: Magento CICD <[email protected]>
Date:   Mon Aug 12 14:45:23 2019 -0700

    merge magento/2.3.3-develop into magento-trigger/MC-19061_revert

commit 76a0d7ca2ecafa043e22fde4a7023241183fac60
Merge: 09ec6714cc1 d525030137d
Author: Prabhu Ram <[email protected]>
Date:   Mon Aug 12 16:42:15 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-19115

commit 1ab19302128366b99a6847af3133de23be2ad5c8
Author: Max Lesechko <[email protected]>
Date:   Mon Aug 12 16:07:56 2019 -0500

    MC-19161: Revert ENGCOM-2983

commit d525030137d2dd8b7cf428371b046c2c2ddd3b34
Merge: 3e375885acc fdc4b65743d
Author: Myroslav Dobra <[email protected]>
Date:   Tue Aug 13 00:00:38 2019 +0300

    Merge pull request #4623 from magento-tsg/2.3.3-develop-pr65

    [TSG] Fixes for 2.3 (pr65) (2.3.3-develop)

commit f1b284b478356cb7b3a544049b35b8e3f5062eb5
Author: Krissy Hiserote <[email protected]>
Date:   Mon Aug 12 15:51:45 2019 -0500

    MC-18977: Revert change of ENGCOM-3260

    - fix static failures

commit 09ec6714cc137b411d8facb3025164d94429e910
Author: Prabhu Ram <[email protected]>
Date:   Mon Aug 12 14:08:56 2019 -0500

    MC-19115: Admin Analytics tracking should be enabled by default
    - Added caching in product metadata to improve performance

commit fdc4b65743db8c65c9389cbadfefb11dcafd3da8
Merge: 28446c45947 3e375885acc
Author: Magento CICD <[email protected]>
Date:   Mon Aug 12 09:51:21 2019 -0700

    merge magento/2.3.3-develop into magento-tsg/2.3.3-develop-pr65

commit f49f1f5592c9263e339bf42f2e842cc1fcfe63e6
Author: Iryna Lagno <[email protected]>
Date:   Mon Aug 12 11:48:59 2019 -0500

    MC-19061: Revert ticket MC-17003

commit ee853472c01c0d7e02da6f8659d0f13657a47854
Author: Viktor Petryk <[email protected]>
Date:   Mon Aug 12 18:18:55 2019 +0300

    MC-19140: [DHL] You are still on New Shipment page after creating the shipment

commit e907198f2f1f118194b9f91193342864afc25629
Merge: 16aa234c854 3e375885acc
Author: Krissy Hiserote <[email protected]>
Date:   Mon Aug 12 07:52:41 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-18977

commit fd73c392026c990721600e5e49f4b096973d99c7
Author: Myroslav Dobra <[email protected]>
Date:   Mon Aug 12 15:35:51 2019 +0300

    MC-19075: Html text are visible on frontend

commit c077220399c4b105bf0d0c31e764072b3c52b58c
Merge: 6af74d9925c 3e375885acc
Author: Serhii Voloshkov <[email protected]>
Date:   Mon Aug 12 10:30:35 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19023

commit 3e375885acc5dffe6f2e6699228ea3172d97e123
Merge: bdd4b683677 fa628ed3f31
Author: Eugene Shakhsuvarov <[email protected]>
Date:   Fri Aug 9 21:34:58 2019 -0500

    Merge pull request #4616 from magento-engcom/MSI-2471

    [EngCom] Fix Elasticsearch support for MSI

commit fa628ed3f3134dcd319a0e57a961ff6323f6ef30
Author: Ievgen Shakhsuvarov <[email protected]>
Date:   Fri Aug 9 16:59:37 2019 -0500

    MSI-2471: Fixed static test failure

commit 28446c4594745c450f8048cd21547200ad8eac40
Merge: 5ab88d0f0f7 bdd4b683677
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 9 23:49:47 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into 2.3.3-develop-pr65

commit d41fc7b3b997a42d75f50e4416a1d0c9d4499e59
Merge: faddcf9e320 bdd4b683677
Author: Prabhu Ram <[email protected]>
Date:   Fri Aug 9 15:37:51 2019 -0500

    Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-19115

commit 9687ccf68d7d6c8b6059e3bc018e28ac60915962
Author: Ievgen Shakhsuvarov <[email protected]>
Date:   Fri Aug 9 15:37:29 2019 -0500

    MSI-2471: Fix Elasticsearch support for MSI

commit 16aa234c85476ffa7f68b91ff72c412b6fdb1cc5
Author: Krissy Hiserote <[email protected]>
Date:   Fri Aug 9 15:20:24 2019 -0500

    MC-18977: Revert change of ENGCOM-3260

commit faddcf9e32093dbbf94e684144d5e6272533294b
Author: Prabhu Ram <[email protected]>
Date:   Fri Aug 9 15:19:30 2019 -0500

    MC-19115: Admin Analytics tracking should be enabled by default
    - Enabling tracking by Default

commit 6af74d9925c94280f8a7e773dc7d07b49abaf197
Author: Serhii Voloshkov <[email protected]>
Date:   Fri Aug 9 15:48:03 2019 +0300

    MC-19023: PayPal Express Checkout Payflow Edition don't work (Internal Error)

commit bdd4b683677c35530b0d49a3f31509f58c7d73fa
Merge: e753827dc06 912f8c5a963
Author: Cristian Partica <[email protected]>
Date:   Thu Aug 8 18:17:54 2019 -0500

    Merge pull request #4610 from magento-honey-badgers/MC-15298

    [honey] MC-15298: Allow admin to opt out of admin analytics tracking

commit 912f8c5a963383655584a074c7d7c0cf1a9057bc
Author: Daniel Renaud <[email protected]>
Date:   Thu Aug 8 16:24:59 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking

commit e70e30484b746b316575014d0727fbe092a9bec3
Author: michellbrito <[email protected]>
Date:   Thu Aug 8 14:37:42 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - removed config

commit f96b7aed68d649bdd03293620d4ef0f2948e62cc
Author: michellbrito <[email protected]>
Date:   Thu Aug 8 11:00:49 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Updated README

commit 3b0d7b7ef25e854fba0f437b5ce18b84fb51aa5f
Author: michellbrito <[email protected]>
Date:   Thu Aug 8 10:46:39 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Updated files based on review

commit ba2390fe8b468a757fb9e4c8465d0f8577d4deda
Author: michellbrito <[email protected]>
Date:   Thu Aug 8 09:06:35 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - added config, rm packaged-lock

commit 5ab88d0f0f74ef01c8bb378424b6b53f7a654f30
Merge: 2649b93a3d5 a079c9139a1
Author: Viktor Sevch <[email protected]>
Date:   Thu Aug 8 10:53:55 2019 +0300

    Merge remote-tracking branch 'origin/MC-18967' into 2.3.3-develop-pr65

commit 70c27d391c1aa9b5aa031f2309bf1ad919aceb5f
Author: michellbrito <[email protected]>
Date:   Wed Aug 7 14:46:13 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - added protected isAllowed

commit 7ebf19be1f1bf6c9814c42df09cbb1c83ceff25f
Author: Prabhu Ram <[email protected]>
Date:   Wed Aug 7 13:35:34 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking
    - static and health fix

commit 6b5c503e5e1795dde824707f951dd3ea1c7fddb4
Author: Prabhu Ram <[email protected]>
Date:   Wed Aug 7 13:32:53 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking
    - static and health fix

commit 7b0b55a021c30d2af52b784b4022f689081e8d0c
Author: michellbrito <[email protected]>
Date:   Wed Aug 7 12:28:43 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - edited files based on review

commit efca56ba664b53ca6e7e756bc699e3e7c4df8bf6
Merge: a3c62615178 e753827dc06
Author: michellbrito <[email protected]>
Date:   Wed Aug 7 10:11:08 2019 -0500

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-15298

commit a3c6261517872b3f078d9eb95f9e127f3fa6f1b0
Merge: b9855cb6675 94a8f6d69c4
Author: michellbrito <[email protected]>
Date:   Wed Aug 7 10:08:09 2019 -0500

    Merge branch 'MC-15298' of https://github.com/magento-honey-badgers/magento2ce into MC-15298

commit b9855cb6675d9841fb2221510f7c3a83a92147ef
Author: michellbrito <[email protected]>
Date:   Wed Aug 7 10:07:47 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking
    - deleted unused files

commit 2649b93a3d5a13d1edeaa174ed53ad9f7e8e1ff6
Merge: 3b97e33c0fe c75e923887f
Author: Viktor Sevch <[email protected]>
Date:   Wed Aug 7 10:24:01 2019 +0300

    Merge remote-tracking branch 'origin/MC-15930' into 2.3.3-develop-pr65

commit 94a8f6d69c448f50aacdfb5e08ed89dd2f3e5663
Author: Prabhu Ram <[email protected]>
Date:   Tue Aug 6 23:02:10 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking
    - MTf fix

commit 28eeac6307821addd475798aa73a2383554b367d
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 17:04:40 2019 -0500

    MC-17593: handle mtf and mftf failures - changed test files

commit 7d36b8b02fbdf648d97c9fa1ba8ba332ea715785
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 16:35:22 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - added declare(strict_types=1)

commit c191c7efe133bc5e616e7fdeafb21de8780b519b
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 14:26:33 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - made disableAdminUsage, enableAdminUsage, markUserNotified public functions

commit 86c936941e5c4614fa7400e14f4f5b1ea61d2dcb
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 14:22:27 2019 -0500

    MC-17593: handle mtf and mftf failures - edited CanViewNotification,HttpContentProvider,Urlbuilder, config

commit f681416e6975126c310dc68f8795db02b397054a
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 14:06:05 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - changes based on review

commit 3ce548211bb881c7eee2a8121d303d98efdcb9b8
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 11:00:51 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - edited AdminAuthLogin

commit 52abb64c9491bf5a33dc6f77e5f4c04a0c8cfe3a
Author: michellbrito <[email protected]>
Date:   Tue Aug 6 09:55:21 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - admin analytics css

commit a079c9139a1ae30f28f85b1f693a28e787e0f0b2
Author: Myroslav Dobra <[email protected]>
Date:   Tue Aug 6 17:06:42 2019 +0300

    MC-18967: [IT] Magento.SendFriend.Controller.SendmailTest fail on 2.3.3-develop

commit c75e923887f687ae88c859ddce6d82dfee402860
Author: Myroslav Dobra <[email protected]>
Date:   Tue Aug 6 11:51:56 2019 +0300

    MC-15930: [FT] [MFTF] AddOutOfStockProductToCompareListTest or functionality is wrong

commit 3b97e33c0fe2e4b7a3c287a292ab2a3a99d7a090
Merge: 45e708cacfe e753827dc06
Author: Andrii Meysar <[email protected]>
Date:   Tue Aug 6 11:35:51 2019 +0300

    Merge remote-tracking branch 'origin/2.3.3-develop' into MC-15577

    # Conflicts:
    #	lib/internal/Magento/Framework/Escaper.php

commit 45e708cacfecd84181ff437c08733d93540b9086
Author: Andrii Meysar <[email protected]>
Date:   Tue Aug 6 11:02:50 2019 +0300

    MC-15577: Fix url output

commit 35a278548c483ff1e5d0161ff5e2980446820267
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 20:13:43 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Edited CreateTest, IndexTest, default.xml, adminhtml_dashboard_index

commit 8b60dd092c86b0ba7457a8e2dcd9d266b4662d7c
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 16:39:43 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Edited component static failure

commit e753827dc0652a03ebbbd810aa2ce17f117395a1
Merge: 542d3bc841d cc2375661f4
Author: Dmytro Voskoboinikov <[email protected]>
Date:   Mon Aug 5 16:34:42 2019 -0500

    Merge branch '2.3-develop' into 2.3.3-develop

    # Conflicts:
    #	dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php

commit 2503817fa0302820ac7c1a7f59d4160b221d2c01
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 15:55:55 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Edited component, component-mixin, AdminAuthLogin static failures

commit e6bceb3d653d29e1d2215b17fcce80afe6765873
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 14:36:22 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Edited DisableAdminUsage, EnableAdminUsage, AdminUsasgeNotificationDataProvider, admin_usage_notification, component, component-mixin, componser

commit cc2375661f427bbf8806d862b4f228b54dcec782
Merge: 6ccd9422ef8 cad08c5cbed
Author: Joan He <[email protected]>
Date:   Mon Aug 5 14:22:38 2019 -0500

    Merge pull request #4604 from magento-arcticfoxes/2.3-develop-pr

    [techdivision] PRs

commit 65d4444aeb618555c5b3609f0d7e2f240636b089
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 14:10:39 2019 -0500

    MC-17593: add mftw test case - updated LoginUser, AdminAuthLogin

commit cad08c5cbed2f237c450ee49215640edcc3feecf
Merge: 46d964d6d90 55d9514dfec
Author: Joan He <[email protected]>
Date:   Mon Aug 5 12:49:30 2019 -0500

    Merge remote-tracking branch 'architects/MC-18929-static-failure' into 2.3-develop-pr

commit fd2b4ed135d9cd0420bb92790e0522f331879fe4
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 11:27:15 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Implemented HttpPostActionInterface to EnableAdminUsage, DisableAdminUsage

commit 55d9514dfecc00016b1b2e8c7456543c23cb9a49
Author: Igor Melnykov <[email protected]>
Date:   Mon Aug 5 11:05:14 2019 -0500

    MC-18929: ci/jenkins/Static-Tests-PR failure

    - whitelist TransportBuilder

commit 7d3f1c72994b8e7509aaa8a19a8cdcde6a300f43
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 09:53:30 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - Edited composer.json, DisableAdminUsage, and EnableAdminUsage

commit 3d1721e6a948727c96009544bb58685f30388b86
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 08:51:39 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - edited CanViewNotificationTest's namespace

commit 004db8edd825a3fd8798c89ed52885d66fcf579d
Author: michellbrito <[email protected]>
Date:   Mon Aug 5 08:37:25 2019 -0500

    MC-15298: Allow admin to opt out of admin analytics tracking - edited DisableAdmin, EnableAdmin

commit 1a4a5066c3f3f8b0ad12b17e68ea617ccac9c119
Author: Andrii Meysar <[email protected]>
Date:   Mon Aug 5 11:56:24 2019 +0300

    MC-15577: Fix url output

commit 46d964d6d90f6ee30a0263f1d77f509f408a732c
Author: roettigl <[email protected]>
Date:   Mon Aug 5 10:45:06 2019 +0200

    MC-18766: Merge mainline update pre composer comand

commit a1aee0981c8432408f7511848e5fa317a85596a0
Merge: 1e9468ed92f 6ccd9422ef8
Author: roettigl <[email protected]>
Date:   Mon Aug 5 10:43:38 2019 +0200

    Merge remote-tracking branch 'origin/2.3-develop' into pre_composer_update

commit 6ccd9422ef8b336682b793227179f0c77811cf12
Merge: 41daebffcb6 b5e273e9122
Author: Valerii Naida <[email protected]>
Date:   Sun Aug 4 21:33:31 2019 -0500

    Merge pull request #4601 from magento-engcom/graphql-develop-prs

    [Magento Community Engineering] Community Contributions - GraphQL

commit b5e273e912247333f19103d9ac46ff536fc0c945
Author: Valerii Naida <[email protected]>
Date:   Sun Aug 4 17:42:38 2019 -0500

    magento/graphql-ce#644: [Checkout] Support of "Braintree" payment method

commit fffeb6200176e738513057efab52745c06ec2fa8
Merge: 41daebffcb6 6cb6c5489ed
Author: Valerii Naida <[email protected]>
Date:   Sun Aug 4 15:14:18 2019 -0500

    ENGCOM-5527: GraphQl-644: [Checkout] Support of "Braintree" payment method #392

commit 6cb6c5489ed2acbd74710ce4e430bdb991828558
Merge: 41daebffcb6 00002f4b4dd
Author: Magento Community Engineering <[email protected]>
Date:   Sun Aug 4 15:13:27 2019 -0500

    ENGCOM-5527: GraphQl-644: [Checkout] Support of 'Braintree' payment method #392

     - Merge Pull Request magento/graphql-ce#392 from pmclain/graphql-ce:feature/braintree-payment
     - Merged commits:
       1. 93b08f65d88270af1c7d92d4ab9ae99be9cfd45b
       2. 7f226f6fa057a7046a7283158edba75aba4a2049
       3. c7fd25010c3b7bfb4edbd205275569e230385290
       4. a59a919e768d36421c0b7cd9991810767ef5a186
       5. 411a5597a6970d0bad7df5123ed73cee086801ec
       6. a784526f87e655676fcd68d766d6a85ac14586f5
       7. 5f25fddd40dd9d0c4b2bc8fdf2044a67dec425f1
       8. 4527ea2101f21db85e0fcd7327b309dbe581e1e0
       9. d57d076cce5f9b77e82001e9bdb1400f420d2678
       10. 05632a8c477e9987cd51623e50bd4de9b9e829f2
       11. 3720ec0ba2daec0c6ed777deb80b7b670b94b231
       12. a6e32e8f7475f3e375e137da1378a4743ef6aedc
       13. c4609cc0267049c412e686525d40d30bc90d050d
       14. c1eee4f3fb195d648a08e95c6209f1824675b106
       15. 4939d9cc5b71363f1fc2d5af2e0a1ee105086c3c
       16. ba459a1410b778bbeb650e815405629eacfdacc3
       17. fe23996ca1c815f1d5c42d6f9cc12e636b19bf9f
       18. 24488947fb08647277cdfc4c30ab9f2c61e07a52
       19. c552e35b57c25af10cdee2647236845e94dac4dc
       20. e49df5b84c1fe4bb698a086193165c69f5253d5f
       21. 169ac1bd0182e86c359502f72d2edaac4c97d476
       22. f69b080b695af447d783185fda1ee5abc2522c75
       23. ec719be155a11b75f5194b76e34353194e6acef0
       24. d757fb5b6732978c11eef254225b5908697e3f86
       25. 1132a47ad8090470b1d6ce3cdec75f05ffe3d86b
       26. 6fc03223b979bc23d4ad82eaf019e6a7e23ff336
       27. 00002f4b4dd3a43209a2312fd79f798e4262cf6b

commit 00002f4b4dd3a43209a2312fd79f798e4262cf6b
Author: Valerii Naida <[email protected]>
Date:   Sun Aug 4 15:09:53 2019 -0500

    magento/graphql-ce#644: [Checkout] Support of "Braintree" payment method

commit 6fc03223b979bc23d4ad82eaf019e6a7e23ff336
Merge: 1132a47ad80 41daebffcb6
Author: Valerii Naida <[email protected]>
Date:   Sun Aug 4 15:00:39 2019 -0500

    Merge remote-tracking branch 'origin/2.3-develop' into feature/braintree-payment

    # Conflicts:
    #	composer.lock

commit 41daebffcb6c2062509f5d86d751cb71997e4c07
Merge: 1d9e07b218c f3a7d04d462
Author: Joan He <[email protected]>
Date:   Sun Aug 4 07:50:12 2019 -0500

    Merge pull request #4600 from magento-techdivision/mail_interface_cleanup

    MC-15295: Mail interface cleanup

commit f3a7d04d4622f8f8ed37263aa5d8a5f16e3c8e61
Merge: 968cbf6ce4f 1d9e07b218c
Author: Joan He <[email protected]>
Date:   Sat Aug 3 20:51:50 2019 -0500

    Merge branch '2.3-develop' into mail_interface_cleanup

commit 1d9e07b218c7c8ad1f05706828cb2dd47d2d2d58
Merge: e50fe6f5bd6 a842b187603
Author: Yevhen Miroshnychenko <[email protected]>
Date:   Sat Aug 3 18:35:53 2019 -0500

    Merge pull request #4577 from magento-thunder/MC-18477

    Fixed issues:
     - MC-18477: Deadlocks when consumers run from cron

commit f31a8ac61ce2cc0724719d312d6c88eca2f09c97
Merge: a70b6c9bb88 e50fe6f5bd6
Author: michellbrito <[email protected]>
Date:   Sat Aug 3 15:16:43 2019 -0700

    Merge remote-tracking branch 'origin' into MC-15298

commit a70b6c9bb88109300d8f89cd3b93661a8500a238
Author: michellbrito <[email protected]>
Date:   Sat Aug 3 15:16:12 2019 -0700

    MC-15298: Allow admin to opt out of admin analytics tracking - edited DisableAdmin, EnableAdmin, admin_usage_notification

commit a842b1876036c252d172f1ce97092ec6b98854f5
Merge: 81d81cbd7d1 e50fe6f5bd6
Author: Bohdan Korablov <[email protected]>
Date:   Sat Aug 3 15:51:20 2019 -0500

    Merge remote-tracking branch 'origin/2.3-develop' into MC-18477

commit e50fe6f5bd65ce9ced2e2a99d4a0aa3d51447e60
Merge: 9da3944f95c 3529ab509b9
Author: Zabaznov Vitalii <[email protected]>
Date:   Sat Aug 3 15:25:04 2019 -0500

    Merge pull request #4593 from magento-performance/MC-17868

    [Performance] Break up jQuery UI into smaller widgets

commit 3529ab509b975d2923ffacb33557ce9f9bb16e0b
Merge: 73a74f83410 9da3944f95c
Author: Dmytro Poperechnyy <[email protected]>
Date:   Sat Aug 3 08:35:24 2019 -0500

    Merge remote-tracking branch 'mainline/2.3-develop' into MC-17868

commit 542d3bc841d1ba58011b51cf03ac3ddca30f5a0a
Merge: e947753de06 3a1acc68dbb
Author: Joan He <[email protected]>
Date:   Sat Aug 3 07:42:08 2019 -0500

    Merge pull request #4598 from magento-arcticfoxes/MC-17648

    MC-17648: Registration email confirmation bugfix

commit 9da3944f95cef062ef8110402b7b9973f8d9be4a
Merge: 9152b81dc34 b74c0332de7
Author: Myroslav Dobra <[email protected]>
Date:   Sat Aug 3 13:11:03 2019 +0300

    Merge pull request #4595 from magento-tsg/2.3-develop-pr64

    [TSG] Fixes for 2.3 (pr64) (2.3-develop)

commit b74c0332de75a0aa4e2e26122d4daffe6a437cee
Merge: bcb67e49481 9152b81dc34
Author: Magento CICD <[email protected]>
Date:   Sat Aug 3 01:08:43 2019 -0700

    merge magento/2.3-develop into magento-tsg/2.3-develop-pr64

commit f132a1c44cfcff61b9da7a27ae775ba85b496007
Merge: e62450604e7 9152b81dc34
Author: michellbrito <[email protected]>
Date:   Fri Aug 2 23:06:50 2019 -0700

    Merge remote-tracking branch 'origin' into MC-15298

commit e62450604e7742381e2358400bb197f49035e4bb
Author: michellbrito <[email protected]>
Date:   Fri Aug 2 22:59:59 2019 -0700

    MC-15298: Allow admin to opt out of admin analytics tracking - Updated composer, DisableAdminUsage, EnableAdminUsage

commit 73a74f8341014102e9485477b88626630ecd64bd
Merge: b77b8a02a49 9152b81dc34
Author: Dmytro Poperechnyy <[email protected]>
Date:   Sat Aug 3 00:49:45 2019 -0500

    Merge remote-tracking branch 'mainline/2.3-develop' into MC-17868

commit 3a1acc68dbb0fa284585a7f43bca029ad58cd7c9
Merge: 8334ad0daa5 e947753de06
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 22:37:30 2019 -0700

    merge magento/2.3.3-develop into magento-arcticfoxes/MC-17648

commit 9152b81dc34aed8ad07412fb29eb63efc7f9f2b6
Merge: e008e80c6ee e265c833a79
Author: Joan He <[email protected]>
Date:   Fri Aug 2 23:06:39 2019 -0500

    Merge pull request #4590 from magento-techdivision/update_symfony

    MC-14915: Update Symfony libs

commit b77b8a02a49f0da8ee166234122445101bc61019
Merge: 1355c4a0784 e008e80c6ee
Author: Dmytro Poperechnyy <[email protected]>
Date:   Fri Aug 2 16:32:37 2019 -0500

    Merge remote-tracking branch 'mainline/2.3-develop' into MC-17868

commit e265c833a799f844980cfd8ea3b83a1ca4f980da
Merge: eb2df6e0aa9 e008e80c6ee
Author: Joan He <[email protected]>
Date:   Fri Aug 2 15:33:22 2019 -0500

    Merge branch '2.2-develop' into update_symfony

commit bcb67e49481d1760aaccc59c3113c6be7225cfd0
Merge: 9e09b8a6084 98579a352af
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 2 23:21:26 2019 +0300

    Merge remote-tracking branch 'origin/MC-17934' into 2.3-develop-pr64

commit 9e09b8a6084849fd9e5ce8b81706053fe915f882
Merge: e008e80c6ee 052f21b7929
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 2 23:21:17 2019 +0300

    Merge remote-tracking branch 'origin/MC-18768' into 2.3-develop-pr64

commit e008e80c6ee41cb3ea0bdce3068c0e15a62ff260
Merge: 4613a93ac14 cef9ad14ac0
Author: Alex Kolesnyk <[email protected]>
Date:   Fri Aug 2 14:53:50 2019 -0500

    Merge pull request #4583 from magento-pangolin/MFTF2.4.3-2.3-Bump

    MQE-1660: Bump MFTF version in Magento

commit 968cbf6ce4f69bbf0e79def62173f709793e3761
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 22:41:42 2019 +0300

    MC-15295: Fix integration, attachment

commit 1e9468ed92f799a69a9164f3013b71696cc5daa0
Merge: 428d57450a0 4613a93ac14
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 11:35:51 2019 -0700

    merge magento/2.3-develop into magento-techdivision/pre_composer_update

commit cef9ad14ac0593faf6275ecd34d767062139045e
Author: Alex Kolesnyk <[email protected]>
Date:   Fri Aug 2 13:34:23 2019 -0500

    MQE-1660: Bump MFTF version in Magento

    - Provide valid MTF dependency

commit af4c6c5a9b0df768d49caae1ab37c48651cc4f7f
Merge: 6de7d6ecc17 4613a93ac14
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 11:18:13 2019 -0700

    merge magento/2.3-develop into magento-pangolin/MFTF2.4.3-2.3-Bump

commit 4613a93ac14159d8d30b158825fe644e5dda062e
Merge: a07f70ff8f8 da6289c3a31
Author: Alex Kolesnyk <[email protected]>
Date:   Fri Aug 2 13:14:40 2019 -0500

    Merge pull request #4572 from magento-engcom/graphql-develop-prs

    [Magento Community Engineering] Community Contributions - GraphQL

commit 09cb75ec30c45aac2ba8bc6c303ffddf1bed5603
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 21:07:59 2019 +0300

    Update MimePart.php

commit eb2df6e0aa9a5f0e35aa306127bd96989260e9e6
Merge: 85cfa0012fb a07f70ff8f8
Author: Joan He <[email protected]>
Date:   Fri Aug 2 13:07:55 2019 -0500

    Merge remote-tracking branch 'upstream/2.3-develop' into update_symfony

commit 98d4606a0924237f489ea225f6abd7db76e14524
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 20:13:43 2019 +0300

    MC-15295: Fix default values for Mime Part

commit 428d57450a0f87447e7d1f4bafd7ef58053c4e39
Merge: 8c16eeb727c a07f70ff8f8
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 09:23:28 2019 -0700

    merge magento/2.3-develop into magento-techdivision/pre_composer_update

commit 6de7d6ecc17a0012554d92436d4e3997f2d9635a
Merge: abdb90c3d62 a07f70ff8f8
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 09:15:31 2019 -0700

    merge magento/2.3-develop into magento-pangolin/MFTF2.4.3-2.3-Bump

commit da6289c3a3146db5fc91cabedf5348de6abb6e9f
Merge: 702e6d85e3f a07f70ff8f8
Author: Alex Kolesnyk <[email protected]>
Date:   Fri Aug 2 11:11:29 2019 -0500

    Merge branch '2.3-develop' of github.com:magento/magento2ce into graphql-develop-prs

commit a07f70ff8f84df047fff73e021c9da42508bca38
Merge: cac46e0c699 8bf85ece6c5
Author: Cristian Partica <[email protected]>
Date:   Fri Aug 2 10:56:13 2019 -0500

    Merge pull request #4578 from magento-honey-badgers/badgers-pr

    [honey] MC-17120: PayPal :: Additional Payments Support

commit e947753de063d3d7ab75f9368342df44ea0ad37f
Merge: 639e3ceafbd d08f7e3b4fd
Author: Dan Mooney <[email protected]>
Date:   Fri Aug 2 10:53:02 2019 -0500

    Merge pull request #4574 from magento-obsessive-owls/MC-17700-squashed

    [owls] MC-17700: Add more hosts from more scopes

commit abdb90c3d624b6fc6128e06b2a1fe9046bbf779f
Author: Kevin Kozan <[email protected]>
Date:   Fri Aug 2 09:44:35 2019 -0500

    MQE-1660: Bump MFTF version in Magento

    - MFTF version bump, lock file update.

commit 85cfa0012fb85a2c626cb8ad5bb4205becd104c9
Merge: ea4b3820851 cac46e0c699
Author: Falk Ulbricht <[email protected]>
Date:   Fri Aug 2 16:38:40 2019 +0200

    Merge branch '2.3-develop' into update_symfony

commit 81d81cbd7d177a8e1c4db3a9877dd82d676943bd
Merge: 45a85f4d9a7 cac46e0c699
Author: Bohdan Korablov <[email protected]>
Date:   Fri Aug 2 09:29:56 2019 -0500

    Merge remote-tracking branch 'origin/2.3-develop' into MC-18477

commit 6af586fa781691e8ac736d6204e19ab16bf78a88
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 17:13:44 2019 +0300

    MC-15295: Added updates to composer.lock

commit 8334ad0daa529f5345c536112b9194c6d2f73683
Author: Andrew Molina <[email protected]>
Date:   Fri Aug 2 09:09:38 2019 -0500

    MC-17648: Registration email confirmation bugfix

commit d1144d42126167b284edf08e859ac87bb3766df3
Author: Andrew Molina <[email protected]>
Date:   Fri Aug 2 08:49:02 2019 -0500

    MC-17648: Registration email confirmation bugfix

commit d08f7e3b4fd58b3beddc915def814943cc05ce2b
Merge: d18dfe8554e 639e3ceafbd
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 06:44:43 2019 -0700

    merge magento/2.3.3-develop into magento-obsessive-owls/MC-17700-squashed

commit d18dfe8554e158282b59870c75f64bdef3492301
Author: Dan Mooney <[email protected]>
Date:   Fri Aug 2 08:39:13 2019 -0500

    MC-17700: Downloadable Product links

commit 639e3ceafbd2db529923df688638e91335c20d66
Merge: 1391c57ef31 84a9cf2ff14
Author: Joan He <[email protected]>
Date:   Fri Aug 2 08:09:30 2019 -0500

    Merge pull request #4579 from magento-arcticfoxes/2.3.3-develop-pr

    [arcticfoxes] Bug Fixes

commit 8bf85ece6c58c00ea3a509828ad2f14ce7f0bc4e
Merge: 1c623c8558d cac46e0c699
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 06:01:49 2019 -0700

    merge magento/2.3-develop into magento-honey-badgers/badgers-pr

commit 1c623c8558d0c6ada2e963650d3adbb60363076e
Merge: 1d4c276a334 867aa3aad38
Author: Daniel Renaud <[email protected]>
Date:   Fri Aug 2 07:57:51 2019 -0500

    Merge remote-tracking branch 'origin/badgers-pr' into badgers-pr

commit 1d4c276a334d66b19e11945ee0c7a43141e4e6a2
Author: Daniel Renaud <[email protected]>
Date:   Fri Aug 2 07:49:25 2019 -0500

    MC-17125: PayPal UK & Australia :: Website Payments Pro Hosted Solution - gateway

commit 07b72273f5422a0801094b352aca5ef6f3f7032c
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 15:26:54 2019 +0300

    MC-15295: fix static tests

commit 34123920d83b2cbd0abe2748771ed0c9810998ac
Merge: 1afc10628bf cac46e0c699
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 15:03:44 2019 +0300

    Merge branch '2.3-develop' into mail_interface_cleanup

commit cac46e0c6997d179803376827a5aa8ab3c2f0163
Merge: cf0bfb3737d de1a64222eb
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 2 13:55:25 2019 +0300

    Merge pull request #4582 from magento-tsg/2.3-develop-pr59

    [TSG] Fixes for 2.3 (pr59) (2.3-develop)

commit 1afc10628bf85601e5c03b9c6fe71ba3a86cb6cd
Merge: 008262324c9 cf0bfb3737d
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 12:53:53 2019 +0300

    Merge branch '2.3-develop' into mail_interface_cleanup

commit 008262324c9875c78f8643728752100a07dc1d9d
Author: Stepan Furman <[email protected]>
Date:   Fri Aug 2 12:52:08 2019 +0300

    MC-15295: fix unit tests

commit de1a64222eb3855c1dd75d80c3a40faa72326c88
Merge: 82d539edf12 cf0bfb3737d
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 01:30:09 2019 -0700

    merge magento/2.3-develop into magento-tsg/2.3-develop-pr59

commit cf0bfb3737d541177c5e635b3b2c9aace390b3de
Merge: 70466fad99b 10502973c61
Author: Myroslav Dobra <[email protected]>
Date:   Fri Aug 2 11:28:35 2019 +0300

    Merge pull request #4568 from magento-tsg/2.3-develop-mftf-pr21

    [TSG] MFTF for 2.3 (pr21) (2.3-develop)

commit ea4b3820851e8b882b619dcc5ad84f95f606e9d4
Merge: 5ca795b41d0 70466fad99b
Author: Falk Ulbricht <[email protected]>
Date:   Fri Aug 2 09:46:41 2019 +0200

    Merge branch '2.3-develop' into update_symfony

commit 10502973c61a434ed056a33adca6eeadf6bfcc03
Merge: 8ac241c87dc 70466fad99b
Author: Magento CICD <[email protected]>
Date:   Fri Aug 2 00:02:43 2019 -0700

    merge magento/2.3-develop into magento-tsg/2.3-develop-mftf-pr21

commit 70466fad99b0d5e58d60c59bd426e44b456e1b6a
Merge: 19e8507a675 5408fb5bdc2
Author: Dmytro Horytskyi <[email protected]>
Date:   Fri Aug 2 02:01:25 2019 -0500

    Merge pull request #4569 from magento-tango/PR-08-233

    [tango] PR 08 2.3.3

commit 8ac241c87dcacb85511bc3b1f9cb54963c2b5260
Merge: 96d9f870e78 19e8507a675
Author: Magento CICD <[email protected]>
Date:   Thu Aug 1 23:42:51 2019 -0700

    merge magento/2.3-develop into magento-tsg/2.3-develop-mftf-pr21

commit a282e764dcaaa44942dba29835aa5b6efd3745d5
Author: Andrew Molina <[email protected]>
Date:   Thu Aug 1 16:56:56 2019 -0500

    MC-17648: Registration email confirmation bugfix
    * Removed extra newline

commit 2f1860b9876094d7933bac3cf2ab7595f4bca0a4
Author: Andrew Molina <[email protected]>
Date:   Thu Aug 1 16:37:22 2019 -0500

    MC-17648: Registration email confirmation bugfix

commit 84a9cf2ff14c4ae326469d97ec75754adc486c2f
Merge: 06ddcd8ff3f d713dac0293
Author: Joan He <[email protected]>
Date:   Thu Aug 1 16:30:15 2019 -0500

    Merge remote-tracking branch 'arcticfoxes/MC-18115' into 2.3.3-develop-pr

commit d713dac0293adc342826e2e6999b4b770a662166
Author: Joan He <[email protected]>
Date:   Thu Aug 1 16:29:17 2019 -0500

    MC-18115: Email template preview bugfix

commit 06ddcd8ff3faf51e1436066267799e019d87350c
Merge: 1391c57ef31 fa604dc7b68
Author: Joan He <[email protected]>
Date:   Thu Aug 1 16:25:28 2019 -0500

    Merge remote-tracking branch 'arcticfoxes/MC-17147' into 2.3.3-develop-pr

commit 1355c4a0784cba877c9194c20f1ccdaa57b12ae2
Merge: d885dc0c536 19e8507a…
  • Loading branch information
@Crell
Crell committed Nov 20, 2019
1 parent f7e8998 commit 5cbf976
Show file tree
Hide file tree
Showing 6 changed files with 390 additions and 285 deletions.
77 changes: 59 additions & 18 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,70 @@
# Magento 2 Community Edition for Platform.sh
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
<h2>Welcome</h2>
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.

This template builds Magento 2 CE on Platform.sh. It includes additional scripts to customize Magento to run effectively in a build-and-deploy environment.
## Magento System Requirements
[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html).

Magneto is a fully integrated ecommerce system and web store written in PHP. This is the Open Source version.
## Install Magento

## Services
* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).

* PHP 7.2
* MariaDB 10.2
* Redis 3.2
<h2>Contributing to the Magento 2 Code Base</h2>
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.

## Post-install
To learn about how to make a contribution, click [here][1].

1. The site comes pre-configured with an admin account, with username/password of `admin`/`admin123`. Login at `/admin` in your browser. **You will be required to update the password the first time you log in**.
To learn about issues, click [here][2]. To open an issue, click [here][3].

## Customizations
To suggest documentation improvements, click [here][4].

The following changes have been made relative to Magento 2 as it is downloaded from Magento.com. If using this project as a reference for your own existing project, replicate the changes below to your project.
[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
[3]: <https://github.com/magento/magento2/issues>
[4]: <https://devdocs.magento.com>

* The `.platform.app.yaml`, `.platform/services.yaml`, and `.platform/routes.yaml` files have been added. These provide Platform.sh-specific configuration and are present in all projects on Platform.sh. You may customize them as you see fit.
* An additional front controller is included in `pub/static-versioned.php` to serve static files.
* A custom deploy script, written in Python, is provided in the `deploy` file and called from the deploy hook in `.platform.app.yaml`. The `deploy` script handles installing Magento on first run, including populating the administrator account. It also handles Magento self-updates on normal point release updates. Do not modify or remove this file.
* The installer has been patched to not ask for information that is already provided by Platform.sh, such as database credentials, file paths, or the initial administrator account. These changes should have no impact post-installation. See the [patch file](https://github.com/platformsh/template-builder/blob/master/magento2ce/platformsh.patch) for details.
<h3>Community Maintainers</h3>
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.

## References
<a href="https://magento.com/magento-contributors#maintainers">
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
</a>

* [Magento](https://magento.com/)
* [PHP on Platform.sh](https://docs.platform.sh/languages/php.html)
<h3>Top Contributors</h3>
Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
<a href="https://magento.com/magento-contributors">
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
</a>

### Labels Applied by the Magento Team
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.

## Reporting Security Issues

To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.

Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).

## License

Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.

[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact [email protected] for a copy.

Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.

## Community Engineering Slack

To connect with Magento and the Community, join us on the [Magento Community Engineering Slack](https://magentocommeng.slack.com). If you are interested in joining Slack, or a specific channel, send us request at [[email protected]](mailto:[email protected]) or [self signup](https://tinyurl.com/engcom-slack).


We have channels for each project. These channels are recommended for new members:

- [general](https://magentocommeng.slack.com/messages/C4YS78WE6): Open chat for introductions and Magento 2 questions
- [github](https://magentocommeng.slack.com/messages/C7KB93M32): Support for GitHub issues, pull requests, and processes
- [public-backlog](https://magentocommeng.slack.com/messages/CCV3J3RV5): Discussions of the Magento 2 backlog
Loading

0 comments on commit 5cbf976

Please sign in to comment.