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

[HotFix] Add conflict to doctrine/orm to fix the problem with creating taxons #13165

Merged
merged 1 commit into from
Oct 4, 2021
Merged

[HotFix] Add conflict to doctrine/orm to fix the problem with creating taxons #13165

merged 1 commit into from
Oct 4, 2021

Conversation

GSadee
Copy link
Member

@GSadee GSadee commented Oct 4, 2021

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

@GSadee GSadee added the Bug Confirmed bugs or bugfixes. label Oct 4, 2021
@GSadee GSadee requested a review from a team as a code owner October 4, 2021 09:41
@probot-autolabeler probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Oct 4, 2021
@Zales0123 Zales0123 merged commit 8db773d into Sylius:1.9 Oct 4, 2021
@Zales0123
Copy link
Member

Thanks, Grzegorz! 🎉

@GSadee GSadee deleted the hot-fix-doctrine-orm branch October 4, 2021 10:01
@GSadee GSadee mentioned this pull request Oct 6, 2021
Merged
Zales0123 added a commit that referenced this pull request Oct 6, 2021
@Zales0123
bug #13173 [HotFix] Update conflict to doctrine/orm to fix the proble…
6fc113a 
…m with creating taxons (GSadee)

This PR was merged into the 1.9 branch.

Discussion
----------

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

<!--
 - Bug fixes must be submitted against the 1.9 or 1.10 branch (the lowest possible)
 - Features and deprecations must be submitted against the master 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
-------

82d4598 [HotFix] Update conflict to doctrine/orm to fix the problem with creating taxons
@lruozzi9
Copy link
Contributor

Hi, when will you release this fix? Unfortunately, this bug breaks the actions in the plugins.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zales0123 Zales0123 Zales0123 approved these changes

@arti0090 arti0090 arti0090 approved these changes

Assignees
No one assigned
Labels
Bug Confirmed bugs or bugfixes. Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GSadee @Zales0123 @lruozzi9 @arti0090