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

[UPMERGE] 2.0 -> api-platform-3 #16408

Merged
merged 17 commits into from
Jun 17, 2024
Merged

Conversation

SyliusBot
Copy link

This PR has been generated automatically.
For more details see 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/api-platform-3 -m "Resolve conflicts between 2.0 and api-platform-3"

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.

TheMilek and others added 17 commits June 12, 2024 14:36
| Q               | A
|-----------------|-----
| Branch?         |2.0 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.12 or 1.13 branches
 - 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
-->

#### Desktop
![Screenshot 2024-06-14 at 10 10
07](https://github.com/Sylius/Sylius/assets/9448101/781ac0ff-2be9-409d-9173-9d3b6717988a)

#### Responsive
<table>
<td>

![Screenshot 2024-06-14 at 10 11
24](https://github.com/Sylius/Sylius/assets/9448101/3de23548-a312-4d60-aeb2-277c8de1acf1)
</td>
<td>

![Screenshot 2024-06-14 at 10 10
42](https://github.com/Sylius/Sylius/assets/9448101/938e3b13-a172-49e6-a709-540605c2a7c4)
</td>
</table>
This PR was merged into the 2.0 branch.

Discussion
----------

<img width="1315" alt="Screenshot 2024-06-13 at 11 34 57" src="https://github.com/Sylius/Sylius/assets/15385420/2e6d84ba-284b-45d1-b93e-bd042aad3c86">


Commits
-------
  Unify autocomplete styles
@SyliusBot SyliusBot requested review from a team as code owners June 15, 2024 02:15
@probot-autolabeler probot-autolabeler bot added the Admin AdminBundle related issues and PRs. label Jun 15, 2024
Copy link

github-actions bot commented Jun 15, 2024

Bunnyshell Preview Environment deleted

Available commands:

  • /bns:deploy to redeploy the environment

@GSadee GSadee merged commit 8b4c071 into api-platform-3 Jun 17, 2024
26 of 31 checks passed
@GSadee GSadee deleted the upmerge/2.0_api-platform-3 branch June 17, 2024 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin AdminBundle related issues and PRs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants