Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | hash merging with a block ignores non-existing keys altogether | Xavier Noria | 2010-06-13 | 2 | -18/+17 |
| | |||||
* | re-organized test for merge into separate tests | Paul Barry | 2010-06-13 | 1 | -13/+21 |
| | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵ | Paul Mucur | 2010-06-13 | 3 | -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 ↵ | wycats | 2010-06-12 | 1 | -0/+10 |
| | | | | | | [Closes #4804]"" This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1. | ||||
* | Bump rack-mount version to 0.6.4 | Santiago Pastorino | 2010-06-12 | 1 | -1/+1 |
| | |||||
* | require conversions to use String#ord | Santiago Pastorino | 2010-06-12 | 1 | -0/+1 |
| | |||||
* | Revert "Validators should at model level and not at AR:Base level [Closes ↵ | wycats | 2010-06-12 | 1 | -10/+0 |
| | | | | | | #4804]" This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61. | ||||
* | registers 4146a44 in CHANGELOG | Xavier Noria | 2010-06-12 | 1 | -0/+5 |
| | |||||
* | removes spurious .rb in require | Xavier Noria | 2010-06-12 | 1 | -1/+1 |
| | |||||
* | Move ActionMailer::TC to AV::TC::Behavior | David Chelimsky | 2010-06-12 | 3 | -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 ↵ | rohit | 2010-06-12 | 1 | -9/+9 |
| | | | | state:resolved] | ||||
* | subject is automatically looked up on I18n using mailer_name and action_name ↵ | José Valim | 2010-06-12 | 3 | -2/+4 |
| | | | | as scope as in t('.subject') | ||||
* | Use load_paths on AR benchmarks so it uses the bundler setup instead of ↵ | José Valim | 2010-06-12 | 1 | -5/+5 |
| | | | | system gems. | ||||
* | No need to call convert_key before except. | José Valim | 2010-06-12 | 1 | -1/+0 |
| | |||||
* | Simplify and optimize callbacks superclass sync. | José Valim | 2010-06-12 | 1 | -54/+21 |
| | |||||
* | Create mailers folder when starting a new rails app | Lawrence Curtis | 2010-06-12 | 1 | -0/+0 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Test create mailers folder when starting a new app | Damien Mathieu | 2010-06-12 | 1 | -0/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Remove an unused method | Pratik Naik | 2010-06-12 | 1 | -13/+0 |
| | |||||
* | Support ruby 1.8.7 and 1.9.2 (and development versions) | Jeremy Kemper | 2010-06-11 | 1 | -3/+17 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-12 | 5 | -5/+13 |
|\ | |||||
| * | adds missing require for having ActiveSupport::InheritableOptions defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 |
| | | |||||
| * | Updated all number helpers with :locale option. | Slobodan Kovacevic | 2010-06-11 | 1 | -1/+9 |
| | | |||||
| * | grammar fixes | Xavier Noria | 2010-06-11 | 2 | -2/+2 |
| | | |||||
| * | fixing typo | Neeraj Singh | 2010-06-10 | 1 | -1/+1 |
| | | |||||
| * | Fix spelling error in ActiveModel::Conversion docs. [#4826 state:resolved] | Pavel Gorbokon | 2010-06-11 | 1 | -1/+1 |
| | | |||||
* | | AS guide: updates docs on date calculations to reflect a0a6cc2 | Xavier Noria | 2010-06-12 | 1 | -5/+21 |
| | | |||||
* | | Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return ↵ | Geoff Buesing | 2010-06-12 | 3 | -6/+65 |
| | | | | | | | | | | | | TimeWithZone when Time.zone_default is set Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | Single ruby version requirement message | Jeremy Kemper | 2010-06-11 | 2 | -10/+5 |
| | | |||||
* | | Ruby 1.9.1 compat: constant lookup | Jeremy Kemper | 2010-06-11 | 1 | -1/+1 |
| | | |||||
* | | Remove String#constantize deps | Jeremy Kemper | 2010-06-11 | 2 | -8/+9 |
| | | |||||
* | | Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring ↵ | Jeremy Kemper | 2010-06-11 | 1 | -3/+4 |
| | | | | | | | | method_missing | ||||
* | | Revert "Don't overwrite unsaved updates when loading an association but ↵ | José Valim | 2010-06-11 | 3 | -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 sanitizing | Santiago Pastorino | 2010-06-11 | 2 | -13/+12 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Added tests for cookies with domain option. | Rizwan Reza | 2010-06-11 | 1 | -0/+22 |
| | | |||||
* | | Moved test/controller/cookie_test.rb to test/dispatch/cookies_test.rb | Rizwan Reza | 2010-06-11 | 1 | -2/+2 |
| | | |||||
* | | Refactored duplication into a separate method. Dropped class variable. | Rizwan Reza | 2010-06-11 | 1 | -15/+17 |
| | | |||||
* | | Adding missing docs to delete cookies with :all which were added that way. | Rizwan Reza | 2010-06-11 | 1 | -1/+2 |
| | | |||||
* | | Took out the domain option logic to cookies.rb. | Rizwan Reza | 2010-06-11 | 3 | -22/+32 |
| | | |||||
* | | Moved Domain regexp to a constant and added comments. | Rizwan Reza | 2010-06-11 | 1 | -1/+8 |
| | | |||||
* | | The previous commit didn't work with complex domains, which is now fixed. | Rizwan Reza | 2010-06-11 | 2 | -9/+9 |
| | | |||||
* | | Add support for multi-subdomain session by setting cookie host in session ↵ | Rizwan Reza | 2010-06-11 | 4 | -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 defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 |
|/ | |||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-10 | 61 | -513/+949 |
|\ | |||||
| * | abort generation/booting on Ruby 1.9.1 | Xavier Noria | 2010-06-10 | 5 | -4/+13 |
| | | |||||
| * | layout 'application' is not anymore on application_controller | Santiago Pastorino | 2010-06-10 | 1 | -2/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | detect being inside a rails application even from a subdirectory | Chad Fowler | 2010-06-10 | 4 | -19/+56 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Revert "Add support for multi-subdomain session by setting cookie host in ↵ | José Valim | 2010-06-10 | 4 | -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 Kreeftmeijer | 2010-06-10 | 3 | -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 Harper | 2010-06-10 | 2 | -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é Valim | 2010-06-10 | 2 | -31/+0 |
| | |