Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Debugging Rails Applications guide updated. | miloops | 2008-09-05 | 1 | -17/+155 |
| | |||||
* | Add HTML generation task for the routing guide. | Hongli Lai (Phusion) | 2008-09-05 | 1 | -5/+17 |
| | |||||
* | Merge branch 'master' of git@github.com:lifo/docrails | Hongli Lai (Phusion) | 2008-09-05 | 3 | -21/+297 |
|\ | |||||
| * | Edits to the "Routing from the Outside In" guide. | Mike Gunderloy | 2008-09-05 | 1 | -15/+71 |
| | | | | | | | | Cleaned up a few parts, reworded coverage of classic vs. RESTful routing, added coverage of routing assertions. | ||||
| * | More work on Rails debugging guide. | miloops | 2008-09-04 | 1 | -14/+50 |
| | | |||||
| * | Merge branch 'master' of git@github.com:lifo/docrails | miloops | 2008-09-04 | 1 | -6/+6 |
| |\ | |||||
| | * | Merge branch 'master' of git://github.com/lifo/docrails | Alan Harper | 2008-09-05 | 1 | -0/+53 |
| | |\ | |||||
| | * | | Changed variable names for in_groups_of to make more obvious | Alan Harper | 2008-09-04 | 1 | -6/+6 |
| | | | | |||||
| * | | | Added prompt, context and references to debugging Rails guide. | miloops | 2008-09-04 | 1 | -0/+131 |
| | |/ | |/| | |||||
| * | | Merge branch 'master' of git@github.com:lifo/docrails | miloops | 2008-09-04 | 0 | -0/+0 |
| |\| | |||||
| * | | Initial commit of the Rails debugging guide. | miloops | 2008-09-04 | 1 | -0/+53 |
| | | | |||||
* | | | Merge branch 'master' of git@github.com:lifo/docrails | Hongli Lai (Phusion) | 2008-09-04 | 269 | -4583/+7625 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-03 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge docrails | Pratik Naik | 2008-09-03 | 23 | -199/+312 |
| | | | |||||
| * | | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-03 | 131 | -2200/+3101 |
| |\| | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/resources.rb | ||||
| | * | Add each_with_object from 1.9 for a more convenient alternative to inject. | Adam Keys | 2008-09-03 | 2 | -1/+26 |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#962 state:committed] | ||||
| | * | Inline help text was incorrectly telling user to uncomment line to use ↵ | Nigel Ramsay | 2008-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | default local time. User should comment the line to use default local time. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#960 state:committed] | ||||
| | * | Whitespace. | Clemens Kofler | 2008-09-03 | 1 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Some performance goodness for inheritable attributes. | Clemens Kofler | 2008-09-03 | 4 | -17/+17 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Some performance goodness for AR. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Some performance goodness for AM Validations. | Clemens Kofler | 2008-09-03 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Some performance goodness for AM StateMatchine. | Clemens Kofler | 2008-09-03 | 1 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Some performance goodness for routing. | Clemens Kofler | 2008-09-03 | 1 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Some performance goodness for AR associations. | Clemens Kofler | 2008-09-03 | 1 | -32/+32 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | More symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 5 | -9/+9 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | More symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Use symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 1 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Removed unnecessary Symbol#to_proc from Asset Tag Helper. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Don't set Content-Length on 304 responses | Jonathan del Strother | 2008-09-02 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it. [#958 state:resolved] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Database connections are now pooled, one pool per #establish_connection call. | Jeremy Kemper | 2008-09-02 | 85 | -708/+1175 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pools start out empty and grow as necessary to a maximum size (default is 5, configure size with key 'pool' in your database configuration). If no connections are available, a thread will wait up to a 'wait_timeout' time (default is 5 seconds). Connections are verified and reset when checked out from the pool (usually upon first access to ActiveRecord::Base.connection), and returned back to the pool after each request. If you would like to use connection pools outside of ActionPack, there is an ActiveRecord::Base.connection_pool method that gives you access to the pool, and you can manually checkout/checkin connections, or supply a block to ActiveRecord::Base.connection_pool.with_connection which takes care of the checkout/checkin for you. [#936 state:resolved] | ||||
| | | * | Merge rexml-expansion-fix gem into activesupport. | Michael Koziarski | 2008-09-02 | 2 | -0/+56 |
| | | | | | | | | | | | | | | | | | | | | Addresses the security issue documented at: * http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/ | ||||
| | | * | translates when a message symbol has been set on builtin validations | Iain Hecker | 2008-08-31 | 2 | -1/+35 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | | * | Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵ | Jeremy Kemper | 2008-08-31 | 35 | -92/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb | ||||
| | | * | Add layout functionality to mailers. | Pratik Naik | 2008-08-31 | 9 | -3/+115 |
| | | | | | | | | | | | | | | | | | | | | Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up. | ||||
| | | * | Fixes optimised named routes generating question mark followed by nothing ↵ | Luke Melia | 2008-08-31 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when provided an empty hash as the last argument. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#481 state:committed] | ||||
| | | * | Moved layout exemption logic into the view | Joshua Peek | 2008-08-31 | 5 | -121/+63 |
| | | | | |||||
| | | * | Prefix ActionView::Base private methods with an underscore | Joshua Peek | 2008-08-31 | 5 | -12/+13 |
| | | | | |||||
| | | * | Fix AM tests and add tests for rendering logging | Pratik Naik | 2008-08-31 | 3 | -2/+32 |
| | | | | |||||
| | | * | Add lost log messages about template rendering | Pratik Naik | 2008-08-31 | 2 | -1/+3 |
| | | | | |||||
| | | * | Move layout rendering logic to ActionView::Base | Pratik Naik | 2008-08-31 | 4 | -70/+57 |
| | | | | |||||
| | | * | Fix tests that assumed implicit order by id | Jeremy Kemper | 2008-08-30 | 1 | -2/+2 |
| | | | | |||||
| | | * | Move copying ivar logic from ActionController::Base to ActionView::Base | Pratik Naik | 2008-08-31 | 7 | -57/+35 |
| | | | | |||||
| | | * | Use reflection primary_key instead of id for when selecting association ids. | miloops | 2008-08-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#906 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | | * | Allow prototype functions to receive position parameter as a symbol. | miloops | 2008-08-30 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | [#887 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | | * | Remove unused use_full_path argument | Pratik Naik | 2008-08-31 | 1 | -5/+5 |
| | | | | |||||
| | | * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-08-30 | 3 | -2/+15 |
| | | |\ | |||||
| | | | * | Add test to make sure RJS block inside controller is executed in view context | Pratik Naik | 2008-08-30 | 1 | -0/+13 |
| | | | | | |||||
| | | | * | Dont pass controller partial layout option to view | Pratik Naik | 2008-08-30 | 2 | -2/+2 |
| | | | | | |||||
| | | * | | Performance: Better query for ASSOCIATION_ids. Select only ids if the ↵ | miloops | 2008-08-30 | 4 | -17/+73 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | association hasn't been loaded. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | | * | Remove double layout check | Pratik Naik | 2008-08-30 | 1 | -6/+1 |
| | | | |