Merge branch '5.15' into 5

MNT Fix behat test that was relying on a bug

.github/workflows/ci.yml

@@ -4,13 +4,8 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Saturday at 12:30pm UTC
-  schedule:
-    - cron: '30 12 * * 6'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:30 PM UTC, only on Saturday and Sunday
+  schedule:
+    - cron: '30 12 * * 6,0'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

docs/en/userguide/form-submissions.md

@@ -96,11 +96,10 @@ This decides whether to send the email based on two options
 
 ## File Upload Field
 
-[note]
-This functionality is specifically included in Silverstripe core functionality 4.6 and above,
-[silverstripe-userforms](https://github.com/silverstripe/silverstripe-userforms/) 5.3 and above and is also included in
-the module [silverstripe-elemental-userforms](https://github.com/dnadesign/silverstripe-elemental-userforms).
-[/note]
+> [!NOTE]
+> This functionality is specifically included in Silverstripe core functionality 4.6 and above,
+> [silverstripe-userforms](https://github.com/silverstripe/silverstripe-userforms/) 5.3 and above and is also included in
+> the module [silverstripe-elemental-userforms](https://github.com/dnadesign/silverstripe-elemental-userforms).
 
 Files and other data that is uploaded by your website visitors should be handled with care to reduce the risk of exposing sensitive data.
 Files which are uploaded through a form inherit the permissions of the folder they are being placed into, so it's important that you
@@ -131,10 +130,9 @@ Indicates that a file/folder has restricted access and will only be visible to c
 
 ![Overview of icons usage on thumbnails and headers in the Files area](_images/overview-icons.png)
 
-[note]
-Folder with restricted access containing files with custom permissions and their associated file icons.
-* FS - Form submission
-[/note]
+> [!NOTE]
+> Folder with restricted access containing files with custom permissions and their associated file icons.
+> * FS - Form submission
 
 To get started, create a new **User Defined Form** page in the CMS. See [Creating and editing forms](creating-and-editing-forms)
 to learn more. To add a File Upload field to the form, click on the ***Form Fields*** tab in the page editing view.

tests/behat/features/userforms.feature

@@ -35,6 +35,7 @@ Feature: Userforms
     And I fill in "Options[GridFieldAddNewInlineButton][2][Value]" with "2"
     And I press the "Save" button
     And I follow "My userform"
+    And I click the "Form Fields" CMS tab
 
     # Create textfields
     And I press the "Add Field" button
@@ -64,6 +65,7 @@ Feature: Userforms
     And I check "Is this field Required?"
     And I press the "Save" button
     And I follow "My userform"
+    And I click the "Form Fields" CMS tab
 
     # Drag and drop my text field 2 to Page Two
     Then I drag the ".ss-gridfield-item[data-id='4'] .handle" element to the ".ss-gridfield-item[data-id='6'] .handle" element