Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and ↵ | Grant Hollingworth | 2008-11-06 | 4 | -4/+29 |
| | | | | | | the SMTP server supports it [#1336 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fixed the sanitize helper to avoid double escaping already properly escaped ↵ | David Heinemeier Hansson | 2008-11-06 | 0 | -0/+0 |
|\ | | | | | | | entities [#683 state:committed] | ||||
| * | Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as ↵ | David Heinemeier Hansson | 2008-11-06 | 2 | -4/+10 |
| | | | | | | | | they only clutter up the log and offer no value [DHH] | ||||
* | | Fixed the sanitize helper to avoid double escaping already properly escaped ↵ | David Heinemeier Hansson | 2008-11-06 | 4 | -2/+8 |
| | | | | | | | | entities [#683 state:committed] | ||||
* | | Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as ↵ | David Heinemeier Hansson | 2008-11-06 | 2 | -4/+10 |
|/ | | | | they only clutter up the log and offer no value [DHH] | ||||
* | Dont bother logging the parameters hash if there are no parameters | David Heinemeier Hansson | 2008-11-06 | 1 | -1/+1 |
| | |||||
* | Make sure ActiveRecord::Base.connected? doesn't raise an exception for ↵ | Pratik Naik | 2008-11-06 | 2 | -1/+7 |
| | | | | defined connections | ||||
* | Update guides from docrails | Pratik Naik | 2008-11-06 | 39 | -368/+1476 |
| | |||||
* | Ensure ActiveRecord::ConnectionPool.connected? handles undefined ↵ | Wes Oldenbeuving | 2008-11-06 | 2 | -1/+9 |
| | | | | | | connections. [#936 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fixed that FormTagHelper generates illegal html if name contains e.g. square ↵ | Vladimir Dobriakov | 2008-11-04 | 3 | -5/+46 |
| | | | | | | brackets [#1238 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Fix regression bug that made date_select and datetime_select raise a Null ↵ | Bernardo de Pádua | 2008-11-04 | 3 | -2/+44 |
| | | | | | | Pointer Exception when a nil date/datetime was passed and only month and year were displayed [#1289 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Dont log the _method attribute either. Its already available in the header | David Heinemeier Hansson | 2008-11-04 | 37 | -47375/+1167 |
|\ | |||||
| * | Remove unused debug_routes | Pratik Naik | 2008-11-02 | 1 | -6/+0 |
| | | |||||
| * | Dont dup params twice when filter_parameters is present | Pratik Naik | 2008-11-02 | 1 | -2/+2 |
| | | |||||
| * | Check first for git repository before using git branch | Pratik Naik | 2008-11-02 | 1 | -1/+1 |
| | | |||||
| * | Dont document internals | Pratik Naik | 2008-11-02 | 1 | -3/+0 |
| | | |||||
| * | Merge docrails. Remove unnecessary files. | Pratik Naik | 2008-11-02 | 4 | -46728/+8 |
| | | |||||
| * | Backwards compatibility fixes for relative_url_root | Michael Koziarski | 2008-11-02 | 2 | -6/+4 |
| | | | | | | | | | | * Make the old deprecated relative_url_root still set the value as it's still used by mongrel * Set the default from the ENV value when the file is required, not at runtime. | ||||
| * | Merge with docrails | Pratik Naik | 2008-11-02 | 26 | -611/+1096 |
| | | |||||
| * | Cleaned up route optimisation guard condition generation code as it was ↵ | Tom Lea | 2008-11-01 | 2 | -7/+32 |
| | | | | | | | | | | | | | | | | getting a little messy. Add additional condition to handle the case where default_url_options is only defined in the controller, not the view. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Make refresh_specs more resilient. Always add vendor/gems to gem search ↵ | Matt Jones | 2008-11-01 | 3 | -14/+27 |
| | | | | | | | | | | | | path. Use Gem.clear_paths to ensure we get a current searcher. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Dont log the _method attribute either. Its already available in the header | David Heinemeier Hansson | 2008-11-04 | 1 | -2/+2 |
|/ | |||||
* | Simplified the logging format for parameters (don't include controller, ↵ | David Heinemeier Hansson | 2008-11-01 | 2 | -6/+25 |
| | | | | action, and format as duplicates) [DHH] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-11-01 | 0 | -0/+0 |
|\ |