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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow overriding exception handling in threaded consumer	Carlos Antonio da Silva	2012-05-04	2	-1/+24
\|
*	Allow configuring a different queue consumer	Carlos Antonio da Silva	2012-05-04	4	-9/+44
\| \| \| \| \| \|	Also make sure to not use default queue consumer with custom queue implementation. It is up to the new queue implementation to start / shutdown the consumer.
*	Merge pull request #5650 from sekrett/master	Vijay Dev	2012-05-04	1	-1/+1
\|\ \| \| \| \|	Documentation fix: Change the example for habtm association to use proc according to changelog
\| *	Change the example for habtm association to use proc according to changelog	Alexander Zubkov	2012-03-29	1	-1/+1
\| \|
* \|	actually don't need to expand the aggregates at all	Jon Leighton	2012-05-04	1	-11/+1
\| \|
* \|	#to_sym is unnecessary	Jon Leighton	2012-05-04	1	-3/+3
\| \|
* \|	de-globalise method	Jon Leighton	2012-05-04	3	-9/+6
\| \|
* \|	extract code from AR::Base	Jon Leighton	2012-05-04	3	-35/+31
\| \|
* \|	clean up implementation of dynamic methods. use method compilation etc.	Jon Leighton	2012-05-04	8	-322/+204
\| \|
* \|	Merge pull request #6148 from twinturbo/head-fix	José Valim	2012-05-03	2	-1/+87
\|\ \ \| \| \| \| \| \|	Make ActionController#head pass rack-link
\| * \|	Remove content-length as well	twinturbo	2012-05-03	2	-2/+9
\| \| \|
\| * \|	Make ActionController#head pass rack-link	twinturbo	2012-05-03	2	-1/+80
\| \| \|
* \| \|	Merge pull request #5821 from Deradon/fix-engine-tasks	Piotr Sarnacki	2012-05-03	2	-1/+37
\|\ \ \ \| \| \| \| \| \| \| \|	Provided fix for calling rake tasks within mountable engines
\| * \| \|	Provided fix for calling rake tasks within mountable engines	Patrick Helm	2012-04-12	2	-1/+37
\| \| \| \|
* \| \| \|	Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbed	Aaron Patterson	2012-05-03	2	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix cache (FileStore) clear to keep .gitkeep.
\| * \| \| \|	Cache (FileStore) clear should keep .gitkeep	Marcos Tapajos	2012-01-13	2	-1/+8
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6012 from avakhov/dbconsole-test	Piotr Sarnacki	2012-05-03	2	-22/+162
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cover Rails::DBConsole with tests
\| * \| \| \| \|	Add Rails::DBConsole tests	Alexey Vakhov	2012-05-02	2	-22/+162
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4496 from makeable/master	Aaron Patterson	2012-05-03	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Active Support Cache - race_condition_ttl should be an integer
\| * \| \| \| \| \|	race_condition_ttl should be an integer	Matt Williams	2012-01-17	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6144 from bogdan/routes	José Valim	2012-05-03	1	-2/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RouteSet: optimize routes generation when globbing is used
\| * \| \| \| \| \| \|	RouteSet: optimize routes generation when globbing is used	Bogdan Gusiev	2012-05-03	1	-2/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6135 from alindeman/assert_redirect_to_with_regexp	José Valim	2012-05-03	3	-13/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows assert_redirected_to to accept a regular expression
\| * \| \| \| \| \| \|	Allows assert_redirected_to to accept a regular expression	Andy Lindeman	2012-05-03	3	-13/+26
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #6139 from pwim/extract_options-actionpack	José Valim	2012-05-03	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use extract_options!
\| * \| \| \| \| \| \|	use extract_options!	Paul McMahon	2012-05-03	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6141 from mhfs/mailer_tweeks	José Valim	2012-05-03	2	-14/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor ActionMailer tweaks
\| * \| \| \| \| \| \| \|	No need to force conversion to Symbol since case ensures it's already	Marcelo Silveira	2012-05-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	one.
\| * \| \| \| \| \| \| \|	No need to work around 1.8 warnings anymore.	Marcelo Silveira	2012-05-03	1	-13/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #6137 from FLOChip/cache_documentation	Vijay Dev	2012-05-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	cache_store has an extra option of :null_store.
\| * \| \| \| \| \| \|	cache_store has an extra option of :null_store.	Teng Siong Ong	2012-05-03	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6138 from bogdan/routes	José Valim	2012-05-03	1	-19/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RouteSet: remove some code dups
\| * \| \| \| \| \| \| \|	RouteSet: remove some code dups	Bogdan Gusiev	2012-05-02	1	-19/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6134 from ↵	Jon Leighton	2012-05-03	3	-2/+12
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	carlosantoniodasilva/ar-relation-kernel-private-methods Fix issue with private kernel methods and collection associations
\| * \| \| \| \| \| \| \|	Fix issue with private kernel methods and collection associations. Closes #2508	Carlos Antonio da Silva	2012-05-02	3	-2/+12
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue #2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing.
* \| \| \| \| \| \| \|	Add CHANGELOG entry	Santiago Pastorino	2012-05-02	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6131 from schneems/schneems/routes_backtrace	Santiago Pastorino	2012-05-02	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add backtrace to development routing error page
\| * \| \| \| \| \| \| \|	Add backtrace to development routing error page	schneems	2012-05-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a user gets a routing error due to a view helper such as using user_path without an :id they must go to their logs to see the backtrace. By adding in the trace template, a user can see which line the error occurred on without leaving the browser. When a routing error occurs outside of the view the application trace will be blank and will not confuse developers.
* \| \| \| \| \| \| \| \|	Merge pull request #5153 from mhfs/first_finder_fix	Aaron Patterson	2012-05-02	5	-9/+92
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made `first` finder consistent among database engines by adding a default order
\| * \| \| \| \| \| \| \| \|	Use arel nodes instead of raw sql	Marcelo Silveira	2012-05-02	2	-4/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use Array#first instead of Array#[0]	Marcelo Silveira	2012-05-02	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Adding note about `first` and `take` to the changelog	Marcelo Silveira	2012-05-02	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Introducing `take` as a replacement to the old behavior of `first`	Marcelo Silveira	2012-05-02	3	-3/+52
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Document `last`, check for primary key on default order and use quoted table ↵	Marcelo Silveira	2012-05-02	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and column names
\| * \| \| \| \| \| \| \| \|	Made `first` finder consistent among database engines by adding a	Marcelo Silveira	2012-05-02	2	-2/+24
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default order clause (fixes #5103)
* / / / / / / / /	Reset the request parameters after a constraints check	Andrew White	2012-05-02	3	-0/+25
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510.
* \| \| \| \| \| \| \|	Merge pull request #6125 from ncri/master	José Valim	2012-05-02	2	-3/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding proc evaluation for action caching layout parameter
\| * \| \| \| \| \| \| \|	added proc evaluation for action cache's layout parameter	Nico	2012-05-02	2	-3/+36
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headers	Aaron Patterson	2012-05-02	2	-7/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ActionDispatch::Http::Headers to support fetch
\| * \| \| \| \| \| \| \| \|	Enable ActionDispatch::Http::Headers to support fetch	Mark Turner	2012-05-02	2	-7/+13
\| \|/ / / / / / / /