Skip to content

unbreak master tests - #16723

Merged
efischer19 merged 1 commit into
masterfrom
efischer/xss_limit
Nov 30, 2017
Merged

unbreak master tests#16723
efischer19 merged 1 commit into
masterfrom
efischer/xss_limit

Conversation

@efischer19

Copy link
Copy Markdown
Contributor

Retrying https://github.com/edx/edx-platform/pull/16719, but I force pushed at the wrong time

@edx/testeng @robrap

@efischer19

Copy link
Copy Markdown
Contributor Author

Looks like we added 1 mako-html-entities and 2 mako-unwanted-html-filter in the commit that dropped a bunch of mako-missing-default

@robrap

robrap commented Nov 30, 2017

Copy link
Copy Markdown
Contributor

@efischer19: See https://github.com/edx/edx-platform/pull/16709#discussion_r154126165

We can always land a separate PR later if we want to get this merged asap to fix master.

@efischer19

Copy link
Copy Markdown
Contributor Author

Roger that @robrap. I'm inclined to leave tests running here and merge ASAP once they pass, but I've also started working on fixing those errors and will throw up a separate PR to get them in soon.

@robrap robrap left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Once tests pass. Thanks @efischer19!

@efischer19
efischer19 merged commit e1f0297 into master Nov 30, 2017
@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production on Monday, December 04, 2017.

@edx-pipeline-bot

Copy link
Copy Markdown
Contributor

EdX Release Notice: This PR has been deployed to the production environment.

@efischer19
efischer19 deleted the efischer/xss_limit branch March 19, 2018 15:53
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