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

	Commit message (Expand)	Author	Age	Files	Lines
*	Refactor connection handler	Jon Leighton	2012-08-31	1	-22/+14
*	Make connection pool retrieval faster	Jon Leighton	2012-08-31	3	-20/+18
*	Revert "Merge pull request #7452 from arunagw/memcached_dalli"	Jon Leighton	2012-08-31	2	-7/+7
*	Revert "Add missing require"	Jon Leighton	2012-08-31	1	-1/+0
*	Merge pull request #7479 from eriko/master	Xavier Noria	2012-08-31	1	-1/+1
\|\
\| *	Update actionpack/lib/action_dispatch/routing/mapper.rb	Erik Ordway	2012-08-29	1	-1/+1
* \|	Instrumentation requires RackDelegation	José Valim	2012-08-30	1	-0/+1
* \|	Merge pull request #7485 from kennyj/fix_build_20120830	Rafael Mendonça França	2012-08-30	1	-3/+3
\|\ \
\| * \|	Fix build about TemplateDigestorTest.	kennyj	2012-08-30	1	-3/+3
\|/ /
* \|	Merge pull request #7484 from kennyj/fix_warning_20120830	Rafael Mendonça França	2012-08-30	1	-1/+1
\|\ \
\| * \|	Fixes warning: & interpreted as argument prefix	kennyj	2012-08-30	1	-1/+1
\|/ /
* \|	Merge pull request #7483 from christos/improve_template_digestor	David Heinemeier Hansson	2012-08-30	4	-4/+38
\|\ \
\| * \|	Further improve RENDER_DEPENDENCY regexp comments	Christos Zisopoulos	2012-08-30	1	-1/+1
\| * \|	Improve RENDER_DEPENDENCY regexp comment to keep the doc editor happy.	Christos Zisopoulos	2012-08-30	1	-1/+1
\| * \|	`Digestor` can now parse old style hash syntax for `render`	Christos Zisopoulos	2012-08-30	3	-4/+11
\| * \|	`Digestor` ignores most whitespace when parsing `render` invocations	Christos Zisopoulos	2012-08-30	4	-2/+29
* \| \|	Merge pull request #7477 from kennyj/fix_7469	Piotr Sarnacki	2012-08-30	1	-0/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Added missing require. When performing rake test:isolated, test/base_test.rb ...	kennyj	2012-08-29	1	-0/+1
* \| \|	Merge pull request #7481 from joliss/typo	Vijay Dev	2012-08-30	1	-3/+3
\|\ \ \
\| * \| \|	Fix grammar	Jo Liss	2012-08-30	1	-3/+3
* \| \| \|	documents after_(commit\|rollback)	Xavier Noria	2012-08-30	1	-0/+18
\|/ / /
* \| \|	Merge pull request #7480 from aaronbrethorst/master	Carlos Antonio da Silva	2012-08-29	1	-8/+8
\|\ \ \
\| * \| \|	Fix Markdown rendering of 'controller-level etag additions' feature	Aaron Brethorst	2012-08-29	1	-8/+8
\| \| \|/ \| \|/\|
* / \|	Use class_attribute so we dont bleed	David Heinemeier Hansson	2012-08-29	1	-1/+6
\|/ /
* \|	Added controller-level etag additions that will be part of the action etag co...	David Heinemeier Hansson	2012-08-29	3	-4/+78
* \|	Add automatic template digests to all CacheHelper#cache calls (originally spi...	David Heinemeier Hansson	2012-08-29	14	-14/+358
* \|	Fix spacing	David Heinemeier Hansson	2012-08-29	1	-8/+8
* \|	Fix spacing	David Heinemeier Hansson	2012-08-29	1	-5/+4
* \|	Merge pull request #7230 from schneems/schneems/expose_required_keys	Andrew White	2012-08-29	6	-30/+41
\|\ \
\| * \|	refactor route_set `generate_extras` functionality	schneems	2012-08-28	1	-17/+9
\| * \|	Add Missing Keys from Journey on failed URL format	schneems	2012-08-28	6	-16/+35
* \| \|	fixes a regexp	Xavier Noria	2012-08-29	1	-1/+1
\| \|/ \|/\|
* \|	Merge pull request #7476 from ayrton/fixed_indentation	Xavier Noria	2012-08-29	1	-3/+3
\|\ \
\| * \|	Fixed indendation	Ayrton De Craene	2012-08-29	1	-3/+3
\|/ /
* \|	Add a test to make sure preloading properly merges association and default sc...	Pratik Naik	2012-08-28	3	-0/+23
* \|	CHANGELOGs are now per branch	Xavier Noria	2012-08-28	6	-17846/+6
* \|	detect circular constant autoloading	Xavier Noria	2012-08-28	4	-4/+27
* \|	Merge pull request #7470 from kennyj/fix_method_redefined_warning	Rafael Mendonça França	2012-08-28	2	-0/+6
\|\ \
\| * \|	Fix method redefined warnings.	kennyj	2012-08-29	2	-0/+6
\|/ /
* \|	Merge pull request #7469 from kennyj/fix_many_warnings_in_am	José Valim	2012-08-28	1	-1/+1
\|\ \
\| * \|	Fixes warnings when executing rake test in ActionMailer. Related to 582a7f459...	kennyj	2012-08-29	1	-1/+1
\|/ /
* \|	Merge pull request #7468 from kennyj/tiny_fixings	José Valim	2012-08-28	5	-7/+4
\|\ \ \| \|/ \|/\|
\| *	Remove unused require.	kennyj	2012-08-29	2	-3/+0
\| *	Fixes wrong test class names.	kennyj	2012-08-29	4	-4/+4
\|/
*	fixes a bug in dependencies.rb	Xavier Noria	2012-08-28	1	-1/+1
*	Merge pull request #7466 from arunagw/warning_removed_ap	Rafael Mendonça França	2012-08-28	1	-1/+1
\|\
\| *	removed : warning: `*' interpreted as argument prefix	Arun Agrawal	2012-08-28	1	-1/+1
\|/
*	Add missing require	Rafael Mendonça França	2012-08-28	1	-0/+1
*	Merge pull request #7452 from arunagw/memcached_dalli	Rafael Mendonça França	2012-08-28	2	-7/+7
\|\
\| *	More fixes for action pack tests with Dalli.	Arun Agrawal	2012-08-27	1	-3/+3