Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-06-14 | 28 | -152/+185 | |
|\ | ||||||
| * | docfix (email instead of emai) | David Chelimsky | 2010-06-13 | 1 | -3/+3 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | explains why AS::OrderedHash does not leverage inheritance | Xavier Noria | 2010-06-13 | 1 | -0/+11 | |
| | | ||||||
| * | render(:inline) in a layout before yield replaces original content | Neeraj Singh | 2010-06-13 | 3 | -1/+9 | |
| | | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | removes spurious .rb in require | Santiago Pastorino | 2010-06-13 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Tidy up generators based on latest change on AM. | José Valim | 2010-06-13 | 3 | -4/+4 | |
| | | ||||||
| * | CI changes per Chad's request | wycats | 2010-06-13 | 1 | -2/+2 | |
| | | ||||||
| * | Change implementation to do it without asking each time for block_given? | Santiago Pastorino | 2010-06-13 | 1 | -6/+4 | |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | revises implementation of AS::OrderedHash#merge! | Xavier Noria | 2010-06-13 | 3 | -21/+24 | |
| | | ||||||
| * | Revert "hash merging with a block ignores non-existing keys altogether" | Xavier Noria | 2010-06-13 | 2 | -17/+18 | |
| | | | | | | | | | | | | This reverts commit 72f9fec607c4a72b2e88995d0cb32b16b96e9068. It is wrong, this feature is a little undocumented, doing some research. | |||||
| * | 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 | |
| | | ||||||
* | | updated active record querying guide to standardize on first_name for Client | Derek Willis | 2010-06-13 | 1 | -1/+1 | |
| | | ||||||
* | | updated active record querying guide to standardize on first_name for Client | Derek Willis | 2010-06-13 | 1 | -12/+12 | |
| | | ||||||
* | | Remove unneeded .rb suffix on require statements | Santiago Pastorino | 2010-06-13 | 1 | -13/+13 | |
| | | ||||||
* | | Routing guide: Fix path | Josiah Ivey | 2010-06-13 | 1 | -1/+1 | |
| | | ||||||
* | | Rails Guides: AR Querying, .count should be at the end as it returns a ↵ | Rohit Arondekar | 2010-06-13 | 1 | -1/+1 | |
| | | | | | | | | number. [#4811 state:resolved] | |||||
* | | truncate documentation an examples added for :safe option | Santiago Pastorino | 2010-06-13 | 1 | -0/+10 | |
| | | ||||||
* | | gems versions bumped up | Santiago Pastorino | 2010-06-13 | 1 | -20/+20 | |
| | | ||||||
* | | There is no type="array" returned with errors. [#3691:resolved] | Ryan Bigg | 2010-06-12 | 1 | -1/+1 | |
|/ | ||||||
* | 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. |