Merge remote-tracking branch 'origin/master' into error-info

2017-08-23 14:51:53 +02:00
parent 5d6158f95a b90392f580
commit 530e727d6e
14 changed files with 176 additions and 17 deletions
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,7 +1,7 @@
 class Comment < ActiveRecord::Base
  # inherit the creation module: encapsulates that this is a polymorphic user, offers some aliases and makes sure that all necessary attributes are set.
  include Creation
-  attr_accessor :username
+  attr_accessor :username, :date, :updated

  belongs_to :file, class_name: 'CodeOcean::File'
  belongs_to :user, polymorphic: true