aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/fixtures.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2017-07-02 14:35:13 -0700
committerGitHub <noreply@github.com>2017-07-02 14:35:13 -0700
commit111736ddf6fe81f3e42af37dfa1b0520a8c91473 (patch)
tree050eea5a719faa416b64b804617f8755b6500e09 /activerecord/lib/active_record/fixtures.rb
parentf443460670576cd82a806a851b7124479e8325c9 (diff)
parent92c29d82eb2f323bb1338a039229a66057a7d137 (diff)
downloadrails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.gz
rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.bz2
rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.zip
Merge pull request #29638 from amatsuda/require_relative_2017
Using require_relative in the Rails codebase
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rw-r--r--activerecord/lib/active_record/fixtures.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index e9acb8acae..c9e97d9d2b 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -4,8 +4,8 @@ require "zlib"
require "set"
require "active_support/dependencies"
require "active_support/core_ext/digest/uuid"
-require "active_record/fixture_set/file"
-require "active_record/errors"
+require_relative "fixture_set/file"
+require_relative "errors"
module ActiveRecord
class FixtureClassNotFound < ActiveRecord::ActiveRecordError #:nodoc: