Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5

1 files changed, 8 insertions, 7 deletions

diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 4ea89bf81..8b7b9ebe4 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 95
+# Schema version: 108
 #
 # Table name: info_request_events
 #
@@ -8,12 +8,12 @@
 #  event_type          :text            not null
 #  params_yaml         :text            not null
 #  created_at          :datetime        not null
-#  described_state     :string(255)     
-#  calculated_state    :string(255)     
-#  last_described_at   :datetime        
-#  incoming_message_id :integer         
-#  outgoing_message_id :integer         
-#  comment_id          :integer         
+#  described_state     :string(255)
+#  calculated_state    :string(255)
+#  last_described_at   :datetime
+#  incoming_message_id :integer
+#  outgoing_message_id :integer
+#  comment_id          :integer
 #  prominence          :string(255)     default("normal"), not null
 #
 
@@ -147,6 +147,7 @@ class InfoRequestEvent < ActiveRecord::Base
                 return event.calculated_state
             end
         end
+        return
     end
 
     def waiting_classification