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.

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

Merge bug fixes into wp/trunk #14796

Merged
merged 17 commits into from
Apr 4, 2019
Merged

Merge bug fixes into wp/trunk #14796

merged 17 commits into from
Apr 4, 2019

Conversation

ellatrix
Copy link
Member

@ellatrix ellatrix commented Apr 3, 2019

This is a list of cherry-picked bug fixes to be included in WordPress Beta 2.

Please let me know if I missed any commits, or if I included something by accident (a bug fix for something broken during the 5.4 cycle, or something for phase 2).

Cc @mirka @nosolosw @Jackie6 @kjellr @jasmussen @notnownikki @aduth and @youknowriad. Have a look through the commits tab.

Tests should pass for this branch.

ellatrix and others added 15 commits April 3, 2019 15:38
* RichText: improve format boundary style

* rgb => rgba
* Make ClipboardButton inside a block work in Safari

* Update changelogs

* Block Editor: Update "Next" to "Unreleased" per guidelines

https://github.com/WordPress/gutenberg/blob/master/packages/README.md#maintaining-changelogs
…4487)

* Input Interaction: always expand single line selection vertically

* Add e2e test
* Preformatted: save line breaks as characters

* Update e2e test
This PR fixes an issue where the sidebar would have two scrollbars when in fullscreen mode.
* Fix embedding Twitter URLs with a trailing slash (Closes #12664)

* Fix race condition for WordPress URLs that end in slashes, add test
* Input Interaction: better horizontal edge detection

* Correct BR ranges

* Add e2e test

* Increase buffer for Firefox

* Clean up

* Merge isEdge logic

* Fix typo

* Address feedback

* Build docs
…at' (#14411)

* RichText: unify active formats, 'selectedFormat' and 'placeholderFormat'

* Add extra e2e test

* Only should boundary style when focused

* Update docs
Copy link
Member

@aduth aduth left a comment

Choose a reason for hiding this comment

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

Not sure how best to review this. I took a look over my own fixes and those I had a hand in reviewing. In that and a short run-through of the branch, it all appears in order.

One of #14772 and #14791 are bug fixes which should be included at some point in a WordPress 5.2 beta, depending on whether we'd want to wait for those to land or merge separately.

@ellatrix
Copy link
Member Author

ellatrix commented Apr 3, 2019

Hm, the tests are not running on Travis if you select a different base. This is a bit annoying.

@ellatrix
Copy link
Member Author

ellatrix commented Apr 3, 2019

Added 933ca4a just to run the tests. I'll remove it again later.

@ellatrix
Copy link
Member Author

ellatrix commented Apr 3, 2019

@youknowriad So is this ok to merge with wp/trunk, or should we create a wp/5.2?

It looks like ideally we wait for some more commits: #14772, #14791 and maybe #14239.

@pento Just so you know about this branch. Don't release Beta 2 before we merge it with trunk. 🙂

@youknowriad
Copy link
Contributor

Let's follow Core exactly, for now, this means this goes into wp/trunk but when performing the package creation, we should update only the last number (patch).

@ellatrix
Copy link
Member Author

ellatrix commented Apr 4, 2019

I'm about to merge this and start the package process from wp/trunk. @gziolo Does that sound correct?

@gziolo
Copy link
Member

gziolo commented Apr 4, 2019

I see 👍 from @youknowriad which means it should be good :)

Please note that there is one breaking change included for the @wordpres/block-editor which means it will require a major version bump. It's surprising but it should be okay as this package wasn't in core before 5.2.0.

@youknowriad
Copy link
Contributor

@gziolo What is this breaking change?

@youknowriad
Copy link
Contributor

Just read it, I actually it's not even a breaking change for me, It's a bug fix.

@ellatrix
Copy link
Member Author

ellatrix commented Apr 4, 2019

Ok merging then!

@aduth
Copy link
Member

aduth commented Apr 4, 2019

a6ff3a0 is the merge commit for #14772 . Can we cherry-pick that one in?

@ellatrix
Copy link
Member Author

ellatrix commented Apr 4, 2019

@youknowriad @aduth Did we want to limit this to commits that made 5.4, or not?

@aduth
Copy link
Member

aduth commented Apr 4, 2019

@ellatrix Sorry, I misunderstood what was meant with targeting 5.4 as meaning only bug fixes which had already been released with 5.4, not bug fixes for bugs introduced or present in 5.4. It's fine to wait for a later round of bug fixes with the next Gutenberg release.

@ellatrix ellatrix merged commit 09ac4a5 into wp/trunk Apr 4, 2019
pento added a commit to WordPress/wordpress-develop that referenced this pull request Apr 8, 2019
Props iseulde, kjellr, aduth, 0mirka00, mcsf, nosolosw, gziolo, jasmussen, talldanwp, notnownikki, swissspidy, jorgefilipecosta, noisysocks.
See WordPress/gutenberg#14796.
Fixes #46801.



git-svn-id: https://develop.svn.wordpress.org/trunk@45138 602fd350-edb4-49c9-b593-d223f7449a82
nylen pushed a commit to nylen/wordpress-develop-svn that referenced this pull request Apr 8, 2019
Props iseulde, kjellr, aduth, 0mirka00, mcsf, nosolosw, gziolo, jasmussen, talldanwp, notnownikki, swissspidy, jorgefilipecosta, noisysocks.
See WordPress/gutenberg#14796.
Fixes #46801.



git-svn-id: https://develop.svn.wordpress.org/trunk@45138 602fd350-edb4-49c9-b593-d223f7449a82
markjaquith pushed a commit to markjaquith/WordPress that referenced this pull request Apr 8, 2019
Props iseulde, kjellr, aduth, 0mirka00, mcsf, nosolosw, gziolo, jasmussen, talldanwp, notnownikki, swissspidy, jorgefilipecosta, noisysocks.
See WordPress/gutenberg#14796.
Fixes #46801.


Built from https://develop.svn.wordpress.org/trunk@45138


git-svn-id: http://core.svn.wordpress.org/trunk@44947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
gMagicScott pushed a commit to gMagicScott/core.wordpress-mirror that referenced this pull request Apr 8, 2019
Props iseulde, kjellr, aduth, 0mirka00, mcsf, nosolosw, gziolo, jasmussen, talldanwp, notnownikki, swissspidy, jorgefilipecosta, noisysocks.
See WordPress/gutenberg#14796.
Fixes #46801.


Built from https://develop.svn.wordpress.org/trunk@45138


git-svn-id: https://core.svn.wordpress.org/trunk@44947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
@gziolo gziolo deleted the wp/trunk-beta-2 branch May 21, 2019 10:44
miya0001 pushed a commit to cjk4wp/wordpress that referenced this pull request Jul 4, 2019
Props iseulde, kjellr, aduth, 0mirka00, mcsf, nosolosw, gziolo, jasmussen, talldanwp, notnownikki, swissspidy, jorgefilipecosta, noisysocks.
See WordPress/gutenberg#14796.
Fixes #46801.



git-svn-id: http://develop.svn.wordpress.org/trunk@45138 602fd350-edb4-49c9-b593-d223f7449a82
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.

10 participants