Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'upgrade-cors-django-3' of https://github.com/johnetordo…
…ff/osf.io into django-3-onmibus * 'upgrade-cors-django-3' of https://github.com/johnetordoff/osf.io: upgrade CORS for Django 3 [ENG-3867] Create Storage Regions on post migration signal (CenterForOpenScience#9965) [ENG-3866] Move citation style population out of migration stream (CenterForOpenScience#9966) [ENG-3868] Move blocked email domains to post-migrate signal (CenterForOpenScience#9958) [ENG-3863] Move schema ensuring and schema blocks update to post-migrate signals (CenterForOpenScience#9974) [ENG-3865] Create Licenses using post-migrate signal (CenterForOpenScience#9961) [ENG-3836] Investigate waffle flags (CenterForOpenScience#9950) move createcachetable to post migrate signal (CenterForOpenScience#9944) remove post-migrate signals from migration stream (CenterForOpenScience#9964) # Conflicts: # admin/base/settings/defaults.py # api/base/settings/defaults.py # osf/apps.py # osf/migrations/0037_ensure_licenses.py # osf/migrations/0038_ensure_schemas.py # osf/migrations/0074_parse_citation_styles.py # osf/migrations/0077_ensure_schemas.py # osf/migrations/0078_ensure_schemas.py # osf/migrations/0080_ensure_schemas.py # osf/migrations/0083_add_ember_waffle_flags.py # osf/migrations/0095_add_url_to_licenses.py # osf/migrations/0095_ensure_licenses.py # osf/migrations/0096_ensure_schemas.py # osf/migrations/0099_add_default_storage_region.py # osf/migrations/0107_add_dependent_styles.py # osf/migrations/0112_ensure_schemas.py # osf/migrations/0121_remove_support_page_waffle_flag.py # osf/migrations/0121_remove_waffle_flags.py # osf/migrations/0135_user_settings_waffles.py # osf/migrations/0136_add_ember_auth_register_waffle_flag.py # osf/migrations/0136_preprint_node_divorce.py # osf/migrations/0137_transfer_preprint_service_permissions.py # osf/migrations/0138_ensure_subjects_and_providers.py # osf/migrations/0142_change_registration_schemas.py # osf/migrations/0142_remove_forks_flag.py # osf/migrations/0142_remove_waffle_analytics_flags.py # osf/migrations/0144_add_prereg_winddown_switches.py # osf/migrations/0147_blacklistedemaildomain.py # osf/migrations/0149_add_datacite_doi_switch.py # osf/migrations/0152_ensure_schemas.py # osf/migrations/0154_remove_ember_project_registrations_flag.py # osf/migrations/0156_create_cache_table.py # osf/migrations/0157_add_storage_usage_flag.py # osf/migrations/0162_post_migrate.py # osf/migrations/0167_auto_20190506_1556.py # osf/migrations/0170_ensure_schemas.py # osf/migrations/0172_ensure_schemas.py # osf/migrations/0173_ensure_schemas.py # osf/migrations/0174_add_ab_testing_home_page_version_b_flag.py # osf/migrations/0191_migrate_schemas_to_schemablocks.py # osf/migrations/0195_add_enable_chronos_waffle_flag.py # osf/migrations/0196_update_schemas.py # osf/migrations/0197_add_ab_testing_home_page_hero_text_version_b_flag.py # osf/migrations/0199_draft_node_permissions.py # osf/migrations/0201_add_egap_flag.py # osf/migrations/0204_ensure_schemas.py # osf/migrations/0207_ensure_schemas.py # osf/migrations/0207_update_schemas2.py # osf/migrations/0208_update_EGAP_schema.py # osf/migrations/0221_add_schemas.py # osf/migrations/0227_add_secondary_data.py # osf/migrations/__init__.py # osf_tests/test_registration_bulk_upload_parser.py # requirements.txt
- Loading branch information