Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-09-10 | 56 | -333/+640 |
|\ | |||||
| * | Disable warnings in AP tests | Jeremy Kemper | 2008-09-10 | 1 | -7/+8 |
| | | |||||
| * | Revert "Add :accessible option to Associations for allowing mass assignments ↵ | Pratik Naik | 2008-09-10 | 6 | -157/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | using hash. [#474 state:resolved]" This reverts commit e0750d6a5c7f621e4ca12205137c0b135cab444a. Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_collection.rb | ||||
| * | Expanded documentation for new composed_of options | Rob Anderton | 2008-09-10 | 1 | -10/+53 |
| | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#892 state:committed] | ||||
| * | Added :constructor and :converter options to composed_of and deprecated the ↵ | Rob Anderton | 2008-09-10 | 4 | -33/+124 |
| | | | | | | | | | | | | conversion block Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Support :limit on update_all so that has_many with :limit can be safely updated | Tarmo Tänav | 2008-09-10 | 5 | -7/+41 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Fixed test_find_last_by_one_attribute_caches_dynamic_finder for postgresql 8.3 | Tarmo Tänav | 2008-09-10 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Added ActionController::Translation module delegating to I18n #translate/#t ↵ | Sven Fuchs | 2008-09-10 | 3 | -0/+41 |
| | | | | | | | | | | | | and #localize/#l [status:committed #1008] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-09-10 | 0 | -0/+0 |
| |\ | |||||
| | * | Added Inflector#parameterize for easy slug generation ("Donald E. ↵ | David Heinemeier Hansson | 2008-09-10 | 5 | -0/+51 |
| | | | | | | | | | | | | Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby] | ||||
| * | | Added Inflector#parameterize for easy slug generation ("Donald E. ↵ | David Heinemeier Hansson | 2008-09-10 | 5 | -0/+51 |
| |/ | | | | | | | Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby] | ||||
| * | Added image_submit_tag confirm option [status:committed #784] | Alastair Brunton | 2008-09-10 | 3 | -0/+19 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | The FormTagHelper#submit_tag helper will now pass along the original value ↵ | Jose Fernandez | 2008-09-10 | 3 | -12/+11 |
| | | | | | | | | | | | | of the submit button to the params if the :disable_with option is used [status:committed #633] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Missing doc updates | David Heinemeier Hansson | 2008-09-09 | 3 | -1/+5 |
| | | |||||
| * | Fix for SQLite's db creation warnings [status:committed #614] | Antonio Cangiano | 2008-09-09 | 1 | -6/+18 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Added find_last_by dynamic finder [status:committed #762] | miloops | 2008-09-09 | 3 | -5/+39 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Fixed problem causes by leftover backup templates ending in tilde ↵ | U-ESCAPEE\Mack | 2008-09-09 | 2 | -1/+11 |
| | | | | | | | | | | | | [state:committed #969] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | No local variable in the global namespace plz | David Heinemeier Hansson | 2008-09-09 | 1 | -3/+2 |
| | | |||||
| * | Fixed that REXML fix would break on earlier versions of ruby (Frederick ↵ | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+3 |
| | | | | | | | | Cheung) [state:resolved #987] | ||||
| * | Revert "Remove the Version check as it's not always available." | David Heinemeier Hansson | 2008-09-09 | 1 | -20/+22 |
| | | | | | | | | This reverts commit 6e2851d4261fbbea00e8e74802a507a89af80e2f. | ||||
| * | Only separate loggings with a comma when there are actually two statements | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+2 |
| | | |||||
| * | Stopped logging template compiles as it only clogs up the log | David Heinemeier Hansson | 2008-09-09 | 2 | -4/+3 |
| | | |||||
| * | Dont reference the class being tested when it can be assumed | David Heinemeier Hansson | 2008-09-09 | 1 | -1/+0 |
| | | |||||
| * | Revert "Revert "Add layout functionality to mailers."" | David Heinemeier Hansson | 2008-09-09 | 9 | -3/+115 |
| | | | | | | | | This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060. | ||||
| * | Revert "Add layout functionality to mailers." | David Heinemeier Hansson | 2008-09-09 | 9 | -115/+3 |
| | | | | | | | | This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa. | ||||
| * | Add special AssociationReflection methods for creating association objects, ↵ | Hongli Lai (Phusion) | 2008-09-09 | 7 | -16/+62 |
| | | | | | | | | | | | | | | | | and modify the code base to use those methods instead of creating association objects directly. This allows plugins to hook into association object creation behavior. [#986 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Make the options that has_many, belongs_to and other association generation ↵ | Hongli Lai (Phusion) | 2008-09-09 | 2 | -18/+32 |
| | | | | | | | | | | | | | | | | methods can accept, configurable. [#985 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Interpolation requires double quotes | Michael Koziarski | 2008-09-09 | 1 | -1/+1 |
| | | |||||
| * | Ruby 1.9 compat: remove instance variables and global variables from block ↵ | Akira Matsuda | 2008-09-09 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | parameters [#1000 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ruby 1.9 compat: use String#lines instead of to_a in Ruby 1.9 | Akira Matsuda | 2008-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | [#1001 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ruby 1.9 compat: remove constants from block parameters | Akira Matsuda | 2008-09-09 | 2 | -2/+3 |
| | | | | | | | | | | | | [#1002 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-09-09 | 1 | -22/+20 |
| |\ | |||||
| | * | Remove the Version check as it's not always available. | Michael Koziarski | 2008-09-09 | 1 | -22/+20 |
| | | | |||||
| * | | Check for uninitialized instance variables | Jeremy Kemper | 2008-09-08 | 4 | -20/+24 |
| | | | |||||
| * | | Check whether memoized ivar is initialized | Jeremy Kemper | 2008-09-08 | 1 | -1/+1 |
| | | | |||||
| * | | Remove recognized_optimized method before redefining it | Jeremy Kemper | 2008-09-08 | 1 | -2/+15 |
| | | | |||||
| * | | Use defined? check since @view_paths may be uninitialized | Jeremy Kemper | 2008-09-08 | 1 | -1/+5 |
| |/ | |||||
| * | Fix indentation mismatch | Jeremy Kemper | 2008-09-08 | 3 | -3/+3 |
| | | |||||
| * | Don't shadow arg with block var | Jeremy Kemper | 2008-09-08 | 1 | -2/+2 |
| | | |||||
| * | BigDecimal to_s and yaml housekeeping | Jeremy Kemper | 2008-09-08 | 1 | -22/+18 |
| | | |||||
| * | Revert "Revert "Raise UnknownAttributeError when unknown attributes are ↵ | Jeremy Kemper | 2008-09-08 | 2 | -1/+17 |
| | | | | | | | | | | | | supplied via mass assignment"" This reverts commit 41efd73887c00ffd228b05d9346ec47a1f3759b9. | ||||
| * | Ensure routing optimizations are cleared when new routes are added [#981 ↵ | Matt Jones | 2008-09-07 | 3 | -2/+41 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Revert "Raise UnknownAttributeError when unknown attributes are supplied via ↵ | Jeremy Kemper | 2008-09-06 | 2 | -17/+1 |
| | | | | | | | | | | | | mass assignment" This reverts commit 108db00aa90fe266564483ab301cf0669cae600f. | ||||
| * | Ruby 1.9 compat: use method_defined? instead of instance_methods.include? ↵ | Jeremy Kemper | 2008-09-06 | 1 | -3/+6 |
| | | | | | | | | Don't encourage args abuse by flattening. | ||||
* | | Include tip for using ruby-debug in development mode without restarting the ↵ | miloops | 2008-09-10 | 1 | -0/+5 |
| | | | | | | | | server. | ||||
* | | Add the description of "Debugging Rails applications" guide to index. | miloops | 2008-09-10 | 1 | -1/+3 |
| | | |||||
* | | Fix a bunch of singular-vs-plural mistakes in URLs | Mike Gunderloy | 2008-09-10 | 1 | -19/+19 |
| | | |||||
* | | Fix various AsciiDoc markup issues and a few typos. | Mike Gunderloy | 2008-09-09 | 1 | -16/+16 |
| | | |||||
* | | Force generate guides | Pratik Naik | 2008-09-09 | 1 | -2/+2 |
| | | |||||
* | | Add new guides to index page | Pratik Naik | 2008-09-09 | 2 | -0/+12 |
| | |