aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| |\
| * | Dont log the _method attribute either. Its already available in the headerDavid Heinemeier Hansson2008-11-041-2/+2
| | |
* | | Reimplement Jeremy's PostgreSQL automatic transaction state introspection code.Hongli Lai (Phusion)2008-11-033-2/+62
| | | | | | | | | | | | | | | | | | - Fixed compatibility with the old 'postgres' driver which doesn't support transaction state introspection. - Added unit tests for it.
* | | Rename ActiveRecord::Base#transaction's :force option to :nest. Improve ↵Hongli Lai (Phusion)2008-11-032-7/+62
| | | | | | | | | | | | documentation for nested transactions.
* | | Make SQLite3 pass the unit tests for savepoints.Hongli Lai (Phusion)2008-11-034-4/+18
| | |
* | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in ↵Hongli Lai (Phusion)2008-11-032-2/+1
| | | | | | | | | | | | transaction_test.
* | | Revert "PostgreSQL: introduce transaction_active? rather than tracking ↵Hongli Lai (Phusion)2008-11-031-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity ourselves" This commit conflicts with savepoint support. This reverts commit 045713ee240fff815edb5962b25d668512649478. Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
* | | Fix the final MySQL unit test failure that's related to savepoint support.Hongli Lai (Phusion)2008-11-031-28/+39
| | |
* | | Improve documentation for DatabaseStatements#transactions and ↵Hongli Lai (Phusion)2008-11-033-6/+74
| | | | | | | | | | | | AbstractAdapter#transactional_fixtures, especially with regard to support for nested transactions.
* | | Fix assert_queries failures by ignoring savepoint sql.Jonathan Viney2008-11-031-1/+1
| | |
* | | Fix what looks like a Mysql bug with transactions, savepoints, and create table.Jonathan Viney2008-11-031-21/+26
| | |
* | | Implement savepoints.Jonathan Viney2008-11-037-14/+185
| |/ |/|
* | 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>
* 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]
* Really silence spec warnings when running GemDependency tests [#1308 ↵Jeffrey Hardy2008-10-311-3/+2
| | | | | | state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-313-28/+25
|\
| * Revert "config.load_paths should be frozen [#728 state:resolved]"Joshua Peek2008-10-301-1/+0
| | | | | | | | This reverts commit 2dcdcf1552748f331bf6f6194ffddabd837bcac9.
| * It is not necessary to store QueryCache in a thread local since the cache is ↵Joshua Peek2008-10-301-27/+14
| | | | | | | | local to the connection object which is managed by the connection pool
| * config.load_paths should be frozen [#728 state:resolved]Joshua Peek2008-10-301-0/+1
| |
| * Use database name in query cache thread local key [#1283 state:resolved]Joshua Peek2008-10-301-3/+2
| |
| * Ensure content type gets reset after render_to_string [#1182 state:resolved]Joshua Peek2008-10-302-0/+11
| |
* | Fixed the option merging in Array#to_xml [#1126 state:resolved]David Heinemeier Hansson2008-10-312-1/+3
|/
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-303-2/+6
|\
| * Dup local assigns for partial collections so nil values doesn't get ↵Joshua Peek2008-10-303-2/+6
| | | | | | | | overwritten [#1250 state:resolved]