merges master and fix conflicts

2015-08-26 14:48:16 +02:00
parent c9ca3877e8 a2b240c360
commit 25c3c4d1f1
44 changed files with 385 additions and 208 deletions
--- a/db/migrate/20150826112411_rename_reviewed_at_to_archived_at_in_comments_and_debates.rb
+++ b/db/migrate/20150826112411_rename_reviewed_at_to_archived_at_in_comments_and_debates.rb
@@ -0,0 +1,6 @@
+class RenameReviewedAtToArchivedAtInCommentsAndDebates < ActiveRecord::Migration
+  def change
+    rename_column :comments, :reviewed_at, :archived_at
+    rename_column :debates, :reviewed_at, :archived_at
+  end
+end