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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \|	Merge pull request #513 from BlackBulletIV/patch-1	Xavier Noria	2011-05-11	2	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Modified NamedScopeTest to use CollectionAssociation.	Michael Ebens	2011-05-11	1	-1/+1
\| * \| \|	Modified CollectionAssociation to refer to the new class name.	Michael Ebens	2011-05-11	1	-1/+1
\|/ / /
* \| \|	Don't use select() values from the join model of a through association. Fixes...	Jon Leighton	2011-05-11	5	-3/+23
* \| \|	Bring back obj.association_loaded? as a deprecated method. Fixes #472.	Jon Leighton	2011-05-11	2	-0/+22
* \| \|	Merge pull request #509 from gucki/master	Jon Leighton	2011-05-11	1	-1/+1
\|\ \ \
\| * \| \|	fix bug in usage example of #unscoped	Corin Langosch	2011-05-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #507 from dlee/fix_identity_map_tests	José Valim	2011-05-10	2	-2/+2
\|\ \ \
\| * \| \|	Fix tests to reflect IdentityMap no longer default	David Lee	2011-05-10	2	-2/+2
* \| \| \|	Merge pull request #506 from dlee/custom_csrf_token_tests	José Valim	2011-05-10	2	-9/+33
\|\ \ \ \
\| * \| \| \|	Test csrf token param name customization	David Lee	2011-05-10	2	-9/+33
\| \|/ / /
* \| \| \|	Merge pull request #503 from smartinez87/conventions	José Valim	2011-05-10	5	-30/+30
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Follow code conventions on some tests	Sebastian Martinez	2011-05-10	5	-30/+30
\|/ / /
* \| \|	Merge pull request #501 from guilleiguaran/patch-2	José Valim	2011-05-10	1	-0/+1
\|\ \ \
\| * \| \|	Adding .sass-cache to gitignore template	Guillermo Iguaran	2011-05-10	1	-0/+1
\|/ / /
* \| \|	Add test to specify that attributes from an association's conditions should b...	Jon Leighton	2011-05-10	4	-4/+28
* \| \|	Remove unnecessary '\|\| {}'	Jon Leighton	2011-05-10	1	-1/+1
* \| \|	Get around weird missing constant error caused by AS instead of simply raisin...	José Valim	2011-05-11	2	-26/+37
* \| \|	Don't use mass-assignment protection when applying the scoped.scope_for_creat...	Jon Leighton	2011-05-10	3	-3/+16
* \| \|	make sure log file is written in binary mode. fixes #497	Aaron Patterson	2011-05-10	2	-0/+41
* \| \|	Merge pull request #499 from smartinez87/csv	José Valim	2011-05-10	1	-2/+2
\|\ \ \
\| * \| \|	impact guides with no CSV fixture support	Sebastian Martinez	2011-05-10	1	-2/+2
\|/ / /
* \| \|	Need it declared too	David Heinemeier Hansson	2011-05-10	1	-0/+1
* \| \|	Include lib/assets for sprocket paths	David Heinemeier Hansson	2011-05-10	1	-0/+1
* \| \|	Merge pull request #498 from vatrai/minor_cleaning	José Valim	2011-05-10	1	-11/+11
\|\ \ \
\| * \| \|	minor cleaning with new api method	Vishnu Atrai	2011-05-11	1	-11/+11
\|/ / /
* \| \|	deprecating CSV fixture support	Aaron Patterson	2011-05-10	4	-55/+7
* \| \|	deprecating read_csv_fixture_files method	Aaron Patterson	2011-05-10	1	-0/+2
* \| \|	Merge pull request #490 from vijaydev/patch-4	Piotr Sarnacki	2011-05-10	1	-1/+1
\|\ \ \
\| * \| \|	Replace LH with GitHub url for filing issues	Vijay Dev	2011-05-10	1	-1/+1
* \| \| \|	Merge pull request #495 from vatrai/minor_fixes	Piotr Sarnacki	2011-05-10	3	-3/+3
\|\ \ \ \
\| * \| \| \|	minor cleaning	Vishnu Atrai	2011-05-10	3	-3/+3
\| \|/ / /
* \| \| \|	Merge pull request #494 from vijaydev/patch-5	José Valim	2011-05-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use all in place of find(:all)	Vijay Dev	2011-05-10	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #493 from guilleiguaran/changelog-fixes	Aaron Patterson	2011-05-10	7	-4/+280
\|\ \ \ \
\| * \| \| \|	Merging 3.0.x CHANGELOGs	Guillermo Iguaran	2011-05-10	7	-4/+280
* \| \| \| \|	Merge pull request #492 from jaw6/master	José Valim	2011-05-10	4	-4/+10
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Methods that return nil should not be considered YAML	Joshua Wehner	2011-05-10	4	-4/+10
\| \| \|/ / \| \|/\| \|
* / \| \|	Update sprocket comments	David Heinemeier Hansson	2011-05-10	2	-3/+8
\|/ / /
* \| \|	Merge pull request #487 from vijaydev/patch-3	Xavier Noria	2011-05-10	1	-2/+2
\|\ \ \
\| * \| \|	s/javascript/JavaScript	Vijay Dev	2011-05-10	1	-2/+2
\|/ / /
* \| \|	Fix previous commit by allowing a proc to be given as response_body. This is ...	José Valim	2011-05-10	3	-34/+57
* \| \|	Merge pull request #446 from danielstutzman/response_body_is_proc	José Valim	2011-05-10	1	-0/+38
\|\ \ \
\| * \| \|	New test: setting response_body to a Proc should be supported.	Daniel Stutzman	2011-05-07	1	-0/+38
* \| \| \|	Merge pull request #484 from slainer68/master	José Valim	2011-05-10	2	-0/+8
\|\ \ \ \
\| * \| \| \|	Puts ActiveRecord::SessionStore attributes in white list, fixes #483	slainer68	2011-05-10	2	-0/+8
\|/ / / /
* \| \| \|	Merge pull request #482 from vijaydev/patch-2	José Valim	2011-05-10	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix typos in IM documentation	Vijay Dev	2011-05-10	1	-2/+2
\|/ / / /
* \| \| \|	Document identity map inconsistency with associations, closes #474.	José Valim	2011-05-10	1	-1/+28
* \| \| \|	Fix #480. Passing nil to create association works.	José Valim	2011-05-10	1	-1/+1