Commit Graph

53849 Commits

Author SHA1 Message Date
Nicholas D'Alfonso
ac9d2bfd30 AA-85 mobile reset dates
- render reset dates banner in webview for mobile app.
- improve banner redirect mechanism
2020-04-02 00:37:54 -04:00
Jansen Kantor
18c5333a68 bump submission and ora versions (#23575) 2020-04-01 19:14:47 -04:00
Nimisha Asthagiri
946aa548ae Merge pull request #23569 from edx/arch/django2-instructor-analytics
Django2: Update django-model-utils
2020-04-01 18:11:07 -04:00
Nimisha Asthagiri
28f65effd2 Update edx-ora2 and edx-celeryutils to upgrade django-model-utils 2020-04-01 17:46:22 -04:00
Nimisha Asthagiri
147189478f Django2: Update django-model-utils
Update this library in order to get the Django2 fix in https://github.com/jazzband/django-model-utils/pull/335
2020-04-01 17:43:52 -04:00
Jansen Kantor
c096464a3c EDUCATOR-4976 (Part 1): Add teamset type validation to has_specific_team_access (#23539)
Add teamset type validation to has_specific_team_access
2020-04-01 16:40:03 -04:00
Muhammad Soban Javed
05e5c7e6ab Merge pull request #23530 from edx/BOM-1428
BOM-1428: Fix Django 2.0 test failures in theming management command
2020-04-02 01:15:42 +05:00
Diana Huang
e2b82479a1 Merge pull request #23541 from cldme/LEARNER-2041_remove_logout_view_config
LEARNER-2041: Remove deprecated LogoutViewConfiguration from student models
2020-04-01 15:40:00 -04:00
Claudiu Ion
765a6867fd Remove deprecated LogoutViewConfiguration from student models 2020-04-01 18:47:49 +00:00
Jeremy Bowman
9ef0aa4880 Downgrade to pytest-django 3.8.0 for now (#23566)
We'll upgrade this again along with pytest once pytest-dev/pytest#6925 is resolved.

Also, it looks like a flaky error in test class DB setup outside a transaction was mucking things up for the rest of the test shard. I didn't try to fix the flakiness, but this should at least limit the blast radius to just that test class. We really need to start using setUpTestData() more consistently.
2020-04-01 14:17:27 -04:00
edX cache uploader bot
c8663fa518 Updating Bokchoy testing database cache (#23538) 2020-04-01 14:15:54 -04:00
Nimisha Asthagiri
efc14c1e9d Merge pull request #23568 from edx/arch/csmh-router-comment
Django2 CMSH Router: add clarifying comment
2020-04-01 12:00:25 -04:00
Nimisha Asthagiri
7f036af429 Django2 CMSH Router: add clarifying comment 2020-04-01 11:28:23 -04:00
Nimisha Asthagiri
03bb132368 Merge pull request #23564 from edx/arch/django22-fix-csmh-router
Django2 CSMH: Database Router update
2020-04-01 11:20:58 -04:00
David Ormsbee
11025c4d1a Merge pull request #23559 from edx/ormsbee/csm_write_optimization
Make XBlock views/handlers non-atomic requests.
2020-04-01 11:02:46 -04:00
Stu Young
9b9e2f7e67 add reserved keyword linter to CI (#23499) 2020-04-01 10:30:46 -04:00
Ahtisham Shahid
3c35f21da2 Merge pull request #23545 from edx/ahtisham/PROD-1376
Updated ORA2 version
2020-04-01 19:00:25 +05:00
Nimisha Asthagiri
8991b161dc Django2 CSMH Database Router update 2020-04-01 09:25:56 -04:00
Tim McCormack
b489a4ecb1 Django2 bytestring conversion: Lynx html_to_text output (#23558)
Fixes test of email body for Django 2.0.
2020-04-01 13:12:25 +00:00
Saad Yousaf
e4c00dd335 Merge pull request #23563 from edx/saad/PROD-1287-remove-flaky-test
[PROD-1287] - Remove flaky test lms.djangoapps.instructor_task.tests.test_tasks_helper.TestProblemGradeReport.test_grading_failure
2020-04-01 17:49:28 +05:00
Awais Qureshi
8dfcdc3281 Merge pull request #23554 from edx/awais786/BOM-1438
BOM-1438
2020-04-01 16:07:21 +05:00
SaadYousaf
8c4ae15766 remove flaky test. 2020-04-01 15:46:20 +05:00
Awais Qureshi
30a2ae8aec BOM-1438
Fix course_id string.
2020-04-01 14:42:35 +05:00
Ahtisham Shahid
714f22e735 Updated ora version
fixed tag issue
2020-04-01 12:04:50 +05:00
David Ormsbee
5ea71beeb1 Make XBlock views/handlers non-atomic requests.
We're seeing slow commits on production for courseware_studentmodule
updates. Based on the slow queries during those times, we think it
might be because multiple worker processes are trying to update the
same rows from within long-running transactions (since courseware
is relatively slow).

The risk with this is that since the whole view execution is no
longer wrapped in a big implicit transaction, it's possible that
XBlock state will update and things that key off of that (e.g.
completion progress information or pre-req milestones) will fail
in a way that will leave the database in an unplanned-for state,
though this is already the case for those actions that trigger
asynchronous tasks like grades recalculation.

The query counts for the index view test were adjusted down
because save points count towards the total and we're no longer
setting them at the top level around the view as a whole.
2020-03-31 21:22:58 -04:00
Nimisha Asthagiri
d8774e4f8d Merge pull request #23555 from edx/arch/django2-bulk-email
Django2 bulk_email: bytestring conversion
2020-03-31 16:55:33 -04:00
Nimisha Asthagiri
90a330d0ad Django2 bulk_email: bytestring conversion 2020-03-31 16:04:45 -04:00
Nimisha Asthagiri
c1c447b7f2 Merge pull request #23553 from edx/arch/django2-enrollments
Django2 enrollments app: course_id string
2020-03-31 15:46:35 -04:00
Nimisha Asthagiri
e320af0272 Merge pull request #23552 from edx/arch/django2-badges
Django2 Badges: fix course_id string
2020-03-31 15:46:11 -04:00
Manjinder Singh
b1baf5db77 Converting variable to string before assignment in tests (#23546)
* Converting variable to string before assignment in tests

Django 2 is stricter of string typing, so it will no longer do implicit conversions in some cases.
While the release notes only mention dropping bytestring support in some places, they seem to have also dropped implicit conversion to str for whole host of things.
2020-03-31 15:31:52 -04:00
Nimisha Asthagiri
be6b2a3e52 Merge pull request #23551 from edx/arch/django22-tox
Django2: Add to tox.ini's envlist
2020-03-31 14:39:58 -04:00
Calen Pennington
094fbaeda2 Merge pull request #23548 from cpennington/upgrade-edx-when
Upgrade edx-when
2020-03-31 14:39:09 -04:00
Nimisha Asthagiri
b96d975b97 Django2 enrollments app: course_id str 2020-03-31 14:28:17 -04:00
Nimisha Asthagiri
8a0d57eec3 Django2 Badges: fix course_id string 2020-03-31 14:23:53 -04:00
Nimisha Asthagiri
662a1a466a Django2: Add to tox.ini's envlist 2020-03-31 14:16:46 -04:00
Calen Pennington
7d8a715b32 Upgrade edx-when 2020-03-31 13:52:04 -04:00
Nimisha Asthagiri
da55a740a1 Django2 experiments app: Fix course_id string 2020-03-31 13:42:02 -04:00
Nimisha Asthagiri
0a57ff98c0 Merge pull request #23547 from edx/arch/django-22-content-type-gating
Django2 StackedConfigurationModel: Fix query filter
2020-03-31 13:32:38 -04:00
Nimisha Asthagiri
5447e86307 Django2 StackedConfigurationModel: Fix query filter
BOM-1432
2020-03-31 12:45:44 -04:00
Ali Akbar
358b181bdf Merge pull request #23481 from edx/aakbar/demandhint-static-link-fix
add static links re-write for demnadhint tag
2020-03-31 15:04:33 +05:00
Saad Yousaf
521f5f2dc8 Merge pull request #23531 from edx/saad/PROD-1287-fix
[PROD-1287] - Optimize problem_grade_report code - FIX.
2020-03-31 14:35:08 +05:00
adeelehsan
8d840e6f55 Merge pull request #23529 from edx/revert-23509-aehsan/prod-1222/added_logs_for_investigation
Revert "Added logs for investigation"
2020-03-31 12:31:05 +05:00
Nathan Sprenkle
02392879b7 Team Management Upload A11y Improvements (#23502)
* Expose team management file input for better a11y
* Disable upload button when file not selected
2020-03-30 17:03:15 -04:00
Tim McCormack
5edc8fd380 Remove test for PREVENT_AUTH_USER_WRITES since code breaks in Django 2 (#23536)
...and it turns out we don't need the switch anymore, anyway.

When we upgraded to Django 1.11, this flag was added in order to
allow for a database migration that would render the user table
unwriteable for up to half an hour:
https://github.com/edx/edx-platform/pull/17561

This involved swapping out the signal handler for logins via
`user_logged_in.disconnect(django_update_last_login)`, but with
Django 2.0, that disconnect is silently failing (returning
false). Likely the disconnect is now happening too soon.
(See edx-platform/common/djangoapps/student/apps.py line 21 in 61e1eda.)

The result is that by the time the waffle switch is consulted, the
normal handler has already run, and the user's last login date has
already been updated.

For now we're just removing the test, and have filed ARCHBOM-1084 for
followup (deleting the switch and related code).
2020-03-30 20:28:18 +00:00
David Ormsbee
26d6ee0a5c Merge pull request #23537 from edx/ormsbee/edx-when-index-drop
Bump edx-when to 1.1.4 (perf fix)
2020-03-30 15:42:21 -04:00
David Ormsbee
ab15d37655 Bump edx-when to 1.1.4 (perf fix) 2020-03-30 15:18:05 -04:00
Tim McCormack
2e059513d1 Downgrade pytest to 5.3.5 for now to avoid reporting bug (#23533) 2020-03-30 18:57:55 +00:00
Awais Qureshi
195d225044 BOM-1417 (#23476)
Fixing management command.

Django PR removed force_str method: dc8834cad4 (diff-55346957c9b0473492d19a390a7adb47L36)

None is not working now.
2020-03-30 14:10:58 -04:00
atesker
c4914bc2b3 EDUCATOR-4979. Bump ora2 verstion to 2.6.22 2020-03-30 14:05:49 -04:00
Soban Javed
c76d1cff79 fixed error in theme management commands in django 2.0 2020-03-30 20:43:02 +05:00