aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 05:02:54 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 05:02:54 +0000
commitf42403ff499fb120c4996b61a6f98b96e399ed87 (patch)
tree0ed039d1e36cf0e8a1e0c42024db60d7a3a65938
parentf26e9b68612823f00962366368ee19beb567d44f (diff)
downloadrails-f42403ff499fb120c4996b61a6f98b96e399ed87.tar.gz
rails-f42403ff499fb120c4996b61a6f98b96e399ed87.tar.bz2
rails-f42403ff499fb120c4996b61a6f98b96e399ed87.zip
Remove duplicate fixture entry in comments.yml. Closes #4923. [Blair Zajac <blair@orcaware.com>]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4305 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/test/fixtures/comments.yml6
2 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 3a9fc110d6..f43040b9ad 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove duplicate fixture entry in comments.yml. Closes #4923. [Blair Zajac <blair@orcaware.com>]
+
* Update FrontBase adapter to check binding version. Closes #4920. [mlaster@metavillage.com]
* New Frontbase connections don't start in auto-commit mode. Closes #4922. [mlaster@metavillage.com]
diff --git a/activerecord/test/fixtures/comments.yml b/activerecord/test/fixtures/comments.yml
index 758eaf6dbf..236bdb2e36 100644
--- a/activerecord/test/fixtures/comments.yml
+++ b/activerecord/test/fixtures/comments.yml
@@ -16,12 +16,6 @@ does_it_hurt:
body: Don't think too hard
type: SpecialComment
-eager_sti_on_associations_comment:
- id: 4
- post_id: 4
- body: Normal type
- type: Comment
-
eager_sti_on_associations_vs_comment:
id: 5
post_id: 4