aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change implementation to do it without asking each time for block_given?Santiago Pastorino2010-06-131-6/+4
* revises implementation of AS::OrderedHash#merge!Xavier Noria2010-06-133-21/+24
* Revert "hash merging with a block ignores non-existing keys altogether"Xavier Noria2010-06-132-17/+18
* hash merging with a block ignores non-existing keys altogetherXavier Noria2010-06-132-18/+17
* re-organized test for merge into separate testsPaul Barry2010-06-131-13/+21
* Support passing a block to ActiveSupport::OrderedHash's merge and merge! [#48...Paul Mucur2010-06-133-3/+22
* Revert "Revert "Validators should at model level and not at AR:Base level [Cl...wycats2010-06-121-0/+10
* Bump rack-mount version to 0.6.4Santiago Pastorino2010-06-121-1/+1
* require conversions to use String#ordSantiago Pastorino2010-06-121-0/+1
* Revert "Validators should at model level and not at AR:Base level [Closes #48...wycats2010-06-121-10/+0
* registers 4146a44 in CHANGELOGXavier Noria2010-06-121-0/+5
* removes spurious .rb in requireXavier Noria2010-06-121-1/+1
* Move ActionMailer::TC to AV::TC::BehaviorDavid Chelimsky2010-06-123-45/+55
* Change sanitize to escape in test names of text_helper_test [#4844 state:reso...rohit2010-06-121-9/+9
* subject is automatically looked up on I18n using mailer_name and action_name ...José Valim2010-06-123-2/+4
* Use load_paths on AR benchmarks so it uses the bundler setup instead of syste...José Valim2010-06-121-5/+5
* No need to call convert_key before except.José Valim2010-06-121-1/+0
* Simplify and optimize callbacks superclass sync.José Valim2010-06-121-54/+21
* Create mailers folder when starting a new rails appLawrence Curtis2010-06-121-0/+0
* Test create mailers folder when starting a new appDamien Mathieu2010-06-121-0/+1
* Remove an unused methodPratik Naik2010-06-121-13/+0
* Support ruby 1.8.7 and 1.9.2 (and development versions)Jeremy Kemper2010-06-111-3/+17
* Merge remote branch 'docrails/master'Xavier Noria2010-06-125-5/+13
|\
| * adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
| * Updated all number helpers with :locale option.Slobodan Kovacevic2010-06-111-1/+9
| * grammar fixesXavier Noria2010-06-112-2/+2
| * fixing typoNeeraj Singh2010-06-101-1/+1
| * Fix spelling error in ActiveModel::Conversion docs. [#4826 state:resolved]Pavel Gorbokon2010-06-111-1/+1
* | AS guide: updates docs on date calculations to reflect a0a6cc2Xavier Noria2010-06-121-5/+21
* | Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return TimeWithZ...Geoff Buesing2010-06-123-6/+65
* | Single ruby version requirement messageJeremy Kemper2010-06-112-10/+5
* | Ruby 1.9.1 compat: constant lookupJeremy Kemper2010-06-111-1/+1
* | Remove String#constantize depsJeremy Kemper2010-06-112-8/+9
* | Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring met...Jeremy Kemper2010-06-111-3/+4
* | Revert "Don't overwrite unsaved updates when loading an association but prese...José Valim2010-06-113-17/+3
* | text_helper now escape the unsafe input instead of sanitizingSantiago Pastorino2010-06-112-13/+12
* | Added tests for cookies with domain option.Rizwan Reza2010-06-111-0/+22
* | Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rbRizwan Reza2010-06-111-2/+2
* | Refactored duplication into a separate method. Dropped class variable.Rizwan Reza2010-06-111-15/+17
* | Adding missing docs to delete cookies with :all which were added that way.Rizwan Reza2010-06-111-1/+2
* | Took out the domain option logic to cookies.rb.Rizwan Reza2010-06-113-22/+32
* | Moved Domain regexp to a constant and added comments.Rizwan Reza2010-06-111-1/+8
* | The previous commit didn't work with complex domains, which is now fixed.Rizwan Reza2010-06-112-9/+9
* | Add support for multi-subdomain session by setting cookie host in session coo...Rizwan Reza2010-06-114-2/+47
* | adds missing require for having ActiveSupport::InheritableOptions definedXavier Noria2010-06-111-0/+1
|/
* Merge remote branch 'rails/master'Xavier Noria2010-06-1061-513/+949
|\
| * abort generation/booting on Ruby 1.9.1Xavier Noria2010-06-105-4/+13
| * layout 'application' is not anymore on application_controllerSantiago Pastorino2010-06-101-2/+1
| * detect being inside a rails application even from a subdirectoryChad Fowler2010-06-104-19/+56
| * Revert "Add support for multi-subdomain session by setting cookie host in ses...José Valim2010-06-104-47/+2