Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | controller_path is required by ActionView, so move it up to ↵ | José Valim | 2009-12-31 | 7 | -190/+174 | |
| | | | | AbstractController and refactor AbstractController::Layouts. | |||||
* | Fix new year heisenbug | Jeremy Kemper | 2009-12-31 | 1 | -2/+2 | |
| | ||||||
* | Merge commit 'josevalim/inheritance' | Jeremy Kemper | 2009-12-31 | 10 | -68/+125 | |
|\ | ||||||
| * | Simplify repair_validations on AR and make it work with new callbacks. | José Valim | 2010-01-01 | 8 | -49/+32 | |
| | | ||||||
| * | Fix inheritance issue with new callbacks. | José Valim | 2010-01-01 | 3 | -20/+94 | |
| | | ||||||
* | | Merge commit 'mikel/master' | Jeremy Kemper | 2009-12-31 | 6 | -5/+23 | |
|\ \ | ||||||
| * | | Updating mail requirement to 1.4.3 | Mikel Lindsaar | 2009-12-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:mikel/rails | Mikel Lindsaar | 2009-12-31 | 0 | -0/+0 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/tmail_compat.rb | |||||
| | * | | Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompat | Mikel Lindsaar | 2009-12-30 | 5 | -4/+23 | |
| | | | | ||||||
| * | | | removing spurious line | Mikel Lindsaar | 2009-12-31 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompat | Mikel Lindsaar | 2009-12-31 | 5 | -4/+23 | |
| | | | | ||||||
* | | | | Make sure association proxy does not pass quoted table name to sanitize_sql | Pratik Naik | 2010-01-01 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Handle Range with excluded end | Pratik Naik | 2010-01-01 | 1 | -1/+8 | |
| | | | | ||||||
* | | | | Try using cached attribute before creating a new one | Pratik Naik | 2010-01-01 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Use PredicateBuilder for sql hash sanitization | Pratik Naik | 2010-01-01 | 3 | -26/+14 | |
| | | | | ||||||
* | | | | Fix the method name for recusion | Pratik Naik | 2010-01-01 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Move predicate building to a stand alone PredicateBuilder class | Pratik Naik | 2010-01-01 | 3 | -30/+41 | |
| | | | | ||||||
* | | | | Some railties cleanup: | Carl Lerche | 2009-12-31 | 19 | -109/+116 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin | |||||
* | | | | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb | Carl Lerche | 2009-12-31 | 17 | -135/+140 | |
| | | | | ||||||
* | | | | Use Arel::Attribute when building where conditions from hash | Pratik Naik | 2010-01-01 | 1 | -5/+36 | |
| | | | | ||||||
* | | | | Raise a helpful error if config.frameworks is used | Carl Lerche | 2009-12-31 | 2 | -0/+23 | |
| | | | | ||||||
* | | | | Add a /rails.rb for each framework for consistency | Carl Lerche | 2009-12-31 | 7 | -4/+18 | |
| | | | | ||||||
* | | | | Fully remove config.frameworks in favor of requires in boot.rb | Carl Lerche | 2009-12-31 | 8 | -38/+24 | |
| | | | | ||||||
* | | | | Use Arel::Attribute for pk conditions | Pratik Naik | 2010-01-01 | 1 | -4/+4 | |
| | | | | ||||||
* | | | | Add Relation#table to get the relevant Arel::Table | Pratik Naik | 2010-01-01 | 1 | -1/+10 | |
| | | | | ||||||
* | | | | Add Relation#delete [Pratik Naik, Emilio Tagua] | Pratik Naik | 2010-01-01 | 3 | -4/+8 | |
| |_|/ |/| | | ||||||
* | | | Dont gitkeep things that are gitignored | David Heinemeier Hansson | 2009-12-31 | 1 | -1/+1 | |
|/ / | ||||||
* | | Clarify assertion | Jeremy Kemper | 2009-12-30 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-31 | 24 | -559/+341 | |
|\ \ | ||||||
| * | | Fix controller runtime test | Jeremy Kemper | 2009-12-30 | 1 | -2/+2 | |
| | | | ||||||
| * | | Allow ActiveSupport's isolation tests to run with MiniTest on 1.9 | Carl Lerche | 2009-12-30 | 2 | -141/+189 | |
| | | | ||||||
| * | | Revert "Add config.action_controller.include behavior to plugins." | Jeremy Kemper | 2009-12-30 | 5 | -57/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb | |||||
| * | | Fix up AR extension by using Railties module instead of Rails and requiring ↵ | Jeremy Kemper | 2009-12-30 | 4 | -8/+10 | |
| | | | | | | | | | | | | ControllerRuntime at initialization time instead of boot | |||||
| * | | Remove self-require | Jeremy Kemper | 2009-12-30 | 1 | -2/+1 | |
| | | | ||||||
| * | | Partially revert "ActionDispatch should require as little of ActiveSupport ↵ | Jeremy Kemper | 2009-12-30 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | as possible" Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70. | |||||
| * | | depends on Module#attr_internal | Jeremy Kemper | 2009-12-30 | 1 | -1/+3 | |
| | | | ||||||
| * | | Merge commit 'josevalim/arlog' | Jeremy Kemper | 2009-12-30 | 6 | -32/+77 | |
| |\ \ | ||||||
| | * | | Kick AR logging back to life and move ControllerRuntime inside ↵ | José Valim | 2009-12-30 | 6 | -32/+77 | |
| | | | | | | | | | | | | | | | | ActiveRecord::Rails. | |||||
| * | | | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2009-12-30 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | * | | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally ↵ | José Valim | 2009-12-30 | 5 | -289/+9 | |
| | | | | | | | | | | | | | | | | | | | | remove it. | |||||
| | * | | | Setup and teardown now use new callbacks. | José Valim | 2009-12-30 | 3 | -32/+52 | |
| | | | | | ||||||
| * | | | | Merge commit 'josevalim/callbacks' | Jeremy Kemper | 2009-12-30 | 8 | -321/+61 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally ↵ | José Valim | 2009-12-30 | 5 | -289/+9 | |
| | | | | | | | | | | | | | | | | | | | | remove it. | |||||
| | * | | | Setup and teardown now use new callbacks. | José Valim | 2009-12-30 | 3 | -32/+52 | |
| | |/ / | ||||||
| * | | | ActionDispatch should require as little of ActiveSupport as possible | Carl Lerche | 2009-12-30 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Added .gitkeep to empty directories and --skip-git to skip gitignore/gitkeep ↵ | David Heinemeier Hansson | 2009-12-31 | 1 | -6/+13 | |
| | | | | | | | | | | | | | | | | files | |||||
* | | | | Orphan experiment no longer needed | David Heinemeier Hansson | 2009-12-30 | 1 | -69/+0 | |
|/ / / | ||||||
* / / | Organize Relation methods into separate modules | Pratik Naik | 2009-12-30 | 5 | -241/+262 | |
|/ / | ||||||
* | | Merge commit 'mikel/master' | Jeremy Kemper | 2009-12-30 | 3 | -0/+26 | |
|\| | ||||||
| * | Adding TMailCompat layer for :set_content_type and friends | Mikel Lindsaar | 2009-12-30 | 3 | -0/+26 | |
| | |