aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/comment.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-09-17 17:39:51 +0100
committerLouise Crow <louise.crow@gmail.com>2013-09-17 17:39:51 +0100
commit6fbcb461025dc315d688038d9f0a8e138d00ba33 (patch)
tree628ad3d7bf9cb2310bc2bed2e94b8670532a0dd4 /app/models/comment.rb
parentabde5e4a1139c41c6db23ce041fba090674f65ac (diff)
parentf41ec6d1cb167058a808b7820da5345c6da962fd (diff)
Merge branch 'feature/hide-individual-responses' into rails-3-develop
Conflicts: Gemfile app/views/admin_request/edit_outgoing.html.erb config/packages doc/CHANGES.md doc/INSTALL.md spec/models/info_request_spec.rb spec/models/public_body_spec.rb
Diffstat (limited to 'app/models/comment.rb')
-rw-r--r--app/models/comment.rb17
1 files changed, 8 insertions, 9 deletions
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 9527030a9..75d37e04f 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,17 +1,16 @@
# == Schema Information
-# Schema version: 114
#
# Table name: comments
#
-# id :integer not null, primary key
-# user_id :integer not null
-# comment_type :string(255) default("internal_error"), not null
+# id :integer not null, primary key
+# user_id :integer not null
+# comment_type :string(255) default("internal_error"), not null
# info_request_id :integer
-# body :text not null
-# visible :boolean default(TRUE), not null
-# created_at :datetime not null
-# updated_at :datetime not null
-# locale :text default(""), not null
+# body :text not null
+# visible :boolean default(TRUE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# locale :text default(""), not null
#
# models/comments.rb: