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

[RNMobile][Monorepo] import of gutenberg-mobile (with history of commits) #19706

Merged
merged 5,475 commits into from
Jan 17, 2020
Merged

[RNMobile][Monorepo] import of gutenberg-mobile (with history of commits) #19706

merged 5,475 commits into from
Jan 17, 2020

Conversation

Tug
Copy link
Contributor

@Tug Tug commented Jan 16, 2020 •
edited
Loading

Explores #11491.
Tries again #18508 which was squashed and thus is preventing us from pulling new commits from gutenberg-mobile

This is a migration of gutenberg-mobile to gutenberg repository with git history.

How has this been tested?

At this stage, there is nothing to test.
This PR is just there so we can merge the whole https://github.com/wordpress-mobile/gutenberg-mobile repository into packages/react-native-editor with all its history, so subsequent PRs changes are minimized.
For this the following PR was run:

git subtree add --prefix packages/react-native-editor [email protected]:wordpress-mobile/gutenberg-mobile.git develop

Any subsequent update from gutenberg-mobile can be done using:

git subtree pull --prefix packages/react-native-editor [email protected]:wordpress-mobile/gutenberg-mobile.git develop

We will not attempt to fix any of the errors that arise from this merge, thus the reason why we're not targeting master but a feature branch instead

maxme and others added 30 commits November 29, 2019 15:25
@maxme
Update bundle and gutenberg ref - fix disappearing image
e3868b3
@maxme
Merge pull request #1627 from wordpress-mobile/release/1.18.0
03b0941 
Release v1.18.0
@maxme
Merge branch 'master' into develop
362be51
@SergioEstevao
Update GB reference.
c8a88ab
@SergioEstevao
Merge branch 'refs/heads/develop' into issue/fix_merge_of_preformatte…
47e0e7a 
…d_blocks
@SergioEstevao
Update GB reference.
4a30b38
@SergioEstevao
Merge branch 'refs/heads/develop' into issue/368_improve_code_block
d98c181 
# Conflicts:
#	gutenberg
@SergioEstevao
Update GB reference.
bfefe06
@koke
Update Gutenberg
ee39888
@koke
Merge branch 'develop' into add/spt-basic-template-picker
aadcea9
Update Gutenberg ref
669ea9d
@Tug
Merge remote-tracking branch 'origin/develop' into update/simplify-an…
b1bf800 
…droid-strings-xml
@SergioEstevao
Update GB reference
825d00f
@SergioEstevao
Update GB reference.
f6c5b0a
@SergioEstevao
Merge pull request #1630 from wordpress-mobile/issue/368_improve_code…
f091d71 
…_block

Improve code block style
@mkevins
Merge branch 'develop' into fix/multiple-media-selection-handling
facf8fa
@mkevins
Merge pull request #1621 from wordpress-mobile/fix/multiple-media-sel…
42d44a5 
…ection-handling

Use plural method for multiple media selection handling
@koke
Only enable page templates on dev builds
07c4185
@koke
Merge branch 'develop' into add/spt-basic-template-picker
bd312fe
@marecar3
Update aztec version
0133cc3
@marecar3
Merge branch 'develop' into issue/list_settings
b4c10c6 
# Conflicts:
#	gutenberg
@marecar3
Update aztec version
39a174a
@mkevins
Add colors for gallery block
5e2c2bf
@mkevins
Update gutenberg reference
049b03d
@mkevins
Update gutenberg reference
f7d765a
@mkevins
Update gutenberg reference
fc06e4b
@mkevins
Merge pull request #1647 from wordpress-mobile/fix/add-gallery-colors
d8f20fb 
Fix/add gallery colors
@SergioEstevao
Update GB reference.
8540269
@SergioEstevao
Merge branch 'refs/heads/develop' into issue/list_settings
07ec30e
Update Gutenberg ref
69fcbeb
chipsnyder and others added 18 commits January 14, 2020 10:09
@chipsnyder
Update Gutenberg commit reference
6afdfe0
@Tug
Merge pull request #1770 from wordpress-mobile/master-to-develop-post…
49f605f 
…-release-v1.20.0

Master to develop post release v1.20.0
@koke
Update Gutenberg
af32139
@koke
Merge branch 'develop' into add/spt-template-preview
2a74200
@koke
Merge pull request #1676 from wordpress-mobile/add/spt-template-preview
a5a6f05 
Add/spt template preview
@SergioEstevao
Update GB version.
fb7c762
@chipsnyder
Update Gutenberg
7f4a8d0
@chipsnyder
Merge remote-tracking branch 'upstream/develop' into issue/690-shortcode
f5d47d9
@chipsnyder
Update Release Notes for Shortcode block
30f518d
@SergioEstevao
Update GB to point to master after merge
6bdbdd7
@SergioEstevao
Merge pull request #1778 from wordpress-mobile/issue/fix_focus_issue
83d1753 
Fix Bold, Italic, Strikethrough format
@chipsnyder
Update gutenberg
977c00a
@chipsnyder
Merge remote-tracking branch 'upstream/develop' into issue/690-shortcode
edff0cd
Merge pull request #1774 from chipsnyder/issue/690-shortcode
55bed0c 
[RNMobile] Shortcode block support
@mkevins
Update gutenberg reference
22b6a4e
@mkevins
Merge branch 'develop' into fix/select-control-label
d847cda
@mkevins
Merge pull request #1765 from wordpress-mobile/fix/select-control-label
665a548 
Fix SelectControl to display label instead of value
@Tug
Add 'packages/react-native-editor/' from commit '665a5483741ecb90d403…
d175340 
…1a2c7c6ae280470ad49d'

git-subtree-dir: packages/react-native-editor
git-subtree-mainline: e33a49f
git-subtree-split: 665a548
@Tug Tug added the [Type] Technical Prototype Offers a technical exploration into an idea as an example of what's possible label Jan 16, 2020
@Tug Tug requested review from maxme and dratwas January 16, 2020 15:42
@Tug Tug self-assigned this Jan 16, 2020
@Tug Tug changed the title Rnmobile/import mobile no squash [RNMobile][Monorepo] import of gutenberg-mobile (with history of commits) Jan 16, 2020
@Tug Tug requested a review from gziolo January 16, 2020 15:43
@dratwas
Copy link
Contributor

dratwas commented Jan 16, 2020

LGTM 🎉

@Tug
Copy link
Contributor Author

Tug commented Jan 16, 2020

@gziolo would you be able to merge this without squashing the commits please?

@gziolo
Copy link
Member

gziolo commented Jan 16, 2020

@gziolo would you be able to merge this without squashing the commits please?

it's disabled, we need someone with the owner role – @youknowriad or @mtias?

@youknowriad youknowriad merged commit 7e153d0 into feat/import-gutenberg-mobile-no-squash Jan 17, 2020
@youknowriad youknowriad deleted the rnmobile/import-mobile-no-squash branch January 17, 2020 09:22
@ellatrix ellatrix added this to the Gutenberg 7.3 milestone Jan 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxme maxme Awaiting requested review from maxme

@dratwas dratwas Awaiting requested review from dratwas

@gziolo gziolo Awaiting requested review from gziolo

Assignees

@Tug Tug

Labels
[Type] Technical Prototype Offers a technical exploration into an idea as an example of what's possible
Projects
None yet
Milestone
Gutenberg 7.3
Development

Successfully merging this pull request may close these issues.