Skip to content

Update Tahoe Nutmeg upgrade branch with changes from main#1288

Open
github-actions[bot] wants to merge 202 commits intoshadinaif/upgrade-to-nutmegfrom
main
Open

Update Tahoe Nutmeg upgrade branch with changes from main#1288
github-actions[bot] wants to merge 202 commits intoshadinaif/upgrade-to-nutmegfrom
main

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Oct 3, 2022

This is an automated pull request from branch Juniper main into shadinaif/upgrade-to-nutmeg (Nutmeg upgrade).

This is meant for making sure all of our Juniper changes gets merge into Nutmeg otherwise Juniper would stall. If tests passes merge this pull request.

If there are merge conflicts, it needs to be resolved manually as descriped in the following Runbook:

Fixing the conflicts via GitHub UI is usually a bad idea due to over simplified UX that makes the process less predictable.

OmarIthawi and others added 4 commits September 26, 2022 19:56
)

A new behaviour:

- Empty signature is still added when initially create a certificate;
- Empty signature isn't added when certificate has at least one signature.
…ificate-bugfix

fix: empty signature added after every certificate saving (openedx#30912)
bryanlandia and others added 3 commits October 3, 2022 17:04
It's still used by EdxRestAPIClient which is used for PS integrations
…ect-allowlist

Add legacy /user_api/ prefix to MAIN_SITE_REDIRECT_ALLOWLIST
Add TahoeCourseAuthor role with Studio access
remove_site: fix CMS role IntegrityError + refactoring
don't report conflicts for releases before nutmeg
remove_site: also remove models with LearningContextKeyField
remove beeline logs from site config get_value
add beeline tracing for site config service usage
allow lint specific directory e.g. `tox -e pep8 openedx/`
```
django.db.utils.IntegrityError: (1451, 'Cannot delete or update a parent row: a foreign key constraint fails (`edxapp`.`user_tasks_usertaskstatus`, CONSTRAINT `user_tasks_usertaskstat_user_id_5ceae753d027017b_fk_auth_user_id` FOREIGN KEY (`user_id`) REFERENCES `auth_user` (`id`))')
```
SAMLConfiguration will be deleted with `site.delete()`
delete multiple sites at once; fixes for CMS-modules
bryanlandia and others added 25 commits January 1, 2024 20:03
Sync Dockerfile.tutor with latest server-vars.yml for Tahoe prod
…-support

feat: Add Mandrill Subaccount support
…parameter-helper

Add sanitize function for redirect parameter next
…rl-method

Improve the sanitize_next_parameter method with handling new cases
…-in-iframe

Hide site elements if render in iframe
…-in-iframe

Hide html elements if the parameter is set
…-in-iframe

Set cookie value ror hideElements before redirect
…-in-iframe

Hide html elements by parameter
…-in-iframe

Add function to set hideElements cookie
@melvinsoft
Copy link

.

Copy link

@melvinsoft melvinsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants