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

	Commit message (Expand)	Author	Age	Files	Lines
*	document include_blank's usage with a string [ci skip]	Greg Molnar	2014-06-05	1	-1/+4
*	Merge pull request #15512 from akshay-vishnoi/delete-deprecated-method	Yves Senn	2014-06-05	3	-54/+5
\|\
\| *	Remove deprecated method ActiveRecord::Migrator.proper_table_name	Akshay Vishnoi	2014-06-05	3	-54/+4
* \|	Merge pull request #15421 from gchan/time_with_zone_precision	Matthew Draper	2014-06-05	3	-1/+36
\|\ \
\| * \|	Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lost	Gordon Chan	2014-05-30	3	-1/+36
* \| \|	Merge pull request #15518 from jonathancadepowers/master	Guillermo Iguaran	2014-06-05	1	-0/+4
\|\ \ \
\| * \| \|	Update getting_started.md	Jonathan Powers	2014-06-05	1	-0/+2
\| * \| \|	Update getting_started.md	Jonathan Powers	2014-06-05	1	-0/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #15515 from leafac/fix-inverse-associations-block-test	Matthew Draper	2014-06-05	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix inverse associations test	Leandro Facchinetti	2014-06-04	1	-1/+1
\|/ /
* \|	Merge pull request #15497 from schneems/schneems/levenshtein-generator-failur...	Rafael Mendonça França	2014-06-04	3	-9/+63
\|\ \
\| * \|	Emit suggested generator names when not found	schneems	2014-06-04	3	-9/+63
\|/ /
* \|	have an actual `NullColumn` object and update docs accordingly.	Yves Senn	2014-06-04	4	-5/+16
* \|	Revert "Correct Documentation for asset_tag_helpers"	Rafael Mendonça França	2014-06-04	1	-17/+16
* \|	Merge pull request #15502 from sgrif/sg-use-null-column	Yves Senn	2014-06-04	2	-23/+23
\|\ \
\| * \|	Use null column for association key types	Sean Griffin	2014-06-04	2	-23/+23
* \| \|	Merge branch 'master' of github.com:rails/rails	Aaron Patterson	2014-06-04	34	-134/+268
\|\ \ \
\| * \| \|	For our build, stick with mail 2.5.x for now	Matthew Draper	2014-06-05	1	-0/+1
\| * \| \|	Merge pull request #15504 from sgrif/sg-postgres-defaults	Rafael Mendonça França	2014-06-04	2	-48/+11
\| \|\ \ \
\| \| * \| \|	Collapse PG default extractoin of most types to single regex	Sean Griffin	2014-06-04	2	-48/+11
\| \| \|/ /
\| * \| \|	Merge pull request #15495 from maurogeorge/action-mailer-subject-guides	Rafael Mendonça França	2014-06-04	1	-0/+18
\| \|\ \ \
\| \| * \| \|	Pluralize params	Mauro George	2014-06-03	1	-1/+1
\| \| * \| \|	Add default_i18n_subject to the guides	Mauro George	2014-06-03	1	-0/+18
\| * \| \| \|	Merge pull request #15505 from akshay-vishnoi/doc_changes	Santiago Pastorino	2014-06-04	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Correct result, previously showing wrong result	Akshay Vishnoi	2014-06-04	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Merge pull request #15463 from geopet/refactor_xml_compute_type	Rafael Mendonça França	2014-06-04	2	-6/+7
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Refactor XML serializer to not depend on `serialized_attributes`	Geoff Petrie & Sean Griffin	2014-06-01	1	-3/+5
\| \| * \| \|	Test the serialized types of virtual columns in XML	Geoff Petrie & Sean Griffin	2014-06-01	2	-4/+3
\| * \| \| \|	Merge pull request #15500 from prathamesh-sonpatki/change-wording-of-explanat...	Yves Senn	2014-06-04	1	-2/+2
\| \|\ \ \ \
\| \| * \| \| \|	Change wording of explanation about precision & scale of decimal numbers [ci ...	Prathamesh Sonpatki	2014-06-04	1	-2/+2
\| * \| \| \| \|	Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load	Carlos Antonio da Silva	2014-06-04	4	-2/+27
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Fix regression on eager loading association based on SQL query rather	Lauro Caetano	2014-06-03	4	-2/+27
\| * \| \| \| \|	Cleaned up duplicated CHANGELOG entry [ci skip]	Godfrey Chan	2014-06-03	1	-3/+2
\| * \| \| \| \|	Merge pull request #15498 from zenspider/fix_memory_leak	Guillermo Iguaran	2014-06-03	2	-7/+7
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Convert StrongParameters cache to a hash. This fixes an unbounded	Ryan Davis	2014-06-03	2	-7/+7
\| * \| \| \| \| \|	Merge pull request #15499 from eileencodes/reuse-available-belongs_to-method	Rafael Mendonça França	2014-06-03	3	-5/+4
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	reuse available belongs_to? method	eileencodes	2014-06-03	3	-5/+4
\| \|/ / / / / /
\| * \| \| \| \| \|	Partially revert deprecation of *_filter	Rafael Mendonça França	2014-06-03	3	-36/+9
\| * \| \| \| \| \|	Merge pull request #15438 from sgrif/sg-null-column	Rafael Mendonça França	2014-06-03	5	-14/+40
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Return a null column when no column exists for an attribute	Sean Griffin	2014-06-03	5	-14/+40
\| * \| \| \| \| \| \|	Merge pull request #15349 from tgxworld/remove_duplicated_method_call	Rafael Mendonça França	2014-06-03	3	-7/+3
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Remove duplicated HashWithIndifferentAccess#with_indifferent_access.	Guo Xiang Tan	2014-05-26	3	-7/+3
\| * \| \| \| \| \| \| \|	Merge pull request #15172 from notEthan/active_record_pretty_print	Rafael Mendonça França	2014-06-03	3	-0/+95
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	implement ActiveRecord::Base#pretty_print + changelog	Ethan	2014-05-29	3	-0/+95
\| * \| \| \| \| \| \| \| \|	Merge pull request #15492 from sgrif/sg-dirty-defaults	Rafael Mendonça França	2014-06-03	5	-2/+40
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Keep column defaults in type cast form	Sean Griffin	2014-06-03	5	-2/+40
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #15493 from bf4/relax_mail_dep	Rafael Mendonça França	2014-06-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4	Benjamin Fleischer	2014-06-03	1	-1/+1
\| \| \| \|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \|
* \| / \| \| \| \| \| \| \| \|	push splitting "to" up the callstack	Aaron Patterson	2014-06-03	1	-15/+20
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	force table creation	Aaron Patterson	2014-06-03	1	-2/+3