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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Documentation, add examples of using an Enum scope	Zac	2014-05-09	1	-2/+4
\|/ / / / /
* \| \| \| \|	test, regression test for has_many with instance dependent scope.	Yves Senn	2014-05-09	2	-0/+12
* \| \| \| \|	Merge pull request #15044 from zzak/travis_ruby_too_won	Rafael Mendonça França	2014-05-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Only need MINOR version level to test Ruby 2.1.x on Travis	Zachary Scott	2014-05-09	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #15042 from arthurnn/revert_dirty_transactions	Rafael Mendonça França	2014-05-09	3	-52/+0
\|\ \ \ \ \
\| * \| \| \| \|	Reverts "Fix bugs with changed attributes tracking when transaction gets roll...	Arthur Neves	2014-05-09	3	-52/+0
* \| \| \| \| \|	just call the method and assert the return value	Aaron Patterson	2014-05-09	1	-8/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #15041 from arthurnn/update_ruby	Guillermo Iguaran	2014-05-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Use ruby 2.1.2 on travis	Arthur Neves	2014-05-09	1	-1/+1
\|/ / / / /
* \| \| \| \|	add tests for path based url_for calls	Aaron Patterson	2014-05-08	1	-2/+19
* \| \| \| \|	don't manipulate the testclass, just add helpers to the instance	Aaron Patterson	2014-05-08	1	-10/+11
* \| \| \| \|	add a test for classes with options	Aaron Patterson	2014-05-08	1	-0/+7
* \| \| \| \|	add tests for the polymorphic_path method	Aaron Patterson	2014-05-08	1	-0/+3
* \| \| \| \|	Merge pull request #15030 from mechanicles/a-to-an	Rafael Mendonça França	2014-05-08	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Change 'a' to 'an' [ci skip]	Santosh Wadghule	2014-05-09	1	-1/+1
* \| \| \| \| \|	Merge pull request #15029 from JuanitoFatas/docpatch/routing	Rafael Mendonça França	2014-05-08	1	-11/+11
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[ci skip] Minor improvements on routing.md.	Juanito Fatas	2014-05-09	1	-11/+11
* \| \| \| \| \|	add more tests around the polymorphic url api	Aaron Patterson	2014-05-08	1	-0/+12
* \| \| \| \| \|	set a constant for the "anonymous" habtm model fixes #15022	Aaron Patterson	2014-05-08	2	-0/+11
* \| \| \| \| \|	test, regression test for unparsable PostgreSQL defaults.	Yves Senn	2014-05-08	1	-0/+17
* \| \| \| \| \|	Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fix	Carlos Antonio da Silva	2014-05-08	4	-1/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed HABTM's CollectionAssociation size	Fred Wu	2014-05-08	4	-1/+30
* \| \| \| \| \| \|	test, reset changed state in PG's uuid tests.	Yves Senn	2014-05-08	1	-2/+4
* \| \| \| \| \| \|	pg guide, inet code example. [ci skip]	Yves Senn	2014-05-08	1	-3/+29
\|/ / / / / /
* \| \| \| \| \|	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
\|\ \ \ \ \ \ \