github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-16 18:19:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2868 from chancancode/dont_silence_deprecation_warnings

Browse Source 
*Don't* silence the deprecation warnings in test
This commit is contained in:
Sam
2014-10-14 18:44:36 +11:00
parent 08d1f1ef7c 7ddf1df3e0
commit cc688155f4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/email_token.rb
View File

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

2
config/environments/test.rb
View File

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