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/2.0 -m "Resolve conflicts between 1.14 and 2.0"
```
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.
This PR was merged into the 1.14 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.14 <!-- see the comment below -->
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | yes <!-- don't forget to update the UPGRADE-*.md file -->
| 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
-->
deprecates as it has been removed [here](https://github.com/Sylius/Sylius/pull/16646)
Commits
-------
Deprecate PromotionCouponPromotionFilter
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/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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.
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/2.0 -m "Resolve conflicts between 1.14 and 2.0"
```
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.
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
| Related tickets | N/A
| License | MIT
Commits
-------
Refactor GUS info
This PR was merged into the 1.13 branch.
Discussion
----------
| Q | A
|-----------------|-----
| Branch? | 1.13
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | #14786
| License | MIT
Commits
-------
Fix Full CI to run 2.0
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/1.14 -m "Resolve conflicts between 1.13 and 1.14"
```
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.
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
| Related tickets | [action](https://github.com/Sylius/Sylius/actions/runs/10086616660/job/27889633254)
| License | MIT
Fixed intermittent test failures in GitHub Actions
Commits
-------
[ChannelsTest] Use inArray to check locales
First of all:
- changing the naming of the section from `Details` to `General`
- if there is only one section on a subpage, it remains without a header
- adding headers to `Translations` sections
- moved `code` field to be always first
- shipping method folder structure unified
| Q | A
|-----------------|-----
| Branch? | 2.0
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Related tickets | replaces #16340
| License | MIT
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/2.0 -m "Resolve conflicts between 1.14 and 2.0"
```
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.
| Q | A
|-----------------|-----
| Branch? | 1.14
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| 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
-->
