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.

Sign up for GitHub

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

Jump to bottom

[UPMERGE] 1.12 -> 1.13 #15958

Merged
merged 2 commits into from
Mar 7, 2024
Merged

[UPMERGE] 1.12 -> 1.13 #15958

merged 2 commits into from
Mar 7, 2024

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/1.13 -m "Resolve conflicts between 1.12 and 1.13"

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 change the commit title to

Resolve conflicts between 1.12 and 1.13

CoderMaggie and others added 2 commits March 6, 2024 21:27
@CoderMaggie
Forum has retired
ea5fdd6
@Rafikooo
docs #15956 Bye Sylius Forum ☠️ (CoderMaggie)
0c4957f 
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12                   |
| Bug fix?        | yes                                                       |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no |
| Related tickets |                      |
| License         | MIT                                                          |

Sylius Forum is no longer alive, it should not be mentioned in the docs anymore.

Commits
-------
  Forum has retired
@SyliusBot SyliusBot requested a review from a team as a code owner March 7, 2024 02:03
@probot-autolabeler probot-autolabeler bot added the Documentation Documentation related issues and PRs - requests, fixes, proposals. label Mar 7, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 7, 2024 •
edited
Loading

Bunnyshell Preview Environment deleted

Available commands:

  • /bns:deploy to redeploy the environment

@jakubtobiasz jakubtobiasz merged commit 65d4294 into 1.13 Mar 7, 2024
32 checks passed
@jakubtobiasz jakubtobiasz deleted the upmerge/1.12_1.13-0c4957f3a5 branch March 7, 2024 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakubtobiasz jakubtobiasz jakubtobiasz approved these changes

Assignees
No one assigned
Labels
Documentation Documentation related issues and PRs - requests, fixes, proposals.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SyliusBot @jakubtobiasz @CoderMaggie @Rafikooo