Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Don't write nil values to default session options hash | Joshua Peek | 2008-12-16 | 1 | -3/+9 | |
| | | | | | ||||||
| * | | | | Session objects are always a hash, so we need to ensure a flash hash is ↵ | Joshua Peek | 2008-12-15 | 1 | -35/+20 | |
| | | | | | | | | | | | | | | | | | | | | always assigned to the session | |||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-15 | 34 | -1807/+1138 | |
| |\ \ \ \ | ||||||
| | * | | | | Clear empty nil values in session hash before saving | Joshua Peek | 2008-12-15 | 2 | -23/+6 | |
| | | | | | | ||||||
| | * | | | | Switch to Rack based session stores. | Joshua Peek | 2008-12-15 | 31 | -1799/+1127 | |
| | | | | | | ||||||
| | * | | | | Auto-load template handlers based on unmatched extensions [#1540 state:resolved] | Nathan Weizenbaum | 2008-12-15 | 2 | -8/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| | * | | | | Require mocha >= 0.9.3, older versions don't work anymore [#1579 state:resolved] | Hongli Lai (Phusion) | 2008-12-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | | Revert "Make constantize look into ancestors" | Jeremy Kemper | 2008-12-15 | 2 | -40/+42 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | [#410 state:open] This reverts commit 262fef7ed57520b857605a0105fe7ba9265654f6. | |||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-15 | 5 | -5/+19 | |
| |\ \ \ \ | ||||||
| | * | | | | Use Mime::JS in place of explicit 'text/javascript' [#1573 state:resolved] | Seth Fitzsimmons | 2008-12-15 | 2 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| | * | | | | Implement Mime::Type.=~ to match all synonyms against arg [#1573 state:resolved] | Seth Fitzsimmons | 2008-12-15 | 3 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | | Make constantize look into ancestors | Frederick Cheung | 2008-12-15 | 2 | -42/+40 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | [#410 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Properly parenthasize calls to defined?(Rails) in 75fa82418 [#1563 ↵ | Frederick Cheung | 2008-12-15 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Fixed ActionView::TestCase current url context [#1561 state:resolved] | Dan Pickett | 2008-12-15 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-12-15 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
| | * | | | | Make delete_if/reject faster and fix other mutators | Frederick Cheung | 2008-12-12 | 2 | -13/+61 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#1559 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | | Added gem backtrace pretty priting (Juan Lupión) [#1497 state:committed] | David Heinemeier Hansson | 2008-12-15 | 1 | -0/+3 | |
| | | | | | | ||||||
| * | | | | | Make delete_if/reject faster and fix other mutators | Frederick Cheung | 2008-12-15 | 2 | -13/+61 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | [#1559 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Add :partial option to assert_template [#1550 state:resolved] | mark | 2008-12-11 | 6 | -23/+75 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Fixed session related memory leak [#1558 state:resolved] | Frederick Cheung | 2008-12-11 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Fixed template lookups from outside the rails root [#1557 state:resolved] | Joshua Peek | 2008-12-11 | 3 | -2/+6 | |
| | | | | | ||||||
| * | | | | Fixed ActiveSupport::OrderedHash #delete_if, #reject!, and #reject, which ↵ | Eloy Duran | 2008-12-11 | 2 | -1/+46 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | did not sync the @keys after the operation. This probably holds true for other mutating methods as well. Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | | | | | Documented some undocumented activerecord methods. | Ryan Bigg | 2008-12-16 | 2 | -3/+6 | |
| | | | | | ||||||
* | | | | | Updated finders guide to include hash conditionals. | Ryan Bigg | 2008-12-16 | 1 | -0/+35 | |
| | | | | | ||||||
* | | | | | Fix formatting typo | Frederick Cheung | 2008-12-15 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix typo | Frederick Cheung | 2008-12-14 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Added some text about the possibility of observers' registration also at the ↵ | CassioMarques | 2008-12-13 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | config/environment files (AR Validations and Callbacks Guide) | |||||
* | | | | | Updated section about halting execution of operations when a before_xxx ↵ | CassioMarques | 2008-12-13 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | callback returns false (AR Validations and Callbacks Guide) | |||||
* | | | | | Some more info about the effect of calling the clear method upon a model's ↵ | CassioMarques | 2008-12-13 | 2 | -8/+14 | |
| | | | | | | | | | | | | | | | | | | | | errors collection (AR Validations an Callbacks Guide) | |||||
* | | | | | ActionMailer::Base - add example of multiple recipients and make the format ↵ | Xavier Shay | 2008-12-12 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | of addresses obvious | |||||
* | | | | | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-11 | 51 | -482/+600 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/source/activerecord_validations_callbacks.txt | |||||
| * | | | | Fix for Integration::Session follow_redirect! headers['location'] bug with ↵ | Christos Zisopoulos | 2008-12-10 | 2 | -9/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rack [#1555 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | | Prefer Rails.logger over RAILS_DEFAULT_LOGGER | Joshua Peek | 2008-12-10 | 4 | -7/+9 | |
| | | | | | ||||||
| * | | | | Don't use the transaction instance method so that people with ↵ | Frederick Cheung | 2008-12-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has_one/belongs_to :transaction aren't fubared [#1551 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Squash memory leak when calling flush with an empty buffer | Frederick Cheung | 2008-12-10 | 2 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#1552 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-10 | 4 | -14/+43 | |
| |\ \ \ \ | ||||||
| | * | | | | Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵ | Bruce Krysiak | 2008-12-10 | 4 | -14/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | | | | | Revert "Fix: counter_cache should decrement on deleting associated records." | Jeremy Kemper | 2008-12-10 | 3 | -37/+0 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | [#1196 state:open] This reverts commit 05f2183747c8e75c9e8bbaadb9573b4bdf41ecfc. | |||||
| * | | | | Fix test names collision. | Emilio Tagua | 2008-12-10 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#1549 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Add ActiveRecord::VERSION autoload | Jeremy Kemper | 2008-12-10 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Fix ActionController autoloads | Jeremy Kemper | 2008-12-10 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Fix: counter_cache should decrement on deleting associated records. | Emilio Tagua | 2008-12-10 | 3 | -0/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#1195 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Rework ActiveSupport::OrderedHash to make lookups faster | Frederick Cheung | 2008-12-10 | 3 | -38/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Explicitly require ERB Utils extensions from TagHelper | Joshua Peek | 2008-12-09 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-09 | 3 | -223/+244 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/CHANGELOG | |||||
| | * | | | | Updated included memcache-client to the 1.5.0.5 version which includes fixes ↵ | David Heinemeier Hansson | 2008-12-09 | 3 | -223/+244 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from fiveruns and 37signals to deal with failover and timeouts (Joshua Sierles) [#1535 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | |||||
| * | | | | | Fix tests broken by switch to Pathname | Jeremy Kemper | 2008-12-09 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 9 | -34/+43 | |
| | | | | | | ||||||
| * | | | | | How'd that sneak in there? | Jeremy Kemper | 2008-12-09 | 1 | -1/+0 | |
| |/ / / / | ||||||
| * | | | | Fix failing test introduced by optional-format routes | Jeremy Kemper | 2008-12-08 | 1 | -0/+1 | |
| | | | | |