aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵Paul Mucur2010-06-133-3/+22
| | | | | | | | [#4838 state:committed] For better consistency with Ruby's own Hash implementation. Signed-off-by: Xavier Noria <fxn@hashref.com>
* Revert "Revert "Validators should at model level and not at AR:Base level ↵wycats2010-06-121-0/+10
| | | | | | [Closes #4804]"" This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1.
* 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 ↵wycats2010-06-121-10/+0
| | | | | | #4804]" This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61.
* 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
| | | | | | [#4843 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Change sanitize to escape in test names of text_helper_test [#4844 ↵rohit2010-06-121-9/+9
| | | | state:resolved]
* subject is automatically looked up on I18n using mailer_name and action_name ↵José Valim2010-06-123-2/+4
| | | | as scope as in t('.subject')
* Use load_paths on AR benchmarks so it uses the bundler setup instead of ↵José Valim2010-06-121-5/+5
| | | | system gems.
* 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
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Test create mailers folder when starting a new appDamien Mathieu2010-06-121-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* 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 ↵Geoff Buesing2010-06-123-6/+65
| | | | | | | | | | | | TimeWithZone when Time.zone_default is set Signed-off-by: Xavier Noria <fxn@hashref.com>
* | 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 ↵Jeremy Kemper2010-06-111-3/+4
| | | | | | | | method_missing
* | Revert "Don't overwrite unsaved updates when loading an association but ↵José Valim2010-06-113-17/+3
| | | | | | | | | | | | | | | | preserve the order of the loaded records. [#4642 state:open]" This commit introduced a regression described in ticket [#4830]. This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11.
* | text_helper now escape the unsafe input instead of sanitizingSantiago Pastorino2010-06-112-13/+12
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | 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 ↵Rizwan Reza2010-06-114-2/+47
| | | | | | | | | | | | cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved] This reverts commit 330a89072a493aafef1e07c3558964477f85adf0.
* | 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
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * detect being inside a rails application even from a subdirectoryChad Fowler2010-06-104-19/+56
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Revert "Add support for multi-subdomain session by setting cookie host in ↵José Valim2010-06-104-47/+2
| | | | | | | | | | | | | | | | session cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved]" It does not work for domains like co.uk and com.br. This reverts commit c4d6245e875bbb276c122a5a401422d341dac4df.
| * Rails::Generators::GeneratedAttribute: tests, cleanups and a bugfix [#4631 ↵Jeff Kreeftmeijer2010-06-103-19/+105
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Missing method error doesn't specify which controller it is missing from ↵Alan Harper2010-06-102-2/+11
| | | | | | | | | | | | | | | | | | [#4436 state:resolved] The error page shown when the method you are requesting on a controller doesn't specify which controller the method is missing from Signed-off-by: José Valim <jose.valim@gmail.com>
| * Remove punctuate_body! No code in lib was using it and it had no documentation.José Valim2010-06-102-31/+0
| |