Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
| | | ||||||
* | | Relation#many? shoud load the records if there's a LIMIT | Pratik Naik | 2009-12-30 | 2 | -1/+7 | |
| | | ||||||
* | | Add Relation#any? and Relation#many? | Pratik Naik | 2009-12-30 | 2 | -0/+42 | |
| | | ||||||
* | | Fix the count test for postgres | Pratik Naik | 2009-12-30 | 1 | -1/+1 | |
|/ | ||||||
* | Revert "Add default respond_to formats to ApplicationController." | Jeremy Kemper | 2009-12-29 | 1 | -1/+0 | |
| | | | | | | (Needs consensus that these are appropriate defaults.) This reverts commit 66604b2e0e8d3aba25cab673c7a3d7831a68490c. | |||||
* | Use the correct method for eager loading autoloads | Carl Lerche | 2009-12-29 | 2 | -1/+17 | |
| | ||||||
* | Clean up changelog a bit | Jeremy Kemper | 2009-12-29 | 1 | -22/+12 | |
| | ||||||
* | Merge branch 'mail' | Jeremy Kemper | 2009-12-29 | 52 | -8306/+463 | |
|\ | ||||||
| * | Move mail gem dep to Action Mailer's gemspec | Jeremy Kemper | 2009-12-29 | 2 | -4/+1 | |
| | | ||||||
| * | Merge branch 'master' of git://github.com/mikel/rails into mail | Jeremy Kemper | 2009-12-29 | 340 | -5815/+6374 | |
| |\ | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | |||||
| | * | Adding default 8bit encoding if the body has non usascii in it | Mikel Lindsaar | 2009-12-28 | 2 | -1/+3 | |
| | | | ||||||
| | * | Remove unused code paths and require mail only when it's needed. | José Valim | 2009-12-28 | 3 | -17/+9 | |
| | | | ||||||
| | * | Moved sort_parts into Mail, updated mail requirement to 1.4.2 | Mikel Lindsaar | 2009-12-28 | 5 | -40/+22 | |
| | | | ||||||
| | * | DRY ActionMailer code. | José Valim | 2009-12-27 | 1 | -60/+61 | |
| | | | ||||||
| | * | Getting rid of some warnings in AM suite. | José Valim | 2009-12-27 | 4 | -8/+10 | |
| | | | ||||||
| | * | Merge Mail with latest Rails and move mail gem to Gemfile. | José Valim | 2009-12-27 | 175 | -3154/+3185 | |
| | |\ | ||||||
| | * | | Updating action_mailer to need mail 1.4.1 | Mikel Lindsaar | 2009-12-27 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Changing body to use :to_s instead of :decoded... better use case | Mikel Lindsaar | 2009-12-27 | 7 | -39/+39 | |
| | | | | ||||||
| | * | | Updating readme | Mikel Lindsaar | 2009-12-27 | 1 | -1/+4 | |
| | | | | ||||||
| | * | | Updating actionmailer to call :to_s on all field values instead of decoded | Mikel Lindsaar | 2009-12-27 | 2 | -9/+9 | |
| | | | | ||||||
| | * | | Updating requirement for mail to 1.3.4 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Updating requirement for mail to 1.3.3 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merged in latest changes from rails/master | Mikel Lindsaar | 2009-12-17 | 4 | -3/+24 | |
| | | | |