Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | Fixes for working with 1.9.1-head | Mikel Lindsaar | 2009-12-17 | 5 | -24/+10 | |
| | | | | ||||||
| | * | | Merge branch 'rails' | Mikel Lindsaar | 2009-12-17 | 217 | -2750/+3351 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb actionmailer/lib/action_mailer/delivery_method/smtp.rb | |||||
| | * \ \ | Merge branch 'master' of git://github.com/rails/rails into rails_master | Mikel Lindsaar | 2009-11-24 | 226 | -2695/+1914 | |
| | |\ \ \ | ||||||
| * | \ \ \ | Merge branch 'master' into mail | Jeremy Kemper | 2009-11-23 | 15 | -102/+118 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge commit 'mikel/master' into mail | Jeremy Kemper | 2009-11-23 | 7 | -30/+37 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | |||||
| | * | | | | | Change require mail version to 1.3.0 | Mikel Lindsaar | 2009-11-24 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Changed deprecation to use ActiveSupport::Deprecation | Mikel Lindsaar | 2009-11-24 | 1 | -2/+3 | |
| | | | | | | | ||||||
| | * | | | | | Fixed up incompatible encoding problem for Ruby 1.9 in test suite | Mikel Lindsaar | 2009-11-23 | 2 | -3/+13 | |
| | | | | | | | ||||||
| | * | | | | | Deprecating attachment :body => 'string' in favour of attachment :data => ↵ | Mikel Lindsaar | 2009-11-23 | 2 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'string' | |||||
| | * | | | | | Removing utils, and updating requires to match | Mikel Lindsaar | 2009-11-23 | 4 | -20/+12 | |
| | | | | | | | ||||||
| * | | | | | | Add mail dep to AM gemspec | Jeremy Kemper | 2009-11-23 | 2 | -3/+1 | |
| | | | | | | | ||||||
| * | | | | | | Never require jcode | Jeremy Kemper | 2009-11-22 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Rely on gemspec and bundled env for gem dependency. We just require it. | Jeremy Kemper | 2009-11-22 | 1 | -2/+1 | |
| | | | | | | | ||||||
| * | | | | | | Bundle mail 1.2.8 | Jeremy Kemper | 2009-11-22 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge commit 'origin/master' into mail | Jeremy Kemper | 2009-11-22 | 211 | -2360/+1626 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Opps.. need to require it as well as gem mail :) | Mikel Lindsaar | 2009-11-22 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Adding mail as a gem load | Mikel Lindsaar | 2009-11-22 | 1 | -2/+1 | |
| | | | | | | | ||||||
| * | | | | | | 131 tests, 309 assertions, 0 failures, 0 errors | Mikel Lindsaar | 2009-11-22 | 8 | -65/+57 | |
| | | | | | | | ||||||
| * | | | | | | Updating tests for Mail gem | Mikel Lindsaar | 2009-11-22 | 2 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | 131 tests, 266 assertions, 9 failures, 6 errors | Mikel Lindsaar | 2009-11-21 | 3 | -13/+36 | |
| | | | | | | | ||||||
| * | | | | | | Down to 13 failures, 14 errors | Mikel Lindsaar | 2009-11-20 | 2 | -7/+14 | |
| | | | | | | | ||||||
| * | | | | | | Down to 30 failures total | Mikel Lindsaar | 2009-11-20 | 5 | -51/+97 | |
| | | | | | | | ||||||
| * | | | | | | More updates... 45 errors left to get it working with Mail gem | Mikel Lindsaar | 2009-11-20 | 9 | -72/+94 | |
| | | | | | | | ||||||
| * | | | | | | Starting again on actionmailer integration with mail | Mikel Lindsaar | 2009-11-12 | 44 | -8119/+186 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:rails/rails | Jeremy Kemper | 2009-12-29 | 2 | -12/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make plugins responsible for loading their own rake tasks | Sam Pohlenz | 2009-12-29 | 2 | -7/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
| * | | | | | | | Application object should instantiate non-vendored plugins | Sam Pohlenz | 2009-12-29 | 2 | -5/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | |||||
* | | | | | | | | Clean up railties Rakefile from old responsibilities which are now part of ↵ | José Valim | 2009-12-29 | 1 | -67/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main Rakefile | |||||
* | | | | | | | | Add rails app --edge and rails app --dev | José Valim | 2009-12-29 | 3 | -8/+38 | |
| | | | | | | | | ||||||
* | | | | | | | | Add default respond_to formats to ApplicationController. | José Valim | 2009-12-29 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Use extlib_inheritable_accessor in request_forgery_protection.rb. | Carl Lerche | 2009-12-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | For some reason the current class_inheritable_accessor does not play nice with included hooks. class_inheritable_accessor will be revised shortly. | |||||
* | | | | | | | Finally remove rails/initializer.rb | Carl Lerche | 2009-12-29 | 2 | -16/+0 | |
| | | | | | | | ||||||
* | | | | | | | Simplify get_projection_name_from_chained_relations using recursion | Pratik Naik | 2009-12-30 | 1 | -12/+5 | |
| | | | | | | | ||||||
* | | | | | | | Relation#count should look for projections in chained relations and perform ↵ | Emilio Tagua | 2009-12-30 | 2 | -3/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the count on the given column Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | | | | | Check to see if the plugin object responds to load_tasks (vendor/plugin/* ↵ | Carl Lerche | 2009-12-29 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | does not yet) Fixes Sam Ruby's tests. | |||||
* | | | | | | | Oops, add the missing #tap call | Pratik Naik | 2009-12-29 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Replace Base#safe_to_array with Array.wrap | Pratik Naik | 2009-12-29 | 1 | -14/+2 | |
| | | | | | | | ||||||
* | | | | | | | Rewrite Relation#readonly, eager_load, preload using Object#tap | Pratik Naik | 2009-12-29 | 1 | -12/+4 | |
| | | | | | | | ||||||
* | | | | | | | Rename Relation#create_new_relation to spawn and refactor preload/eagerload ↵ | Pratik Naik | 2009-12-29 | 1 | -37/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations using attr_writer | |||||
* | | | | | | | Refactor Relation#readonly using attr_writer | Pratik Naik | 2009-12-29 | 1 | -10/+19 | |
| | | | | | | | ||||||
* | | | | | | | Make sure evalled method knows where it came from | Yehuda Katz | 2009-12-29 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Relation#respond_to? should take second argument for responding to private ↵ | Pratik Naik | 2009-12-29 | 2 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods | |||||
* | | | | | | | Make sure Relation responds to dynamic finder methods | Pratik Naik | 2009-12-29 | 2 | -2/+18 | |
| | | | | | | | ||||||
* | | | | | | | Add Relation#size and Relation#empty? | Pratik Naik | 2009-12-29 | 2 | -3/+23 | |
| | | | | | | | ||||||
* | | | | | | | Use relation#delete_all for Model.delete_all | Pratik Naik | 2009-12-29 | 2 | -7/+2 | |
| | | | | | | | ||||||
* | | | | | | | Add Relation#delete_all | Pratik Naik | 2009-12-29 | 3 | -0/+30 | |
| | | | | | | | ||||||
* | | | | | | | Complain if there's no such middleware | Jeremy Kemper | 2009-12-28 | 1 | -2/+3 | |
| | | | | | | |