Revert "Allow theme template block override" - #16724
Merged
tuchfarber merged 1 commit intoNov 30, 2017
Merged
Conversation
douglashall
previously approved these changes
Nov 30, 2017
Contributor
|
@tuchfarber Looks like you need to rebase. |
Contributor
Author
|
I just used the revert button on the initial PR. I'll pull the branch and rebase. Hopefully that helps. |
Contributor
|
Should this be against the release-candidate branch instead of master? |
douglashall
dismissed
their stale review
November 30, 2017 16:21
Yes, this should be made against release-candidate.
Contributor
Author
|
jenkins run python |
nasthagiri
approved these changes
Nov 30, 2017
Contributor
|
@tuchfarber it looks like there wasn't a pause put on the pipeline for this issues so RC was just overwritten by master. Is the change in master? if not, can you push it to master? |
tuchfarber
deleted the
revert-15947-allow-theme-template-block-override
branch
November 30, 2017 19:53
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts edx/edx-platform#15947
This is breaking the homepage of MIT and HMS. It's failing to find the about_site.html file now. I don't know much about this code, but it's possible that the issue is that the about_site.html file doesn't exist in platform, it's only in the theme.