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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Merge pull request #7203 from frodsan/typo_live	Rafael Mendonça França	2012-07-30	1	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|	fix typo in metal/live [ci skip]
\| * \| \| \| \| \| \| \| \|	fix typo in metal/live [ci skip]	Francesco Rodriguez	2012-07-30	1	-6/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Remove the deprecation of update_column.	Rafael Mendonça França	2012-07-30	3	-48/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update_column was suggested as replacement of update_attribute at the last release of 3-2-stable, so deprecating it now will confuse the users.
* \| \| \| \| \| \| \| \|	Revert "DRY class_attribute code"	José Valim	2012-07-30	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	class_attribute is a building block and using define_method can be much slower for such basic method definitions. This reverts commit d59208d7032e2be855a89ad8d4685cc08dd7cdb3.
* \| \| \| \| \| \| \| \|	Merge pull request #7198 from cfcosta/refactor-cache_control_headers	Rafael Mendonça França	2012-07-29	1	-11/+19
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor ActionDispatch::Http::Cache::Response#cache_control_headers
\| * \| \| \| \| \| \| \| \|	Refactor ActionDispatch::Http::Cache::Response#cache_control_headers.	Cainã Costa	2012-07-30	1	-11/+19
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	updated changelog	Aaron Patterson	2012-07-29	1	-0/+16
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	close the response when the response body is set so that normal render calls ↵	Aaron Patterson	2012-07-29	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	will work
* \| \| \| \| \| \| \| \| \|	header hash is duped before being sent up the rack stack	Aaron Patterson	2012-07-29	3	-12/+33
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	freeze the header object	Aaron Patterson	2012-07-29	2	-0/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	make sure set_response! sets the correct response object	Aaron Patterson	2012-07-29	2	-0/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	adding a more docs on closing response streams	Aaron Patterson	2012-07-29	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	pushing Buffer up to Live	Aaron Patterson	2012-07-29	1	-22/+22
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	adding some docs	Aaron Patterson	2012-07-29	1	-1/+26
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Controller actions are processed in a separate thread for live	Aaron Patterson	2012-07-29	3	-7/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	responses. Processing controller actions in a separate thread allows us to work around the rack api - we can allow the user to set status and headers, then block until the first bytes are written. As soon as the first bytes are written, the main thread can return the status, headers, and (essentially) a queue for the body.
* \| \| \| \| \| \| \| \| \|	raise exceptions on header set after response committed	Aaron Patterson	2012-07-29	3	-0/+43
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	make sure appropriate headers are set and deleted	Aaron Patterson	2012-07-29	1	-0/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	added live responses which can be written and read in separate threads	Aaron Patterson	2012-07-29	5	-0/+130
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	ActionController::DataStreaming::FileBody doesn't respond to #close.	Rafael Mendonça França	2012-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	flushing output should write to the stream rather than mutating the response ↵	Aaron Patterson	2012-07-29	3	-12/+16
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object
* \| \| \| \| \| \| \|	remove dead test	Aaron Patterson	2012-07-29	1	-4/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	adding a buffered stream to the response object	Aaron Patterson	2012-07-29	4	-3/+93
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	initialize ivars, refactor recycle! to call initialize	Aaron Patterson	2012-07-29	2	-9/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove warning renaming the test classes to use the test convention	Rafael Mendonça França	2012-07-29	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove deprecation warning, since scoped waas deprecated	Rafael Mendonça França	2012-07-29	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #7196 from ↵	Aaron Patterson	2012-07-29	1	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rimidl/fix-incorrect-require-mysql-in-mysql_rake_test Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test
\| * \| \| \| \| \| \|	fix incorrect usage `require mysql` in the ↵	Vladimir Strakhov	2012-07-29	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activerecord/test/.../mysql_rake_test.rb
* \| \| \| \| \| \| \|	Merge pull request #7188 from rodrigoflores/master	Carlos Antonio da Silva	2012-07-29	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation Fix: Pointing the case when no dependent option is given to a association method
\| * \| \| \| \| \| \| \|	Explaining a bit better about the default behaviour of dependent	Rodrigo Flores	2012-07-28	1	-1/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7192 from bogdan/sqlite_tests_fix	Carlos Antonio da Silva	2012-07-29	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More polite cleanup for sqlite tests
\| * \| \| \| \| \| \| \| \|	More polite cleanup for sqlite tests	Bogdan Gusiev	2012-07-29	1	-4/+4
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7194 from alexandrz/master	Carlos Antonio da Silva	2012-07-29	1	-6/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	DRY class_attribute
\| * \| \| \| \| \| \| \|	DRY class_attribute code	Aleksandr Zykov	2012-07-29	1	-6/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	issue a warning when we cannot construct a controller	Aaron Patterson	2012-07-28	1	-2/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	this test is not a controller test, so switch to AS::TC	Aaron Patterson	2012-07-28	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	removes the AR session store from eager loaded code [fixes #7160]	Xavier Noria	2012-07-29	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale.
* \| \| \| \| \| \|	Merge pull request #7186 from rimidl/fix-failure-test-in-actionpack	Rafael Mendonça França	2012-07-28	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix test_can_wait_until_commit(ResponseTest) in /actionpack/test/dispatch/response_test.rb
\| * \| \| \| \| \| \|	fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpack	Vladimir Strakhov	2012-07-28	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7185 from route/reset_table_name_refactoring	Rafael Mendonça França	2012-07-28	1	-8/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Refactor to reset_table_name
\| * \| \| \| \| \| \|	Refactor to reset_table_name	Dmitry Vorotilin	2012-07-28	1	-8/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	missing require: the AR session store depends on the AP abstract store	Xavier Noria	2012-07-28	1	-0/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This require makes the dependency even more clear. In particular we are eager loading the session store but that does not work if AR is used outside Rails, this patch is preliminary work in fixing #7160.
* \| \| \| \| \| \|	adds a missing require from Active Support	Xavier Noria	2012-07-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This file uses mattr_accessor.
* \| \| \| \| \| \|	threads can wait on responses to be committed	Aaron Patterson	2012-07-27	3	-1/+34
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Removing composed_of from ActiveRecord."	Rafael Mendonça França	2012-07-27	19	-32/+790
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 14fc8b34521f8354a17e50cd11fa3f809e423592. Reason: we need to discuss a better path from this removal. Conflicts: activerecord/lib/active_record/reflection.rb activerecord/test/cases/base_test.rb activerecord/test/models/developer.rb
* \| \| \| \| \| \|	Merge pull request #7182 from yahonda/address_7178	Rafael Mendonça França	2012-07-27	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modity the :json_data_empty attribute from `:null => false` to `:null => true`
\| * \| \| \| \| \| \|	Modity the :json_data_empty attribute from `:null => false` to `:null => true`	Yasuo Honda	2012-07-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to address ORA-01400 errors with Oracle enhanced adapter. The original commit 3c0bf043 requires :json_data_empty attribute has empty string OR null, then setting `:default => ""` is enough.
* \| \| \| \| \| \| \|	Merge pull request #7181 from jfirebaugh/rbx	Rafael Mendonça França	2012-07-27	1	-5/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Don't test language-level exception messages
\| * \| \| \| \| \| \|	Don't test language-level exception messages	John Firebaugh	2012-07-27	1	-5/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby implementations should be free to produce exception messages that are not identical to MRI. For example, Rubinius produces 'Expected an even number, got 5'.
* \| \| \| \| \| \|	Merge pull request #6827 from zephyr-dev/master	José Valim	2012-07-27	5	-0/+118
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validates_presence_of associated object marked for destruction
\| * \| \| \| \| \| \|	AR has a subclass of AM:PresenceValidator.	Brent Wheeldon & Nick Monje	2012-07-20	5	-0/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to mark the parent object as invalid if all associated objects in a presence validated association are marked for destruction. See: https://github.com/rails/rails/issues/6812