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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use relative path to sqlite3 db in `rails db` command	Alexey Vakhov	2012-05-22	2	-7/+12
*	Merge pull request #6420 from chancancode/master_restore_frozen_state_on_roll...	Piotr Sarnacki	2012-05-21	2	-1/+13
\|\
\| *	Restore the frozen state on rollback. Fixes #6417.	Godfrey Chan	2012-05-21	2	-1/+13
* \|	Merge pull request #5125 from winston/log_exception_when_cache_read_fails	Michael Koziarski	2012-05-21	2	-1/+11
\|\ \
\| * \|	#read_entry in ActiveSupport::Cache::FileStore should log details of the exce...	Winston	2012-02-22	2	-1/+11
* \| \|	using __method__ for the command method calls	Aaron Patterson	2012-05-21	2	-5/+64
* \| \|	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
* \| \|	Remove not used variables from connection poll test	Carlos Antonio da Silva	2012-05-21	1	-2/+2
* \| \|	Refactor aggregation writer method	Carlos Antonio da Silva	2012-05-21	2	-5/+3
* \| \|	Merge pull request #5156 from avakhov/class-attribute-instance-accessor	Carlos Antonio da Silva	2012-05-21	4	-4/+14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add instance_accessor option to class_attribute	Alexey Vakhov	2012-05-22	4	-4/+14
\|/ /
* \|	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
* \| \| \|	Merge pull request #6416 from pmahoney/threadsafe-connection-pool	Aaron Patterson	2012-05-21	3	-35/+202
\|\ \ \ \
\| * \| \| \|	Make connection pool fair with respect to waiting threads.	Patrick Mahoney	2012-05-20	3	-35/+202
* \| \| \| \|	Merge pull request #6143 from senny/composed_of_converter_returns_nil	Aaron Patterson	2012-05-21	3	-7/+31
\|\ \ \ \ \
\| * \| \| \| \|	allow the :converter Proc form composed_of to return nil	Yves Senn	2012-05-03	3	-7/+31
* \| \| \| \| \|	Merge pull request #6424 from avakarev/refactoring_unless-else	Jeremy Kemper	2012-05-21	1	-9/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Refactoring: turn unless/else into if/else	Andrey Vakarev	2012-05-21	1	-9/+9
\|/ / / / / /
* \| / / / /	More info on commit messages in contributing guide	Piotr Sarnacki	2012-05-21	1	-1/+31
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Fix generators to help with ambiguous `ApplicationController` issue	Piotr Sarnacki	2012-05-20	4	-5/+24
* \| \| \| \|	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	2	-3/+7
* \| \| \| \|	Merge pull request #6408 from ivankukobko/master	Carlos Antonio da Silva	2012-05-20	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	fixed typo in word finiding	Ivan Kukobko	2012-05-20	1	-1/+1
\|/ / / / /
* \| \| \| \|	Revert "Merge pull request #5702 from oscardelben/patch-4"	Piotr Sarnacki	2012-05-20	1	-1/+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
* \| \| \| \|	Merge pull request #6399 from dchelimsky/issue-5899	José Valim	2012-05-20	4	-18/+27
\|\ \ \ \ \
\| * \| \| \| \|	Raise Assertion instead of RoutingError for routing assertion failures.	David Chelimsky	2012-05-20	4	-18/+27
\|/ / / / /
* \| \| \| \|	Merge pull request #6050 from route/wrapped_keys_in_log	José Valim	2012-05-20	2	-1/+10
\|\ \ \ \ \
\| * \| \| \| \|	Show in log correct wrapped keys	Dmitry Vorotilin	2012-05-20	2	-1/+10
* \| \| \| \| \|	Improve docs for `try` by adding note on `BasicObject`	Piotr Sarnacki	2012-05-20	1	-0/+4
* \| \| \| \| \|	Merge pull request #5702 from oscardelben/patch-4	Piotr Sarnacki	2012-05-19	1	-3/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Call undefine_attribute_methods only when defining new attributes	Oscar Del Ben	2012-05-18	1	-3/+1
* \| \| \| \| \|	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
* \| \| \| \| \| \|	Merge pull request #6397 from kennyj/fix_translate_exception	Aaron Patterson	2012-05-19	1	-3/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix a problem of translate_exception method in Japanese.	kennyj	2012-05-20	1	-3/+7
* \| \| \| \| \| \| \|	Merge pull request #6398 from pmahoney/threadsafe-connection-pool	Aaron Patterson	2012-05-19	1	-4/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Synchronize read and modification of @reserved_connections hash to avoid conc...	Patrick Mahoney	2012-05-19	1	-4/+8
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6396 from kennyj/dont_use_assert_block	Rafael Mendonça França	2012-05-19	2	-2/+2
\|\ \ \ \ \ \ \