diff --git a/cms/envs/common.py b/cms/envs/common.py index bf13fa14fa414915e155c321de6a114d4458eabf..26165aa9e04009e8ca0719ce1b4cb24929d30810 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1505,6 +1505,8 @@ INSTALLED_APPS = [ # Learning Sequence Navigation 'openedx.core.djangoapps.content.learning_sequences.apps.LearningSequencesConfig', + + 'ratelimitbackend', ] diff --git a/lms/envs/common.py b/lms/envs/common.py index d9749890b52fd493227512a2cfe3e46f1fe0f6da..332e712f4b2a02a112cc612df9dcd29c76021905 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2566,6 +2566,8 @@ INSTALLED_APPS = [ # Learning Sequence Navigation 'openedx.core.djangoapps.content.learning_sequences.apps.LearningSequencesConfig', + + 'ratelimitbackend', ] ######################### CSRF ######################################### diff --git a/requirements/edx/base.in b/requirements/edx/base.in index fbec039203f7c9e088c5256b524c8813d9ceedae..20047d3d3b7d3df5dc5a6adba5dc0bffce1bd528 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -58,7 +58,6 @@ django-oauth-toolkit # Provides oAuth2 capabilities for Django django-pipeline django-pyfs django-ratelimit -django-ratelimit-backend django-require django-sekizai django-ses diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 4bc67e0787d87f920468ead476299d27f0671b46..e027ef3b2c1182f71a56fb5626b0099e3b686aa4 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -69,7 +69,7 @@ django-oauth-toolkit==1.3.2 # via -r requirements/edx/base.in django-object-actions==2.0.0 # 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-ratelimit-backend==2.0 # via -r requirements/edx/base.in +git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/github.in django-ratelimit==3.0.0 # via -r requirements/edx/base.in django-require==1.0.11 # via -r requirements/edx/base.in django-sekizai==1.1.0 # via -r requirements/edx/base.in, django-wiki diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 43b9e5fd5f82abf3c8daf43f816f801afc606cdb..8a7682ada67993b094ca224662cb716aaf569286 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -81,7 +81,7 @@ django-oauth-toolkit==1.3.2 # via -r requirements/edx/testing.txt django-object-actions==2.0.0 # 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-ratelimit-backend==2.0 # via -r requirements/edx/testing.txt +git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/testing.txt django-ratelimit==3.0.0 # via -r requirements/edx/testing.txt django-require==1.0.11 # via -r requirements/edx/testing.txt django-sekizai==1.1.0 # via -r requirements/edx/testing.txt, django-wiki diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 089d6b75103dba3718e84c99516465486aadd484..beaabfff212a5bcc1e29540971543b9e10f66264 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -58,6 +58,10 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme +# This is a temporary fork until https://github.com/brutasse/django-ratelimit-backend/pull/50 is merged +# back into the upstream code. +git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 + # Our libraries: -e git+https://github.com/edx/codejail.git@ffec49bb09785fb688afc5d24714d4e43ae8449f#egg=codejail==3.0.1 -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index b39bc582663fc3fdc4449082444ef677457845a8..493069e19f36cddcc173954d3136e81ae3504e65 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -79,7 +79,7 @@ django-oauth-toolkit==1.3.2 # via -r requirements/edx/base.txt django-object-actions==2.0.0 # 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-ratelimit-backend==2.0 # via -r requirements/edx/base.txt +git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # via -r requirements/edx/base.txt django-ratelimit==3.0.0 # via -r requirements/edx/base.txt django-require==1.0.11 # via -r requirements/edx/base.txt django-sekizai==1.1.0 # via -r requirements/edx/base.txt, django-wiki