Skip to content

Fix last mobile merge into master#14620

Merged
Tug merged 4 commits intomasterfrom
fix/rnmobile-develop-merge
Mar 26, 2019
Merged

Fix last mobile merge into master#14620
Tug merged 4 commits intomasterfrom
fix/rnmobile-develop-merge

Conversation

@Tug
Copy link
Copy Markdown
Contributor

@Tug Tug commented Mar 25, 2019 •
edited
Loading

Description

Last PR #14503 was supposed to merge all the changes from rnmobile/develop (the development branch for mobile) to master. It seems I made some mistakes when resolving conflicts as a couple of changes from rnmobile/develop were omitted. This PR aims to fix this and have rnmobile/develop fully merged into master.

How has this been tested?

I checked manually by looking at the PRs merged into rnmobile/develop and what we have in master.
I also used the following command to find diff between master and rnmobile/develop:

git diff -M origin/master...origin/rnmobile/develop --name-only --diff-filter=M | grep .native. | xargs git diff -M origin/master...origin/rnmobile/develop --

Note that I'm excluding all non .native.* file here.

@Tug Tug self-assigned this Mar 25, 2019
@Tug Tug requested a review from SergioEstevao March 25, 2019 16:47
@Tug Tug added [Status] In Progress Tracking issues with work in progress Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change) labels Mar 25, 2019
@Tug Tug mentioned this pull request Mar 25, 2019
Merged
@hypest @SergioEstevao
[Native mobile] Bring release v1.0.1 back to "mobile develop" (#14075)
b812b2e 
* Don't allow placeholder to moves once we tap on it (#14066)

* Use platform based SCSS vars for block minHeight (#14070)

# Conflicts:
#	packages/block-library/src/heading/edit.native.js
#	packages/editor/src/components/post-title/style.native.scss
Tug
Tug commented Mar 25, 2019
View reviewed changes
packages/block-library/src/heading/style.native.scss Outdated
@@ -0,0 +1,5 @@
@import "variables.scss";
Copy link
Copy Markdown
Contributor Author

@Tug Tug Mar 25, 2019

Choose a reason for hiding this comment

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

We'll have to remove this, this was dropped as part of the merge PR (we auto import _variables.scss now)

Tug
Tug commented Mar 25, 2019
View reviewed changes
packages/block-library/src/paragraph/style.native.scss Outdated
@@ -1,3 +1,5 @@
@import "variables.scss";
Copy link
Copy Markdown
Contributor Author

@Tug Tug Mar 25, 2019

Choose a reason for hiding this comment

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

Same here

SergioEstevao
SergioEstevao approved these changes Mar 26, 2019
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.

Looking good.

SergioEstevao
SergioEstevao approved these changes Mar 26, 2019
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.

Looking good!

@Tug Tug merged commit 2c1fe1a into master Mar 26, 2019
@Tug Tug deleted the fix/rnmobile-develop-merge branch March 26, 2019 12:12
@youknowriad youknowriad added this to the 5.4 (Gutenberg) milestone Mar 29, 2019
@Tug Tug removed the [Status] In Progress Tracking issues with work in progress label May 15, 2019
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

Assignees

@Tug Tug

Labels

Mobile App - i.e. Android or iOS Native mobile impl of the block editor. (Note: used in scripts, ping mobile folks to change)

Projects

None yet

Milestone

5.4 (Gutenberg)

Development

Successfully merging this pull request may close these issues.

4 participants

@Tug @SergioEstevao @youknowriad @hypest