aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAlexey Muranov <alexey.muranov@gmail.com>2012-10-07 20:32:48 +0200
committerAlexey Muranov <alexey.muranov@gmail.com>2012-10-07 20:43:18 +0200
commitc9ccef554cb5f28d4c4b8d1eb8f5b4de6e25f341 (patch)
treeb2b5233169ab00bed0532952917527f6ecf85ad1 /activerecord/lib/active_record
parentd871807a78ca607f5f78e8eaab99e3d46f284c63 (diff)
downloadrails-c9ccef554cb5f28d4c4b8d1eb8f5b4de6e25f341.tar.gz
rails-c9ccef554cb5f28d4c4b8d1eb8f5b4de6e25f341.tar.bz2
rails-c9ccef554cb5f28d4c4b8d1eb8f5b4de6e25f341.zip
Move/rename files to follow naming conventions
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/fixture_set/file.rb (renamed from activerecord/lib/active_record/fixtures/file.rb)0
-rw-r--r--activerecord/lib/active_record/fixtures.rb2
2 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixture_set/file.rb
index 11b53275e1..11b53275e1 100644
--- a/activerecord/lib/active_record/fixtures/file.rb
+++ b/activerecord/lib/active_record/fixture_set/file.rb
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index cfc93f46b9..899e89a6f5 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -2,7 +2,7 @@ require 'erb'
require 'yaml'
require 'zlib'
require 'active_support/dependencies'
-require 'active_record/fixtures/file'
+require 'active_record/fixture_set/file'
require 'active_record/errors'
require 'active_support/deprecation' # temporary