Merge branch 'hotfix/0.28.0.4'

mysociety · Mar 27, 2017 · 3b7e3f4 · 3b7e3f4
2 parents 7e2a386 + 0d37683
commit 3b7e3f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/app/models/mail_server_log.rb b/app/models/mail_server_log.rb
@@ -20,11 +20,13 @@
 # Email: [email protected]; WWW: http://www.mysociety.org/
 
 class MailServerLog < ActiveRecord::Base
+  # `serialize` needs to be called before all other ActiveRecord code.
+  # See http://stackoverflow.com/a/15610692/387558
+  serialize :delivery_status, DeliveryStatusSerializer
+
   belongs_to :info_request
   belongs_to :mail_server_log_done
 
-  serialize :delivery_status, DeliveryStatusSerializer
-
   before_create :calculate_delivery_status
 
   # Load in exim or postfix log file from disk, or update if we already have it

diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
@@ -11,7 +11,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.28.0.3'
+ALAVETELI_VERSION = '0.28.0.4'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -1,3 +1,10 @@
+# 0.28.0.4
+
+# Highlighted Features
+
+* Fix bug causing `MailServerLog#delivery_status` to return an ActiveRecord
+  serialized attribute (Gareth Rees)
+
 # 0.28.0.3
 
 # Highlighted Features