Merge branch 'release/0.14' into wdtk

Conflicts:
    app/views/request/show.html.erb

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/models/censor_rule_spec.rb b/spec/models/censor_rule_spec.rb
index 3782cc630..5b41cc0d4 100644
--- a/spec/models/censor_rule_spec.rb
+++ b/spec/models/censor_rule_spec.rb
@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: censor_rules
+#
+#  id                :integer          not null, primary key
+#  info_request_id   :integer
+#  user_id           :integer
+#  public_body_id    :integer
+#  text              :text             not null
+#  replacement       :text             not null
+#  last_edit_editor  :string(255)      not null
+#  last_edit_comment :text             not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  regexp            :boolean
+#
+
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe CensorRule, "substituting things" do