diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-10 19:41:59 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-10 19:41:59 +0000 |
commit | f0c22d4ad5c61e7e683291fd42e143d1a339c3a2 (patch) | |
tree | b6815bee5d0834955db78074e52bf07247d399a4 /activerecord/lib/active_record/fixtures.rb | |
parent | a72ace1596c5be23cf6f3dee29232d8529053eb1 (diff) | |
download | rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.tar.gz rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.tar.bz2 rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.zip |
occured -> occurred. Closes #5559.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4604 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-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 af222e38e4..9eb3b5792b 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -308,7 +308,7 @@ class Fixtures < YAML::Omap end end rescue Exception=>boom - raise Fixture::FormatError, "a YAML error occured parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{boom.class}: #{boom}" + raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{boom.class}: #{boom}" end elsif File.file?(csv_file_path) # CSV fixtures |