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

Revert 98ac7a4 and a477d1d #1007

Merged
merged 1 commit into from
Jan 9, 2018
Merged

Revert 98ac7a4 and a477d1d #1007

merged 1 commit into from
Jan 9, 2018

Conversation

KostyaTretyak
Copy link
Contributor

See #1006

@joshbruce
Copy link
Member

@Feder1co5oave: Real quick, this looks good to me, but I would like a second pair of eyes - just to be able to add it to the release we are trying to do today.

Thank you @KostyaTretyak!

@Feder1co5oave
Copy link
Contributor

NO WAIT

@Feder1co5oave
Copy link
Contributor

Looks like this won't solve #1006. Check out my last comments.

@KostyaTretyak
Copy link
Contributor Author

Now marked works this way:

`
def ?`

Output:

<p>`</p>
<p>def ?`</p>

With this pull request marked output:

<p><code>def ?</code></p>

@KostyaTretyak
Copy link
Contributor Author

KostyaTretyak commented Jan 8, 2018

However, when we return everything as it was before 98ac7a4, then this rule will not be works.

A link reference definition cannot interrupt a paragraph.

@joshbruce
Copy link
Member

joshbruce commented Jan 8, 2018

Three questions mainly for @KostyaTretyak, @Feder1co5oave, @UziTech:

  1. Do we merge this before doing the release of 0.3.12?
  2. Should we push the release off a day or two to figure this out?
  3. Should we go ahead and make the release to close-out the XSS upgradeability then deal with issues as they come?

@Feder1co5oave
Copy link
Contributor

Feder1co5oave commented Jan 8, 2018

I believe it's better if we just revert this one (#974), push out important security issues and in the meanwhile work on these, as you suggest @joshbruce.

@KostyaTretyak I admit I'm crossing my eyes over regexes and markdown examples, can you point out in the review what complies to the spec and what doesn't?

Thanks to both of you

@joshbruce
Copy link
Member

@Feder1co5oave: I believe that's the best as well. Having said that, still not entirely comfortable doing the revert myself using git revert if this one doesn't do that. Help a brother out?

@Feder1co5oave
Copy link
Contributor

You only need to merge this pr

@joshbruce joshbruce merged commit 1036093 into markedjs:master Jan 9, 2018
@joshbruce
Copy link
Member

@Feder1co5oave: Thanks, brother. Just really wanted to make sure I was looking at the right thing and understanding the conversation that was happening. :)

@joshbruce
Copy link
Member

joshbruce commented Jan 9, 2018

Text-based communication because the lowest bandwidth communication and all that. ;)

@KostyaTretyak KostyaTretyak deleted the revert branch January 9, 2018 00:11
zhenalexfan pushed a commit to zhenalexfan/MarkdownHan that referenced this pull request Nov 8, 2021
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.

3 participants