diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-01 12:47:25 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-01 12:47:29 +0200 |
| commit | 27c2516f4868863ea27b85f94885641f61add700 (patch) | |
| tree | 974e8a612970de29844788c8e12a6659616b5578 | |
| parent | 182445e1b4b2e12542457ba32f255a0cc2f01910 (diff) | |
| download | rails-27c2516f4868863ea27b85f94885641f61add700.tar.gz rails-27c2516f4868863ea27b85f94885641f61add700.tar.bz2 rails-27c2516f4868863ea27b85f94885641f61add700.zip | |
Sort out circular dependency for now
| -rw-r--r-- | lib/active_file/site.rb | 2 | ||||
| -rw-r--r-- | lib/active_file/sites/disk_site.rb | 2 | ||||
| -rw-r--r-- | test/disk_site_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/active_file/site.rb b/lib/active_file/site.rb index 2a9043567c..44010767dd 100644 --- a/lib/active_file/site.rb +++ b/lib/active_file/site.rb @@ -39,3 +39,5 @@ end module ActiveFile::Sites end + +require "active_file/sites/disk_site" diff --git a/lib/active_file/sites/disk_site.rb b/lib/active_file/sites/disk_site.rb index 9068e14866..2f3871c65f 100644 --- a/lib/active_file/sites/disk_site.rb +++ b/lib/active_file/sites/disk_site.rb @@ -1,5 +1,3 @@ -require "active_file/site" - require "fileutils" require "pathname" diff --git a/test/disk_site_test.rb b/test/disk_site_test.rb index 0c5de70c72..076cbd8a3f 100644 --- a/test/disk_site_test.rb +++ b/test/disk_site_test.rb @@ -2,7 +2,7 @@ require "test_helper" require "fileutils" require "tmpdir" require "active_support/core_ext/securerandom" -require "active_file/sites/disk_site" +require "active_file/site" class ActiveFile::DiskSiteTest < ActiveSupport::TestCase FIXTURE_KEY = SecureRandom.base58(24) |