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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use super in javascript_include_tag and stylesheet_link_tag instead of genera...	Guillermo Iguaran	2011-08-24	1	-14/+2
*	Remove redundant join and call to html_safe	Guillermo Iguaran	2011-08-24	1	-2/+2
*	Revert "Simplify JavaScriptHelper#escape_javascript"	Santiago Pastorino	2011-08-24	1	-4/+6
*	Bring in sprockets precompile task	Joshua Peek	2011-08-24	1	-3/+26
*	Merge pull request #2644 from guilleiguaran/allow-assets-debugging	Santiago Pastorino	2011-08-24	6	-9/+61
\|\
\| *	Add config.allow_debugging option to determine if the debug_assets query para...	Guillermo Iguaran	2011-08-24	6	-9/+61
* \|	Merge pull request #2668 from guilleiguaran/debug-assets-media-type	Santiago Pastorino	2011-08-24	2	-2/+6
\|\ \ \| \|/ \|/\|
\| *	Debug assets shouldn't ignore media type for stylesheets. Closes #2625	Guillermo Iguaran	2011-08-23	2	-2/+6
* \|	Merge pull request #2390 from arunagw/test_for_environment_file	Santiago Pastorino	2011-08-24	1	-0/+9
\|\ \
\| * \|	Test added to check mass_assignment_sanitizer is not present if --skip-active...	Arun Agrawal	2011-08-03	1	-0/+9
* \| \|	Merge pull request #2647 from dmathieu/no_rescue	Santiago Pastorino	2011-08-24	2	-7/+8
\|\ \ \
\| * \| \|	remove useless rescue	Damien Mathieu	2011-08-24	2	-7/+8
* \| \| \|	Merge pull request #2669 from BMorearty/remove-extra-word	Santiago Pastorino	2011-08-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Remove extra word from sentence in initialization guide.	Brian Morearty	2011-08-23	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* / \| \|	Simplify JavaScriptHelper#escape_javascript	Daniel Schierbeck	2011-08-24	1	-7/+6
\|/ / /
* \| \|	`load` should also return the value from `super`	Aaron Patterson	2011-08-23	1	-1/+3
* \| \|	require needs to return true or false. thank you Ryan "zenspider" Davis	Aaron Patterson	2011-08-23	1	-1/+3
* \| \|	Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore	David Heinemeier Hansson	2011-08-23	1	-0/+1
\|\ \ \
\| * \| \|	Add .rbenv-version to .gitignore	Guillermo Iguaran	2011-08-20	1	-0/+1
* \| \| \|	Make ActionController::TestCase#recycle! set @protocol to nil	David Majda	2011-08-23	1	-1/+1
* \| \| \|	Add failing test case for #2654	Andrew White	2011-08-23	1	-0/+17
* \| \| \|	Ensure regexp and hash key are UTF-8	Andrew White	2011-08-23	2	-4/+16
* \| \| \|	Merge pull request #2616 from tilsammans/patch-2	Xavier Noria	2011-08-23	1	-1/+1
\|\ \ \ \
\| * \| \| \|	removed the link to my blog to help stop endless comments	Joost Baaij	2011-08-23	1	-1/+1
\| * \| \| \|	Revert "Removed my name from the changelog as the amount of blogspam became r...	Joost Baaij	2011-08-23	1	-0/+1
\| * \| \| \|	Removed my name from the changelog as the amount of blogspam became ridiculous.	Joost Baaij	2011-08-22	1	-1/+0
* \| \| \| \|	Merge pull request #2653 from luckydev/ser-wrap	Xavier Noria	2011-08-23	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	added missing require array/wrap in serialization	Anand	2011-08-23	1	-0/+2
* \| \| \| \| \|	Merge pull request #2652 from dasch/remove-trailing-whitespace	Xavier Noria	2011-08-23	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove trailing whitespace	Daniel Schierbeck	2011-08-23	1	-2/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #2651 from luckydev/serialization-tests	José Valim	2011-08-23	1	-1/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	added more tests for only-include and except-include options in serialization	Anand	2011-08-23	1	-1/+14
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Don't modify params in place - fixes #2624	Andrew White	2011-08-23	2	-5/+9
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #2646 from guilleiguaran/add-destroy-alias-to-engine	Aaron Patterson	2011-08-22	1	-2/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Add destroy alias to engines	Guillermo Iguaran	2011-08-22	1	-2/+3
\|/ / / /
* \| \| \|	Merge pull request #2411 from ai/debug_assets_by_config	Santiago Pastorino	2011-08-22	5	-19/+17
\|\ \ \ \
\| * \| \| \|	Allow to debug assets by config.assets.debug	Andrey A.I. Sitnik	2011-08-22	5	-19/+17
* \| \| \| \|	Merge pull request #2627 from luckydev/tr	Aaron Patterson	2011-08-22	2	-1/+4
\|\ \ \ \ \
\| * \| \| \| \|	Travis status image added to GitHub README, excluding API pages.	Anand	2011-08-22	2	-1/+4
* \| \| \| \| \|	Merge pull request #2611 from ognevsky/add-destroy-alias	Aaron Patterson	2011-08-22	2	-1/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add Destroy Alias	Andrey Ognevsky	2011-08-22	2	-1/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251	Santiago Pastorino	2011-08-22	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use mysql_creation_options inside rescue block	Jonathon M. Abbott	2011-08-14	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-path	Joshua Peek	2011-08-22	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix Sprockets rewrite_asset_path	Guillermo Iguaran	2011-08-22	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2631 from dasch/refactor-sprockets	Santiago Pastorino	2011-08-22	1	-2/+7
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor Sprockets::Helpers::RailsHelper#performing_caching?	Daniel Schierbeck	2011-08-22	1	-2/+7
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2618 from FLOChip/unicode_j	Aaron Patterson	2011-08-21	2	-2/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fix escape_javascript for unicode character \u2028.	Teng Siong Ong	2011-08-21	2	-2/+4
* \| \| \| \| \| \|	Merge pull request #2620 from cesario/3-1-0	Santiago Pastorino	2011-08-21	1	-1/+1
\| \|_\|/ / / / \|/\| \| \| \| \|