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

[Backport] Can't cancel removal of a block or container in layout by setting remove attribute value to false #14198

Merged
merged 2 commits into from
Mar 26, 2018
Merged

[Backport] Can't cancel removal of a block or container in layout by setting remove attribute value to false #14198

merged 2 commits into from
Mar 26, 2018

Conversation

quisse
Copy link

@quisse quisse commented Mar 20, 2018 •
edited
Loading

Description

MAGETWO-69715

Fixed Issues (if relevant)

  1. Can't cancel removal of a block or container in layout by setting remove attribute value to false #1931: Can't cancel removal of a block or container in layout by setting remove attribute value to false

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@ihor-sviziev
Copy link
Contributor

Hi @quisse,

Looks like #1931 was fixed in 2.2.x branch with following commits:

I see fully different changes in your PR. I think it's not good idea to have different fixes between releases, because that will cause appearing new issues.

Could you just cherry-pich commits listed above and update your PR only with these changes?

@ihor-sviziev ihor-sviziev self-assigned this Mar 21, 2018
@quisse quisse closed this Mar 23, 2018
Evgeniy Kolesov and others added 2 commits March 23, 2018 12:04
@quisse quisse reopened this Mar 23, 2018
@ihor-sviziev ihor-sviziev self-requested a review March 23, 2018 11:37
@ihor-sviziev ihor-sviziev changed the title MAGETWO-69715 [Forwardport] Can't cancel removal of a block or container in layout by setting remove attribute value to false Mar 23, 2018
@ihor-sviziev ihor-sviziev changed the title [Forwardport] Can't cancel removal of a block or container in layout by setting remove attribute value to false [Backport] Can't cancel removal of a block or container in layout by setting remove attribute value to false Mar 23, 2018
@magento-engcom-team magento-engcom-team added this to the March 2018 milestone Mar 24, 2018
@magento-engcom-team
Copy link
Contributor

Hi @ihor-sviziev, thank you for the review.
ENGCOM-1062 has been created to process this Pull Request

@magento-engcom-team
Copy link
Contributor

@quisse thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

@quisse quisse self-assigned this Mar 26, 2018
@magento-engcom-team magento-engcom-team mentioned this pull request Mar 26, 2018
Closed
@magento-engcom-team magento-engcom-team merged commit 2423fac into magento:2.1-develop Mar 26, 2018
magento-engcom-team pushed a commit that referenced this pull request Mar 26, 2018
ENGCOM-1062: [Backport] Can't cancel removal of a block or container …
8eb1ea7 
…in layout by setting remove attribute value to false #14198
magento-engcom-team pushed a commit that referenced this pull request Mar 26, 2018
ENGCOM-1062: [Backport] Can't cancel removal of a block or container …
b5700ce 
…in layout by setting remove attribute value to false #14198
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ihor-sviziev ihor-sviziev ihor-sviziev approved these changes

Assignees

@ihor-sviziev ihor-sviziev

@quisse quisse

Labels
Progress: accept Release Line: 2.1
Projects
None yet
Milestone
March 2018
Development

Successfully merging this pull request may close these issues.
3 participants
@quisse @ihor-sviziev @magento-engcom-team