aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge Mail with latest Rails and move mail gem to Gemfile.José Valim2009-12-27175-3154/+3185
| | |\
| | * | Updating action_mailer to need mail 1.4.1Mikel Lindsaar2009-12-271-1/+1
| | | |
| | * | Changing body to use :to_s instead of :decoded... better use caseMikel Lindsaar2009-12-277-39/+39
| | | |
| | * | Updating readmeMikel Lindsaar2009-12-271-1/+4
| | | |
| | * | Updating actionmailer to call :to_s on all field values instead of decodedMikel Lindsaar2009-12-272-9/+9
| | | |
| | * | Updating requirement for mail to 1.3.4Mikel Lindsaar2009-12-171-1/+1
| | | |
| | * | Updating requirement for mail to 1.3.3Mikel Lindsaar2009-12-171-1/+1
| | | |
| | * | Merged in latest changes from rails/masterMikel Lindsaar2009-12-174-3/+24
| | | |
| | * | Fixes for working with 1.9.1-headMikel Lindsaar2009-12-175-24/+10
| | | |
| | * | Merge branch 'rails'Mikel Lindsaar2009-12-17217-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_masterMikel Lindsaar2009-11-24226-2695/+1914
| | |\ \ \
| * | \ \ \ Merge branch 'master' into mailJeremy Kemper2009-11-2315-102/+118
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit 'mikel/master' into mailJeremy Kemper2009-11-237-30/+37
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb
| | * | | | | Change require mail version to 1.3.0Mikel Lindsaar2009-11-241-1/+1
| | | | | | |
| | * | | | | Changed deprecation to use ActiveSupport::DeprecationMikel Lindsaar2009-11-241-2/+3
| | | | | | |
| | * | | | | Fixed up incompatible encoding problem for Ruby 1.9 in test suiteMikel Lindsaar2009-11-232-3/+13
| | | | | | |
| | * | | | | Deprecating attachment :body => 'string' in favour of attachment :data => ↵Mikel Lindsaar2009-11-232-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'string'
| | * | | | | Removing utils, and updating requires to matchMikel Lindsaar2009-11-234-20/+12
| | | | | | |
| * | | | | | Add mail dep to AM gemspecJeremy Kemper2009-11-232-3/+1
| | | | | | |
| * | | | | | Never require jcodeJeremy Kemper2009-11-221-1/+0
| | | | | | |
| * | | | | | Rely on gemspec and bundled env for gem dependency. We just require it.Jeremy Kemper2009-11-221-2/+1
| | | | | | |
| * | | | | | Bundle mail 1.2.8Jeremy Kemper2009-11-221-0/+3
| | | | | | |
| * | | | | | Merge commit 'origin/master' into mailJeremy Kemper2009-11-22211-2360/+1626
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Opps.. need to require it as well as gem mail :)Mikel Lindsaar2009-11-221-0/+1
| | | | | | |
| * | | | | | Adding mail as a gem loadMikel Lindsaar2009-11-221-2/+1
| | | | | | |
| * | | | | | 131 tests, 309 assertions, 0 failures, 0 errorsMikel Lindsaar2009-11-228-65/+57
| | | | | | |
| * | | | | | Updating tests for Mail gemMikel Lindsaar2009-11-222-2/+2
| | | | | | |
| * | | | | | 131 tests, 266 assertions, 9 failures, 6 errorsMikel Lindsaar2009-11-213-13/+36
| | | | | | |
| * | | | | | Down to 13 failures, 14 errorsMikel Lindsaar2009-11-202-7/+14
| | | | | | |
| * | | | | | Down to 30 failures totalMikel Lindsaar2009-11-205-51/+97
| | | | | | |
| * | | | | | More updates... 45 errors left to get it working with Mail gemMikel Lindsaar2009-11-209-72/+94
| | | | | | |
| * | | | | | Starting again on actionmailer integration with mailMikel Lindsaar2009-11-1244-8119/+186
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:rails/railsJeremy Kemper2009-12-292-12/+15
|\ \ \ \ \ \ \
| * | | | | | | Make plugins responsible for loading their own rake tasksSam Pohlenz2009-12-292-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * | | | | | | Application object should instantiate non-vendored pluginsSam Pohlenz2009-12-292-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* | | | | | | | Clean up railties Rakefile from old responsibilities which are now part of ↵José Valim2009-12-291-67/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main Rakefile
* | | | | | | | Add rails app --edge and rails app --devJosé Valim2009-12-293-8/+38
| | | | | | | |
* | | | | | | | Add default respond_to formats to ApplicationController.José Valim2009-12-291-0/+1
|/ / / / / / /
* | | | | | | Use extlib_inheritable_accessor in request_forgery_protection.rb.Carl Lerche2009-12-291-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.rbCarl Lerche2009-12-292-16/+0
| | | | | | |
* | | | | | | Simplify get_projection_name_from_chained_relations using recursionPratik Naik2009-12-301-12/+5
| | | | | | |
* | | | | | | Relation#count should look for projections in chained relations and perform ↵Emilio Tagua2009-12-302-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 Lerche2009-12-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | does not yet) Fixes Sam Ruby's tests.
* | | | | | | Oops, add the missing #tap callPratik Naik2009-12-291-1/+1
| | | | | | |
* | | | | | | Replace Base#safe_to_array with Array.wrapPratik Naik2009-12-291-14/+2
| | | | | | |
* | | | | | | Rewrite Relation#readonly, eager_load, preload using Object#tapPratik Naik2009-12-291-12/+4
| | | | | | |
* | | | | | | Rename Relation#create_new_relation to spawn and refactor preload/eagerload ↵Pratik Naik2009-12-291-37/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | associations using attr_writer
* | | | | | | Refactor Relation#readonly using attr_writerPratik Naik2009-12-291-10/+19
| | | | | | |
* | | | | | | Make sure evalled method knows where it came fromYehuda Katz2009-12-291-2/+2
| | | | | | |
* | | | | | | Relation#respond_to? should take second argument for responding to private ↵Pratik Naik2009-12-292-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | methods