forked from openedx/edx-platform
-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Farhan/edly 6016 #417
Closed
Closed
Farhan/edly 6016 #417
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch would enable routing learner to logistration MFE via forgot password url than on platform when ENABLE_LOGISTRATION_MICROFRONTEND feature flag is set. VAN-98
ENT-3522: Upgraded edx-enterprise version to 3.9.9
remove the constraint on edx-sga
Update the celery startup code to more closely match the docs. We believe some of these imports are causeing circulare dependencies that are causing race conditions in task discovery. Since all django apps should be loaded using the django fixup in celery 4, we shouldn't need these other overrides. https://github.com/celery/celery/blob/v4.4.7/celery/fixups/django.py https://docs.celeryproject.org/en/v4.4.7/django/first-steps-with-django.html#using-celery-with-django
ENT-3116: Bumps edx-enterprise to 3.9.10
Part of the notifier service deprecation (DEPR-106). Also removed pdfminer from the package uninstall list, since we no longer install the package it conflicts with either.
add log to get insights about why data sharing consent is not required
But change the order so that celery is loaded first.
* upgrade ora to 2.11.3
I grew tired of modifying the Makefile to compile requirements without upgrading them. Also, installing pip-tools should not be part of the compile-requirements target, so a separate target was created.
This makes this class reusable by other IDAs.
This simplifies the internals of the waffle flag classes in order to better move them to edx-toggles later.
The same API is preserved, internally, to avoid many changes across the edx-platform codebase (for now).
Note that those features are destined to be deprecated, eventually.
edx-toggles==2.0.0 is likely to suppress namespace objects for the management of toggle objefcts. We explicitely prevent this by adding a requirement constraint.
When module_name is None, the call to edx-django-utils' get_code_owner_from_module crashes. So we avoid making that call when the module_name is None, which sometimes happens (for good reasons or not, but it's valid behaviour).
[BD-21] Move waffle_utils from edx-platform to edx-toggles
[BD-21] Use edx-toggle's SettingDictToggle to document setting-based feature toggles
The required `set_code_owner_attribute` decorator was introduced in v3.12.0, therefore we need to bump the dependency.
(cherry picked from commit e17b2ab)
…ry-xxe-fix-koa fix: update lxml parser for celery tasks to be more secure
fix!: Make default queue names service variant specific. (cherry picked from commit 4b29872)
## Description Cherry-picks https://github.com/edx/edx-platform/pull/28066 into `open-release/koa.master`. ## Testing instructions * LMS: https://periodic-build-koa.opencraft.hosting/ * Studio: https://studio.periodic-build-koa.opencraft.hosting/ (Ocim Admins only) 1. Visit https://periodic-build-koa.opencraft.hosting/heartbeat?extended 2. Ensure that the `celery` check is passing. 3. Shell into the latest deployed instance and run: ``` # LMS $ /edx/bin/edxapp-shell-lms >>> from django.conf import settings >>> settings.HEARTBEAT_CELERY_ROUTING_KEY 'edx.lms.core.high' >>> settings.HIGH_PRIORITY_QUEUE 'edx.lms.core.high' >>> settings.CELERY_QUEUES {'edx.lms.core.default': {}, 'edx.lms.core.high': {}, 'edx.lms.core.high_mem': {}, 'edx.cms.core.default': {}} >>> assert settings.HEARTBEAT_CELERY_ROUTING_KEY in settings.CELERY_QUEUES >>> # Studio $ /edx/bin/edxapp-shell-cms >>> from django.conf import settings >>> settings.HEARTBEAT_CELERY_ROUTING_KEY 'edx.cms.core.high' >>> settings.HIGH_PRIORITY_QUEUE 'edx.cms.core.high' >>> settings.CELERY_QUEUES {'edx.cms.core.default': {}, 'edx.cms.core.high': {}, 'edx.lms.core.default': {}} >>> assert settings.HEARTBEAT_CELERY_ROUTING_KEY in settings.CELERY_QUEUES >>> ``` ## Deadline None ## Review - [ ] @gabor-boros - [x] @arbrandes or @Agrendalath ? CC @bradenmacdonald
…y-updates-koa [SE-4304] feat: add celery beat configuration to Koa
…ixes (openedx#27028) This is the backport of https://github.com/edx/edx-platform/pull/27028. --- This pull requests backport a feature to include CCX course IDs in the generated course filenames used for downloading reports, etc. The suffix appended to the generated filename prefix is following the `<separator>_ccx_<ccx id>` pattern, to ensure unique filename generation per ccx - previously all CCX courses were downloaded with the same name. **Dependencies**: None **Screenshots**: ![Screenshot 2021-03-16 at 16 22 12](https://user-images.githubusercontent.com/19173947/111349994-f1c42980-8681-11eb-8fff-d28024899957.png) **Sandbox URL**: TBD **Merge deadline**: None **Testing instructions**: 1. Navigate to https://pr29101.sandbox.opencraft.hosting 2. Login as staff 3. Navigate to https://pr29101.sandbox.opencraft.hosting/courses/ccx-v1:edX+DemoX+Demo_Course+ccx@1/instructor#view-data_download 4. Click "Download profile information as a CSV" button 5. Check that the file name contains CCX
Co-authored-by: Taimoor Ahmed <[email protected]>
[NIC] Image Explorer CSS Being Overridden EDLY-5982
Wrong base branch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Describe what this pull request changes, and why. Include implications for people using this change.
Design decisions and their rationales should be documented in the repo (docstring / ADR), per
OEP-19, and can be
linked here.
Useful information to include:
"Developer", and "Operator".
changes.
Supporting information
Link to other information about the change, such as Jira issues, GitHub issues, or Discourse discussions.
Be sure to check they are publicly readable, or if not, repeat the information here.
Testing instructions
Please provide detailed step-by-step instructions for testing this change.
Deadline
"None" if there's no rush, or provide a specific date or event (and reason) if there is one.
Other information
Include anything else that will help reviewers and consumers understand the change.