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.

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

Merge mainline #1044

Merged
merged 305 commits into from
May 6, 2018
Merged

Merge mainline #1044

merged 305 commits into from
May 6, 2018

Conversation

vkublytskyi
Copy link

Merge latest changes from magento/magento2 repository

Sergii Kovalenko and others added 30 commits April 19, 2018 17:37
Void methods were breaking Interceptor classes due to a return statement.
PHP7.2 forbids the presence of a return statement with parameters in void methods, even if returning null.
…allows to dump only scope and theme while skipping system for easier maintainability.
@vkublytskyi vkublytskyi changed the base branch from 2.2-develop to 2.3-develop May 2, 2018 08:50
Sergii Kovalenko and others added 6 commits May 2, 2018 16:00
- [MAGETWO-89009] Split database doesn't work on 2.3-develop
- [MAGETWO-89401] Make tables renaming possible
- [MAGETWO-89404] Schema revert bug
- [MAGETWO-89402] Make 'db:status' command works properly
- [MAGETWO-90640] Invalid charset during installation
- [MAGETWO-90640] Make split db test working on L2 on bamboo
- [MAGETWO-90684] Upgrade fails if DB contains view
- [MAGETWO-90942] Couldnt edit order from admin with enabled split db
…act information #14957

 - Merge Pull Request magento/magento2#14957 from JeroenVanLeusden/magento2:patch-1
 - Merged commits:
   1. aa99c01
[performance] MAGETWO-89051: Absorb image optimization from 2.1 into 2.3
Accepted Public Pull Requests:
 - magento/magento2#14957: Move customer.account.dashboard.info.extra block to contact information (by @JeroenVanLeusden)
 - magento/magento2#14908: [Forwardport] Add default schedule config for sitemap_generate job (by @rostyslav-hymon)
 - magento/magento2#14897: Fix issue #14895 - Change Password warning message appear two times (by @phoenix128)
 - magento/magento2#14807: [Forwardport] Add argument on app:config:dump to skip dumping all system settings. (by @ihor-sviziev)


Fixed GitHub Issues:
 - magento/magento2#5768: Magento 2.0.7 XML sitemap is not generated by schedule (reported by @dexterityzx) has been fixed in magento/magento2#14908 by @rostyslav-hymon in 2.3-develop branch
   Related commits:
     1. 0b85921
     2. 01f6fc2
     3. a324f86

 - magento/magento2#14895: Change Password warning message appear two times (reported by @cnviradiya) has been fixed in magento/magento2#14897 by @phoenix128 in 2.3-develop branch
   Related commits:
     1. 0abb682
     2. 8d8706e

 - magento/magento2#11396: app:config:dump locks every configuration setting no alternative to dump specific setting only (reported by @gulshan-streammarket) has been fixed in magento/magento2#14807 by @ihor-sviziev in 2.3-develop branch
   Related commits:
     1. 2631805
     2. 8bfbc77
     3. d3c53f8
     4. 0cbf318
@vkublytskyi vkublytskyi self-assigned this May 4, 2018
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.