aboutsummaryrefslogtreecommitdiffstats
path: root/lib/active_file
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-01 12:47:25 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-01 12:47:29 +0200
commit27c2516f4868863ea27b85f94885641f61add700 (patch)
tree974e8a612970de29844788c8e12a6659616b5578 /lib/active_file
parent182445e1b4b2e12542457ba32f255a0cc2f01910 (diff)
downloadrails-27c2516f4868863ea27b85f94885641f61add700.tar.gz
rails-27c2516f4868863ea27b85f94885641f61add700.tar.bz2
rails-27c2516f4868863ea27b85f94885641f61add700.zip
Sort out circular dependency for now
Diffstat (limited to 'lib/active_file')
-rw-r--r--lib/active_file/site.rb2
-rw-r--r--lib/active_file/sites/disk_site.rb2
2 files changed, 2 insertions, 2 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"