Merge branch 'main' into FS-3061-ClientSideFileUploadV3

communitiesuk · Dec 4, 2023 · a80143a · a80143a
2 parents f0b62cb + a1cdf30
commit a80143a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/copilot/fsd-form-runner/manifest.yml b/copilot/fsd-form-runner/manifest.yml
@@ -54,7 +54,7 @@ variables:
   ACCESSIBILITY_STATEMENT_URL: "https://frontend.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk/accessibility_statement"
   AWS_BUCKET_NAME:
     from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-FormUploadsBucket
-  BASIC_AUTH_ON: true
+  BASIC_AUTH_ON: false
   CONTACT_US_URL: "https://frontend.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk/contact_us"
   COOKIE_POLICY_URL: "https://frontend.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk/cookie_policy"
   FEEDBACK_LINK: "https://frontend.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk/feedback"

diff --git a/fsd_config/form_jsons/cof/cy/cefnogaeth-leol-cof.json b/fsd_config/form_jsons/cof/cy/cefnogaeth-leol-cof.json
@@ -50,7 +50,7 @@
             "minimumRequiredFiles": 0
           },
           "type": "ClientSideFileUploadField",
-          "title": "Lanlwythwch dystiolaeth ategol",
+          "title": "Lanlwythwch dystiolaeth ategol (dewisol)",
           "hint": "Uwchlwythwch dystiolaeth i ddangos y gefnogaeth sydd gennych gan y gymuned.\n\n<p>Dylai fod yn ffeil unigol nad yw'n fwy na 10MB ar unrhyw un o'r fformatau canlynol (jpg, jpeg, png, pdf, txt, doc, docx, odt, csv, xls, xlsx, ods).</p>"
         }
       ],