aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Timeout the connection pool monitor on ruby 1.8 onlyJeremy Kemper2008-11-082-7/+18
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-071-1/+1
|\
| * If average value from DB is 0, make sure to convert it to a 0.0 float before ↵Ken Collins2008-11-071-1/+1
| | | | | | | | | | | | calling #to_d on it [#1346 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Work around ruby 1.9 segfaultJeremy Kemper2008-11-071-0/+1
| |
* | Don't worry about attribute orderingJeremy Kemper2008-11-071-1/+2
| |
* | Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
| |
* | Use delete if the rhs is nilJeremy Kemper2008-11-071-1/+5
|/
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-079-20/+33
|\
| * Don't leave open dangling connections in development mode. [#1335 ↵Pratik Naik2008-11-081-2/+1
| | | | | | | | state:resolved]
| * Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵Nick Sieger2008-11-082-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 paramRich Manalang2008-11-072-2/+3
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed]
| * Added tests for HABTM associations with counter_sqlTekin Suleyman2008-11-071-0/+23
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1102 state:committed]
| * Added :counter_sql as a valid key for habtm associationsTekin Suleyman2008-11-071-1/+1
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Revert commit which breaks all the tests.Michael Koziarski2008-11-072-10/+4
| | | | | | | | | | | | | | | | This reverts commit 8adb79b9b5983cda8dbdd4ef401661fbd51d8844. Conflicts: activerecord/CHANGELOG
* | Don't shadow local with black argJeremy Kemper2008-11-071-4/+4
| |
* | Fix indentation mismatchJeremy Kemper2008-11-071-1/+1
| |
* | Mark utf-8 encodingJeremy Kemper2008-11-071-0/+1
|/
* Fix memory leak issue in ActiveRecord scoped_methodsJoshua Peek2008-11-061-2/+1
|
* Increment the version of our modified memcache_client code to prevent users ↵Luca Guidi2008-11-063-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 Kandratsenka2008-11-061-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 typoMichael Koziarski2008-11-061-1/+1
|
* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and ↵Grant Hollingworth2008-11-064-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 Hansson2008-11-060-0/+0
|\ | | | | | | entities [#683 state:committed]
| * Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as ↵David Heinemeier Hansson2008-11-062-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 Hansson2008-11-064-2/+8
| | | | | | | | entities [#683 state:committed]
* | Stop logging SHOW FIELDS and SET SQL_AUTO_IS_NULL=0 for the MysqlAdapter as ↵David Heinemeier Hansson2008-11-062-4/+10
|/ | | | they only clutter up the log and offer no value [DHH]
* Dont bother logging the parameters hash if there are no parametersDavid Heinemeier Hansson2008-11-061-1/+1
|
* Make sure ActiveRecord::Base.connected? doesn't raise an exception for ↵Pratik Naik2008-11-062-1/+7
| | | | defined connections
* Update guides from docrailsPratik Naik2008-11-0639-368/+1476
|
* Ensure ActiveRecord::ConnectionPool.connected? handles undefined ↵Wes Oldenbeuving2008-11-062-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 Dobriakov2008-11-043-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ádua2008-11-043-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 headerDavid Heinemeier Hansson2008-11-0437-47375/+1167
|\
| * Remove unused debug_routesPratik Naik2008-11-021-6/+0
| |
| * Dont dup params twice when filter_parameters is presentPratik Naik2008-11-021-2/+2
| |
| * Check first for git repository before using git branchPratik Naik2008-11-021-1/+1
| |
| * Dont document internalsPratik Naik2008-11-021-3/+0
| |
| * Merge docrails. Remove unnecessary files.Pratik Naik2008-11-024-46728/+8
| |
| * Backwards compatibility fixes for relative_url_rootMichael Koziarski2008-11-022-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 docrailsPratik Naik2008-11-0226-611/+1096
| |
| * Cleaned up route optimisation guard condition generation code as it was ↵Tom Lea2008-11-012-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 Jones2008-11-013-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 headerDavid Heinemeier Hansson2008-11-041-2/+2
|/
* Simplified the logging format for parameters (don't include controller, ↵David Heinemeier Hansson2008-11-012-6/+25
| | | | action, and format as duplicates) [DHH]
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-010-0/+0
|\
| * Make sure habtm use class variable to list association valid keysLuca Guidi2008-11-011-9/+12
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1310 state:committed]
* | Make sure habtm use class variable to list association valid keysLuca Guidi2008-11-012-10/+14
|/ | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1310 state:committed]
* Remove the logging of the Session ID when the session store is CookieStore [DHH]David Heinemeier Hansson2008-11-012-1/+7
|
* Accidently nixed a doc headerDavid Heinemeier Hansson2008-11-011-0/+1
|
* Added render :js for people who want to render inline JavaScript replies ↵David Heinemeier Hansson2008-11-013-1/+35
| | | | without using RJS [DHH]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 10:47:57 +0000