Skip to content

[Gutenberg] After 1.21.0 back to develop#13290

Merged
etoledom merged 14 commits intodevelopfrom
gutenberg/after-1.21.0
Jan 28, 2020
Merged

[Gutenberg] After 1.21.0 back to develop#13290
etoledom merged 14 commits intodevelopfrom
gutenberg/after-1.21.0

Conversation

@etoledom
Copy link
Copy Markdown
Contributor

@etoledom etoledom commented Jan 27, 2020 •
edited
Loading

This PR merges the development branch after the Gutenberg v1.21.0 release into WPiOS develop.

  • This include the RN upgrade.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

SergioEstevao and others added 13 commits November 27, 2019 14:56
@SergioEstevao
Update GB references.
e1979ab
@SergioEstevao
Merge branch 'develop' into gutenberg/try_rn_update_to_0.61
5ac2971 
# Conflicts:
#	Podfile
#	Podfile.lock
@SergioEstevao
Merge branch 'develop' into gutenberg/try_rn_update_to_0.61
cf57df1 
# Conflicts:
#	Podfile
#	Podfile.lock
@etoledom
Merge remote-tracking branch 'origin/gutenberg/integrate_release_1.21…
9d6db87 
….0' into gutenberg/after-1.21.0
@SergioEstevao
Update Gutenberg version.
df5817b
@SergioEstevao
Merge branch 'develop' into gutenberg/try_rn_update_to_0.61
ee31ef4 
# Conflicts:
#	Podfile
#	Podfile.lock
@SergioEstevao
Merge branch 'gutenberg/after-1.21.0' into gutenberg/try_rn_update_to…
53125e3 
…_0.61

# Conflicts:
#	Podfile
#	Podfile.lock
@SergioEstevao
Fix UI unit tests
ccaa384
@SergioEstevao
Fix test for block editor too.
9b1db76
@hypest
Update gb-mobile ref
6954d4d
@hypest
Update gb-mobile ref
145e9a7
@hypest
Update to merged to develop gb-mobile ref
63b694a
@hypest
Merge pull request #13116 from wordpress-mobile/gutenberg/try_rn_upda…
fca8987 
…te_to_0.61

Update Podfile to support RN-0.61
@etoledom etoledom added the Gutenberg Editing and display of Gutenberg blocks. label Jan 27, 2020
@etoledom etoledom added this to the 14.2 milestone Jan 27, 2020
@etoledom etoledom self-assigned this Jan 27, 2020
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 27, 2020 •
edited
Loading

You can trigger an installable build for these changes by visiting CircleCI here.

@etoledom etoledom marked this pull request as ready for review January 27, 2020 18:13
SergioEstevao
SergioEstevao approved these changes Jan 27, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@SergioEstevao SergioEstevao left a comment

Choose a reason for hiding this comment

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

Working great!

@leandroalonso leandroalonso mentioned this pull request Jan 28, 2020
Merged
3 tasks
@etoledom
Copy link
Copy Markdown
Contributor Author

etoledom commented Jan 28, 2020

Thank you @SergioEstevao !

@etoledom etoledom merged commit c3321b3 into develop Jan 28, 2020
@etoledom etoledom deleted the gutenberg/after-1.21.0 branch January 28, 2020 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SergioEstevao SergioEstevao SergioEstevao approved these changes

@maxme maxme Awaiting requested review from maxme

Assignees

@etoledom etoledom

Labels

Gutenberg Editing and display of Gutenberg blocks.

Projects

None yet

Milestone

14.2 ❄️

Development

Successfully merging this pull request may close these issues.

3 participants

@etoledom @SergioEstevao @hypest