Skip to content

Conversation

@mzorz
Copy link
Contributor

@mzorz mzorz commented Jan 18, 2021

Builds on top of #3001

That PR is approved, we just needed to update it with develop and add the latest gutenberg submodule commit hash to the changeset as well, which I've done here.

The commit history in this PR looks populated becasue the base branch hasn't been updated with develop, but once it's done, it'll clearly look that only the gutenberg commit hash is what this very PR updates only.

The steps would be then:

  1. on Contact Info - Adding Feature Flag + Jetpack API Version Check #3001, update the branch with the base branch (git merge develop)
  2. then come back here and see the diff should be reduced to the commits updating gutenberg submodule only
  3. merge this one only after having the Gutenberg one merged.

Related WPAndroid PR: wordpress-mobile/WordPress-Android#13804
Related Gutenberg PR: WordPress/gutenberg#28293

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

dcalhoun and others added 27 commits January 12, 2021 15:33
The link to the user-facing release notes documentation was broken due
to the file being relocated from `docs/` to the root directory.
…jetpack-122c45b

Bump jetpack from `1bc2f22` to `122c45b`
…k-669e9ad

Bump Jetpack submodule and fix break changes
cameronvoell and others added 26 commits January 18, 2021 15:50
…blocks

Reusable blocks - Present block content (preview mode)
…o_develop

Merge release 1.45.0 to develop
…jetpack-60f41b6

Bump jetpack from `6f07c39` to `60f41b6`
Add support for `"multiple": false` block types
@peril-wordpress-mobile
Copy link

Wanna run full suite of Android and iOS UI tests? Click here and 'Approve' CI job!

@mzorz
Copy link
Contributor Author

mzorz commented Jan 27, 2021

Discussed with @illusaen, will merge and then merge the base PR #3001 as approved 👍

@mzorz mzorz merged commit fbdd9d7 into contact-info-api-jetpack Jan 27, 2021
@mzorz mzorz deleted the contact-info-api-jetpack-mario branch January 27, 2021 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants