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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch '3-2-stable-security' into 3-2-2	Aaron Patterson	2012-03-01	5	-30/+72
\|\
\| *	Ensure [] respects the status of the buffer.	José Valim	2012-02-29	2	-17/+49
\| *	delete vulnerable AS::SafeBuffer#[]	Akira Matsuda	2012-02-20	2	-12/+0
\| *	use AS::SafeBuffer#clone_empty for flushing the output_buffer	Akira Matsuda	2012-02-20	1	-1/+1
\| *	add AS::SafeBuffer#clone_empty	Akira Matsuda	2012-02-20	2	-0/+15
\| *	fix output safety issue with select options	Sergey Nartimov	2012-02-20	2	-4/+11
* \|	Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare	Aaron Patterson	2012-02-23	1	-1/+1
* \|	Merge pull request #5084 from johndouthat/patch-1	Aaron Patterson	2012-02-22	1	-2/+1
* \|	updating RAILS_VERSION	Aaron Patterson	2012-02-22	9	-17/+17
* \|	Fix CHANGELOG	Santiago Pastorino	2012-02-22	1	-2/+2
* \|	Add CHANGELOG entry	Santiago Pastorino	2012-02-22	1	-0/+2
* \|	format lookup for partials is derived from the format in which the template i...	Santiago Pastorino	2012-02-22	11	-36/+25
* \|	bumping up arel	Aaron Patterson	2012-02-21	1	-1/+1
* \|	prepared statements can be disabled	Aaron Patterson	2012-02-21	8	-30/+56
* \|	tag bind params with a bind param object	Aaron Patterson	2012-02-21	3	-3/+3
* \|	more ruby 2.0 respond_to? changes	Aaron Patterson	2012-02-21	1	-1/+1
* \|	ruby 2.0 makes protected methods return false for respond_to, so pass true as...	Aaron Patterson	2012-02-21	1	-1/+1
* \|	fix bad docs from f373f296 [ci skip]	Vijay Dev	2012-02-21	1	-3/+3
* \|	Don't wrap the raise with ensure	Santiago Pastorino	2012-02-21	2	-10/+12
* \|	Merge pull request #5096 from lawso017/master	Aaron Patterson	2012-02-21	2	-19/+43
* \|	Restore lookup formats to the previous value after searching for the failing ...	Santiago Pastorino	2012-02-21	2	-2/+5
* \|	Add CHANGELOG entry	Santiago Pastorino	2012-02-21	1	-0/+2
* \|	Merge pull request #5106 from kennyj/fix_warnings_20120210	Santiago Pastorino	2012-02-21	6	-27/+29
\|\ \ \| \|/ \|/\|
\| *	Fix some warnings on 3-2-stable	kennyj	2012-02-21	6	-27/+29
\|/
*	Fix a failing test	Santiago Pastorino	2012-02-20	1	-0/+2
*	Use the right format when a partial is missing.	Santiago Pastorino	2012-02-20	3	-0/+9
*	Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset	José Valim	2012-02-20	2	-0/+7
\|\
\| *	Reset memoized hash keys when new entry added	Chris Kelly	2012-02-20	2	-0/+7
\|/
*	search private / protected methods in trunk ruby	Aaron Patterson	2012-02-20	1	-1/+1
*	sync __run_callbacks with ruby-trunk	Sokolov Yura	2012-02-20	1	-1/+1
*	Remove fixture files with Windows incompatible filenames	Andrew White	2012-02-20	13	-39/+88
*	fix a typo [ci skip]	Vijay Dev	2012-02-18	1	-1/+1
*	Documenting the :inverse_of option for associations	Mike Gunderloy	2012-02-18	1	-0/+99
*	fix spacer template example	Sergey Nartimov	2012-02-18	1	-1/+1
*	Update Time#change docs to reflect the options it uses	Eric Oestrich	2012-02-18	1	-1/+1
*	Fix actionpack readme weblog example	Alexey Vakhov	2012-02-18	1	-1/+1
*	Merge pull request #5081 from arunagw/fix_ar_test	Xavier Noria	2012-02-18	1	-1/+5
\|\
\| *	fix test with ruby 187-p358	Arun Agrawal	2012-02-18	1	-1/+5
\|/
*	Simplify regexp	Andrew White	2012-02-17	1	-1/+1
*	Fix ActionDispatch::Static to serve files with unencoded PCHAR	Andrew White	2012-02-17	14	-2/+50
*	Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358	Santiago Pastorino	2012-02-17	1	-2/+2
\|\
\| *	Fixes failing test with ruby 1.8.7-p358	Arun Agrawal	2012-02-17	1	-2/+2
* \|	Merge pull request #5073 from asanghi/4918_backport	José Valim	2012-02-17	2	-1/+15
\|\ \ \| \|/ \|/\|
\| *	backporting #4918 to 3.2 stable; adding extra test for accept header given by...	Aditya Sanghi	2012-02-17	2	-1/+15
\|/
*	Merge pull request #5049 from fabioyamate/master	José Valim	2012-02-15	2	-3/+10
*	adding tests to document behavior for #4817	Aaron Patterson	2012-02-14	1	-0/+26
*	Rack body respond to each and not to join	Santiago Pastorino	2012-02-14	2	-2/+16
*	Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo	José Valim	2012-02-14	1	-1/+4
*	Fix deprecation warning in AS::Concern.	José Valim	2012-02-13	1	-1/+1
*	Fix that failed tests should exit with a nonzero error code.	Jeremy Kemper	2012-02-10	2	-31/+17