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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix build	Santiago Pastorino	2012-06-13	1	-2/+2
*	ActionController::Caching depends on RackDelegation and AbstractController::C...	Santiago Pastorino	2012-06-13	1	-0/+32
*	Merge branch 'master-sec'	Aaron Patterson	2012-06-12	1	-0/+4
\|\
\| *	Array parameters should not contain nil values.	Aaron Patterson	2012-06-12	1	-0/+4
* \|	This consider_all_requests_local doesn't make sense	Santiago Pastorino	2012-06-12	1	-18/+0
\|/
*	Return proper format on exceptions	Santiago Pastorino	2012-06-11	1	-0/+43
*	both string and sumbol will be interpolated as string no need to convert to_s	ganesh	2012-06-11	1	-5/+5
*	stop `to_s`ing method names	Akira Matsuda	2012-06-06	1	-16/+16
*	fix meaningless test case	Akira Matsuda	2012-06-06	1	-1/+1
*	accept a block in button helper.	Yuki Nishijima	2012-06-05	1	-1/+5
*	Allow to use mounted helpers in ActionView::TestCase	Piotr Sarnacki	2012-06-01	2	-0/+20
*	Merge pull request #6588 from nbibler/polymorphic_to_model	José Valim	2012-06-01	1	-1/+27
*	Include routes.mounted_helpers into integration tests	Piotr Sarnacki	2012-06-01	1	-0/+19
*	Merge branch 'master-sec'	Aaron Patterson	2012-05-31	1	-1/+6
\|\
\| *	Strip [nil] from parameters hash.	Aaron Patterson	2012-05-30	1	-1/+6
* \|	Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl	Jeremy Friesen	2012-05-31	1	-0/+31
* \|	Simplify link_to using content_tag	Carlos Antonio da Silva	2012-05-31	1	-0/+20
* \|	accept a block in button_to helper	Sergey Nartimov	2012-05-30	1	-0/+7
* \|	no need to pass an empty block to button_to helper	Sergey Nartimov	2012-05-30	1	-2/+2
* \|	Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active...	José Valim	2012-05-28	1	-0/+11
\|\ \
\| * \|	Moving NumberHelpers from ActionView to ActiveSupport	Andrew Mutz	2012-05-27	1	-0/+11
* \| \|	Fix sorting of helpers from different paths	Piotr Sarnacki	2012-05-28	3	-0/+40
\|/ /
* \|	Add `:escape` option for `truncate`	Rafael Mendonça França	2012-05-26	1	-0/+19
* \|	Test that the block used in truncate is escaped if it is not HTML safe	Rafael Mendonça França	2012-05-26	1	-12/+11
* \|	Truncate now has the ability to receive a html option that allows it to call ...	Li Ellis Gallardo	2012-05-26	1	-8/+29
* \|	Remove implicit dependency on pathname	José Valim	2012-05-25	1	-1/+1
* \|	Merge pull request #6453 from parndt/session_keys	José Valim	2012-05-22	1	-0/+16
\|\ \
\| * \|	Added ActionDispatch::Request::Session#keys and ActionDispatch::Request::Sess...	Philip Arndt	2012-05-23	1	-0/+16
* \| \|	Add tests for time_field and date_field helpers	Carlos Galdino	2012-05-22	1	-0/+18
\|/ /
* \|	Merge pull request #6359 from carlosgaldino/add-html5-inputs	Jeremy Kemper	2012-05-22	3	-0/+181
\|\ \
\| * \|	Add several HTML5 input helpers	Carlos Galdino	2012-05-21	2	-0/+160
\| * \|	Add HTML5 input[type="color"] helper	Carlos Galdino	2012-05-21	3	-0/+21
* \| \|	Fixed typo new_defautls -> new_defaults.	Philip Arndt	2012-05-23	1	-3/+13
\| \|/ \|/\|
* \|	Fix bug when Rails.application is defined but is nil. See #881	Marc-Andre Lafortune	2012-05-21	1	-0/+7
* \|	Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"	José Valim	2012-05-21	1	-4/+4
* \|	Merge pull request #6425 from pinetops/resolver_concurrency_fix	Aaron Patterson	2012-05-21	1	-4/+4
\|\ \ \| \|/ \|/\|
\| *	Make the Resolver template cache threadsafe - closes #6404	Tom Clarke	2012-05-21	1	-4/+4
* \|	Merge pull request #2549 from trek/RoutingErrorForMissingControllers	Aaron Patterson	2012-05-21	1	-0/+10
\|\ \
\| * \|	When a route references a missing controller, raise ActionController::Routing...	Trek Glowacki	2011-08-16	1	-0/+10
* \| \|	Escape the extension when normalizing the action cache path.	Andrew White	2012-05-20	1	-1/+30
* \| \|	Return 400 Bad Request for URL paths with invalid encoding.	Andrew White	2012-05-20	1	-0/+31
* \| \|	Raise ActionController::BadRequest for malformed parameter hashes.	Andrew White	2012-05-20	4	-1/+29
* \| \|	Raise Assertion instead of RoutingError for routing assertion failures.	David Chelimsky	2012-05-20	2	-11/+11
* \| \|	Show in log correct wrapped keys	Dmitry Vorotilin	2012-05-20	1	-0/+8
* \| \|	Don't use assert_block method. It will be deprecated.	kennyj	2012-05-20	1	-1/+1
* \| \|	Clarify grouped_options_for_select method API, add changelog entry	Carlos Antonio da Silva	2012-05-19	1	-2/+2
* \| \|	Merge pull request #6384 from ihid/tidy_text_helpers	Jeremy Kemper	2012-05-18	1	-0/+42
\|\ \ \
\| * \| \|	Tidied and standardised text_helper implementations.	Jeremy Walker	2012-05-19	1	-0/+42
* \| \| \|	Fix build: can't convert Regexp to String	kennyj	2012-05-19	1	-1/+1
* \| \| \|	reverting decoupling of NumberHelper from safe_join and adding tests for esca...	Andrew Mutz	2012-05-18	1	-0/+2
\|/ / /