Skip to content

Ammonia 3.0 upgrade #1876

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 4 commits into from
Oct 30, 2019
Merged

Ammonia 3.0 upgrade #1876

merged 4 commits into from
Oct 30, 2019

Conversation

AZanellato
Copy link
Contributor

@AZanellato AZanellato commented Oct 22, 2019

Closes #1872.

I have followed the instructions on the issue. Basically removing that list of allowed elements and relying on ammonia to do the job and also upgrading ammonia to 3.0.

Crates.io has only the input tag as an added tag other than
the default ones from ammonia. So adding only that one.
@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 @carols10cents (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

Thanks for the pull request! Could you also look into the list of tag attributes? The motivating bug was that we did not allow some attributes that are relevant for table layout, but there are more attributes that we could safely allow.

@AZanellato
Copy link
Contributor Author

Of course! Will do that later today 😄

Copy link
Member

@jtgeibel jtgeibel left a comment

Choose a reason for hiding this comment

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

@AZanellato it looks like you can completely drop the assignment to tag_attributes now that it is no longer used. Other than that, I think this should be good to go.

@AZanellato
Copy link
Contributor Author

@jtgeibel done! :)

@smarnach
Copy link
Contributor

r? @smarnach

Copy link
Contributor

@smarnach smarnach left a comment

Choose a reason for hiding this comment

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

The changes look good to me. I tested this on a staging deployment, and it works fine.

@smarnach
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2019

📌 Commit 6df0cfd has been approved by smarnach

@bors
Copy link
Contributor

bors commented Oct 29, 2019

⌛ Testing commit 6df0cfd with merge c0001b9...

bors added a commit that referenced this pull request Oct 29, 2019
Ammonia 3.0 upgrade

Closes #1872.

I have followed the instructions on the issue. Basically removing that list of allowed elements and relying on ammonia to do the job and also upgrading ammonia to 3.0.
@bors
Copy link
Contributor

bors commented Oct 29, 2019

💔 Test failed - checks-travis

@smarnach
Copy link
Contributor

@bors retry

@bors
Copy link
Contributor

bors commented Oct 29, 2019

⌛ Testing commit 6df0cfd with merge dcf0218...

bors added a commit that referenced this pull request Oct 29, 2019
Ammonia 3.0 upgrade

Closes #1872.

I have followed the instructions on the issue. Basically removing that list of allowed elements and relying on ammonia to do the job and also upgrading ammonia to 3.0.
@bors
Copy link
Contributor

bors commented Oct 29, 2019

💔 Test failed - checks-travis

@smarnach
Copy link
Contributor

smarnach commented Oct 30, 2019 via email

@bors
Copy link
Contributor

bors commented Oct 30, 2019

⌛ Testing commit 6df0cfd with merge 986d3bf...

bors added a commit that referenced this pull request Oct 30, 2019
Ammonia 3.0 upgrade

Closes #1872.

I have followed the instructions on the issue. Basically removing that list of allowed elements and relying on ammonia to do the job and also upgrading ammonia to 3.0.
@bors
Copy link
Contributor

bors commented Oct 30, 2019

☀️ Test successful - checks-travis
Approved by: smarnach
Pushing 986d3bf to master...

@bors bors merged commit 6df0cfd into rust-lang:master Oct 30, 2019
@AZanellato AZanellato deleted the ammonia-3.0-upgrade branch October 30, 2019 17:47
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.

Base list of allowed HTML tags and attributes on the Ammonia defaults
6 participants