Merge pull request #2868 from chancancode/dont_silence_deprecation_warnings

*Don't* silence the deprecation warnings in test

app/models/email_token.rb

@@ -22,7 +22,7 @@ class EmailToken < ActiveRecord::Base
   end
 
   def self.confirm_valid_after
-    SiteSetting.email_token_grace_period_hours.ago
+    SiteSetting.email_token_grace_period_hours.hours.ago
   end
 
   def self.unconfirmed

config/environments/test.rb

@@ -40,7 +40,5 @@ Discourse::Application.configure do
   config.assets.compile = true
   config.assets.digest = false
 
-  # silence deprecation warnings in test
   config.eager_load = false
-  ActiveSupport::Deprecation.silenced = true
 end