This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
Commits
-------
5a7291ab1b [CI] Minor refactor in full builds
* 1.14:
[CI] Extract unstable build from full builds
[CI] Add SyliusMailerBundle alpha version to custom build
[CI] Specify exact MariaDB versions
[CI] Bump up DB versions to current LTS
[CI] Upgrade ResourceBundle in unstable custom build
* 1.13:
[CI] Extract unstable build from full builds
[CI] Add SyliusMailerBundle alpha version to custom build
[CI] Specify exact MariaDB versions
[CI] Bump up DB versions to current LTS
[CI] Upgrade ResourceBundle in unstable custom build
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
Commits
-------
9001a39406 [CI] Bump up DB versions to current LTS
6966db9d9c [CI] Specify exact MariaDB versions
* 2.0:
[CI] Split JS builds for Panther and Chromedriver + add additional rerun
Revert "[CI] Upmerge Action False Positive"
Remove note about twig/twig from CONFLICTS.md file
Bump twig packages
[CI] Complete upmerge action successfully even if there are no changes between branches
Add missing tags and cover scenarios in shopping_cart suite
[CS][DX] Refactor
* 2.0:
[CI] Split JS builds for Panther and Chromedriver + add additional rerun
Revert "[CI] Upmerge Action False Positive"
Remove note about twig/twig from CONFLICTS.md file
Bump twig packages
[CI] Complete upmerge action successfully even if there are no changes between branches
Add missing tags and cover scenarios in shopping_cart suite
[CS][DX] Refactor
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/payment-request -m "Resolve conflicts between 2.0 and payment-request"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
* 2.0:
Fix data grid sorting when there are no defaults
[Admin][CatalogPromotion] Fix icon for show variants link
[CS][DX] Refactor
[CS][DX] Refactor
[CS][DX] Refactor
[CI] Update Sylius branches in refactor workflow
| Q | A
|-----------------|-----
| Branch? | api-platform-3
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets |
| License | MIT
<!--
- Bug fixes must be submitted against the 1.13 branch
- Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
- Make sure that the correct base branch is set
To be sure you are not breaking any Backward Compatibilities, check the
documentation:
https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
* 2.0:
[CS][DX] Refactor
[CS][DX] Refactor
[CS][DX] Refactor
[CI] Update Sylius branches in refactor workflow
[Behat] Switch another random JS failed scenarios to Chromedriver
[Behat] Switch another random JS failed scenarios to Chromedriver
[Behat] Switch random JS failed scenarios to Chromedriver
[PHPStan] Temporarily ignore errors with ResourceBundle 1.11 to fix static analysis
Minor improvements in PHPStan configuration
[Taxonomy] Fix Taxon spec
[PHPStan] Support both sylius/resource-bundle 1.10 and 1.11
[CS][DX] Refactor
* 2.0:
[CS][DX] Refactor
[CS][DX] Refactor
[CS][DX] Refactor
[CI] Update Sylius branches in refactor workflow
[Behat] Switch another random JS failed scenarios to Chromedriver
[Behat] Switch another random JS failed scenarios to Chromedriver
[Behat] Switch random JS failed scenarios to Chromedriver
[CS][DX] Refactor
