merges master and fixes conflicts

2015-08-20 18:50:10 +02:00
parent e7effbf77c 73f5c4e21e
commit ee881230ba
24 changed files with 358 additions and 15 deletions
--- a/db/migrate/20150819135933_add_hidden_at_to_users.rb
+++ b/db/migrate/20150819135933_add_hidden_at_to_users.rb
@@ -0,0 +1,6 @@
+class AddHiddenAtToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :hidden_at, :datetime
+    add_index :users, :hidden_at
+  end
+end