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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	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
\|/ /
* \|	Refactoring the redirect method for the router api.	Aaron Patterson	2011-11-18	1	-0/+5
\| \|
* \|	remove the :path feature to redirects, since it cannot work	Aaron Patterson	2011-11-18	1	-33/+0
\| \|
* \|	require that all blocks have arity of 2	Aaron Patterson	2011-11-18	1	-1/+1
\| \|
* \|	_html translation should escape interpolated arguments	lest	2011-11-17	1	-0/+6
\| \|
* \|	Fix impractical I18n lookup in nested fields_for	Alexander Uvarov	2011-11-17	1	-0/+46
\| \|
* \|	add test for bug fixed in 4f2bf64	Andre Arko	2011-11-14	1	-0/+5
\| \|
* \|	change tests to expect X-F-F over REMOTE_ADDR	Andre Arko	2011-11-13	1	-2/+2
\| \|
* \|	Merge pull request #3592 from avakhov/av-highlight-regexp	José Valim	2011-11-10	1	-0/+4
\|\ \ \| \| \| \| \| \|	Fix and simplify highlight regexp
\| * \|	Fix and simplify highlight regexp	Alexey Vakhov	2011-11-10	1	-0/+4
\| \| \|
* \| \|	Merge pull request #3581 from amatsuda/metal_response_body_19	José Valim	2011-11-10	1	-0/+6
\|\ \ \ \| \|/ / \|/\| \|	AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
\| * \|	A test case to ensure that AC::Metal#response_body= always wraps the given ↵	Akira Matsuda	2011-11-10	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	value in an Array in both Ruby 1.8 and 1.9 (refs #3581)
* \| \|	Fix trouble using :subdomain in development environment when using ↵	Bradford Folkens	2011-11-08	1	-0/+11
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	numeric addresses. See-also pull request #3561 from 3-1-stable Otherwise the following occurs: TypeError: can't convert nil into String /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
* \|	Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."	Jon Leighton	2011-11-06	1	-11/+0
\| \| \| \| \| \| \| \|	This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521.
* \|	Skip test_default_external_works on the CI for Ruby 1.9.3.	Jon Leighton	2011-11-05	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test is affected by a bug in Ruby 1.9.3p0 and trunk: http://redmine.ruby-lang.org/issues/5564 Given we cannot fix it for ourselves, it is better to skip for now so that we will easily see if further failures are introduced. Jon Leighton is monitoring the bug report and will revert this when a suitable solution is found (either a new Ruby release or a generic workaround). If you are using 1.9.3 in your app and have templates that are not in UTF-8, you should add a workaround early on in the boot process. For example, if your templates are Shift_JIS encoded, then add the following in an initializer: Encoding::Converter.new('Shift_JIS', 'UTF-8')
* \|	add tests for the case where size is explicitly passed to number_field helper	Vijay Dev	2011-11-04	1	-0/+4
\| \|