Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge docrails. | Pratik Naik | 2008-11-14 | 50 | -2524/+4399 |
| | |||||
* | Rails now requires rubygems 1.3.1 of higher. | Pratik Naik | 2008-11-14 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-11-14 | 2 | -19/+40 |
|\ | |||||
| * | Make inheritance of map.resources :only/:except options behave more predictably | Tom Stuart | 2008-11-14 | 2 | -19/+40 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Prepare for RC2 | David Heinemeier Hansson | 2008-11-14 | 12 | -18/+14 |
|/ | |||||
* | Make polymorphic_url compact given array [#1317 state:committed] | hiroshi | 2008-11-14 | 3 | -1/+14 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Revert "Move fixtures settings from AR::TestCase to railties test_help" -- ↵ | David Heinemeier Hansson | 2008-11-14 | 2 | -16/+13 |
| | | | | | | it broke all the tests! This reverts commit 9a88ab64bb45ddb2bdcf80fab9203111d8f8abb4. | ||||
* | Fix typo in pool_conections_test [#1350 state:committed] | Amos King | 2008-11-14 | 1 | -1/+1 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Properly check silence_spec_warnings class variable [#1372 state:committed] | Chris Wanstrath | 2008-11-14 | 1 | -2/+2 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Move fixtures settings from AR::TestCase to railties test_help | Jeremy Kemper | 2008-11-13 | 2 | -13/+16 |
| | |||||
* | Tag helper should output an attribute with the value 'false' instead of ↵ | Hongli Lai (Phusion) | 2008-11-13 | 3 | -5/+11 |
| | | | | omitting the attribute, if the associated option is false but not nil. | ||||
* | Fix map.resources to always generate named routes if they're needed | Tom Stuart | 2008-11-13 | 2 | -6/+85 |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Make sure any Fixnum returned by a DB sum is type cast to a Float before ↵ | Ken Collins | 2008-11-13 | 2 | -1/+6 |
| | | | | | | standard converstion to a BigDecimal [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | gbuesing | 2008-11-13 | 5 | -61/+92 |
|\ | |||||
| * | Instead of overriding html_types, base the verification on ↵ | Michael Koziarski | 2008-11-13 | 2 | -7/+20 |
| | | | | | | | | | | | | | | | | browser_generated_types. Also Deprecate the old unverifiable types. [#1145 state:committed] | ||||
| * | fix two MimeType failing test cases | rick | 2008-11-13 | 2 | -7/+10 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Changed request forgery protection to only worry about HTML-formatted ↵ | Jeff Cohen | 2008-11-13 | 4 | -55/+70 |
| | | | | | | | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | TimeZone: fix base offset for Sri Jayawardenepura. Anchor tests for zone ↵ | gbuesing | 2008-11-13 | 3 | -3/+5 |
|/ | | | | offsets to more current date | ||||
* | TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved] | Phil Ross | 2008-11-12 | 2 | -1/+4 |
| | |||||
* | Add :only/:except options to map.resources | Tom Stuart | 2008-11-12 | 2 | -37/+247 |
| | | | | | | | This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1215 state:committed] | ||||
* | Fixed method_missing for ActionMailer so it no longer matches methods where ↵ | Joel Chippindale | 2008-11-11 | 2 | -1/+6 |
| | | | | | | deliver or create are not a suffix [#1318 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fix for ActionMailer::Base.method_missing so that it raises NoMethodError ↵ | Joel Chippindale | 2008-11-11 | 2 | -6/+16 |
| | | | | | | when no method is found [#1330 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove redundant uniq | Frederick Cheung | 2008-11-11 | 1 | -1/+1 |
| | |||||
* | Only track new constant definitions when we're reloading dependencies | Jeremy Kemper | 2008-11-10 | 2 | -7/+15 |
| | |||||
* | Eliminate excess Regexp creation due to capture counting | Jeremy Kemper | 2008-11-10 | 2 | -4/+26 |
| | |||||
* | Pare down object creation during route building | Jeremy Kemper | 2008-11-10 | 2 | -30/+27 |
| | |||||
* | Add simple case when DB calculations returns 0 instead of 0.0 [#1346 ↵ | Joshua Peek | 2008-11-10 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Move sshpublisher require into the rake tasks that use it so ruby 1.9 and ↵ | Jeremy Kemper | 2008-11-08 | 1 | -1/+2 |
| | | | | macruby don't need the rake gem installed | ||||
* | Add some basic controller logging tests | Pratik Naik | 2008-11-08 | 1 | -0/+46 |
| | |||||
* | Timeout the connection pool monitor on ruby 1.8 only | Jeremy Kemper | 2008-11-08 | 2 | -7/+18 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
|\ | |||||
| * | If average value from DB is 0, make sure to convert it to a 0.0 float before ↵ | Ken Collins | 2008-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | calling #to_d on it [#1346 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Work around ruby 1.9 segfault | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
| | | |||||
* | | Don't worry about attribute ordering | Jeremy Kemper | 2008-11-07 | 1 | -1/+2 |
| | | |||||
* | | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 |
| | | |||||
* | | Use delete if the rhs is nil | Jeremy Kemper | 2008-11-07 | 1 | -1/+5 |
|/ | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-11-07 | 9 | -20/+33 |
|\ | |||||
| * | Don't leave open dangling connections in development mode. [#1335 ↵ | Pratik Naik | 2008-11-08 | 1 | -2/+1 |
| | | | | | | | | state:resolved] | ||||
| * | Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵ | Nick Sieger | 2008-11-08 | 2 | -5/+1 |
| | | | | | | | | | | | | [Nick Sieger, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 2 | -2/+3 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed] | ||||
| * | Added tests for HABTM associations with counter_sql | Tekin Suleyman | 2008-11-07 | 1 | -0/+23 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1102 state:committed] | ||||
| * | Added :counter_sql as a valid key for habtm associations | Tekin Suleyman | 2008-11-07 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Revert commit which breaks all the tests. | Michael Koziarski | 2008-11-07 | 2 | -10/+4 |
| | | | | | | | | | | | | | | | | This reverts commit 8adb79b9b5983cda8dbdd4ef401661fbd51d8844. Conflicts: activerecord/CHANGELOG | ||||
* | | Don't shadow local with black arg | Jeremy Kemper | 2008-11-07 | 1 | -4/+4 |
| | | |||||
* | | Fix indentation mismatch | Jeremy Kemper | 2008-11-07 | 1 | -1/+1 |
| | | |||||
* | | Mark utf-8 encoding | Jeremy Kemper | 2008-11-07 | 1 | -0/+1 |
|/ | |||||
* | Fix memory leak issue in ActiveRecord scoped_methods | Joshua Peek | 2008-11-06 | 1 | -2/+1 |
| | |||||
* | Increment the version of our modified memcache_client code to prevent users ↵ | Luca Guidi | 2008-11-06 | 3 | -5/+11 |
| | | | | | | | | with the gem installed not seeing our changes. The changes will be submitted upstream. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1239 state:committed] | ||||
* | Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised ↵ | Aliaksey Kandratsenka | 2008-11-06 | 1 | -1/+1 |
| | | | | | | | | | recognition code. It produces meaningless line numbers. This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays. [#1319 state:committed] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix stupid typo | Michael Koziarski | 2008-11-06 | 1 | -1/+1 |
| |