codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-31 09:09:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 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
commit cc688155f4
2 changed files with 1 additions and 3 deletions
app/models
email_token.rb
config/environments
test.rb

2
app/models/email_token.rb
View file

@ -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

2
config/environments/test.rb
View file

@ -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