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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fixed HABTM's CollectionAssociation size	Fred Wu	2014-05-08	4	-1/+30
*	Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fix	Godfrey Chan	2014-05-07	1	-1/+1
\|\
\| *	Branch name should match in text and code example.	Ivan Tse	2014-05-08	1	-1/+1
\|/
*	Merge pull request #15016 from arthurnn/dup_attr_on_save_state	Godfrey Chan	2014-05-07	1	-1/+1
\|\
\| *	Dup the changed_attributes otherwise we could lose them	Arthur Neves	2014-05-07	1	-1/+1
\|/
*	Merge pull request #15015 from pothibo/database-configuration	Rafael Mendonça França	2014-05-07	3	-1/+22
\|\
\| *	Use Rails::Paths::Path#existent in database_configuration	Pier-Olivier Thibault	2014-05-07	3	-1/+22
* \|	Add CHANGELOG entry for #14989	Rafael Mendonça França	2014-05-07	1	-0/+5
* \|	Return a non zero code when db has never been setup on status	Paul B	2014-05-07	2	-3/+2
* \|	Merge pull request #12746 from coreyward/master	Rafael Mendonça França	2014-05-07	2	-15/+36
\|\ \
\| * \|	Fix Hash#deep_merge bug and improve documentation — resolves #12738	Corey Ward	2013-12-09	2	-11/+31
* \| \|	Merge branch 'rm-trasaction-fix-13166'	Rafael Mendonça França	2014-05-07	3	-0/+52
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Keep track of dirty attrs after after rollback.	Arthur Neves	2014-05-07	4	-20/+11
\| * \|	Merge pull request #13166 from bogdan/transaction-magic	Rafael Mendonça França	2014-05-07	3	-1/+62
\|/\| \|
\| * \|	Fix bugs with changed attributes tracking when transaction gets rollback	Bogdan Gusiev	2013-12-04	3	-1/+62
* \| \|	Merge pull request #15012 from schneems/schneems/headers-key	Yves Senn	2014-05-07	2	-1/+5
\|\ \ \
\| * \| \|	HTTP::Headers#key? correctly converts	schneems	2014-05-07	2	-1/+5
* \| \| \|	test for inconsistency between String and Symbol url_for handling	Aaron Patterson	2014-05-07	1	-0/+4
* \| \| \|	add tests for symbols passed to polymorphic_url	Aaron Patterson	2014-05-07	1	-0/+12
\|/ / /
* \| \|	test, persist inherited class with different table name. Refs #14971.	Yves Senn	2014-05-07	1	-0/+14
* \| \|	Merge pull request #15002 from vanderhoop/master	Arthur Neves	2014-05-07	1	-2/+2
\|\ \ \
\| * \| \|	fixed typos in active_record basics [skip ci]	vanderhoop	2014-05-07	1	-2/+2
\|/ / /
* \| \|	Merge pull request #14964 from zuhao/refactor_actionmailer_tests	Yves Senn	2014-05-07	1	-102/+157
\|\ \ \
\| * \| \|	Fix state leaks in actionmailer/test/base_test.rb.	Zuhao Wan	2014-05-07	1	-102/+157
* \| \| \|	Merge pull request #15007 from vipulnsward/fix-scrubber-overshadow	Yves Senn	2014-05-07	1	-1/+1
\|\ \ \ \
\| * \| \| \|	rename `str` to `string` to fix overshadowing of variable	Vipul A M	2014-05-07	1	-1/+1
* \| \| \| \|	Merge pull request #14993 from jonatack/patch-7	Yves Senn	2014-05-07	1	-10/+9
\|\ \ \ \ \
\| * \| \| \| \|	Follow-up to #14990 [ci skip]	Jon Atack	2014-05-07	1	-10/+9
\|/ / / / /
* / / / /	Update links to new rails version in guides [ci skip]	Arun Agrawal	2014-05-07	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #15004 from JuanitoFatas/patch/ar-pg	Yves Senn	2014-05-07	1	-3/+12
\|\ \ \ \
\| * \| \| \|	[ci skip] Add feature section and normalize prologue with other guides.	Juanito Fatas	2014-05-07	1	-3/+12
\|/ / / /
* \| \| \|	apparently passing a string to polymorphic_url is something we support	Aaron Patterson	2014-05-06	1	-0/+12
* \| \| \|	make sure url_for works similar to polymorphic_url	Aaron Patterson	2014-05-06	1	-38/+43
* \| \| \|	add a test for the parameters sent to the url helper for new records	Aaron Patterson	2014-05-06	1	-0/+15
* \| \| \|	Merge pull request #15000 from gregmolnar/guides_fix	Arthur Nogueira Neves	2014-05-06	1	-1/+4
\|\ \ \ \
\| * \| \| \|	fix guides mobile nav issue [ci skip]	Greg Molnar	2014-05-06	1	-1/+4
\|/ / / /
* \| \| \|	typo [ci skip]	Xavier Noria	2014-05-06	1	-1/+1
* \| \| \|	Merge pull request #14997 from jpcody/nested_value_i18n	Rafael Mendonça França	2014-05-06	4	-2/+44
\|\ \ \ \
\| * \| \| \|	Include label value in i18n attribute lookup	Joshua Cody	2014-05-06	4	-2/+44
* \| \| \| \|	Merge pull request #14998 from arthurnn/tests_for_process_return	Rafael Mendonça França	2014-05-06	2	-9/+13
\|\ \ \ \ \
\| * \| \| \| \|	Ensure that .process return the method return	Arthur Neves	2014-05-06	2	-9/+13
* \| \| \| \| \|	several enhancements to humanize [closes #12288]	Xavier Noria	2014-05-06	4	-19/+68
* \| \| \| \| \|	Merge pull request #14982 from eric-chahin/GBV_refactor	Rafael Mendonça França	2014-05-06	2	-8/+6
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Refactor AssociationScope#get_bind_values	Eric Chahin	2014-05-05	2	-8/+6
* \| \| \| \| \|	Merge pull request #14945 from tomkadwill/form_authenticity_param_refactor	Rafael Mendonça França	2014-05-06	3	-6/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Moved 'params[request_forgery_protection_token]' into its own method and impr...	Tom Kadwill	2014-05-06	3	-6/+34
* \| \| \| \| \| \|	Only accept actions without File::SEPARATOR in the name.	Rafael Mendonça França	2014-05-06	2	-4/+41
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #14990 from fredwu/has_many_through_association_doc_grammar	Yves Senn	2014-05-06	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed grammar	Fred Wu	2014-05-06	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'postgres/guide'	Yves Senn	2014-05-06	1	-0/+338
\|\ \ \ \ \ \