Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-14104 Update logic for Markdown emphasis from upstream #2414

Merged
merged 3 commits into from
Feb 28, 2019
Merged

Conversation

hmhealey
Copy link
Member

For context, we don't have our marked fork up to date with upstream because we've made some extensive changes to it internally. Since the goal is still to switch to commonmark.js, there haven't been many efforts to get it up to date, but occasionally we need to manually copy changes like this to fix annoying bugs.

The actual changes for this PR are here: mattermost/marked@c1b6989

Ticket Link

https://mattermost.atlassian.net/browse/MM-14104

@hmhealey hmhealey added 2: Dev Review Requires review by a core commiter CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Feb 26, 2019
@hmhealey hmhealey added this to the v5.9.0 milestone Feb 26, 2019
@deanwhillier
Copy link
Contributor

Looks like the update is causing some tests to fail. @hmhealey is investigating.

@hmhealey
Copy link
Member Author

Fixed. Turns out we were previously using a branch on the marked fork, and switching to the master branch on it lost some changes. I merged those into master and updated the commit.

Also, one of the tests was legitimately broken

@deanwhillier deanwhillier merged commit e4c2403 into master Feb 28, 2019
@deanwhillier deanwhillier added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Feb 28, 2019
hmhealey added a commit that referenced this pull request Feb 28, 2019
* MM-14104 Update logic for Markdown emphasis from upstream

* Fix accidentally reverted marked changes

* Update unintentionally improved unit test
@hmhealey hmhealey deleted the mm14104 branch February 28, 2019 14:46
@hmhealey hmhealey added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Feb 28, 2019
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Mar 1, 2019
@lindy65 lindy65 added Tests/Not Needed Does not require new release tests and removed 4: Reviews Complete All reviewers have approved the pull request labels Mar 4, 2019
stevepartridge pushed a commit to stevepartridge/mattermost-webapp that referenced this pull request Mar 30, 2019
…#2414)

* MM-14104 Update logic for Markdown emphasis from upstream

* Fix accidentally reverted marked changes

* Update unintentionally improved unit test
tuannguyen041094 pushed a commit to Designveloper/mattermost-webapp that referenced this pull request Apr 9, 2019
…#2414)

* MM-14104 Update logic for Markdown emphasis from upstream

* Fix accidentally reverted marked changes

* Update unintentionally improved unit test
tuannguyen041094 pushed a commit to Designveloper/mattermost-webapp that referenced this pull request Apr 21, 2019
…#2414)

* MM-14104 Update logic for Markdown emphasis from upstream

* Fix accidentally reverted marked changes

* Update unintentionally improved unit test
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changelog/Done Required changelog entry has been written CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation Tests/Not Needed Does not require new release tests
Projects
None yet
5 participants