Skip to content

[UPMERGE] 2.0 -> 2.0-docs#17720

Merged
GSadee merged 8 commits into2.0-docsfrom
upmerge/2.0_2.0-docs
Mar 11, 2025
Merged

[UPMERGE] 2.0 -> 2.0-docs#17720
GSadee merged 8 commits into2.0-docsfrom
upmerge/2.0_2.0-docs

Conversation

@SyliusBot
Copy link
Copy Markdown
Contributor

@SyliusBot SyliusBot commented Mar 6, 2025

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/2.0-docs -m "Resolve conflicts between 2.0 and 2.0-docs"

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.

mihaichitic and others added 4 commits March 3, 2025 09:46
@mihaichitic @GSadee
update bunnyshell/workflows to v2
ddfa3be
@Rafikooo
Update bunnyshell/workflows to v2 (#17709)
888638a 
| Q               | A
|-----------------|-----
| Branch?         | 1.14
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | #17655
| 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
-->
@NoResponseMate
[Maintenance][Behat] Fix invalid check in order show page
8d6e421
@GSadee
Merge branch '1.14' into 2.0
c56374b 
* 1.14:
  update bunnyshell/workflows to v2
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 6, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

NoResponseMate and others added 4 commits March 6, 2025 16:56
@NoResponseMate
[UI] Refix invalid key setting on adding a collection item
c8bb820
@NoResponseMate
[Behat][ProductAttribute] Improve select multiple values adding scenario
a25b573
@GSadee
[Maintenance][Behat] Fix invalid check in order show page (#17717)
7fa2a15 
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | in behats
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | -
| License         | MIT

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Improved the accuracy of product detection in order details, ensuring
a more reliable display of items in your orders.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
@GSadee
[UI] Refix invalid key setting on adding a collection item (#17723)
4962e55 
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #17713, related #17685
| License         | MIT

The fix for collection items being substituted when removing an item
from anywhere but the end of the collection and adding a new item has
inadvertently caused a different bug to prop up, breaking the adding of
multiple select product attributes due to their collection keys not
being comparable.

Curiously, we have an UI test for this exact case, but it seems to just
ignore the exception popup and continue with other steps; Updated to
check the saved values so we can be sure of the outcome.
@SyliusBot SyliusBot requested review from a team as code owners March 8, 2025 02:14
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 8, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@GSadee GSadee added Documentation Documentation related issues and PRs - requests, fixes, proposals. Maintenance CI configurations, READMEs, releases, etc. labels Mar 11, 2025
@GSadee GSadee merged commit 25aa3a0 into 2.0-docs Mar 11, 2025
75 of 78 checks passed
@GSadee GSadee deleted the upmerge/2.0_2.0-docs branch March 11, 2025 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GSadee GSadee GSadee approved these changes

Assignees

No one assigned

Labels

Documentation Documentation related issues and PRs - requests, fixes, proposals. Maintenance CI configurations, READMEs, releases, etc.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@SyliusBot @GSadee @mihaichitic @Rafikooo @NoResponseMate