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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #15615 from JuanitoFatas/doc/action-mailer	Rafael Mendonça França	2014-06-10	1	-2/+2
\|\
\| *	[ci skip] Improve enable_starttls_auto documentation.	Juanito Fatas	2014-06-11	1	-2/+2
* \|	Merge pull request #15614 from akshay-vishnoi/doc_changes	Richard Schneeman	2014-06-10	2	-18/+15
\|\ \
\| * \|	[ci skip] Add Docs for strip_insignificant_zeros option in number helpers	Akshay Vishnoi	2014-06-10	2	-18/+15
\| \|/
* \|	Merge pull request #15612 from akshay-vishnoi/delete-deprecated-method	Rafael Mendonça França	2014-06-10	3	-10/+4
\|\ \ \| \|/ \|/\|
\| *	Remove deprecated method ActiveRecord::Base.quoted_locking_column	Akshay Vishnoi	2014-06-10	3	-10/+4
* \|	Merge pull request #15611 from akshay-vishnoi/doc_changes	Arthur Nogueira Neves	2014-06-10	2	-4/+4
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Correct output and use valid options of number helpers	Akshay Vishnoi	2014-06-10	2	-4/+4
\|/
*	Merge pull request #15610 from sgrif/silence-warnings	Rafael Mendonça França	2014-06-10	2	-3/+3
\|\
\| *	Silence warnings in tests.	Sean Griffin	2014-06-10	2	-3/+3
* \|	Merge pull request #15609 from sgrif/sg-yaml-virtual-columns	Rafael Mendonça França	2014-06-10	4	-3/+32
\|\ \
\| * \|	Keep the types of virtual columns after yaml serialization	Sean Griffin	2014-06-10	4	-3/+32
\| \|/
* \|	Merge pull request #15603 from kuldeepaggarwal/remove-deprecation-method	Rafael Mendonça França	2014-06-10	2	-37/+0
\|\ \
\| * \|	remove depricated Validatior#setup	Kuldeep Aggarwal	2014-06-10	2	-37/+0
* \| \|	Merge pull request #15605 from mekishizufu/fix_cache_digests_rake_tasks	Rafael Mendonça França	2014-06-10	2	-6/+14
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix cache_digest rake tasks	Jiri Pospisil	2014-06-10	2	-6/+14
* \| \|	Merge pull request #15607 from sgrif/sg-array-type-cast	Rafael Mendonça França	2014-06-10	3	-34/+28
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Inline PG array type casting helper	Sean Griffin	2014-06-10	3	-34/+28
* \| \|	test, fix typo, `create_index` does not exist.	Yves Senn	2014-06-10	1	-1/+1
* \| \|	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
\|/