mirror of
https://github.com/discourse/discourse.git
synced 2025-02-16 18:24:52 -06:00
this warning is getting in the way of my presentation
This commit is contained in:
parent
802330269d
commit
a613347100
@ -20,6 +20,16 @@ module Discourse
|
||||
|
||||
require 'discourse'
|
||||
|
||||
# mocha hates us, active_support/testing/mochaing.rb line 2 is requiring the wrong
|
||||
# require, patched in source, on upgrade remove this
|
||||
if Rails.env.test? || Rails.env.development?
|
||||
require "mocha/version"
|
||||
require "mocha/deprecation"
|
||||
if Mocha::VERSION == "0.13.3" && Rails::VERSION::STRING == "3.2.12"
|
||||
Mocha::Deprecation.mode = :disabled
|
||||
end
|
||||
end
|
||||
|
||||
# Custom directories with classes and modules you want to be autoloadable.
|
||||
config.autoload_paths += %W(#{config.root}/app/serializers)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user