aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-09-041-1/+1
|\
| * Handle connection timeouts with a slightly nicer error message.Michael Koziarski2008-09-041-1/+1
| |
* | Rescue spurious failures in case dummy postgresql user or schema already existsJeremy Kemper2008-09-041-2/+2
| |
* | Deprecate %d and %s in message interpolation, but only in the bundled i18n lib.Jeremy Kemper2008-09-041-2/+7
|/
* Remove flawed execute("ROLLBACK") approach; #reset! defaults to nothingNick Sieger2008-09-042-5/+1
| | | | | | Will need community help to fill out what #reset! should do for each adapter Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Default connection allow_concurrency to false (for PostgreSQL)Nick Sieger2008-09-044-2/+20
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Handle the case where there is no ivar set.Michael Koziarski2008-09-041-1/+1
| | | | This happens on jruby due to a bug, but also on historically marshalled data.
* Deprecate verification_timeout and verify before resetNick Sieger2008-09-045-19/+18
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fix transaction exception testJeremy Kemper2008-09-041-0/+1
|
* still need to track whether we're the toplevel transactionJeremy Kemper2008-09-041-3/+10
|
* PostgreSQL: introduce transaction_active? rather than tracking activity ↵Jeremy Kemper2008-09-041-0/+32
| | | | ourselves
* Don't run 32bit dependant assertions in 64bit environmentsTarmo Tänav2008-09-041-4/+10
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Merge docrailsPratik Naik2008-09-0323-199/+312
|
* Add each_with_object from 1.9 for a more convenient alternative to inject.Adam Keys2008-09-032-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 Ramsay2008-09-031-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 Kofler2008-09-031-5/+5
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some performance goodness for inheritable attributes.Clemens Kofler2008-09-034-17/+17
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some performance goodness for AR.Clemens Kofler2008-09-031-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some performance goodness for AM Validations.Clemens Kofler2008-09-031-2/+2
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some performance goodness for AM StateMatchine.Clemens Kofler2008-09-031-3/+3
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some performance goodness for routing.Clemens Kofler2008-09-031-3/+3
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Some performance goodness for AR associations.Clemens Kofler2008-09-031-32/+32
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* More symbols for send and respond_to?.Clemens Kofler2008-09-035-9/+9
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* More symbols for send and respond_to?.Clemens Kofler2008-09-031-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:18:45 +0000