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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6359 from carlosgaldino/add-html5-inputs	Jeremy Kemper	2012-05-22	12	-0/+434
\|\
\| *	Add several HTML5 input helpers	Carlos Galdino	2012-05-21	10	-0/+368
\| *	Add HTML5 input[type="color"] helper	Carlos Galdino	2012-05-21	8	-0/+66
* \|	Fixed typo new_defautls -> new_defaults.	Philip Arndt	2012-05-23	2	-5/+15
* \|	Merge pull request #6429 from marcandre/fix_test_request	Carlos Antonio da Silva	2012-05-21	2	-1/+8
\|\ \
\| * \|	Fix bug when Rails.application is defined but is nil. See #881	Marc-Andre Lafortune	2012-05-21	2	-1/+8
* \| \|	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	2	-72/+23
* \|	Merge pull request #6425 from pinetops/resolver_concurrency_fix	Aaron Patterson	2012-05-21	2	-23/+72
\|\ \ \| \|/ \|/\|
\| *	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	2	-23/+54
* \|	Merge pull request #2549 from trek/RoutingErrorForMissingControllers	Aaron Patterson	2012-05-21	2	-3/+17
\|\ \
\| * \|	When a route references a missing controller, raise ActionController::Routing...	Trek Glowacki	2011-08-16	2	-3/+17
* \| \|	Refactoring: turn unless/else into if/else	Andrey Vakarev	2012-05-21	1	-9/+9
* \| \|	Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c	José Valim	2012-05-20	1	-10/+22
* \| \|	Fix CHANGELOG order and add a brief description of the changes in the	Rafael Mendonça França	2012-05-20	1	-3/+3
* \| \|	Escape the extension when normalizing the action cache path.	Andrew White	2012-05-20	2	-3/+33
* \| \|	Return 400 Bad Request for URL paths with invalid encoding.	Andrew White	2012-05-20	4	-0/+51
* \| \|	Raise ActionController::BadRequest for malformed parameter hashes.	Andrew White	2012-05-20	8	-6/+47
* \| \|	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	4	-18/+27
* \| \|	Show in log correct wrapped keys	Dmitry Vorotilin	2012-05-20	2	-1/+10
* \| \|	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
* \| \| \|	Don't use assert_block method. It will be deprecated.	kennyj	2012-05-20	1	-1/+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	3	-16/+19
* \| \| \| \|	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	2	-14/+62
\|\ \ \ \
\| * \| \| \|	Tidied and standardised text_helper implementations.	Jeremy Walker	2012-05-19	2	-14/+62
* \| \| \| \|	Fix inspecting route redirections, closes #6369	Łukasz Strzałkowski	2012-05-18	1	-0/+4
* \| \| \| \|	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	2	-1/+3
\|/ / / /
* \| \| \|	Merge pull request #6372 from richo/bugs/middleware_stack_as_array	José Valim	2012-05-17	2	-2/+12
\|\ \ \ \
\| * \| \| \|	Add the #unshift method to the middleware stack	Rich Healey	2012-05-18	2	-2/+12
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #5020 from KL-7/fix-blank-image_tag-source	José Valim	2012-05-17	2	-2/+3
\|\ \ \ \
\| * \| \| \|	Render img tag with empty src if empty string is passed to image_tag.	Kirill Lashuk	2012-05-18	2	-2/+3
\| \|/ / /
* / / /	Add HTML5 input[type="time"] helper	Alex Soulim	2012-05-18	7	-0/+76
\|/ / /
* \| \|	Removed old text_helper apis for highlight, excerpt and word_wrap	Jeremy Walker	2012-05-17	3	-69/+27
* \| \|	Fix incorrect assert_block -> assert conversion. Assumed too much from the Mi...	Jeremy Kemper	2012-05-17	1	-2/+2
* \| \|	Merge pull request #2036 from Bodacious/tag_helper_data_fix	Rafael Mendonça França	2012-05-17	2	-4/+5
\|\ \ \
\| * \| \|	Fixed tag_helper data-attribute bug with BigDecimals	Bodacious	2012-05-17	2	-4/+5
\| \|/ /
* \| \|	MiniTest deprecated #assert_block in favor of calling #assert with a block	Jeremy Kemper	2012-05-17	1	-1/+1
* \| \|	Update actionpack/CHANGELOG.md	José Valim	2012-05-17	1	-0/+3
* \| \|	Merge pull request #6309 from steveklabnik/fix-2394	José Valim	2012-05-17	9	-6/+36
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Created a Raw handler for templates.	Steve Klabnik	2012-05-17	9	-6/+36