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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \|	docs, refactor docs about column modifiers. [ci skip] [Matthew Draper & Yves ...	Yves Senn	2014-06-10	1	-12/+20
* \| \| \| \| \|	Merge pull request #15604 from JuanitoFatas/doc/migration	Xavier Noria	2014-06-10	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] Rename: Rails Database Migration to Active Record Migration.	Juanito Fatas	2014-06-10	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15584 from jamesyang124/issue_15382	Yves Senn	2014-06-10	3	-1/+19
\|\ \ \ \ \ \
\| * \| \| \| \| \|	ActiveRecord::FinderMethods.find passes proc parameter #15382	James Yang	2014-06-10	3	-1/+19
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15602 from JuanitoFatas/doc/type-modifier	Yves Senn	2014-06-10	1	-0/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] Add note about type modifiers that cannot be specified in command l...	Juanito Fatas	2014-06-10	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15599 from arthurnn/HABTMAssociation	Rafael Mendonça França	2014-06-10	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use HasAndBelongsToMany instead of HABTM	Arthur Neves	2014-06-09	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15597 from eileencodes/reuse-available-collection-methods	Rafael Mendonça França	2014-06-09	3	-5/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	reuse available collection? check instead of macro	eileencodes	2014-06-09	3	-5/+5
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15596 from eileencodes/add-has_one-method-and-reuse	Rafael Mendonça França	2014-06-09	5	-5/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	add has_one? method and reuse instead of checking macro	eileencodes	2014-06-09	5	-5/+9
* \| \| \| \| \| \|	Merge pull request #15595 from eileencodes/abstract-away-habtm-macro	Aaron Patterson	2014-06-09	2	-2/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Abstract away use of HABTM macro	eileencodes	2014-06-09	2	-2/+9
* \| \| \| \| \| \|	Fix bug that make HashWithIndifferentAccess work differently of Hash	Rafael Mendonça França	2014-06-09	2	-1/+9
* \| \| \| \| \| \|	Timestamp values should be present on callbacks	Rafael Mendonça França	2014-06-09	4	-23/+15
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #15592 from sgrif/sg-type-cast-from-database	Rafael Mendonça França	2014-06-09	26	-132/+135
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Rename `type_cast` to `type_cast_from_database`	Sean Griffin	2014-06-09	26	-132/+135
\|/ / / / /
* \| \| \| \|	Merge pull request #15586 from sgrif/sg-identity-type	Rafael Mendonça França	2014-06-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Use an actual identity type in AR::Result#identity_type	Sean Griffin	2014-06-09	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #15587 from sgrif/sg-remove-workaround	Rafael Mendonça França	2014-06-09	1	-15/+8
\|\ \ \ \ \
\| * \| \| \| \|	Remove workaround for non-lazy serialize in tests	Sean Griffin	2014-06-09	1	-15/+8
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #15591 from sgrif/sg-rm-write-attribute	Rafael Mendonça França	2014-06-09	15	-64/+64
\|\ \ \ \ \
\| * \| \| \| \|	Make `_before_type_cast` actually be before type cast	Sean Griffin	2014-06-09	15	-64/+64
\| \|/ / / /
* \| \| / /	Do not try to set the foreign_key again on has_many through	Rafael Mendonça França	2014-06-09	1	-1/+1
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #15588 from thedarkone/remove-has-one-order-option	Rafael Mendonça França	2014-06-09	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove a long gone :order option from has_one's valid_options.	thedarkone	2014-06-09	1	-1/+1
\|/ / /
* / /	pg guide, add index to PostgreSQL array example. [ci skip]	Yves Senn	2014-06-09	1	-1/+3
\|/ /
* \|	Merge pull request #15573 from bf4/mail_2_6_1_released	Rafael Mendonça França	2014-06-08	1	-1/+0
\|\ \
\| * \|	Mail 2.6.1 silences excessive warnings; remove Gemfile hack	Benjamin Fleischer	2014-06-08	1	-1/+0
\|/ /
* \|	Merge pull request #15571 from kalmanh/patch-1	Richard Schneeman	2014-06-08	1	-0/+1
\|\ \
\| * \|	Update migrations.md	Kalman Hazins	2014-06-08	1	-0/+1
\|/ /
* \|	Ignore distressingly-frequent segfaults on this build	Matthew Draper	2014-06-08	1	-0/+2
* \|	Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_test	Yves Senn	2014-06-08	1	-1/+4
\|\ \
\| * \|	Restore test deliveries for ActionMailer.	Zuhao Wan	2014-06-07	1	-1/+4
* \| \|	Merge pull request #15452 from matthewd/live-abort	Matthew Draper	2014-06-08	4	-13/+189
\|\ \ \
\| * \| \|	Handle client disconnect during live streaming	Matthew Draper	2014-06-08	4	-13/+189
* \| \| \|	Merge pull request #15567 from aditya-kapoor/add-cases	Rafael Mendonça França	2014-06-07	1	-0/+11
\|\ \ \ \
\| * \| \| \|	Add Missing Test Cases for the constantize	Aditya Kapoor	2014-06-07	1	-0/+11
\| \|/ / /
* \| \| \|	Merge pull request #15566 from kuldeepaggarwal/fix-build	Rafael Mendonça França	2014-06-07	1	-3/+3
\|\ \ \ \
\| * \| \| \|	fix test cases after #15558 merge to master.	Kuldeep Aggarwal	2014-06-07	1	-3/+3
\|/ / / /
* \| \| \|	Merge pull request #15558 from sgrif/sg-rename-property	Rafael Mendonça França	2014-06-07	7	-25/+25
\|\ \ \ \
\| * \| \| \|	Rename `property` to `attribute`	Sean Griffin	2014-06-07	8	-26/+26
* \| \| \| \|	Merge pull request #15546 from sgrif/sg-lazy-decorators	Rafael Mendonça França	2014-06-07	7	-16/+179
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Don't query the database schema when calling `serialize`	Sean Griffin	2014-06-07	7	-16/+179
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #15561 from sgrif/sg-time-zone-aware-arrays	Rafael Mendonça França	2014-06-07	2	-1/+13
\|\ \ \ \
\| * \| \| \|	Ensure time zones don't change after round trip with array columns	Sean Griffin	2014-06-07	2	-1/+13
* \| \| \| \|	Merge pull request #15562 from sgrif/sg-double-type-cast-dirty	Rafael Mendonça França	2014-06-07	5	-25/+27
\|\ \ \ \ \
\| * \| \| \| \|	Do not type cast twice on attribute assignment	Sean Griffin	2014-06-07	5	-25/+27
\| \|/ / / /