Merge branch 'MDL-83733-main' of https://github.com/aanabit/moodle

djarran · Dec 12, 2024 · df990a7 · df990a7
2 parents fce8ddc + 48df296
commit df990a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 106 deletions.
diff --git a/.upgradenotes/MDL-83733-2024112510535598.yml b/.upgradenotes/MDL-83733-2024112510535598.yml
@@ -0,0 +1,8 @@
+issueNumber: MDL-83733
+notes:
+  block_site_main_menu:
+    - message: '''Activity'' selector in site_main_menu block has been deleted.'
+      type: removed
+  block_social_activities:
+    - message: '''Activity'' selector in social_activities block has been deleted.'
+      type: removed
diff --git a/blocks/site_main_menu/tests/behat/behat_block_site_main_menu.php b/blocks/site_main_menu/tests/behat/behat_block_site_main_menu.php
diff --git a/blocks/social_activities/tests/behat/behat_block_social_activities.php b/blocks/social_activities/tests/behat/behat_block_social_activities.php