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.

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

Backport jquery 2432 to Read the Docs #5001

Merged
merged 1 commit into from Dec 17, 2018

Conversation

@davidfischer
Copy link
Contributor

@davidfischer davidfischer commented Dec 14, 2018

Previously media/javascript/jquery/jquery-2.0.3.min.js, the version of jquery used by Sphinx docs sites before readthedocs/readthedocs-sphinx-ext#52, was a symlink to readthedocs/static/vendor/jquery-standalone.js, the version of jquery used by the dashboard. This severs that symlink and replaces the docs sites jquery with a modified version of jquery 2.0.3 with a backported fix.

This allows a few things:

  • The dashboard can upgrade jquery independently of docs sites
  • All previously built docs will point to this specific version of jquery in this PR which should be 100% compatible with the version they previously linked to except with an issue mitigated.
  • After readthedocs/readthedocs-sphinx-ext#52, new builds of Sphinx docs will use the version of jquery bundled with Sphinx. This will remove a source of incompatibility where local Sphinx builds use one version of jquery and RTD Sphinx builds use another.
  • Docs that are never rebuilt will continue to work and point to this specific version of jquery from this PR.

Fixes #4999

@davidfischer davidfischer requested a review from Dec 14, 2018
@codecov
Copy link

@codecov codecov bot commented Dec 14, 2018

Codecov Report

Merging #5001 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #5001   +/-   ##
=======================================
  Coverage   76.74%   76.74%           
=======================================
  Files         158      158           
  Lines        9951     9951           
  Branches     1244     1244           
=======================================
  Hits         7637     7637           
  Misses       1980     1980           
  Partials      334      334

1 similar comment
@codecov
Copy link

@codecov codecov bot commented Dec 14, 2018

Codecov Report

Merging #5001 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #5001   +/-   ##
=======================================
  Coverage   76.74%   76.74%           
=======================================
  Files         158      158           
  Lines        9951     9951           
  Branches     1244     1244           
=======================================
  Hits         7637     7637           
  Misses       1980     1980           
  Partials      334      334

@ericholscher ericholscher merged commit 537510f into master Dec 17, 2018
3 checks passed
@stsewd stsewd deleted the davidfischer/jquery-2432-backport branch Dec 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants