Skip to content

Commit

Permalink
Merge pull request #266 from eduNEXT/jlc/fix-js-content-type
Browse files Browse the repository at this point in the history
fix: "Invalid type for parameter ContentType" error on js upload (#25
  • Loading branch information
johanseto committed Jun 16, 2022
2 parents d16174c + 6150b03 commit 8901991
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
3 changes: 0 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ django-countries==5.5
# Removes deprecated get_ip function, which we still use (ARCHBOM-1329 for unpinning)
django-ipware<3.0.0

# 2.0.0 dropped support for Python 3.5
django-pipeline<2.0.0

# django-storages version 1.9 drops support for boto storage backend.
django-storages<1.9

Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ django-multi-email-field==0.6.2 # via edx-enterprise
django-mysql==3.9.0 # via -r requirements/edx/base.in
django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-object-actions==3.0.1 # via edx-enterprise
django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-pyfs==2.2 # via -r requirements/edx/base.in
django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-pyfs==3.0 # via -r requirements/edx/base.in
git+https://github.com/edx/[email protected]#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/github.in
django-ratelimit==3.0.1 # via -r requirements/edx/base.in
django-require==1.0.11 # via -r requirements/edx/base.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ django-multi-email-field==0.6.2 # via -r requirements/edx/testing.txt, edx-ente
django-mysql==3.9.0 # via -r requirements/edx/testing.txt
django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-object-actions==3.0.1 # via -r requirements/edx/testing.txt, edx-enterprise
django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-pyfs==2.2 # via -r requirements/edx/testing.txt
django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-pyfs==3.0 # via -r requirements/edx/testing.txt
git+https://github.com/edx/[email protected]#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/testing.txt
django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt
django-require==1.0.11 # via -r requirements/edx/testing.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ django-multi-email-field==0.6.2 # via -r requirements/edx/base.txt, edx-enterpr
django-mysql==3.9.0 # via -r requirements/edx/base.txt
django-oauth-toolkit==1.3.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-object-actions==3.0.1 # via -r requirements/edx/base.txt, edx-enterprise
django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-pyfs==2.2 # via -r requirements/edx/base.txt
django-pipeline==2.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-pyfs==3.0 # via -r requirements/edx/base.txt
git+https://github.com/edx/[email protected]#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/base.txt
django-ratelimit==3.0.1 # via -r requirements/edx/base.txt
django-require==1.0.11 # via -r requirements/edx/base.txt
Expand Down

0 comments on commit 8901991

Please sign in to comment.