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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #4018 from arunagw/warning_removed_	José Valim	2011-12-18	1	-1/+1
\|\
\| *	Warning removed in test	Arun Agrawal	2011-12-18	1	-1/+1
\|/
*	Merge pull request #4017 from arunagw/remove_extra_require	José Valim	2011-12-17	2	-2/+0
\|\
\| *	No need 'abstract_unit' here. It's already in 'generators_test_helper'	Arun Agrawal	2011-12-18	2	-2/+0
\|/
*	Merge pull request #4009 from kirs/generate-rake-task	Piotr Sarnacki	2011-12-17	4	-0/+41
\|\
\| *	Rake tasks generator with test	Kir	2011-12-17	4	-0/+41
* \|	Merge pull request #4015 from schneems/schneems/routing_error_help	José Valim	2011-12-17	1	-8/+13
\|\ \
\| * \|	add help text to routing error	schneems	2011-12-17	1	-8/+13
\|/ /
* \|	Add campfire notifications for travis	Santiago Pastorino	2011-12-17	1	-0/+2
* \|	Merge pull request #4012 from JustinCampbell/master	José Valim	2011-12-17	2	-1/+32
\|\ \
\| * \|	Add test for register_alias	Justin Campbell	2011-12-17	1	-0/+9
\| * \|	Add test for type aliases	Justin Campbell	2011-12-17	1	-0/+11
\| * \|	Allow symbols to be passed for extension aliases	Justin Campbell	2011-12-17	2	-1/+12
* \| \|	Use gem versions of sass-rails and coffee-rails.	José Valim	2011-12-17	1	-10/+26
* \| \|	Merge pull request #4010 from arunagw/fix_test_activemodel	José Valim	2011-12-17	1	-1/+1
\|\ \ \
\| * \| \|	Fixed test "ArgumentError: wrong number of arguments(1 for 0)"	Arun Agrawal	2011-12-17	1	-1/+1
\|/ / /
* \| \|	Merge pull request #4008 from arunagw/warning_variable_for_layout	José Valim	2011-12-16	1	-0/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	warning removed "warning: instance variable @variable_for_layout not initiali...	Arun Agrawal	2011-12-17	1	-0/+1
\|/ /
* \|	Merge pull request #4007 from exviva/expand_cache_key_for_one_element_array	José Valim	2011-12-16	2	-8/+16
\|\ \
\| * \|	Fix expanding cache key for single element arrays	Olek Janiszewski	2011-12-16	2	-8/+16
* \| \|	AS::Concern is not really needed for AR::Explain	Xavier Noria	2011-12-16	3	-73/+71
* \| \|	Merge pull request #4006 from devton/validation_error_on_message_is_empty_part_2	José Valim	2011-12-16	2	-1/+8
\|\ \ \
\| * \| \|	Fixed bug when error message is an empty string.	Antonio Roberto	2011-12-16	2	-1/+8
* \| \| \|	Merge pull request #3780 from marcbowes/master	Vijay Dev	2011-12-16	1	-7/+3
\|\ \ \ \
\| * \| \| \|	* A `/` is required if you want to explicitly skip the assets directory. This...	Marc Bowes	2011-11-28	1	-7/+3
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-16	2	-4/+4
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Merge pull request #74 from abonec/master	Alexander	2011-12-15	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Update activerecord/lib/active_record/reflection.rb	Alexander	2011-12-14	1	-1/+1
\| * \| \| \| \|	escape assigns[:person], assigns[person] etc in actioncontroller testcase	Nick Howard	2011-12-14	1	-3/+3
\| \|/ / / /
* \| \| \| \|	Delete obsolete comment	Jon Leighton	2011-12-16	1	-1/+0
* \| \| \| \|	Fix the build on postgres. Note: we should probably actually make schema muta...	Jon Leighton	2011-12-16	1	-1/+1
* \| \| \| \|	Should clear the primary keys cache also	Jon Leighton	2011-12-16	2	-1/+6
* \| \| \| \|	Don't store defaults in the schema cache	Jon Leighton	2011-12-16	4	-6/+6
* \| \| \| \|	Defaults hash can go on the model	Jon Leighton	2011-12-16	2	-15/+2
* \| \| \| \|	Cache columns at the model level.	Jon Leighton	2011-12-16	7	-38/+43
* \| \| \| \|	Wait a full second so we have time for changes to propagate	José Valim	2011-12-16	1	-0/+3
* \| \| \| \|	Fix failing asset test.	José Valim	2011-12-16	1	-1/+3
* \| \| \| \|	Update CHANGELOGs and guides.	José Valim	2011-12-16	3	-0/+6
* \| \| \| \|	Show detailed exceptions no longer returns true if the request is local in pr...	José Valim	2011-12-16	5	-4/+23
* \| \| \| \|	Do not raise an exception if an invalid route was generated automatically.	José Valim	2011-12-16	3	-4/+13
* \| \| \| \|	ShowExceptions should understand X-Cascade responses from exceptions app.	José Valim	2011-12-16	4	-6/+27
* \| \| \| \|	Improve the specs on exceptions app.	José Valim	2011-12-16	3	-3/+21
* \| \| \| \|	Allow a custom exceptions app to set.	José Valim	2011-12-16	3	-2/+17
* \| \| \| \|	Extract the rendering of public exceptions pages into a Rack app.	José Valim	2011-12-16	7	-45/+53
* \| \| \| \|	Get rid of the close checks since we cannot reliably close the session anyway.	José Valim	2011-12-16	7	-165/+1
* \| \| \| \|	Merge pull request #4002 from arunagw/warning_removed_grouped_expression	Piotr Sarnacki	2011-12-16	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Warning removed "warning: (...) interpreted as grouped expression"	Arun Agrawal	2011-12-16	1	-1/+1
\|/ / / / /
* \| \| \| \|	removes Ruby constraint in RedCloth dependency	Xavier Noria	2011-12-15	1	-1/+1
* \| \| \| \|	it's -> its	Xavier Noria	2011-12-15	1	-1/+1
* \| \| \| \|	Move DefaultScope and NamedScope under Scoping	Jon Leighton	2011-12-15	7	-342/+357