diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-27 05:26:42 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-27 05:26:42 +0000 |
| commit | 018e7f24f0a7a74ad52eb342c7d64fb66d7ae983 (patch) | |
| tree | 924a3e2f223ee8b0193e0c86f6b8e4866c828e26 /activerecord | |
| parent | 4df3554e8f7bcf715b419a04c88cbaef4132ea48 (diff) | |
| download | rails-018e7f24f0a7a74ad52eb342c7d64fb66d7ae983.tar.gz rails-018e7f24f0a7a74ad52eb342c7d64fb66d7ae983.tar.bz2 rails-018e7f24f0a7a74ad52eb342c7d64fb66d7ae983.zip | |
Only load .yml files in sub-directories
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3685 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 3254781764..789190fe79 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -292,7 +292,7 @@ class Fixtures < YAML::Omap # YAML fixtures begin yaml_string = "" - Dir["#{@fixture_path}/**/*"].select {|f| test(?f,f) }.each do |subfixture_path| + Dir["#{@fixture_path}/**/*.yml"].select {|f| test(?f,f) }.each do |subfixture_path| yaml_string << IO.read(subfixture_path) end yaml_string << IO.read(yaml_file_path) |