diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-10 21:13:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-10 21:13:22 +0200 |
commit | 3fa66935fd65e2d834dcc743bd835afb5b875f7f (patch) | |
tree | 361e00c0c82de24f359bbe5ba32b76d9913c609e /activerecord/lib/active_record | |
parent | b6300f3ecc79bff29cf9bb804a30fd92403feac1 (diff) | |
parent | 0d72489b2a08487f71dd4230846c01a5d99ef35f (diff) | |
download | rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.tar.gz rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.tar.bz2 rails-3fa66935fd65e2d834dcc743bd835afb5b875f7f.zip |
Merge pull request #29572 from kaspth/test-runner-no-eager-require
Don't eagerly require Rails' minitest plugin.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index ba686fc562..3fbfcc9b47 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -260,7 +260,7 @@ module ActiveRecord def check_schema_file(filename) unless File.exist?(filename) message = %{#{filename} doesn't exist yet. Run `rails db:migrate` to create it, then try again.} - message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails) + message << %{ If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} if defined?(::Rails.root) Kernel.abort message end end |