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

	Commit message (Expand)	Author	Age	Files	Lines
*	Add `:escape` option for `truncate`	Rafael Mendonça França	2012-05-26	1	-2/+5
*	Update the documentation and add CHANGELOG entry	Rafael Mendonça França	2012-05-26	1	-3/+3
*	Test that the block used in truncate is escaped if it is not HTML safe	Rafael Mendonça França	2012-05-26	1	-13/+12
*	Truncate now has the ability to receive a html option that allows it to call ...	Li Ellis Gallardo	2012-05-26	1	-2/+12
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-26	1	-4/+3
\|\
\| *	references to the old behavior removed	Mikhail Vaysman	2012-05-25	1	-4/+3
* \|	Remove implicit dependency on pathname	José Valim	2012-05-25	1	-3/+3
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-23	2	-5/+13
\|\
\| *	Revert "Remove blank trailing comments"	Vijay Dev	2012-05-23	29	-0/+67
\| *	copy edit[ci skip]	Vijay Dev	2012-05-23	1	-1/+1
\| *	Fix incorrect example for fields_for - without the '=' it will not output any...	David Morton	2012-05-22	1	-1/+1
\| *	Remove blank trailing comments	Henrik Hodne	2012-05-20	29	-67/+0
\| *	Update documentation for AbstractController::Base	Henrik Hodne	2012-05-20	1	-3/+11
* \|	Merge pull request #6453 from parndt/session_keys	José Valim	2012-05-22	1	-0/+8
\|\ \
\| * \|	Added ActionDispatch::Request::Session#keys and ActionDispatch::Request::Sess...	Philip Arndt	2012-05-23	1	-0/+8
* \| \|	Refactor date related helpers	Carlos Galdino	2012-05-22	6	-50/+26
\|/ /
* \|	Merge pull request #6359 from carlosgaldino/add-html5-inputs	Jeremy Kemper	2012-05-22	8	-0/+248
\|\ \
\| * \|	Add several HTML5 input helpers	Carlos Galdino	2012-05-21	7	-0/+205
\| * \|	Add HTML5 input[type="color"] helper	Carlos Galdino	2012-05-21	4	-0/+43
* \| \|	Fixed typo new_defautls -> new_defaults.	Philip Arndt	2012-05-23	1	-2/+2
* \| \|	Merge pull request #6429 from marcandre/fix_test_request	Carlos Antonio da Silva	2012-05-21	1	-1/+1
\|\ \ \
\| * \| \|	Fix bug when Rails.application is defined but is nil. See #881	Marc-Andre Lafortune	2012-05-21	1	-1/+1
* \| \| \|	Add instance_accessor option to class_attribute	Alexey Vakhov	2012-05-22	1	-2/+1
\|/ / /
* \| \|	Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"	José Valim	2012-05-21	1	-68/+19
* \| \|	Merge pull request #6425 from pinetops/resolver_concurrency_fix	Aaron Patterson	2012-05-21	1	-19/+68
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	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
* \| \|	Merge pull request #2549 from trek/RoutingErrorForMissingControllers	Aaron Patterson	2012-05-21	1	-3/+7
\|\ \ \
\| * \| \|	When a route references a missing controller, raise ActionController::Routing...	Trek Glowacki	2011-08-16	1	-3/+7
* \| \| \|	Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c	José Valim	2012-05-20	1	-10/+22
* \| \| \|	Escape the extension when normalizing the action cache path.	Andrew White	2012-05-20	1	-2/+3
* \| \| \|	Return 400 Bad Request for URL paths with invalid encoding.	Andrew White	2012-05-20	2	-0/+18
* \| \| \|	Raise ActionController::BadRequest for malformed parameter hashes.	Andrew White	2012-05-20	3	-5/+16
* \| \| \|	Correct order of expected and actual arguments	Andrew White	2012-05-20	1	-1/+1
* \| \| \|	fix closing tag [ci skip]	Vijay Dev	2012-05-20	1	-1/+1
* \| \| \|	Raise Assertion instead of RoutingError for routing assertion failures.	David Chelimsky	2012-05-20	1	-7/+13
* \| \| \|	Show in log correct wrapped keys	Dmitry Vorotilin	2012-05-20	1	-1/+2
* \| \| \|	Merge pull request #5631 from avakhov/ac-log-subsriber-small-refac	Piotr Sarnacki	2012-05-19	1	-3/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Make AC::LogSubscriber#send_file like #send_data	Alexey Vakhov	2012-05-19	1	-3/+1
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-19	1	-1/+4
\|\ \ \ \
\| * \| \| \|	minor fix wrapper tag documentation	Francesco Rodriguez	2012-05-18	1	-1/+1
\| * \| \| \|	Minor fix to the wrapper tag documentation, the options hash is the last one,...	Avi Tzurel	2012-05-19	1	-1/+1
\| * \| \| \|	Added wrapper tag documentation to the simple_format method	Avi Tzurel	2012-05-19	1	-1/+4
* \| \| \| \|	Clarify grouped_options_for_select method API, add changelog entry	Carlos Antonio da Silva	2012-05-19	1	-14/+13
* \| \| \| \|	Improve `rake routes` output for redirects - closes #6369.	Andrew White	2012-05-19	1	-12/+22
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #6384 from ihid/tidy_text_helpers	Jeremy Kemper	2012-05-18	1	-14/+20
\|\ \ \ \
\| * \| \| \|	Tidied and standardised text_helper implementations.	Jeremy Walker	2012-05-19	1	-14/+20
* \| \| \| \|	Fix inspecting route redirections, closes #6369	Łukasz Strzałkowski	2012-05-18	1	-0/+4
* \| \| \| \|	reverting decoupling of NumberHelper from safe_join and adding tests for esca...	Andrew Mutz	2012-05-18	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #6372 from richo/bugs/middleware_stack_as_array	José Valim	2012-05-17	1	-0/+5
\|\ \ \ \