github-actions[bot]
commented
1 year ago Checking git merge conflicts against https://github.com/edx/edx-platform.git
| Comparing with | open-release/nutmeg.master |
|---|---|
Benchmark conflicts with master |
0 |
| Current conflicts | 292 |
| Summary | Adds 292 new conflicts. How can we do better? |
New conflicting files with 'open-release/nutmeg.master'
``` .dockerignore Dockerfile Makefile cms/celery.py cms/djangoapps/contentstore/api/tests/test_validation.py cms/djangoapps/contentstore/courseware_index.py cms/djangoapps/contentstore/tasks.py cms/djangoapps/contentstore/tests/test_course_create_rerun.py cms/djangoapps/contentstore/tests/test_course_settings.py cms/djangoapps/contentstore/tests/test_courseware_index.py cms/djangoapps/contentstore/tests/test_proctoring.py cms/djangoapps/contentstore/tests/test_tasks.py cms/djangoapps/contentstore/tests/test_utils.py cms/djangoapps/contentstore/utils.py cms/djangoapps/contentstore/views/assets.py cms/djangoapps/contentstore/views/course.py cms/djangoapps/contentstore/views/tests/test_assets.py cms/djangoapps/contentstore/views/tests/test_certificates.py cms/djangoapps/contentstore/views/tests/test_item.py cms/djangoapps/contentstore/views/transcript_settings.py cms/djangoapps/contentstore/views/user.py cms/djangoapps/course_creators/tests/test_admin.py cms/envs/common.py cms/envs/devstack.py cms/envs/production.py cms/templates/admin/base_site.html cms/templates/widgets/deprecated-course-key-warning.html cms/urls.py common/djangoapps/student/admin.py common/djangoapps/student/helpers.py common/djangoapps/student/models.py common/djangoapps/student/signals/receivers.py common/djangoapps/student/tests/test_certificates.py common/djangoapps/student/tests/test_email.py common/djangoapps/student/tests/test_events.py common/djangoapps/student/tests/test_helpers.py common/djangoapps/student/tests/test_linkedin.py common/djangoapps/student/tests/test_recent_enrollments.py common/djangoapps/student/tests/test_tasks.py common/djangoapps/student/views/management.py common/djangoapps/third_party_auth/pipeline.py common/djangoapps/third_party_auth/settings.py common/djangoapps/third_party_auth/tests/test_pipeline.py common/djangoapps/third_party_auth/utils.py common/djangoapps/track/tests/test_shim.py common/djangoapps/track/urls.py common/djangoapps/track/views/__init__.py common/djangoapps/track/views/segmentio.py common/djangoapps/track/views/tests/test_views.py common/djangoapps/util/course.py common/djangoapps/util/tests/test_course.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/modulestore/mongo/base.py common/lib/xmodule/xmodule/tests/test_course_module.py common/lib/xmodule/xmodule/video_module/video_handlers.py lms/celery.py lms/djangoapps/badges/events/course_complete.py lms/djangoapps/badges/events/tests/test_course_complete.py lms/djangoapps/certificates/api.py lms/djangoapps/certificates/signals.py lms/djangoapps/certificates/tests/test_api.py lms/djangoapps/certificates/tests/test_signals.py lms/djangoapps/certificates/tests/test_support_views.py lms/djangoapps/certificates/tests/test_views.py lms/djangoapps/certificates/tests/test_webview_views.py lms/djangoapps/certificates/urls.py lms/djangoapps/certificates/views/webview.py lms/djangoapps/course_api/tests/test_serializers.py lms/djangoapps/course_api/tests/test_views.py lms/djangoapps/course_blocks/transformers/tests/test_load_override_data.py lms/djangoapps/courseware/access.py lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/tests/test_navigation.py lms/djangoapps/courseware/views/views.py lms/djangoapps/discussion/django_comment_client/base/tests.py lms/djangoapps/discussion/django_comment_client/tests/test_utils.py lms/djangoapps/grades/models.py lms/djangoapps/grades/tests/test_tasks.py lms/djangoapps/instructor/enrollment.py lms/djangoapps/instructor/tests/test_api.py lms/djangoapps/instructor/tests/test_api_email_localization.py lms/djangoapps/instructor/tests/test_certificates.py lms/djangoapps/instructor/tests/test_ecommerce.py lms/djangoapps/instructor/tests/test_enrollment.py lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py lms/djangoapps/instructor/views/api.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/djangoapps/static_template_view/urls.py lms/envs/common.py lms/envs/devstack.py lms/envs/test.py lms/lib/courseware_search/lms_filter_generator.py lms/lib/tests/test_utils.py lms/templates/dashboard/_dashboard_certificate_information.html lms/templates/split_test_author_view.html lms/templates/student_account/register.underscore lms/templates/video.html lms/tests.py lms/urls.py openedx/core/djangoapps/credentials/models.py openedx/core/djangoapps/signals/signals.py openedx/core/djangoapps/site_configuration/models.py openedx/core/djangoapps/site_configuration/tests/test_models.py openedx/core/djangoapps/theming/finders.py openedx/core/djangoapps/user_api/accounts/api.py openedx/core/djangoapps/user_api/accounts/image_helpers.py openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py openedx/core/djangoapps/user_api/accounts/tests/test_utils.py openedx/core/djangoapps/user_api/accounts/tests/test_views.py openedx/core/djangoapps/user_api/accounts/utils.py openedx/core/djangoapps/user_api/accounts/views.py openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py openedx/core/djangoapps/user_api/tests/test_views.py openedx/core/djangoapps/user_api/views.py openedx/core/djangoapps/user_authn/tasks.py openedx/core/djangoapps/user_authn/views/login.py openedx/core/djangoapps/user_authn/views/password_reset.py openedx/core/djangoapps/user_authn/views/register.py openedx/core/djangoapps/user_authn/views/registration_form.py openedx/core/djangoapps/user_authn/views/tests/test_register.py openedx/core/lib/api/permissions.py openedx/core/lib/cache_utils.py openedx/core/release.py openedx/features/course_experience/utils.py openedx/features/course_experience/views/course_home.py pavelib/assets.py pavelib/prereqs.py requirements/constraints.txt requirements/edx-sandbox/base.in requirements/edx/base.in requirements/edx/base.txt requirements/edx/development.txt requirements/edx/django.txt requirements/edx/github.in requirements/edx/testing.txt tox.ini ```| Comparing with | master |
|---|---|
Benchmark conflicts with master |
0 |
| Current conflicts | 300 |
| Summary | Adds 300 new conflicts. How can we do better? |
Change description
Found that there was a bug by running server in foreground
manage.py lms runserver. The cache has also not proven necessary in production so far, so simplifying for now and effectively disabling it.Type of change
Related issues
Checklists
Development
Security
Code review