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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \|	Merge pull request #2273 from thoefer/refactor	Santiago Pastorino	2011-07-26	1	-5/+4
\|\ \ \
\| * \| \|	refactored 'assert_redirected_to': local call to validate_request! will be ca...	thoefer	2011-07-26	1	-5/+4
* \| \| \|	Remove cruise files	Santiago Pastorino	2011-07-26	5	-415/+0
* \| \| \|	Merge pull request #2095 from dgeb/issue-2094	Aaron Patterson	2011-07-26	2	-1/+18
\|\ \ \ \
\| * \| \| \|	added test case for fix to issue #2094	Dan Gebhardt	2011-07-16	1	-0/+17
\| * \| \| \|	fixed problem in which options[:html][:remote] would be overridden in form_fo...	Dan Gebhardt	2011-07-15	1	-1/+1
* \| \| \| \|	Merge pull request #2285 from castlerock/remove_warnings_ruby193	Santiago Pastorino	2011-07-26	1	-2/+0
\|\ \ \ \ \
\| * \| \| \| \|	remove unused variables warnings removed	Vishnu Atrai	2011-07-26	1	-2/+0
* \| \| \| \| \|	Merge pull request #2284 from joshk/patch-6	Santiago Pastorino	2011-07-26	1	-3/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	enable Travis CI irc notifications to #rails-contrib on irc.freenode.org	Josh Kalderimis	2011-07-26	1	-3/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #2283 from castlerock/remove_warnings_ruby193	Aaron Patterson	2011-07-26	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	remove deprication warning: ambiguous first argument; put parentheses or even...	Vishnu Atrai	2011-07-26	1	-1/+1
\|/ / / / /
* \| \| \| \|	fixing tests on ruby trunk	Aaron Patterson	2011-07-26	1	-1/+1
* \| \| \| \|	fixing whitespace errors	Aaron Patterson	2011-07-26	1	-9/+9
* \| \| \| \|	Merge pull request #2281 from castlerock/remove_warnings_ruby193	Santiago Pastorino	2011-07-26	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	remove deprication warning for ruby 1.9.3-head for unused variables	Vishnu Atrai	2011-07-26	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #2277 from dmathieu/fix_actionpack_tests	José Valim	2011-07-26	1	-26/+26
\|\ \ \ \ \
\| * \| \| \| \|	use sprocket's append_path and assert_match	Damien Mathieu	2011-07-26	1	-26/+26
\|/ / / / /
* \| \| / /	Revert "allow select to have multiple arguments"	Piotr Sarnacki	2011-07-26	2	-11/+3
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #2271 from slawosz/enhance_select_method_api	Piotr Sarnacki	2011-07-26	2	-3/+11
\|\ \ \ \
\| * \| \| \|	allow select to have multiple arguments	Sławosz Sławiński	2011-07-26	2	-3/+11
* \| \| \| \|	Merge pull request #2272 from cesario/fix_relations_test	Santiago Pastorino	2011-07-26	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Simplify the test by using id and name. `id` will be the only real sort crite...	Franck Verrot	2011-07-26	1	-1/+1
\|/ / / /
* \| \| \|	use_sprockets is not used anymore	Santiago Pastorino	2011-07-26	1	-5/+1
* \| \| \|	Bump sprockets up	Santiago Pastorino	2011-07-26	1	-1/+1
* \| \| \|	Check that Rack::Sendfile is not included unless config.action_dispatch.x_sen...	Santiago Pastorino	2011-07-26	1	-0/+8
* \| \| \|	Bump rack up. Closes #2107	Santiago Pastorino	2011-07-25	1	-1/+1
* \| \| \|	Merge pull request #2262 from sferik/format_true	José Valim	2011-07-25	3	-0/+15
\|\ \ \ \
\| * \| \| \|	Add documentation for :format => true	Erik Michaels-Ober	2011-07-25	1	-0/+6
\| * \| \| \|	Allow a route to have :format => true	Erik Michaels-Ober	2011-07-25	2	-0/+9
\| \|/ / /
* \| \| \|	Remove unused use_sprockets config	Santiago Pastorino	2011-07-25	2	-8/+1
* \| \| \|	Don't use Rack::Sendfile middleware if x_sendfile_header is not present	Santiago Pastorino	2011-07-25	1	-1/+3
* \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-07-25	9	-281/+731
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	let TIP and friends handle a multiline paragraph	Xavier Noria	2011-07-25	2	-18/+19