From 3bebdb80a769dcd10e9a44a39694a52a01e3b44f Mon Sep 17 00:00:00 2001
From: joshua stein <jcs@jcs.org>
Date: Fri, 10 Jun 2016 16:31:13 -0500
Subject: [PATCH] User: clear deleted_at when unbanning, since we probably set
 it

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 7927195..4df0b97 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -340,6 +340,7 @@ class User < ActiveRecord::Base
     self.banned_at = nil
     self.banned_by_user_id = nil
     self.banned_reason = nil
+    self.deleted_at = nil
     self.save!
 
     m = Moderation.new