Merge with master

app/controllers/concerns/commentable_actions.rb

@@ -62,10 +62,7 @@ module CommentableActions
   end
 
   def update
-    resource.assign_attributes(strong_params)
-    recover_documents_from_cache(resource)
-
-    if resource.save
+    if resource.update(strong_params)
       redirect_to resource, notice: t("flash.actions.update.#{resource_name.underscore}")
     else
       load_categories
@@ -117,11 +114,4 @@ module CommentableActions
       nil
     end
 
-    def recover_documents_from_cache(resource)
-      return false unless resource.try(:documents)
-      resource.documents = resource.documents.each do |document|
-        document.set_attachment_from_cached_attachment if document.cached_attachment.present?
-      end
-    end
-
 end