Bug 756356 dnt2#122
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Oh, I just realized what this page does. We can't detect it on the server-side because of caching. Is there a way to detect it with javascript?
Not sure if that means we can't even use the django-dnt project.
Contributor
|
I thought I merged is already, and github is saying this can't be merged. Was another branch already merged and this isn't needed anymore? |
Contributor
Author
|
There was a conflict in vendor-local/vendor.pth (a end of file char, or some such non-sense, I think). Merged. |
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
2 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.
New Do Not Track page for bug https://bugzilla.mozilla.org/show_bug.cgi?id=756356
Also pulls the django-dnt middleware.
Replaces Pull Request #121.