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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/f...	Jon Leighton	2011-07-17	1	-2/+2
*	Merge pull request #2118 from arunagw/fix_plugin_gen_test	Santiago Pastorino	2011-07-17	1	-1/+1
\|\
\| *	As we are adding db folder in it. Required in test also.	Arun Agrawal	2011-07-17	1	-1/+1
\|/
*	indeed, if we are going to remove everything in public/assets on assets:clean...	Xavier Noria	2011-07-17	1	-4/+1
*	if we are cleaning all files, we are cleaning all gz files	Xavier Noria	2011-07-17	1	-1/+0
*	Merge pull request #2082 from htanata/rake_routes_formatting	Santiago Pastorino	2011-07-16	4	-15/+107
\|\
\| *	Improve formatting of route to Rack application in rake routes.	Hendy Tanata	2011-07-17	2	-3/+24
\| *	Better formatting of route requirements in rake:routes.	Hendy Tanata	2011-07-16	4	-14/+85
* \|	Merge pull request #2108 from loz/master	Santiago Pastorino	2011-07-16	1	-0/+5
\|\ \
\| * \|	Added gem helper to rake task for engines, as per pull request from 3-1-stabl...	Jonathan Lozinski	2011-07-16	1	-0/+5
* \| \|	Fix the output a bit	Santiago Pastorino	2011-07-16	1	-2/+2
* \| \|	Merge pull request #2101 from loz/master	José Valim	2011-07-16	1	-1/+1
\|\\| \|
\| * \|	Added db to gemspec files so migrations are correctly packaged	Jonathan Lozinski	2011-07-16	1	-1/+1
\| \|/
* \|	Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelog	Santiago Pastorino	2011-07-15	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	Fix wildcard route code example in changelog.	Hendy Tanata	2011-07-16	1	-2/+2
\|/
*	Merge pull request #2073 from bfolkens/master	Santiago Pastorino	2011-07-14	1	-0/+5
\|\
\| *	assert nothing raised for setting a cookie value to nil in ActionDispatch	Bradford Folkens	2011-07-14	1	-0/+5
* \|	Merge pull request #2063 from elight/master	Santiago Pastorino	2011-07-14	2	-3/+29
\|\ \
\| * \|	Fix and unit test for https://github.com/rails/rails/issues/2059	Evan Light	2011-07-14	2	-3/+29
* \| \|	Merge pull request #1807 from caius/find_in_batches_id_bug	Santiago Pastorino	2011-07-14	2	-2/+21
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Stop find_in_batches using the records after yielding.	Caius Durling	2011-06-21	2	-2/+21
* \| \|	Merge pull request #2066 from amatsuda/magicome	Aaron Patterson	2011-07-14	2	-0/+4
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	need magic comments	Akira Matsuda	2011-07-14	2	-0/+4
\|/ /
* \|	Merge pull request #2052 from amatsuda/fullwidth_blank	Aaron Patterson	2011-07-13	2	-2/+6
\|\ \
\| * \|	treat fullwidth whitespace as a blank character	Akira Matsuda	2011-07-14	2	-2/+6
* \| \|	Bump rack up	Santiago Pastorino	2011-07-13	1	-1/+1
\|/ /
* \|	Use cache/assets instead.	José Valim	2011-07-12	4	-5/+4
* \|	assets.cache_store now defaults to filesystem. You will want to share tmp/ass...	José Valim	2011-07-12	6	-16/+9
* \|	Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patch	Santiago Pastorino	2011-07-12	1	-7/+13
\|\ \
\| * \|	Fix for SqlBypass session store	Joseph Wong	2011-07-12	1	-7/+13
* \| \|	Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-test	Santiago Pastorino	2011-07-12	2	-2/+37
\|\ \ \
\| * \| \|	Fixed session ID fixation for ActiveRecord::SessionStore	Joseph Wong	2011-07-12	2	-2/+37
\| \|/ /
* \| \|	Merge pull request #2038 from FLOChip/extra_space	José Valim	2011-07-12	2	-4/+4
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	remove extra space since comment_if already returns the space.	Teng Siong Ong	2011-07-13	2	-4/+4
\|/ /
* \|	Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_...	Jon Leighton	2011-07-12	1	-2/+2
* \|	Fix exception if old and new targets are both nil. Fixes #1471.	Jon Leighton	2011-07-12	4	-2/+15
* \|	Ensure Dir.glob is sorted	Joshua Peek	2011-07-11	1	-1/+1
* \|	Generate valid default fixtures for models with a type column	Marc-Andre Lafortune	2011-07-11	2	-1/+6
* \|	Merge pull request #1722 from AndrewRadev/grouped-select	José Valim	2011-07-11	2	-2/+48
\|\ \
\| * \|	Grouped select helper	Andrew Radev	2011-07-11	2	-2/+48
* \| \|	Merge pull request #1756 from shtirlic/xmlschema_fix	José Valim	2011-07-11	2	-1/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix xmlschema output with fraction_digits >0	shtirlic	2011-07-11	2	-1/+8
* \| \|	Merge pull request #2032 from dziulius/master	Xavier Noria	2011-07-11	1	-1/+1
\|\ \ \
\| * \| \|	#many? uses count instead of select - a bit faster	Julius Markūnas	2011-07-11	1	-1/+1
* \| \| \|	Merge pull request #2009 from vatrai/autoload-todo-new	José Valim	2011-07-11	8	-15/+7
\|\ \ \ \
\| * \| \| \|	TODO fix explicitly loading exceptations, autoload removed	Vishnu Atrai	2011-07-11	8	-15/+7
* \| \| \| \|	Require assets in all environments by default and provide a way to opt-out fr...	José Valim	2011-07-11	2	-3/+8
* \| \| \| \|	Merge pull request #2029 from sikachu/acronym_mention	José Valim	2011-07-11	1	-0/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Mention about acronym inflection in config/initializers/inflections.rb	Prem Sichanugrist	2011-07-11	1	-0/+5
* \| \| \| \|	Merge pull request #1929 from sobrinho/master	Santiago Pastorino	2011-07-11	1	-0/+14
\|\ \ \ \ \