Merge branch 'master' into develop

mysociety · Feb 7, 2025 · 2522e4d · 2522e4d
2 parents 950e236 + 5ea7ffd
commit 2522e4d
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 113 deletions.
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.45.3.0'
+ALAVETELI_VERSION = '0.45.3.1'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

diff --git a/config/initializers/regexp.rb b/config/initializers/regexp.rb
@@ -0,0 +1 @@
+Regexp.timeout = 60.0
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -2,10 +2,20 @@
 
 ## Highlighted Features
 
-Update Pro metric report email for new Stripe price IDs (Graeme Porteous)
-Increase regular expression timeout for attachment masking (Graeme Porteous)
 Add additional InfoRequest embargo scopes (Graeme Porteous)
 
+# 0.45.3.1
+
+## Highlighted Features
+
+* Updated translations from Transifex (Graeme Porteous)
+* Fixes for post Rails 8 upgrade issues:
+  * Fix Pro metric report email for new Stripe price IDs (Graeme Porteous)
+  * Fix STDOUT logging (Graeme Porteous)
+  * Fix citations JSON view (Graeme Porteous)
+  * Fix set reject incoming at mta rake task (Graeme Porteous)
+  * Fix regular expression timeouts (Graeme Porteous)
+
 # 0.45.3.0
 
 ## Highlighted Features