Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: readthedocs/readthedocs.org
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: majacQ/readthedocs.org
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: add-call-to-theme-js
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
4 contributors

Commits on Mar 4, 2021

  1. Embed: add tests for sphinx-bibtex

    @stsewd
    stsewd committed Mar 4, 2021
    Copy the full SHA
    d59aeb3 View commit details

  2. Embed: add tests for glossary

    @stsewd
    stsewd committed Mar 4, 2021
    Copy the full SHA
    9b8e506 View commit details

Commits on Mar 11, 2021

  1. Check against the full incoming URL for canonical redirects 

    We had an issue on the .com where we were looping over the same URL.
The `filename` was blank (/en/latest),
but we still have an infinite redirect at the URL we were redirecting to.
    @ericholscher
    ericholscher committed Mar 11, 2021
    Copy the full SHA
    58a5bd0 View commit details

Commits on Mar 15, 2021

  1. Domain: allow to disable domain creation/update 

    This to have better validation in .com.
We still allow to delete them.
    @stsewd
    stsewd committed Mar 15, 2021
    Copy the full SHA
    7908d46 View commit details

Commits on Mar 16, 2021

  1. Merge branch 'master' into embed-test-def-lists

    @stsewd
    stsewd committed Mar 16, 2021
    Copy the full SHA
    ab997bd View commit details

Commits on Mar 17, 2021

  1. Update tests

    @stsewd
    stsewd committed Mar 17, 2021
    Copy the full SHA
    039859a View commit details

  2. Merge branch 'master' into embed-test-def-lists

    @stsewd
    stsewd committed Mar 17, 2021
    Copy the full SHA
    ed82e79 View commit details

  3. Test with multiple versions

    @stsewd
    stsewd committed Mar 17, 2021
    Copy the full SHA
    da5eff4 View commit details

Commits on Mar 18, 2021

  1. Make Build models default to triggered 

    I'm not sure why we were defaulting them to Finished,
but this should help not confuse the badge code,
and just be more correct in general.
    @ericholscher
    ericholscher committed Mar 18, 2021
    Copy the full SHA
    417df20 View commit details

Commits on Apr 13, 2021

  1. Merge pull request #15 from majacQ/embed-test-def-lists 

    Embed test def lists
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    888897e View commit details

  2. Merge pull request #16 from majacQ/check-full-url-mixin 

    Check against the full incoming URL for canonical redirects
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    d3ecd06 View commit details

  3. Merge pull request #17 from majacQ/allow-disable-domain 

    Domain: allow to disable domain creation/update
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    d3730a0 View commit details

  4. Merge pull request #18 from majacQ/build-default-triggered 

    Build default triggered
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    944426e View commit details

  5. Fix 3 npm dependencies 

    npm audit fix updated the following npm dependencies:

 * handlebars > 4.7.7
 * kind-of > 6.0.3
 * npm > 6.14.13

[atomist:generated]
[atomist-skill:atomist/npm-vulnerability-scanner-skill]
    @atomist-bot
    atomist-bot authored and Jacquelyn Vinson committed Apr 13, 2021
    Copy the full SHA
    03a5fa2 View commit details

  6. Merge pull request #20 from majacQ/atomist/npm-audit-add-call-to-them… 

    …e-js

Fix 3 npm dependencies
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    6058bb7 View commit details

  7. Fix 3 npm dependencies 

    npm audit fix updated the following npm dependencies:

 * handlebars > 4.7.7
 * kind-of > 6.0.3
 * npm > 6.14.13

[atomist:generated]
[atomist-skill:atomist/npm-vulnerability-scanner-skill]
    @atomist-bot
    atomist-bot authored and Jacquelyn Vinson committed Apr 13, 2021
    Copy the full SHA
    c264a1f View commit details

  8. Fix 3 npm dependencies 

    npm audit fix updated the following npm dependencies:

 * handlebars > 4.7.7
 * kind-of > 6.0.3
 * npm > 6.14.13

[atomist:generated]
[atomist-skill:atomist/npm-vulnerability-scanner-skill]
    @atomist-bot
    atomist-bot authored and Jacquelyn Vinson committed Apr 13, 2021
    Copy the full SHA
    f68a2bf View commit details

  9. Merge pull request #22 from majacQ/atomist/npm-audit-master 

    Fix 3 npm dependencies
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    20f54b5 View commit details

  10. Fix 3 npm dependencies 

    npm audit fix updated the following npm dependencies:

 * handlebars > 4.7.7
 * kind-of > 6.0.3
 * npm > 6.14.13

[atomist:generated]
[atomist-skill:atomist/npm-vulnerability-scanner-skill]
    @atomist-bot
    atomist-bot authored and Jacquelyn Vinson committed Apr 13, 2021
    Copy the full SHA
    e7595f7 View commit details

  11. Merge pull request #21 from majacQ/atomist/npm-audit-add-call-to-them… 

    …e-js

Fix 3 npm dependencies
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    fecfb01 View commit details

  12. Merge pull request #23 from majacQ/atomist/npm-audit-add-call-to-them… 

    …e-js

Fix 3 npm dependencies
    Jacquelyn Vinson authored Apr 13, 2021
    Copy the full SHA
    b1ea7e8 View commit details
Showing with 1,916 additions and 285 deletions.
  1. +9 −0 .circleci/config.yml
  2. +281 −242 package-lock.json
  3. +1 −1 package.json
  4. +1 −1 pytest.ini
  5. +1 −1 readthedocs/api/v2/proxied_urls.py
  6. +18 −0 readthedocs/builds/migrations/0034_build_default_triggered.py
  7. +1 −1 readthedocs/builds/models.py
  8. +2 −0 readthedocs/conftest.py
  9. +166 −0 readthedocs/embed/tests/data/sphinx/bibtex/page-getting-started.html
  10. +21 −0 readthedocs/embed/tests/data/sphinx/bibtex/page-installation.html
  11. +98 −0 readthedocs/embed/tests/data/sphinx/bibtex/page-minimal-example.html
  12. +3 −0 readthedocs/embed/tests/data/sphinx/bibtex/page-nel87a.html
  13. +6 −0 readthedocs/embed/tests/data/sphinx/bibtex/page-nel87b.html
  14. +44 −0 readthedocs/embed/tests/data/sphinx/bibtex/page-overview.html
  15. +167 −0 readthedocs/embed/tests/data/sphinx/bibtex/page.html
  16. +8 −0 readthedocs/embed/tests/data/sphinx/bibtex/page.json
  17. +192 −0 readthedocs/embed/tests/data/sphinx/glossary/page-glossary.html
  18. +9 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-RemoveInSphinxXXXWarning.html
  19. +17 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-builder.html
  20. +10 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-configuration-directory.html
  21. +21 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-directive.html
  22. +24 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-document-name.html
  23. +23 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-domain.html
  24. +8 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-environment.html
  25. +12 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-extension.html
  26. +7 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-master-document.html
  27. +12 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-object.html
  28. +6 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-reStructuredText.html
  29. +9 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-role.html
  30. +6 −0 readthedocs/embed/tests/data/sphinx/glossary/page-term-source-directory.html
  31. +193 −0 readthedocs/embed/tests/data/sphinx/glossary/page.html
  32. +8 −0 readthedocs/embed/tests/data/sphinx/glossary/page.json
  33. +7 −0 readthedocs/embed/tests/data/sphinx/source/conf.py
  34. +40 −0 readthedocs/embed/tests/data/sphinx/source/glossary.rst
  35. +35 −0 readthedocs/embed/tests/data/sphinx/source/index.rst
  36. +34 −0 readthedocs/embed/tests/data/sphinx/source/out/glossary-glossary.html
  37. +8 −0 readthedocs/embed/tests/data/sphinx/source/out/glossary-term-builder.html
  38. +4 −0 readthedocs/embed/tests/data/sphinx/source/out/glossary-term-configuration-directory.html
  39. +12 −0 readthedocs/embed/tests/data/sphinx/source/out/glossary-term-directive.html
  40. +5 −0 readthedocs/embed/tests/data/sphinx/source/out/glossary-term-environment.html
  41. +6 −0 readthedocs/embed/tests/data/sphinx/source/out/index-another-title.html
  42. +9 −0 readthedocs/embed/tests/data/sphinx/source/out/index-sub-sub-title.html
  43. +13 −0 readthedocs/embed/tests/data/sphinx/source/out/index-subtitle.html
  44. +30 −0 readthedocs/embed/tests/data/sphinx/source/out/index-title.html
  45. +4 −0 readthedocs/embed/tests/data/sphinx/source/usage.rst
  46. +236 −26 readthedocs/embed/tests/test_api.py
  47. +2 −1 readthedocs/projects/views/base.py
  48. +31 −3 readthedocs/projects/views/private.py
  49. +2 −2 readthedocs/proxito/views/mixins.py
  50. +7 −0 readthedocs/templates/projects/domain_form.html
  51. +13 −6 readthedocs/templates/projects/domain_list.html
  52. +1 −1 readthedocs/templates/projects/includes/feature_disabled.html
  53. +3 −0 requirements/testing.txt
  54. +30 −0 sphinx-tox.ini
9 changes: 9 additions & 0 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,14 @@ jobs:
- run: pip install --user tox
- run: tox -e py36,codecov

sphinx-tests:
docker:
- image: 'cimg/python:3.6'
steps:
- checkout
- run: pip install --user tox
- run: tox -c sphinx-tox.ini

checks:
docker:
- image: 'cimg/python:3.6'
@@ -45,3 +53,4 @@ workflows:
jobs:
- checks
- tests
- sphinx-tests
Loading