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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3884 from sikachu/master-fix_layout	José Valim	2011-12-07	3	-2/+66
\|\ \| \| \| \|	Allow layout fallback when using `layout` method
\| *	Allow layout fallback when using `layout` method	Prem Sichanugrist	2011-12-06	1	-1/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. For example, consider this snippet: class CarsController layout 'single_car', :only => :show end Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
\| *	Fix bug in assert_template when using only `:layout` option	Prem Sichanugrist	2011-12-06	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently if you're do this: assert_template :layout => "foo" Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f]. We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative.
* \|	Use default charset when we read content type without charset.	kennyj	2011-12-07	1	-0/+11
\|/
*	Merge pull request #3428 from adrianpike/asset_path_conflicts	Santiago Pastorino	2011-12-06	1	-0/+57
\|\ \| \| \| \|	Issue #3427 - asset_path_conflicts
\| *	Let's do the same trick for asset_path that we do for ↵	Adrian Pike	2011-12-05	1	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \|	[image,javascript,stylesheet]_path to avoid namespace conflicts on named routes. Closes #3427
* \|	Allowing string as url argument for expire_action	Thomas von Deyen	2011-12-06	1	-0/+20
\|/
*	Merge pull request #3861 from andyjeffries/master	José Valim	2011-12-05	1	-2/+2
\|\ \| \| \| \|	Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)
\| *	Named Routes shouldn't override existing ones (currently route recognition ↵	Andy Jeffries	2011-12-05	1	-2/+2
\| \| \| \| \| \| \| \|	goes with the earliest match, named routes use the latest match)
* \|	use classify in ParamsWrapper to derive model name from controller name	lest	2011-12-05	1	-0/+35
\|/
*	Fix for redirect_to to respect urls with a network path reference like ↵	Overbryd	2011-12-05	1	-0/+10
\| \| \| \|	"//asset.host.com/resources/1235" see issue #3856
*	form_for with +:as+ option uses "action_as" as css class and id	Vasiliy Ermolovich	2011-12-04	1	-11/+11
\|
*	Fix failing cascade exception.	José Valim	2011-12-03	1	-0/+9
\|
*	Merge branch 'exceptions' with the following features:	José Valim	2011-12-01	4	-90/+144
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example) * Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions Conflicts: actionpack/CHANGELOG.md
\| *	Remove unnecessary test setup.	José Valim	2011-12-01	1	-6/+1
\| \|
\| *	Split and improve show and debug exceptions middlewares.	José Valim	2011-12-01	2	-76/+130
\| \|
\| *	Split ShowExceptions responsibilities in two middlewares.	José Valim	2011-12-01	3	-11/+16
\| \|
* \|	Revert "Added ActiveRecord::Base#last_modified to work with the new ↵	David Heinemeier Hansson	2011-12-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fresh_when/stale? conditional get methods from Action Pack" Needless indirection with no added value. This reverts commit 535853e83b9092078035a5abb2aa242fba815c05.
* \|	Added ActiveRecord::Base#last_modified to work with the new ↵	David Heinemeier Hansson	2011-12-01	1	-2/+2
\| \| \| \| \| \| \| \|	fresh_when/stale? conditional get methods from Action Pack
* \|	Allow fresh_when/stale? to take a record instead of an options hash [DHH]	David Heinemeier Hansson	2011-12-01	1	-0/+46
\|/
*	fix method redefined warnings in tests	lest	2011-11-30	3	-12/+5
\|
*	fix warning in tests when using render_erb helper	lest	2011-11-30	1	-0/+2
\|
*	test helpers in erb using erb	lest	2011-11-30	6	-17/+31
\|
*	Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵	José Valim	2011-11-30	1	-1/+12
\| \| \| \|	a before callback halts.
*	Deprecate set_sequence_name in favour of self.sequence_name=	Jon Leighton	2011-11-29	1	-2/+2
\|
*	Deprecate set_table_name in favour of self.table_name= or defining your own ↵	Jon Leighton	2011-11-29	2	-9/+9
\| \| \| \|	method.
*	Handle correctly optional parameters for callable asset_host.	Marc-Andre Lafortune	2011-11-29	1	-0/+8
\|
*	put backtrace_cleaner to env	lest	2011-11-28	1	-0/+7
\|
*	add namespace options to form_for	Vasiliy Ermolovich	2011-11-27	1	-0/+76
\| \| \| \| \|	You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id
*	fix label with block in erb	lest	2011-11-27	2	-0/+11
\|
*	Revert the serializers API as other alternatives are now also under discussion	José Valim	2011-11-25	1	-48/+0
\|
*	Merge pull request #3747 from lest/middleware-logger	José Valim	2011-11-25	4	-22/+21
\|\ \| \| \| \|	middlewares should have configurable logger
\| *	middlewares should use logger from env	lest	2011-11-25	4	-22/+21
\| \|
* \|	Merge branch 'serializers'	José Valim	2011-11-25	1	-0/+48
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md
\| *	Rely solely on active_model_serializer and remove the fancy constant lookup.	José Valim	2011-11-23	1	-1/+15
\| \|
\| *	Merge branch 'master' into serializers	José Valim	2011-11-23	22	-120/+537
\| \|\
\| * \|	Initial commit of serializer support	Jose and Yehuda	2011-10-15	1	-0/+34
\| \| \|
* \| \|	configuration option to always write cookie	lest	2011-11-23	1	-2/+2
\| \| \|
* \| \|	Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test	Yehuda Katz	2011-11-23	1	-3/+3
\|\ \ \ \| \|_\|/ \|/\| \|	Warnings removed. (ambiguous first argument)
\| * \|	Warnings removed. (ambiguous first argument)	kennyj	2011-11-24	1	-3/+3
\| \| \|
* \| \|	Rely on a public contract between railties instead of accessing railtie ↵	José Valim	2011-11-23	3	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \|	methods directly.
* \| \|	Remove unreachable code, and add additional testcases.	kennyj	2011-11-24	2	-0/+24
\|/ /
* \|	Merge pull request #3718 from lest/fix-javascript-include-tag	José Valim	2011-11-22	1	-0/+3
\|\ \ \| \| \| \| \| \|	javascript_include_tag should add '.js' to sources that contain '.'
\| * \|	javascript_include_tag should add '.js' to sources that contain '.'	lest	2011-11-22	1	-0/+3
\| \| \|
* \| \|	move show_detailed_exceptions? to Rescue module	lest	2011-11-22	1	-2/+2
\| \| \|
* \| \|	refactor show exceptions tests	lest	2011-11-22	2	-42/+78
\| \| \|
* \| \|	add ActionController::Metal#show_detailed_exceptions?	lest	2011-11-22	1	-19/+26
\|/ /
* \|	Merge pull request #3695 from tobiassvn/partial_path_error	Yehuda Katz	2011-11-19	1	-0/+7
\|\ \ \| \| \| \| \| \|	Meaningful errors for unexpected partial arguments. Fixes #3573
\| * \|	Meaningful errors for unexpected partial arguments. Fixes #3573	Tobias Svensson	2011-11-19	1	-0/+7
\| \| \|
* \| \|	Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.	Jon Leighton	2011-11-19	1	-1/+11
\|/ /