Skip to content

[Gutenberg] Revert "revert-multiple-media-pr" #12615

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
Merged
pinarol merged 3 commits into from
Oct 8, 2019
Merged

[Gutenberg] Revert "revert-multiple-media-pr" #12615

pinarol merged 3 commits into from
Oct 8, 2019

Conversation

@etoledom
Copy link
Contributor

@etoledom etoledom commented Oct 3, 2019

This PR reverts the reverted PR merge on #12611, merging into a temporary gutenberg/develop branch.

This will allow us to continue develop and test new code on WPiOS without merging native code into WPiOS:develop during the gutenberg-mobile code freeze.

This reverts commit 9a415e7, reversing
changes made to d3ac4a0.

  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@etoledom
Revert "Merge pull request #12611 from wordpress-mobile/issue/revert-…
3064a0b 
…multiple-media-pr"

This reverts commit 9a415e7, reversing
changes made to d3ac4a0.
@etoledom etoledom added the Gutenberg Editing and display of Gutenberg blocks. label Oct 3, 2019
@etoledom etoledom added this to the 13.5 milestone Oct 3, 2019
@etoledom etoledom requested a review from pinarol October 3, 2019 06:52
@etoledom etoledom self-assigned this Oct 3, 2019
pinarol
pinarol approved these changes Oct 8, 2019
View reviewed changes
Copy link
Contributor

@pinarol pinarol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🎉

@etoledom etoledom changed the base branch from gutenberg/develop to develop October 8, 2019 13:44
@etoledom
Copy link
Contributor Author

etoledom commented Oct 8, 2019

Update: I have

  • Moved the target back to develop
  • Updated gutenberg-mobile JS Bundle to contain the latest updates including the release 1.14.
  • Updated the gutenberg-mobile reference to develop
  • Updated this branch from WPiOS:develop.
  • Tested that all the updates from release 1.14 and from this PR works loading the local JS Bundle.

@koke @pinarol - If it looks good to you, please feel free to merge.

@pinarol
Copy link
Contributor

pinarol commented Oct 8, 2019

Thank you very much @etoledom 🎉I've compared the changes with the original PR and they seem all correct. I'll merge the PR once the CI is done unless someone beats me to it.

@pinarol pinarol merged commit 5d73639 into develop Oct 8, 2019
@pinarol pinarol deleted the issue/revert-revert-multiple-media-pr branch October 8, 2019 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pinarol pinarol pinarol approved these changes

Assignees

@etoledom etoledom

Labels

Gutenberg Editing and display of Gutenberg blocks.

Projects

None yet

Milestone

13.5

Development

Successfully merging this pull request may close these issues.

3 participants

@etoledom @pinarol