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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \|	Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".	José Valim	2011-05-10	1	-26/+27
* \| \|	Add failing tests according to #479.	José Valim	2011-05-10	1	-0/+15
* \| \|	Add failing tests, according to #480.	José Valim	2011-05-10	1	-0/+14
* \| \|	Ensure assign_attributes and update_attributes do not fail on nil, closes #478.	José Valim	2011-05-10	3	-0/+10
* \| \|	Add tests for content_for() for read, closes #475.	José Valim	2011-05-10	2	-6/+18
\| \|/ \|/\|
* \|	Update copyright year in Active Resource and Active Support	Vijay Dev	2011-05-09	2	-2/+2
* \|	Disable identity map by default. Detailed documentation will be pushed later.	José Valim	2011-05-10	1	-5/+0
* \|	use a null byte as a bind parameter substitute as it is not allowed in normal...	Aaron Patterson	2011-05-09	3	-12/+59
* \|	Merge pull request #471 from joshk/remove_as_concern	José Valim	2011-05-09	1	-2/+1
\|\ \
\| * \|	removed an unneed AS::Concern from AR::IdentityMap	Josh Kalderimis	2011-05-09	1	-2/+1
\|/ /
* \|	Merge pull request #461 from chrislwade/sorted-migrations	José Valim	2011-05-09	1	-6/+6
\|\ \
\| * \|	Interleave db_list and file_list.	Christopher Wade	2011-05-09	1	-6/+6
\| * \|	Sort migrations by the migration ID.	Christopher Wade	2011-05-09	1	-2/+2
* \| \|	Warn if we cannot verify CSRF token authenticity	José Valim	2011-05-09	2	-1/+6
* \| \|	Fix failing test.	José Valim	2011-05-09	1	-1/+1
* \| \|	xml_mini.rb:_dasherize() replacement 20 to 25% faster	Mike Howard	2011-05-09	1	-4/+3
* \| \|	Oops, missing autoload, closes #466	José Valim	2011-05-09	1	-0/+1
* \| \|	Merge pull request #460 from guilleiguaran/patch-1	José Valim	2011-05-09	1	-1/+1
\|\ \ \
\| * \| \|	Just a minor fix in A.S CHANGELOG	Guillermo Iguaran	2011-05-08	1	-1/+1
\| \|/ /
* \| \|	Optimize the most common resolver case.	José Valim	2011-05-09	3	-15/+28
* \| \|	No need for replace.	José Valim	2011-05-09	1	-12/+11
\|/ /
* \|	Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371	Jon Leighton	2011-05-08	2	-1/+27
\|\ \
\| * \|	Fix for #371	Nick Howard	2011-05-08	2	-1/+27
* \| \|	Ensure that ORDER BY clauses from default scopes are not included in calculat...	Jon Leighton	2011-05-08	2	-1/+5
* \| \|	Merge pull request #457 from vijaydev/master	José Valim	2011-05-08	1	-1/+3
\|\ \ \
\| * \| \|	adds code examples for negative ordinalize	Vijay Dev	2011-05-08	1	-1/+3
\|/ / /
* \| \|	Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_qu...	Jon Leighton	2011-05-08	5	-2/+52
\|\ \ \
\| * \| \|	Don't quote ID's as Arel will quote them -- follow same conventions as the de...	Christopher Meiklejohn	2011-05-08	5	-2/+52
\|/ / /
* \| \|	Merge pull request #445 from prakashmurthy/lighthouse_6334	Aaron Patterson	2011-05-08	1	-0/+10
\|\ \ \
\| * \| \|	Lighthouse ticket # 6334; added tests to verify that spaces in key are dasher...	prakashmurthy	2011-05-08	1	-0/+10