Merge branch 'MDL-76491-400' of https://github.com/paulholden/moodle …

…into MOODLE_400_STABLE

.eslintrc

@@ -87,6 +87,7 @@
     'no-octal-escape': 'error',
     'no-proto': 'error',
     'no-redeclare': 'warn',
+    'no-restricted-globals': ['error', { 'name': 'Notification' }],
     'no-return-assign': 'error',
     'no-script-url': 'error',
     'no-self-assign': 'error',

admin/tool/dataprivacy/amd/src/expand_contract.js

@@ -21,7 +21,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-define(['jquery', 'core/url', 'core/str'], function($, url, str) {
+define(['jquery', 'core/url', 'core/str', 'core/notification'], function($, url, str, Notification) {
 
     var expandedImage = $('<img alt="" src="' + url.imageUrl('t/expanded') + '"/>');
     var collapsedImage = $('<img alt="" src="' + url.imageUrl('t/collapsed') + '"/>');