rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_of	Rafael Mendonça França	2014-06-13	5	-1/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent bad automatic inverse_of association
\| * \| \| \| \| \| \| \| \| \| \|	use name specified by 'as' for automatic inverse association to avoid ↵	Andrew S. Brown	2014-06-10	5	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reflecting on wrong association
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15693 from pdg137/enforce_utf8	Matthew Draper	2014-06-14	3	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In actionview, eliminate calls to tag that use html_safe parameter values.
\| * \| \| \| \| \| \| \| \| \| \|	In actionview, eliminate calls to tag that use html_safe parameter values. ↵	Paul Grayson	2014-06-13	3	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is generally unnecessary, since tag handles string quoting, except in one case (utf8_enforcer_tag) where we want to specify the encoding ourselves.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15579 from sgrif/sg-through-associations	Rafael Mendonça França	2014-06-13	5	-7/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Through associations should set both parent ids on join models
\| * \| \| \| \| \| \| \| \| \| \| \|	Through associations should set both parent ids on join models	Sean Griffin	2014-06-13	5	-7/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	member = Member.new(club: Club.new) member.save! Before: member.current_membership.club_id # => nil After: member.current_membership.club_id # => club's id
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15692 from sromano/falseClass	Matthew Draper	2014-06-14	3	-2/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::Parameters#require now accepts FalseClass values
\| * \| \| \| \| \| \| \| \| \| \| \|	ActionController::Parameters#require now accepts FalseClass values	Sergio Romano	2014-06-13	3	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15685.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15674 from sgrif/sg-mutable-attributes	Matthew Draper	2014-06-14	12	-36/+149
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect in-place changes on mutable AR attributes
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Detect in-place changes on mutable AR attributes	Sean Griffin	2014-06-13	12	-36/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have several mutable types on Active Record now. (Serialized, JSON, HStore). We need to be able to detect if these have been modified in place.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15695 from sgrif/sg-rm-column-types-override	Rafael Mendonça França	2014-06-13	2	-11/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused column types override
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused column types override	Sean Griffin	2014-06-13	2	-11/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15696 from sgrif/sg-bad-test	Rafael Mendonça França	2014-06-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder test which does not represent real world usage
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Reorder test which does not represent real world usage	Sean Griffin	2014-06-13	1	-2/+2
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't generally modify our classes at runtime like this. Let's create the instance after the class is created. Original commit doesn't imply that this was intentional behavior.
* \| \| \| \| \| \| \| \| \| \| \| \|	s/variable supplied/value supplied [ci skip]	Zachary Scott	2014-06-13	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Reword PreparedStatementInvalid example, and use values instead of	Zachary Scott	2014-06-13	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables [ci skip] Thanks to @matthewd for the excellent feedback! :heart:
* \| \| \| \| \| \| \| \| \| \| \| \|	Revert code changes at "Copy edits and code font wrap for Active Record [ci ↵	Rafael Mendonça França	2014-06-13	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	skip]" This partially reverts commit 1a203d5e07f639332880099fab610b886b1742fc. Reason: It was committed by accident
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15306 from rails/4-2-release_notes	Zachary Scott	2014-06-13	2	-0/+249
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Rails 4.2 release notes [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	First pass at Rails 4.2 release notes [ci skip]	Godfrey Chan	2014-06-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Create 4.2 release notes guide scaffold [ci skip]	Zachary Scott	2014-06-13	2	-0/+249
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Point to future 4-2-stable branch for detailed changes. [ci skip] Sync Active Support changelogs with release notes [ci skip] 4.2 Release Notes is a work in progress [ci skip] Assorted fixes for AS release notes [ci skip] * `Hash#deep_transform_keys` has already been backported * Mentioning `ActiveSupport::SafeBuffer#prepend` in the "Deprecations" section would be enough * Fix syntax in `Kernel#concern` example Sync AS release notes with the latest commits [ci skip] Synced 4.2 release notes with commits in railties [ci skip] Sync AP Deprecations and Notable changes from CHANGELOG [ci skip] Removed 4.2 release notes from the index [ci skip] This deprecation was reverted in 489a8f2 [ci skip] Synced Active Record changelogs for 4.2 release notes [ci skip] Synced Active Model changelog with the release notes [ci skip] Added cc26b6b as a 'Removal' item in AP release notes [ci skip] Use 'character' instead of 'symbol' to avoid confusion [ci skip] Edit pass on 4.2 release notes [ci skip] :memo: :lipstick: Use `.xyz` and `#xyz` appropiately [ci skip]
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15689 from sgrif/sg-attribute-methods	Matthew Draper	2014-06-14	2	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we always define attribute methods
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we always define attribute methods	Sean Griffin	2014-06-13	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15593 from sgrif/sg-attribute	Rafael Mendonça França	2014-06-13	16	-88/+225
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce an Attribute object to handle the type casting dance
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Introduce an Attribute object to handle the type casting dance	Sean Griffin	2014-06-13	16	-88/+225
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's a lot more that can be moved to these, but this felt like a good place to introduce the object. Plans are: - Remove all knowledge of type casting from the columns, beyond a reference to the cast_type - Move type_cast_for_database to these objects - Potentially make them mutable, introduce a state machine, and have dirty checking handled here as well - Move `attribute`, `decorate_attribute`, and anything else that modifies types to mess with this object, not the columns hash - Introduce a collection object to manage these, reduce allocations, and not require serializing the types
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy edits from e0f3f1a [ci skip]	Zachary Scott	2014-06-13	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- image_tag is an instance method - explain possible results when asset pipeline is used
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy edits and code font wrap for Active Record [ci skip]	Zachary Scott	2014-06-13	2	-30/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Document behavior concerns regarding the full Rails stack [ci skip]	Zachary Scott	2014-06-13	1	-0/+24
\| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to a discussion on #15508
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15690 from deeeki/activemodel_model_doc	Arthur Nogueira Neves	2014-06-13	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Clarify ActiveModel::Model docs
\| * \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Clarify ActiveModel::Model docs	deeeki	2014-06-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveModel attributes initialized with String return String values
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Builder source code is still available on github [ci skip]	Zachary Scott	2014-06-13	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was also removed from #15542
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Add links to RDoc back into API documentation guidelines [ci skip]	Zachary Scott	2014-06-13	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were removed from #15542 unfortunately :(
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Specifically talking about Rake the library [ci skip]	Zachary Scott	2014-06-13	1	-2/+1
\| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15682 from tgxworld/controller_test_process	Rafael Mendonça França	2014-06-13	1	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set flash in test session when necessary.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Set flash in test session when necessary.	Guo Xiang Tan	2014-06-12	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`to_session_value` returns nil when empty.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15683 from larrylv/fix-token-with-empty-value	Matthew Draper	2014-06-13	3	-8/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fix parsed token value with header `Authorization token=`.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix parsed token value with header `Authorization token=`.	Larry Lv	2014-06-13	3	-8/+32
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15686 from sgrif/sg-pg-int-arrays	Rafael Mendonça França	2014-06-13	2	-6/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	PG arrays should type cast user input
\| * \| \| \| \| \| \| \| \| \| \| \|	PG arrays should type cast user input	Sean Griffin	2014-06-13	2	-6/+15
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We guarantee that `model.value` does not change after `model.save && model.reload`. This requires type casting user input for non-string types.
* \| \| \| \| \| \| \| \| \| \| \|	pg guide, minor copy edits	Yves Senn	2014-06-13	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Set the status before of setting the response body	Guillermo Iguaran	2014-06-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 401 status should be set first because setting the response body in a live controller also closes the response to further changes. Fixes #14229.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15680 from akshay-vishnoi/doc_changes	Sean Griffin	2014-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	[ci skip] BigDecimal#duplicable? returns false in 1.9.x
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] BigDecimal#duplicable? returns false in 1.9.x	Akshay Vishnoi	2014-06-13	1	-1/+1
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #15678 from sgrif/sg-test-hash	Matthew Draper	2014-06-13	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a test to ensure we don't get a performance regression on #hash
\| * \| \| \| \| \| \| \| \| \| \|	Add a test to ensure we don't get a performance regression on #hash	Sean Griffin	2014-06-12	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15677 from sgrif/sg-less-imperative-pk	Matthew Draper	2014-06-13	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a conditional rather than early return in `id`
\| * \| \| \| \| \| \| \| \| \| \| \|	Use a conditional rather than early return in `id`	Sean Griffin	2014-06-12	1	-3/+4
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15676 from sgrif/sg-object-hash	Matthew Draper	2014-06-13	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Defer to super, rather than re-implementing Object#hash
\| * \| \| \| \| \| \| \| \| \| \|	Defer to super, rather than re-implementing Object#hash	Sean Griffin	2014-06-12	1	-1/+5
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #15665 from sgrif/sg-id-perf	Sean Griffin	2014-06-12	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance regression on preloading HABTM associations
\| * \| \| \| \| \| \| \| \| \| \|	Fix performance regression on preloading HABTM associations	Sean Griffin	2014-06-12	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We'd spend a lot of time calling `hash` and `eql?` on the join model, which has no primary key. Calling `id` with no primary key is a really slow way to get back `nil`, so we can improve the performance there. However, even with the escape clause, we still weren't getting high enough performance, as we were checking the primary key too much. `hash` will always return `nil.hash` for records with no id, and `==` will always return `false`. We can optimize those cases in the HABTM join model.