Merge branch 'hotfix/0.3.0.1'

Changelog.md

@@ -1,3 +1,8 @@
+# 0.3.0.1
+
+## Bug fixes
+* Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion [#4715](https://github.com/diaspora/diaspora/issues/4715)
+
 # 0.3.0.0
 
 ## Pod statistics

app/models/message.rb

@@ -17,7 +17,8 @@ class Message < ActiveRecord::Base
   validates :text, :presence => true
   validate :participant_of_parent_conversation
 
-  after_commit :on => :create do
+  after_create do  # don't use 'after_commit' here since there is a call to 'save!'
+                   # inside, which would cause an infinite recursion 
     #sign comment as commenter
     self.author_signature = self.sign_with_key(self.author.owner.encryption_key) if self.author.owner
 

config/defaults.yml

@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.3.0.0" # Do not touch unless doing a release, do not backport the version number that's in master but keep develp to always say "head"
+    number: "0.3.0.1" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
   heroku: false
   environment:
     url: "http://localhost:3000/"