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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6075 from arunagw/warning_removed_unused_variable	Jeremy Kemper	2012-04-29	1	-1/+0
\|\
\| *	railties variable is not required here.	Arun Agrawal	2012-04-30	1	-1/+0
* \|	Merge pull request #6071 from marcandre/observer_redef	Jeremy Kemper	2012-04-29	2	-3/+14
\|\ \ \| \|/ \|/\|
\| *	Fix Observer by acting on singleton class [#3505]	Marc-Andre Lafortune	2012-04-29	2	-3/+14
* \|	Merge pull request #5942 from bcardarella/confirmation_error_message_on_confi...	Aaron Patterson	2012-04-29	7	-11/+38
\|\ \
\| * \|	Support i18n attributes for confirmation	Brian Cardarella	2012-04-24	3	-3/+23
\| * \|	Reordered changelog entry	Brian Cardarella	2012-04-23	1	-2/+2
\| * \|	Updated CHANGELOG	Brian Cardarella	2012-04-23	1	-0/+2
\| * \|	confirmation validation error attribute	Brian Cardarella	2012-04-23	6	-11/+16
* \| \|	Merge pull request #6067 from Locke23rus/patch-2	Aaron Patterson	2012-04-29	1	-1/+1
\|\ \ \
\| * \| \|	Fix typo	Kirill Nikitin	2012-04-30	1	-1/+1
* \| \| \|	Merge pull request #5999 from bogdan/callbacks	Jeremy Kemper	2012-04-29	1	-7/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	AS::Callbacks optimized to reduce call backtrace	Bogdan Gusiev	2012-04-27	1	-7/+7
* \| \| \|	Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactor	Santiago Pastorino	2012-04-29	4	-8/+4
\|\ \ \ \
\| * \| \| \|	Refactor RoutesReloader a bit to avoid creating extra hash objects	Carlos Antonio da Silva	2012-04-28	1	-3/+2
\| * \| \| \|	Remove Declarative module extending, it is already part of AS::TestCase	Carlos Antonio da Silva	2012-04-28	1	-2/+0
\| * \| \| \|	Define only writer method for queue, as reader is declared	Carlos Antonio da Silva	2012-04-28	2	-3/+2
* \| \| \| \|	Restore interpolation of path option in redirect routes	Andrew White	2012-04-29	2	-1/+42
* \| \| \| \|	Merge pull request #6062 from marcandre/tweak_observer	Aaron Patterson	2012-04-29	2	-5/+21
\|\ \ \ \ \
\| * \| \| \| \|	Generate appropriate error more judiciously	Marc-Andre Lafortune	2012-04-29	2	-2/+18
\| * \| \| \| \|	Fix error message:	Marc-Andre Lafortune	2012-04-28	1	-3/+3
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #6065 from Locke23rus/patch-1	Xavier Noria	2012-04-29	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove repeated word	Kirill Nikitin	2012-04-30	1	-1/+1
\|/ / / / /
* \| \| \| \|	Escape interpolated params when redirecting - fixes #5688	Andrew White	2012-04-29	2	-1/+36
* \| \| \| \|	Merge pull request #6061 from twinturbo/scaffold-markup	Piotr Sarnacki	2012-04-29	1	-16/+20
\|\ \ \ \ \
\| * \| \| \| \|	Close #3886 - Add THEAD and TBODY to scaffold markup	twinturbo	2012-04-29	1	-16/+20
\|/ / / / /
* \| \| \| \|	Add failing test case for #6053	Andrew White	2012-04-29	1	-0/+21
* \| \| \| \|	Fix controller_class_name for anonymous controllers.	Michael Schuerig	2012-04-29	1	-1/+1
* \| \| \| \|	Merge pull request #6059 from rafaelfranca/check_box_inverted	José Valim	2012-04-29	2	-6/+100
\|\ \ \ \ \
\| * \| \| \| \|	Change check_box to work inverting the checked and unchecked value	Rafael Mendonça França	2012-04-29	2	-6/+100
* \| \| \| \| \|	Merge pull request #6006 from carlosantoniodasilva/partial-layout-collection-...	José Valim	2012-04-29	6	-16/+49
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add changelog entry and some docs for collection + layout	Carlos Antonio da Silva	2012-04-29	3	-3/+20
\| * \| \| \| \| \|	Move layout logic with collection to be handled only with explicit template i...	Carlos Antonio da Silva	2012-04-29	1	-15/+8
\| * \| \| \| \| \|	Allow access to current object_counter variable from layout when rendering wi...	Carlos Antonio da Silva	2012-04-29	3	-5/+14
\| * \| \| \| \| \|	Allow layout to access current object being rendered when using render partia...	Carlos Antonio da Silva	2012-04-29	2	-1/+5
\| * \| \| \| \| \|	Allow layout rendering to access current object being rendered when using par...	Carlos Antonio da Silva	2012-04-29	3	-8/+18
* \| \| \| \| \| \|	Merge pull request #6017 from larzconwell/remove_sanitize_dom_id	Jeremy Kemper	2012-04-29	1	-6/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Removed the sanitize_dom_id method because HTML5 doctype let's us use anythin...	Larz Conwell	2012-04-27	1	-6/+1
* \| \| \| \| \| \| \|	Merge pull request #6057 from jeremyf/remove-deprecation-warning-due-to-reload	José Valim	2012-04-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Removed extraneous .present? check for AR::Base#reload	Jeremy Friesen	2012-04-29	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #6056 from jeremyf/remove-deprecation-warning-due-to-reload	José Valim	2012-04-29	1	-1/+7
\|\\| \| \| \| \| \| \| \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Removed deprecation warning for #find as a result of AR::Base#reload	Jeremy Friesen	2012-04-29	1	-1/+7
* \| \| \| \| \| \|	Merge pull request #6047 from carlosantoniodasilva/changelog-jsonp-mimetype	José Valim	2012-04-29	2	-1/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog entry for jsonp mimetype change, fix failing test	Carlos Antonio da Silva	2012-04-29	2	-1/+3
\|/ / / / / /
* \| \| \| \| \|	Removed unclear doc in AR querying guide [ci skip]	Vijay Dev	2012-04-29	1	-16/+0
* \| \| \| \| \|	Merge pull request #6044 from gazay/tests_for_string_truncate_w_regexp_separator	José Valim	2012-04-29	2	-1/+10
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Tests for regexp separator in String#truncate	Alexey Gaziev	2012-04-29	2	-1/+10
* \| \| \| \| \| \|	Don't convert params if the request isn't HTML - fixes #5341	Andrew White	2012-04-29	2	-8/+58
* \| \| \| \| \| \|	Merge pull request #5986 from carlosantoniodasilva/deprecation-behavior-silence	José Valim	2012-04-29	3	-2/+32
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add test for default silence and stderr deprecation behaviors	Carlos Antonio da Silva	2012-04-28	1	-0/+20