aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Use symbols for send and respond_to?.Clemens Kofler2008-09-031-6/+6
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Removed unnecessary Symbol#to_proc from Asset Tag Helper.Clemens Kofler2008-09-031-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Don't set Content-Length on 304 responsesJonathan del Strother2008-09-022-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 Kemper2008-09-0285-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 Koziarski2008-09-022-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 validationsIain Hecker2008-08-312-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 Kemper2008-08-3135-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 Naik2008-08-319-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 Melia2008-08-312-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 viewJoshua Peek2008-08-315-121/+63
| |
| * Prefix ActionView::Base private methods with an underscoreJoshua Peek2008-08-315-12/+13
| |
| * Fix AM tests and add tests for rendering loggingPratik Naik2008-08-313-2/+32
| |
| * Add lost log messages about template renderingPratik Naik2008-08-312-1/+3
| |
| * Move layout rendering logic to ActionView::BasePratik Naik2008-08-314-70/+57
| |
| * Fix tests that assumed implicit order by idJeremy Kemper2008-08-301-2/+2
| |
| * Move copying ivar logic from ActionController::Base to ActionView::BasePratik Naik2008-08-317-57/+35
| |
| * Use reflection primary_key instead of id for when selecting association ids.miloops2008-08-301-1/+1
| | | | | | | | | | | | [#906 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Allow prototype functions to receive position parameter as a symbol.miloops2008-08-302-1/+3
| | | | | | | | | | | | [#887 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove unused use_full_path argumentPratik Naik2008-08-311-5/+5
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-303-2/+15
| |\
| | * Add test to make sure RJS block inside controller is executed in view contextPratik Naik2008-08-301-0/+13
| | |
| | * Dont pass controller partial layout option to viewPratik Naik2008-08-302-2/+2
| | |
| * | Performance: Better query for ASSOCIATION_ids. Select only ids if the ↵miloops2008-08-304-17/+73
| |/ | | | | | | | | | | association hasn't been loaded. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove double layout checkPratik Naik2008-08-301-6/+1
| |
| * Add support for shallow nesting of routes. [#838 state:resolved]Pratik Naik2008-08-303-37/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds :shallow option to resource route definition. If true, paths for nested resources which reference a specific member (ie. those with an :id parameter) will not use the parent path prefix or name prefix. Example : map.resources :users, :shallow => true do |user| user.resources :posts end * GET /users/1/posts (maps to PostsController#index action as usual) named route "user_posts" is added as usual. * GET /posts/2 (maps to PostsController#show action as if it were not nested) Additionally, named route "post" is added too.
| * I18n: applied Luca Guidi's patch for better #interpolate performanceSven Fuchs2008-08-301-17/+20
| | | | | | | | | | | | [#943 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Added optional rake doc:app TITLE environment parameterNathaniel Bibler2008-08-291-2/+2
| | | | | | | | | | | | [#939 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Format related patches to support serializing data out in the correct format ↵Rasik Pandey2008-08-299-50/+78
| | | | | | | | | | | | | | with correct http request headers per http method type [#450 state:resolved] Signed-off-by: Tarmo Tänav <tarmo@itech.ee> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make assert_select_rjs code more readable, make use of unused constants and ↵miloops2008-08-292-52/+31
| | | | | | | | | | | | | | | | use more simple Regexps. [#540 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Added button_to_remote helperTarmo Tänav2008-08-293-0/+23
| | | | | | | | | | | | Ticket originally from http://dev.rubyonrails.org/ticket/3641 Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix test to not assume which thread finishes firstJeremy Kemper2008-08-291-1/+2
| |
| * Move some core extension methods into a module under the ↵Hongli Lai (Phusion)2008-08-294-148/+165
| | | | | | | | | | | | | | | | ActiveSupport::CoreExtensions namespace, instead of extending core classes directly. This is more friendly for API reference generators. [#915 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Make NamedScope#size behave identically to AssociationCollection#size. [#933 ↵Tom Stuart2008-08-292-1/+20
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 1.9: methods need to be coerced into stringsJoshua Peek2008-08-291-1/+1
| |
| * ActionMailer should respond_to? to methods handled by method_missing [#700 ↵James Mead2008-08-292-5/+68
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Use a set for the named scope methods not a big regexp.Michael Koziarski2008-08-291-2/+2
| |
* | Minor tweak to retrieve_connection_pool -- recurse instead of loopNick Sieger2008-08-291-6/+4
| |
* | Remove some synchronization that's probably overkill, assuming one doesn't ↵Nick Sieger2008-08-291-10/+1
| | | | | | | | establish connections frequently
* | Remove call to active_record.allow_concurrency since it's deprecatedNick Sieger2008-08-291-1/+0
| |
* | Collapse connection pool class hierarchy; YAGNI.Nick Sieger2008-08-292-112/+51
| | | | | | | | | | - Add connection checkin and checkout callbacks to adapter to allow adapter-specific customization of behavior (e.g., JRuby w/ JNDI)
* | Make clear_active_connections! also return stale connections back to the poolNick Sieger2008-08-296-129/+112
| | | | | | | | - also clean up some cruft remaining from per-thread connection cache
* | Remove CachedConnectionPerThread per-thread pooling mechanism in favor of a ↵Nick Sieger2008-08-296-18/+17
| | | | | | | | fixed pool with default maximum of 5 connections
* | Deprecate allow_concurrency and make it have no effectNick Sieger2008-08-298-114/+27
| |
* | Add connection reset and verification upon each connection checkoutNick Sieger2008-08-293-4/+27
| |
* | Fix typo: was using brackets instead of parens. Must need more sleep.Nick Sieger2008-08-292-1/+11
| |
* | Favor existing connections over new ones if availableNick Sieger2008-08-291-3/+3
| |
* | More doco and class/method renames. Now have a strategy for integration with ↵Nick Sieger2008-08-291-24/+39
| | | | | | | | ActionPack.
* | Fix checkin method, add a couple more testsNick Sieger2008-08-292-5/+35
| |
* | Nearing the finish line. Initial fixed-size connection pool implemented, ↵Nick Sieger2008-08-294-33/+157
| | | | | | | | more docs
* | Clean up the code, get rid of reserve/release, add some more docsNick Sieger2008-08-291-34/+51
| |