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

	Commit message (Expand)	Author	Age	Files	Lines
*	dump IO encoding value along with schema.rb so the file can be reloaded. fixe...	Aaron Patterson	2011-07-29	2	-3/+16
*	Merge pull request #2342 from bcardarella/remove_controller_instance_variable...	Santiago Pastorino	2011-07-29	1	-2/+2
\|\
\| *	Instead of removing the instance variable just set it to nil, resolves the wa...	Brian Cardarella	2011-07-29	1	-2/+2
* \|	Merge pull request #2344 from bcardarella/resolve_warning_for_capture_helper_...	Aaron Patterson	2011-07-29	2	-0/+12
\|\ \
\| * \|	Reset @dirty to false when slicing an instance of SafeBuffer	Brian Cardarella	2011-07-29	2	-0/+12
\| \|/
* \|	Merge pull request #2343 from arunagw/test_add_for_plugin_new_gen	José Valim	2011-07-29	1	-4/+5
\|\ \ \| \|/ \|/\|
\| *	Test add for plugin new generator generate mailer	Arun Agrawal	2011-07-29	1	-4/+5
\|/
*	Merge pull request #2339 from dgeb/mailers-in-plugins	José Valim	2011-07-29	2	-0/+1
\|\
\| *	Include empty app/mailers directory in mountable and full plugins	Dan Gebhardt	2011-07-29	2	-0/+1
\|/
*	Tidy up	Santiago Pastorino	2011-07-28	2	-5/+4
*	Merge pull request #2327 from cesario/patch-1	José Valim	2011-07-28	1	-1/+0
\|\
\| *	We don't need to require erb here.	Franck Verrot	2011-07-28	1	-1/+0
* \|	Merge pull request #2330 from thedarkone/resources-router-fix	José Valim	2011-07-28	2	-8/+16
\|\ \
\| * \|	Make use of the inherited initializer.	thedarkone	2011-07-28	1	-3/+2
\| * \|	There is no need to be destructive with the passed-in options.	thedarkone	2011-07-28	2	-6/+15
* \| \|	Merge pull request #2329 from nertzy/master	Xavier Noria	2011-07-28	1	-1/+1
\|\ \ \
\| * \| \|	Give attribution to Peter Jaros for the patch we paired on.	Grant Hutchins	2011-07-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #2326 from castlerock/plugin_generator_fix	Santiago Pastorino	2011-07-28	1	-8/+8
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	pluging generator test fix	Vishnu Atrai	2011-07-28	1	-8/+8
\|/ /
* \|	Tidy up a bit plugin new gemspec	Santiago Pastorino	2011-07-28	1	-7/+3
* \|	Merge pull request #2295 from dgeb/mo-better-plugins	Santiago Pastorino	2011-07-28	4	-13/+42
\|\ \
\| * \|	Moved dependencies from Gemfile to gemspec to eliminate redundant declarations.	Dan Gebhardt	2011-07-28	2	-7/+24
\| * \|	Extracted version from gemspec and placed it in its own file. This is consist...	Dan Gebhardt	2011-07-28	3	-3/+11
\| * \|	Expanded meta-data in gemspec to include author, email, etc.; Defaults includ...	Dan Gebhardt	2011-07-28	1	-4/+8
* \| \|	Revert "Merge pull request #2309 from smasry/master"	Jon Leighton	2011-07-28	2	-6/+1
* \| \|	Update CHANGELOG.	José Valim	2011-07-28	1	-0/+2
* \| \|	Move the cache to a nested hash which performs better than a hash with array ...	José Valim	2011-07-28	1	-11/+17
* \| \|	Rename class method to_path to _to_path and make it explicit that it is an in...	José Valim	2011-07-28	2	-5/+7
* \| \|	Merge pull request #2034 from Casecommons/to_path	José Valim	2011-07-28	10	-33/+131
\|\ \ \
\| * \| \|	Let ActiveModel instances define partial paths.	Grant Hutchins & Peter Jaros	2011-07-25	10	-33/+131
* \| \| \|	Make Rails.application.assets available in initializers	Joshua Peek	2011-07-27	1	-44/+36
* \| \| \|	contrib app minor tweak	Xavier Noria	2011-07-27	1	-2/+2
* \| \| \|	Merge pull request #2309 from smasry/master	Aaron Patterson	2011-07-27	2	-1/+6
\|\ \ \ \
\| * \| \| \|	Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697	Samer Masry	2011-07-27	2	-1/+6
\|/ / / /
* \| \| \|	Merge pull request #2305 from thedarkone/errors-include	Santiago Pastorino	2011-07-27	2	-1/+2
\|\ \ \ \
\| * \| \| \|	Handle the empty array correctly.	thedarkone	2011-07-27	2	-1/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Improve performance and memory usage for options_for_select with Ruby 1.8.7	Christos Zisopoulos	2011-07-27	1	-2/+2
* \| \| \|	Merge pull request #1969 from dmitriy-kiriyenko/calculations_with_having_on_s...	Jon Leighton	2011-07-27	2	-0/+8
\|\ \ \ \
\| * \| \| \|	Fixed failing query when performing calculation with having based on select.	Dmitriy Kiriyenko	2011-07-27	2	-0/+8
\|/ / / /
* \| \| \|	Add a proxy_association method to association proxies, which can be called by...	Jon Leighton	2011-07-27	4	-6/+27
* \| \| \|	Merge pull request #2296 from lsylvester/typo	Xavier Noria	2011-07-27	1	-5/+5
\|\ \ \ \
\| * \| \| \|	fix some types in schema_test.rb	Lachlan Sylvester	2011-07-27	1	-5/+5
\|/ / / /
* \| \| \|	simplify conditionals by assuming hash values will never be `false`	Aaron Patterson	2011-07-26	1	-10/+2
* \| \| \|	use regular ruby rather than clever ruby	Aaron Patterson	2011-07-26	1	-3/+3
* \| \| \|	fixing wildcard path matching when wildcard is inside parenthesis	Aaron Patterson	2011-07-26	2	-1/+8
* \| \| \|	Merge pull request #2291 from jdelStrother/load_missing_constant	Aaron Patterson	2011-07-26	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Replace unnecessary regexp in Dependencies#load_missing_constant	Jonathan del Strother	2011-07-27	1	-2/+1
* \| \| \| \|	Merge pull request #2279 from jdelStrother/load_missing_constant	Santiago Pastorino	2011-07-26	1	-1/+2
\|\\| \| \| \|
\| * \| \| \|	Constantize a regexp in Dependencies#load_missing_constant	Jonathan del Strother	2011-07-26	1	-1/+2
* \| \| \| \|	Remove blank line	Santiago Pastorino	2011-07-26	1	-1/+0