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

MM-19964 Properly handle whitespace before code block language #4186

Merged
merged 2 commits into from
Nov 13, 2019

Conversation

hmhealey
Copy link
Member

Our fork of marked incorrectly didn't trim the whitespace before the language tag in a code block, which the PR below fixes

Ticket Link

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

Related Pull Requests

Marked PR: mattermost/marked#16

@hmhealey hmhealey added 2: Dev Review Requires review by a core commiter Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) 3: QA Review Requires review by a QA tester CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Nov 11, 2019
@hmhealey hmhealey added this to the v5.17.0 milestone Nov 11, 2019
Copy link
Member

@saturninoabril saturninoabril left a comment

Choose a reason for hiding this comment

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

Tested and passed.


expect(output).not.toContain('<span class="post-code__language">');
});
});
Copy link
Member

Choose a reason for hiding this comment

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

💯

@saturninoabril saturninoabril added QA Review Done and removed 3: QA Review Requires review by a QA tester labels Nov 12, 2019
@amyblais amyblais added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Nov 12, 2019
@amyblais
Copy link
Member

@hmhealey Please help merge this PR before the end of your day today.

@hmhealey hmhealey removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Nov 13, 2019
@hmhealey hmhealey merged commit 6745a6e into master Nov 13, 2019
@hmhealey hmhealey deleted the mm19964 branch November 13, 2019 16:17
@mattermod
Copy link
Contributor

@hmhealey
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-#4186-upstream-release-5.17-1573661879
Branch 'automated-cherry-pick-of-#4186-upstream-release-5.17-1573661879' set up to track remote branch 'release-5.17' from 'upstream'.
+++ Downloading patch to /tmp/4186.patch (in case you need to do this again)

+++ About to attempt cherry pick of PR. To reattempt:
  $ git am -3 /tmp/4186.patch

Applying: MM-19964 Properly handle whitespace before code block language
Using index info to reconstruct a base tree...
M	package-lock.json
M	package.json
Falling back to patching base and 3-way merge...
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Patch failed at 0001 MM-19964 Properly handle whitespace before code block language
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

+++ Conflicts detected:

UU package-lock.json
UU package.json

+++ Aborting in-progress git am.

+++ Returning you to the master branch and cleaning up.

hmhealey added a commit that referenced this pull request Nov 13, 2019
* MM-19964 Properly handle whitespace before code block language

* Update marked to merge commit
@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 Nov 13, 2019
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Nov 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
4: Reviews Complete All reviewers have approved the pull request 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 QA Review Done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants