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

	Commit message (Expand)	Author	Age	Files	Lines
*	use mutex_m rather than use a delegate system	Aaron Patterson	2012-06-21	1	-6/+3
*	Merge pull request #6428 from pinetops/resolver_concurrency_fix	Yehuda Katz	2012-06-21	1	-19/+76
\|\
\| *	Improve the readability of the Resolver change detection code	Tom Clarke	2012-05-22	1	-11/+19
\| *	More granular locking of the Resolver template cache	Tom Clarke	2012-05-21	1	-5/+23
\| *	Make the Resolver template cache threadsafe - closes #6404	Tom Clarke	2012-05-21	1	-19/+50
* \|	stop subclassing string	Aaron Patterson	2012-06-21	1	-3/+10
* \|	add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag	Francesco Rodriguez	2012-06-19	3	-4/+4
* \|	Ensure that cache-control headers are merged	James Tucker	2012-06-18	1	-10/+32
* \|	Merge pull request #6752 from steveklabnik/fix_5680	Rafael Mendonça França	2012-06-16	1	-1/+7
\|\ \
\| * \|	Respect absolute paths in compute_source_path.	Steve Klabnik	2012-06-16	1	-1/+7
* \| \|	TestCase does not need to be loaded when loading the framework	Aaron Patterson	2012-06-15	1	-1/+3
* \| \|	Support unicode character route in config/routes.rb.	kennyj	2012-06-16	2	-1/+8
\|/ /
* \|	Use status, content_type, body method signature for render too	Santiago Pastorino	2012-06-14	1	-4/+3
* \|	Refactor public exceptions to reuse render format method	Carlos Antonio da Silva	2012-06-14	1	-9/+6
* \|	Revert "AV::TestCase does not need to be loaded when eagerly loading the"	Aaron Patterson	2012-06-14	1	-2/+1
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-14	2	-8/+26
\|\ \
\| * \|	moar copy edits [ci skip]	Vijay Dev	2012-06-14	1	-2/+1
\| * \|	copy editing [ci skip]	Vijay Dev	2012-06-14	1	-4/+7
\| * \|	fixed http token authentication formatting	Jakub Kuźma	2012-06-12	1	-8/+13
\| * \|	on CSRF whitelisting the argument for :if must be a symbol	Daniel Lopes	2012-06-07	1	-1/+1
\| * \|	fix typos on the CSRF whitelisting doc	Daniel Lopes	2012-06-07	1	-3/+3
\| * \|	Document the CSRF whitelisting on get requests	Daniel Lopes	2012-06-07	1	-5/+16
* \| \|	AV::TestCase does not need to be loaded when eagerly loading the	Aaron Patterson	2012-06-14	1	-1/+2
* \| \|	i suck, fixing error message	Aaron Patterson	2012-06-14	1	-1/+1
* \| \|	Wrap up missing helper exceptions	Aaron Patterson	2012-06-14	1	-2/+10
* \| \|	using hax to fix tests on Ruby 2.0	Aaron Patterson	2012-06-13	1	-1/+6
* \| \|	Merge pull request #6721 from homakov/patch-2	Santiago Pastorino	2012-06-13	1	-3/+0
\|\ \ \
\| * \| \|	These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o th...	Egor Homakov	2012-06-13	1	-3/+0
* \| \| \|	ActionController::Caching depends on RackDelegation and AbstractController::C...	Santiago Pastorino	2012-06-13	1	-0/+3
\|/ / /
* \| \|	Merge branch 'master-sec'	Aaron Patterson	2012-06-12	1	-2/+4
\|\ \ \
\| * \| \|	Array parameters should not contain nil values.	Aaron Patterson	2012-06-12	1	-2/+4
* \| \| \|	content_type is already a Mime::Type object	Santiago Pastorino	2012-06-12	1	-1/+1
* \| \| \|	This consider_all_requests_local doesn't make sense	Santiago Pastorino	2012-06-12	1	-3/+2
\|/ / /
* \| \|	Return proper format on exceptions	Santiago Pastorino	2012-06-11	1	-14/+36
* \| \|	both string and sumbol will be interpolated as string no need to convert to_s	ganesh	2012-06-11	1	-3/+3
* \| \|	Symbol responds_to :upcase & :downcase in Ruby >= 1.9	Akira Matsuda	2012-06-06	2	-4/+4
* \| \|	One-liner code for logger in ActionView::Helpers::ControllerHelper	Dmitry Vorotilin	2012-06-05	1	-5/+1
* \| \|	Merge pull request #6631 from yuki24/use_block_in_button_helper	José Valim	2012-06-05	1	-2/+13
\|\ \ \
\| * \| \|	accept a block in button helper.	Yuki Nishijima	2012-06-05	1	-2/+13
\| \|/ /
* / /	Metal controller doesn't have logger method, check it and then delegate	Dmitry Vorotilin	2012-06-05	1	-2/+8
\|/ /
* \|	Allow to use mounted helpers in ActionView::TestCase	Piotr Sarnacki	2012-06-01	1	-1/+2
* \|	Merge pull request #6588 from nbibler/polymorphic_to_model	José Valim	2012-06-01	1	-1/+7
* \|	Include routes.mounted_helpers into integration tests	Piotr Sarnacki	2012-06-01	2	-3/+6
* \|	Merge branch 'master-sec'	Aaron Patterson	2012-05-31	1	-0/+22
\|\ \
\| * \|	Strip [nil] from parameters hash.	Aaron Patterson	2012-05-30	1	-0/+22
\| * \|	Fix the build	Santiago Pastorino	2012-05-22	1	-1/+0
\| * \|	require active_support/lazy_load_hooks where is needed	Santiago Pastorino	2012-05-22	1	-0/+1
* \| \|	Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl	Jeremy Friesen	2012-05-31	1	-7/+15
* \| \|	Simplify link_to using content_tag	Carlos Antonio da Silva	2012-05-31	1	-12/+6
* \| \|	Make link_to arguments explicit	Carlos Antonio da Silva	2012-05-31	1	-8/+4