Merge branch 'refactor-notifications' of https://github.com/CenterForOpenScience/osf.io into add-new-notifications-data-model

* 'refactor-notifications' of https://github.com/CenterForOpenScience/osf.io:

# Conflicts:
#	conftest.py
#	tests/test_registrations/test_retractions.py

Author: Johnetordoff

conftest.py

@@ -362,6 +362,7 @@ def helpful_thing(self):
     """
     yield from rolledback_transaction('function_transaction')
 
+
 @pytest.fixture
 def mock_gravy_valet_get_verified_links():
     """This fixture is used to mock a GV request which is made during node's identifier update. More specifically, when

tests/test_registrations/test_retractions.py

@@ -753,6 +753,8 @@ def test_POST_retraction_to_subproject_component_returns_HTTPError_BAD_REQUEST(s
 
 @pytest.mark.enable_bookmark_creation
 @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
+@mock.patch('website.mails.settings.USE_EMAIL', True)
+@mock.patch('website.mails.settings.USE_CELERY', False)
 class RegistrationRetractionViewsTestCase(OsfTestCase):
     def setUp(self):
         super().setUp()