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

	Commit message (Expand)	Author	Age	Files	Lines
*	Allow overriding exception handling in threaded consumer	Carlos Antonio da Silva	2012-05-04	2	-1/+24
*	Allow configuring a different queue consumer	Carlos Antonio da Silva	2012-05-04	4	-9/+44
*	Merge pull request #5650 from sekrett/master	Vijay Dev	2012-05-04	1	-1/+1
\|\
\| *	Change the example for habtm association to use proc according to changelog	Alexander Zubkov	2012-03-29	1	-1/+1
* \|	actually don't need to expand the aggregates at all	Jon Leighton	2012-05-04	1	-11/+1
* \|	#to_sym is unnecessary	Jon Leighton	2012-05-04	1	-3/+3
* \|	de-globalise method	Jon Leighton	2012-05-04	3	-9/+6
* \|	extract code from AR::Base	Jon Leighton	2012-05-04	3	-35/+31
* \|	clean up implementation of dynamic methods. use method compilation etc.	Jon Leighton	2012-05-04	8	-322/+204
* \|	Merge pull request #6148 from twinturbo/head-fix	José Valim	2012-05-03	2	-1/+87
\|\ \
\| * \|	Remove content-length as well	twinturbo	2012-05-03	2	-2/+9
\| * \|	Make ActionController#head pass rack-link	twinturbo	2012-05-03	2	-1/+80
* \| \|	Merge pull request #5821 from Deradon/fix-engine-tasks	Piotr Sarnacki	2012-05-03	2	-1/+37
\|\ \ \
\| * \| \|	Provided fix for calling rake tasks within mountable engines	Patrick Helm	2012-04-12	2	-1/+37
* \| \| \|	Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbed	Aaron Patterson	2012-05-03	2	-1/+8
\|\ \ \ \
\| * \| \| \|	Cache (FileStore) clear should keep .gitkeep	Marcos Tapajos	2012-01-13	2	-1/+8
* \| \| \| \|	Merge pull request #6012 from avakhov/dbconsole-test	Piotr Sarnacki	2012-05-03	2	-22/+162
\|\ \ \ \ \
\| * \| \| \| \|	Add Rails::DBConsole tests	Alexey Vakhov	2012-05-02	2	-22/+162
* \| \| \| \| \|	Merge pull request #4496 from makeable/master	Aaron Patterson	2012-05-03	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	race_condition_ttl should be an integer	Matt Williams	2012-01-17	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #6144 from bogdan/routes	José Valim	2012-05-03	1	-2/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	RouteSet: optimize routes generation when globbing is used	Bogdan Gusiev	2012-05-03	1	-2/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6135 from alindeman/assert_redirect_to_with_regexp	José Valim	2012-05-03	3	-13/+26
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Allows assert_redirected_to to accept a regular expression	Andy Lindeman	2012-05-03	3	-13/+26
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6139 from pwim/extract_options-actionpack	José Valim	2012-05-03	1	-1/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	use extract_options!	Paul McMahon	2012-05-03	1	-1/+2
* \| \| \| \| \| \| \|	Merge pull request #6141 from mhfs/mailer_tweeks	José Valim	2012-05-03	2	-14/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	No need to force conversion to Symbol since case ensures it's already	Marcelo Silveira	2012-05-03	1	-1/+1
\| * \| \| \| \| \| \| \|	No need to work around 1.8 warnings anymore.	Marcelo Silveira	2012-05-03	1	-13/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #6137 from FLOChip/cache_documentation	Vijay Dev	2012-05-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	cache_store has an extra option of :null_store.	Teng Siong Ong	2012-05-03	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #6138 from bogdan/routes	José Valim	2012-05-03	1	-19/+10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	RouteSet: remove some code dups	Bogdan Gusiev	2012-05-02	1	-19/+10
* \| \| \| \| \| \| \| \|	Merge pull request #6134 from carlosantoniodasilva/ar-relation-kernel-private...	Jon Leighton	2012-05-03	3	-2/+12
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix issue with private kernel methods and collection associations. Closes #2508	Carlos Antonio da Silva	2012-05-02	3	-2/+12
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Add CHANGELOG entry	Santiago Pastorino	2012-05-02	1	-0/+2
* \| \| \| \| \| \| \|	Merge pull request #6131 from schneems/schneems/routes_backtrace	Santiago Pastorino	2012-05-02	1	-1/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add backtrace to development routing error page	schneems	2012-05-02	1	-1/+3
* \| \| \| \| \| \| \| \|	Merge pull request #5153 from mhfs/first_finder_fix	Aaron Patterson	2012-05-02	5	-9/+92
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Use arel nodes instead of raw sql	Marcelo Silveira	2012-05-02	2	-4/+7
\| * \| \| \| \| \| \| \| \|	Use Array#first instead of Array#[0]	Marcelo Silveira	2012-05-02	1	-5/+5
\| * \| \| \| \| \| \| \| \|	Adding note about `first` and `take` to the changelog	Marcelo Silveira	2012-05-02	1	-0/+6
\| * \| \| \| \| \| \| \| \|	Introducing `take` as a replacement to the old behavior of `first`	Marcelo Silveira	2012-05-02	3	-3/+52
\| * \| \| \| \| \| \| \| \|	Document `last`, check for primary key on default order and use quoted table ...	Marcelo Silveira	2012-05-02	1	-2/+5
\| * \| \| \| \| \| \| \| \|	Made `first` finder consistent among database engines by adding a	Marcelo Silveira	2012-05-02	2	-2/+24
\|/ / / / / / / / /
* / / / / / / / /	Reset the request parameters after a constraints check	Andrew White	2012-05-02	3	-0/+25
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #6125 from ncri/master	José Valim	2012-05-02	2	-3/+36
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	added proc evaluation for action cache's layout parameter	Nico	2012-05-02	2	-3/+36
* \| \| \| \| \| \| \| \|	Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headers	Aaron Patterson	2012-05-02	2	-7/+13
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Enable ActionDispatch::Http::Headers to support fetch	Mark Turner	2012-05-02	2	-7/+13
\| \|/ / / / / / / /