Permalink
Browse files

Merge pull request #10998 from Empact/tidy-changelog

Fix some activerecord changelog code to be displayed properly as code [ci skip]
  • Loading branch information...
2 parents 37e6201 + d3abc8b commit 353a398bee68c5ea99d76ac7601de0a5fef6f4a5 @steveklabnik steveklabnik committed Jun 18, 2013
Showing with 26 additions and 24 deletions.
  1. +26 −24 activerecord/CHANGELOG.md
@@ -11,33 +11,35 @@
* Ambiguous reflections are on :through relationships are no longer supported.
For example, you need to change this:
- class Author < ActiveRecord::Base
- has_many :posts
- has_many :taggings, :through => :posts
- end
+ class Author < ActiveRecord::Base
+ has_many :posts
+ has_many :taggings, :through => :posts
+ end
- class Post < ActiveRecord::Base
- has_one :tagging
- has_many :taggings
- end
+ class Post < ActiveRecord::Base
+ has_one :tagging
+ has_many :taggings
+ end
- class Tagging < ActiveRecord::Base
- end
+ class Tagging < ActiveRecord::Base
+ end
To this:
- class Author < ActiveRecord::Base
- has_many :posts
- has_many :taggings, :through => :posts, :source => :tagging
- end
+ class Author < ActiveRecord::Base
+ has_many :posts
+ has_many :taggings, :through => :posts, :source => :tagging
+ end
- class Post < ActiveRecord::Base
- has_one :tagging
- has_many :taggings
- end
+ class Post < ActiveRecord::Base
+ has_one :tagging
+ has_many :taggings
+ end
- class Tagging < ActiveRecord::Base
- end
+ class Tagging < ActiveRecord::Base
+ end
+
+ *Aaron Peterson*
* Remove column restrictions for `count`, let the database raise if the SQL is
invalid. The previous behavior was untested and surprising for the user.
@@ -70,9 +72,9 @@
You can turn off the automatic detection of inverse associations by setting
the `:inverse_of` option to `false` like so:
- class Taggable < ActiveRecord::Base
- belongs_to :tag, inverse_of: false
- end
+ class Taggable < ActiveRecord::Base
+ belongs_to :tag, inverse_of: false
+ end
*John Wang*
@@ -110,7 +112,7 @@
* Deprecate `ConnectionAdapters::SchemaStatements#distinct`,
as it is no longer used by internals.
- *Ben Woosley#
+ *Ben Woosley*
* Fix pending migrations error when loading schema and `ActiveRecord::Base.table_name_prefix`
is not blank.

0 comments on commit 353a398

Please sign in to comment.