Skip to content

Allow rowspan and colspan in markdown table rendering #1870

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

Merged
merged 1 commit into from
Oct 16, 2019

Conversation

jtescher
Copy link
Contributor

Allow rowspan and colspan attributes of forms in READMEs.

Fixes #1863

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jtgeibel (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@smarnach
Copy link
Contributor

@jtescher Thanks for your contribution! This change looks good to me, but I don't have access to merge and deploy it – some other member of the team will do so soon.

The only thing I'm wondering about is why we don't use ammonia's defaults – they look reasonable to me, and would avoid a bunch of other rendering issues. This is of course unrelated to this PR, and in my opinion we can merge this as it is.

CC @jtgeibel

@sgrif
Copy link
Contributor

sgrif commented Oct 15, 2019

I'm actually a bit confused about why percy is failing this, this PR definitely shouldn't have affected download count graphs

@jtgeibel
Copy link
Member

I restarted the Frontend job and Percy is happy now, so I'm guessing this was a transient issue on their end.

@smarnach Looking just at the tag_attributes variable, it looks like we additionally allow id and target on a tags. I think id is there to allow hyperlinks to work within the README file. target allows the README to open a link in a new tab. Maybe it would be more reasonable to start with the defaults and then explicitly allow (and document) any such deltas. Would you like to open an issue to track this?

I agree these changes are good to merge.
@bors r+

@bors
Copy link
Contributor

bors commented Oct 16, 2019

📌 Commit ecb2877 has been approved by jtgeibel

@bors
Copy link
Contributor

bors commented Oct 16, 2019

⌛ Testing commit ecb2877 with merge af26bb3...

bors added a commit that referenced this pull request Oct 16, 2019
…tgeibel

Allow rowspan and colspan in markdown table rendering

Allow `rowspan` and `colspan` attributes of forms in READMEs.

Fixes #1863
@bors
Copy link
Contributor

bors commented Oct 16, 2019

☀️ Test successful - checks-travis
Approved by: jtgeibel
Pushing af26bb3 to master...

@bors bors merged commit ecb2877 into rust-lang:master Oct 16, 2019
@smarnach
Copy link
Contributor

I was assuming that the differences in the chart were caused by changes to Google Charts. We use the deprecated jsapi loader that always pulls the latest version of Google Charts, so I wasn't surprised there might be small changes to how the chart looks.

@jtgeibel Yes, we currently do allow a few additional things, e.g. the input element. Since the ammonia API allows amending the defaults with functions like add_tag_attributes(), it would be easy to add these items, but we don't need to put the full list in our code.

I will open an issue for this for further discussion.

@jtescher jtescher deleted the markdown-table-allowed-attributes branch October 21, 2019 21:01
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.

README rendeder scrubs out layout-affecting tags
6 participants