Commit Graph

56322 Commits

Author SHA1 Message Date
Michael Terry
b2ba363f1e Merge pull request #25503 from edx/mikix/parent-access
AA-408: Treat group_access as inheritable in gating transformer
2020-11-06 11:40:58 -05:00
Robert Raposa
fe9395bd7a Merge pull request #25538 from regisb/regisb/improve-waffle-tests
[BD-21] Improve waffle_utils tests to not rely on internal API
2020-11-06 08:58:18 -05:00
Adeel Ehsan
0d9236524d Merge pull request #25398 from edx/aehsan/van-6/added_params_in_register_api
Added next and cours_id params in register endpoint
2020-11-06 18:15:09 +05:00
Kyle McCormick
2d46f12277 Upgrade codejail from 3.1.0 to 3.1.1 for improved logging (#25532)
We are curious whether async jail_code calls on Celery workers
have different resource limit configurations than synchronous
calls on LMS/Studio. We suspect it may be different
because codejail is configured via a Django Middleware, which
may not be initialized for Celery workers.

TNL-7649
2020-11-06 08:00:57 -05:00
adeelehsan
8be2283aef Added next and cours_id params in register endpoint
VAN-6
2020-11-06 17:41:11 +05:00
Régis Behmo
19ff82a3da Improve waffle_utils tests to not rely on internal API
This is required for a smooth upgrade of edx-toggles.
2020-11-06 12:11:52 +01:00
Zaman Afzal
0c405d3569 ENT-3509 Upgrade edx-enterprise to version 3.10.4 (#25535)
* ENT-3509 Upgrade edx-enterprise to version 3.10.4
2020-11-06 14:41:07 +05:00
Simon Chen
a900cec9e7 MST-338 Update other outstanding links to old IDV into new IDV flow (#25526) 2020-11-05 20:43:24 -05:00
Muhammad Soban Javed
b0cbe3604a Merge pull request #25533 from edx/revert-25419-iamsobanjaved/routing-config
Revert "Update routing config"
2020-11-06 02:31:23 +05:00
Muhammad Soban Javed
5a2ea1f954 Revert "Update routing config" 2020-11-06 02:05:48 +05:00
Michael Terry
f2d4e0ccec AA-408: Treat group_access as inheritable in gating transformer
ContentTypeGateTransformer was not considering parent values of
'group_access' when providing its own default value for it.

Also fix a few minor bugs around the place.
2020-11-05 15:27:46 -05:00
Robert Raposa
061d5d8fc5 Merge pull request #25529 from regisb/regisb/better-waffle-deprecation-monitoring
[BD-21] Improve monitoring of waffle deprecation with custom attributes
2020-11-05 15:09:54 -05:00
Robert Raposa
e19f6c248a Merge pull request #25531 from regisb/regisb/completion-requirement-constraint
[BD-21] Ensure we don't break unit tests by upgrading edx-completion
2020-11-05 15:06:01 -05:00
Muhammad Soban Javed
bfa8f71f33 Update routing config #25419 2020-11-06 01:00:29 +05:00
Fred Smith
857f1d0de7 Merge pull request #25473 from edx/github-actions-mysqldbdump/69a63380c26b56716db191b85379648d15f70263
edxapp MySQL database dump
2020-11-05 13:32:35 -05:00
Alan Zarembok
77c993e1c9 Merge pull request #25513 from edx/azarembok/upload-video-api
Add new create_video_upload api.
2020-11-05 12:31:12 -05:00
Alan Zarembok
e4befb1926 Add new generate_video_upload_link api. 2020-11-05 12:04:45 -05:00
Kyle McCormick
758c2b02a1 Pass course-run-specific resource limits to codejail
The limits can be defined in settings.CODE_JAIL['limits_overrides'],
which is a dict mapping context ids (generally, course run keys)
to overrides to be applied to settings.CODE_JAIL['limits'].

This will allow us to temporarily alter the codejail limits
for certain contexts in order to enable, for example,
a certain course run's tasks to run longer while a large exam's
grades are recomputed.

TNL-7649
2020-11-05 11:53:16 -05:00
Kyle McCormick
a82ce035eb Upgrade codejail to 3.1.0 from 3.0.1
Pulls in lastest release:
'Allow context-specific resource limits to be provided'
2020-11-05 11:53:16 -05:00
Zainab Amir
97e9fee92e Add third party auth context api (#25497) 2020-11-05 19:26:29 +05:00
Régis Behmo
73a16a9e1e Ensure we don't break unit tests by upgrading edx-completion
We expect edx-completion to break unit tests in v3.3.0, so here we make
sure that it does not get upgraded automatically.
2020-11-05 14:47:25 +01:00
Robert Raposa
8522579608 Merge pull request #25527 from open-craft/nizar/squash_waffle_flag_warning
Squashes CourseWaffleFlag waffle_utils.WaffleFlag deprecation warning
2020-11-05 07:10:03 -05:00
Syed Muhammad Dawoud Sheraz Ali
1723da959f Merge pull request #25519 from edx/dsheraz/PROD-2198
update devstack video upload authentication mechanism
2020-11-05 13:02:37 +05:00
Régis Behmo
b32fc50947 Improve monitoring of waffle deprecation with custom attributes
We observe a lot of deprecation warnings using the
"deprecated_waffle_utils" custom attribute. To make it easier to track
these items, we add the waffle flag/namespace name to the custom
attribute.
2020-11-05 08:36:03 +01:00
Nizar Mahmoud
3a46e7c5f5 Squashes waffle_utils.WaffleFlag deprecation warning 2020-11-05 02:00:33 +03:00
edX Transifex Bot
e3bc66fbf4 geoip2: update maxmind geolite country database 2020-11-04 16:23:58 -05:00
Diane Kaplan
103ec9e0dc REV-1564: add user-metadata API, for use by Optimizely experiments (#25450) 2020-11-04 11:21:48 -05:00
Robert Raposa
cb57a28d63 Merge pull request #25488 from regisb/regisb/toggle-state-endpoint-settingdict
[BD-21] Expose SettingToggle and SettingDictToggle objects in the API
2020-11-04 10:47:11 -05:00
Régis Behmo
da0623107c Expose SettingToggle and SettingDictToggle objects in the API
Note that settings for which a corresponding SettingToggle or
SettingDictToggle exists are no longer exposed in the "django_settings"
list of the API.
2020-11-04 15:53:48 +01:00
Muhammad Ammar
dd732c4f68 Merge pull request #25514 from edx/ammar/update-dsc-cache-key
refactor dsc logs to avoid splunk noise
2020-11-04 19:17:26 +05:00
Kyle McCormick
d1a775d3cd Use full names for lms.djangoapps imports (#25401)
* Use full LMS imports paths in LMS settings and urls modules
* Use full LMS import paths in Studio settings and urls modules
* Import from lms.djangoapps.badges instead of badges
* Import from lms.djangoapps.branding instead of branding
* Import from lms.djangoapps.bulk_email instead of bulk_email
* Import from lms.djangoapps.bulk_enroll instead of bulk_enroll
* Import from lms.djangoapps.ccx instead of ccx
* Import from lms.djangoapps.course_api instead of course_api
* Import from lms.djangoapps.course_blocks instead of course_blocks
* Import from lms.djangoapps.course_wiki instead of course_wiki
* Import from lms.djangoapps.courseware instead of courseware
* Import from lms.djangoapps.dashboard instead of dashboard
* Import from lms.djangoapps.discussion import discussion
* Import from lms.djangoapps.email_marketing instead of email_marketing
* Import from lms.djangoapps.experiments instead of experiments
* Import from lms.djangoapps.gating instead of gating
* Import from lms.djangoapps.grades instead of grades
* Import from lms.djangoapps.instructor_analytics instead of instructor_analytics
* Import form lms.djangoapps.lms_xblock instead of lms_xblock
* Import from lms.djangoapps.lti_provider instead of lti_provider
* Import from lms.djangoapps.mobile_api instead of mobile_api
* Import from lms.djangoapps.rss_proxy instead of rss_proxy
* Import from lms.djangoapps.static_template_view instead of static_template_view
* Import from lms.djangoapps.survey instead of survey
* Import from lms.djangoapps.verify_student instead of verify_student
* Stop suppressing EdxPlatformDeprecatedImportWarnings
2020-11-04 08:48:33 -05:00
Saleem Latif
e4cb3dfcbd Merge pull request #25522 from edx/saleem-latif/ENT-3522-bug-fix-2
ENT-3522: upgrade edx-enterprise version to 3.10.3
2020-11-04 18:22:17 +05:00
muhammad-ammar
f0aae8ecf5 * update DSC needed cache key to invalidate existing stored values
* refactor DSC logs

ENT-3494
2020-11-04 17:52:02 +05:00
Saleem Latif
d5505461c4 upgrade edx-enterprise version to 3.10.3 2020-11-04 17:39:25 +05:00
DawoudSheraz
84d2a690bf update devstack video upload authentication mechanism 2020-11-04 14:47:33 +05:00
Saleem Latif
d14f6c4739 Merge pull request #25520 from edx/saleem-latif/ENT-3522-bug-fix
ENT-3522: Updated edx-enterprise version to 3.10.2 that contains a bug fix for enterprise customer admin page.
2020-11-04 13:57:37 +05:00
Saleem Latif
415a433cd0 Updated edx-enterprise version to 3.10.2 that contains a bug fix for enterprise customer admin page. 2020-11-04 13:09:04 +05:00
edX requirements bot
9c312c2976 Updating Python Requirements (#25518) 2020-11-04 13:02:31 +05:00
Sarina Canelake
18059c20e7 Merge pull request #25505 from edx/sarina/gender-neutral-language
Change gendered language to gender-neutral 'they/them/their'
2020-11-03 16:16:59 -05:00
Thomas Tracy
ead2825b14 Re-add course key to segment unenroll tracker (#25516) 2020-11-03 15:51:48 -05:00
brianhw
89169443ad Handle more kinds of bad data in segment events. (#25506) 2020-11-03 15:04:05 -05:00
Robert Raposa
4a0e4aa16d Merge pull request #25417 from regisb/regisb/deprecate-toggle-override
[BD-21] Switch to edx-toggles classes and deprecate waffle override methods
2020-11-03 14:06:07 -05:00
Régis Behmo
c9c1136459 Re-introduce waffle classes (with deprecation warnings)
This is for backward compatibility.
2020-11-03 19:25:37 +01:00
Régis Behmo
b70042435a Deprecate waffle_utils.testutils.override* functions
These functions should from now on be imported from
edx_toggles.toggles.testutils.
2020-11-03 19:25:37 +01:00
Régis Behmo
4586002956 Import waffle classes from edx_toggles instead of waffle_utils
Those classes were ported to edx_toggles. The imports remain in
waffle_utils.__init__ for backward compatibility.
2020-11-03 19:25:37 +01:00
Régis Behmo
3b127f8c92 Deprecate WaffleSwitch.override* methods
This allows us to get rid of the custom WaffleSwitch and
WaffleSwitchNamespace classes from waffle_utils in favour of
edx_toggles.toggles classes.
2020-11-03 19:25:37 +01:00
Régis Behmo
2307dff4c9 Deprecate WaffleFlag.override method
This allows us to get rid of waffle_utils' custom WaffleFlag method.
2020-11-03 19:25:37 +01:00
Régis Behmo
16ce16e85e Deprecate ExperimentWaffleFlag.override method
This is part of a removal of the many override methods of toggle
flag/namespace classes. This allows us to remove imports of test modules
from production code.
2020-11-03 19:25:37 +01:00
Robert Raposa
64a162f69c Merge pull request #25494 from regisb/regisb/fix-swaggerdocs
[BD-21] Fix API docs generation and update swagger.yml
2020-11-03 11:40:29 -05:00
Jansen Kantor
831658c9d1 pin ora temporarily (#25510) 2020-11-03 10:42:31 -05:00