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.

Sign up for GitHub

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

Jump to bottom

Make note of possible XSS in Rustdoc #24506

Closed
wants to merge 1 commit into from
Closed

Make note of possible XSS in Rustdoc #24506

wants to merge 1 commit into from

Conversation

steveklabnik
Copy link
Member

Fixes #24160

@rust-highfive
Copy link
Collaborator

r? @pcwalton

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member

@bors: r+ 5148e90 rollup

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 16, 2015
@steveklabnik
Rollup merge of rust-lang#24506 - steveklabnik:gh24160, r=alexcrichton
cd3c1d0 
Fixes rust-lang#24160
@steveklabnik steveklabnik mentioned this pull request Apr 16, 2015
Merged
bors added a commit that referenced this pull request Apr 16, 2015
@bors
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
fb4ab3b 
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
bors added a commit that referenced this pull request Apr 17, 2015
@bors
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
88773f4 
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
@steveklabnik
Copy link
Member Author

needs steveklabnik@3ca83a7

bors added a commit that referenced this pull request Apr 17, 2015
@bors
Auto merge of #24512 - steveklabnik:rollup, r=steveklabnik
b7fb575 
- Successful merges: #23782, #24455, #24490, #24493, #24494, #24496, #24498, #24499, #24501, #24502, #24506, #24507, #24508, #24509, #24510
- Failed merges: #24488
@bors
Copy link
Contributor

bors commented Apr 17, 2015

☔ The latest upstream changes (presumably #24512) made this pull request unmergeable. Please resolve the merge conflicts.

Manishearth added a commit to Manishearth/rust that referenced this pull request Apr 17, 2015
@Manishearth
Rollup merge of rust-lang#24506 - steveklabnik:gh24160, r=alexcrichton
b3f9156 
 Fixes rust-lang#24160
@steveklabnik
Copy link
Member Author

This was merged in #24512 , sorry, I rebased and forgot that'd screw it up :(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Note that rustdoc can expose custom HTML
5 participants
@steveklabnik @rust-highfive @alexcrichton @bors @pcwalton