Merge branch 'dev' into spike/prometheus-metrics-update

epimorphics · Sep 3, 2024 · db7e61e · db7e61e
2 parents 633acaf + b0d5b99
commit db7e61e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,15 +27,12 @@
 - (Jon) Updated `.gitignore` to include ignoring `byebug` history as well as
   sets the tmp directory ignore to be anywhere, not just at the project root
 
-## 1.5.3 - 2024-08
+## 1.5.3 - 2024-09
 
-- (Dan) Update the error messages for the postcode selectors step 3/7 so each
-  error message is unique to the postcode selector
-  [120](https://github.com/epimorphics/standard-reports-ui/issues/120)
-- (Dan) Updates alt text for screenshots of example reports
-  [115](https://github.com/epimorphics/standard-reports-ui/issues/115)
-- (Dan) Updates report page styles so links are underlined and gives download
-  report page a seperate page title
+- (Dan) Fixes bug XXS vulnerability [133](https://github.com/epimorphics/standard-reports-ui/issues/133)
+- (Dan) Update the error messages for the postcode selectors step 3/7 so each error message is unique to the postcode selector [120](https://github.com/epimorphics/standard-reports-ui/issues/120)
+- (Dan) Updates alt text for screenshots of example reports [115](https://github.com/epimorphics/standard-reports-ui/issues/115)
+- (Dan) Updates report page styles so links are underlined and gives download report page a seperate page title
 - (Dan) Updates gemfile to use v1.9.5 lr_common_styles
 - (Dan) Updates the page titles throughout the app
   [116](https://github.com/epimorphics/standard-reports-ui/issues/116)

diff --git a/app/models/step_select_postcode_area.rb b/app/models/step_select_postcode_area.rb
@@ -33,8 +33,8 @@ def validate_with(workflow, value)
       workflow.traverse_to(successor_step)
     else
       set_flash("Sorry, '#{value}' does not appear to be a valid value for a #{subtype_label}.
-      A #{subtype_label} is the first one or two letters of a UK postcode, for example &quot;B&quot;
-      or &quot;TA&quot".html_safe)
+      A #{subtype_label} is the first one or two letters of a UK postcode, for example
+      'B' or 'TA'.")
     end
   end
 end
diff --git a/app/models/step_select_postcode_district.rb b/app/models/step_select_postcode_district.rb
@@ -33,8 +33,8 @@ def validate_with(workflow, value)
       workflow.traverse_to(successor_step)
     else
       set_flash("Sorry, '#{value}' does not appear to be a valid value for a #{subtype_label}.
-      A #{subtype_label} is the first part of a UK postcode, up to the space. For example 
-      &quot;B17&quot; or &quot;TA9&quot".html_safe)
+      A #{subtype_label} is the first part of a UK postcode, up to the space. For example
+      'B17' or 'TA9'.")
     end
   end
 end
diff --git a/app/models/step_select_postcode_sector.rb b/app/models/step_select_postcode_sector.rb
@@ -37,8 +37,8 @@ def validate_with(workflow, value)
       workflow.traverse_to(successor_step)
     else
       set_flash("Sorry, '#{value}' does not appear to be a valid value for a #{subtype_label}.
-      A #{subtype_label} is the first part of a UK postcode, up to and including the first 
-      digit after the space. For example &quot;B17 0&quot; or &quot;TA9 3&quot;".html_safe)
+      A #{subtype_label} is the first part of a UK postcode, up to and including the first
+      digit after the space. For example 'B17 0' or 'TA9 3'.")
     end
   end
 end