aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Get implicit multipart and attachments working together.José Valim and Mikel Lindsaar2010-01-224-40/+109
* First work on implicit multipart.José Valim and Mikel Lindsaar2010-01-224-25/+44
* Add basic template rendering to new DSL.José Valim and Mikel Lindsaar2010-01-228-70/+90
* Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-223-48/+107
|\
| * Add more tests to new API.José Valim and Mikel Lindsaar2010-01-223-48/+107
* | Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-227-208/+172
|\|
| * Move class methods to deprecated stuff.José Valim and Mikel Lindsaar2010-01-222-47/+54
| * Moved deprecated_body.rb to deprecatead_api.rbJosé Valim and Mikel Lindsaar2010-01-227-161/+118
* | Fixing typo in config.frameworks errorMikel Lindsaar2010-01-221-1/+1
|/
* Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-2268-1322/+492
|\
| * Revert "Refactoring attributes/types" [#3348 state:open]Pratik Naik2010-01-2225-775/+148
| * Simplify finder method definitionsPratik Naik2010-01-211-13/+11
| * Make filter parameters based on request, so they can be modified for anything...José Valim2010-01-2110-104/+115
| * Give higher priority to rails generators.José Valim2010-01-214-9/+23
| * Supplying Arel::SqlLiteral is much fasterPratik Naik2010-01-212-7/+17
| * Default to sync instrumentation.José Valim2010-01-2121-369/+80
| * Add shortcut test to abstract/render_test.rbJosé Valim2010-01-211-0/+9
| * Don't let generators die if rubygems puts crap in your load path.José Valim2010-01-211-1/+3
| * Tidy up new filter_parameters implementation.José Valim2010-01-2113-125/+150
| * Add deprecation warning for calling filter_parameter_logging ActionController...Prem Sichanugrist2010-01-215-78/+22
| * Move filter_parameter_logging logic out of the controller and create ActionDi...Prem Sichanugrist2010-01-218-57/+130
* | Updating functional tests to not compare equality with encoded, Mail::Message...José Valim and Mikel Lindsaar2010-01-221-1/+1
* | Updating deprecated_body.rb to use :content instead of :data or :body in the ...José Valim and Mikel Lindsaar2010-01-221-3/+8
* | Added use of AS::Notifications for tmail_compat.rbJosé Valim and Mikel Lindsaar2010-01-222-5/+6
* | Updating deprecated API to sanitize old style attachments hash to work with n...José Valim and Mikel Lindsaar2010-01-222-11/+36
* | Adding tests for attachments['blah.rb'] = {} et alJosé Valim and Mikel Lindsaar2010-01-215-3/+44
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-2122-347/+310
|\|
| * Use quoted_table_name with arel.from() if no from values explicitly supplied....Pratik Naik2010-01-211-2/+4
| * Cache quoted_table_namePratik Naik2010-01-211-4/+5
| * Relation#spawn is basically clone + resetPratik Naik2010-01-211-12/+2
| * Always use table.* in the finder query unless specifiedPratik Naik2010-01-211-1/+1
| * Add AD::Route#to_sSam Ruby2010-01-201-0/+6
| * Use @limit_value and @offset_value instead of calling arelPratik Naik2010-01-202-5/+5
| * Move update and update_all to RelationPratik Naik2010-01-202-70/+65
| * Only send filtered_env for notificationsJoshua Peek2010-01-201-8/+9
| * Request#filter_parameters and filter_envJoshua Peek2010-01-201-2/+24
| * Fix AP's AR integration tests warningPratik Naik2010-01-201-1/+1
| * Base.merge_conditions is no longer neededPratik Naik2010-01-202-16/+2
| * Expose last controller in rack env["action_controller.instance"]Joshua Peek2010-01-202-32/+7
| * fixes the failure of config.plugins without :all option tests [#3718 status:r...Santiago Pastorino2010-01-201-4/+3
| * Move ActionController::Translation to AbstractController::Translation.José Valim2010-01-206-4/+4
| * Bring normalize behavior to AbstractController::RenderingJosé Valim2010-01-205-39/+37
| * Dont delegate Relation#update to arelPratik Naik2010-01-203-4/+4
| * Delegate delete_all to RelationPratik Naik2010-01-202-24/+20
| * Move destroy to RelationPratik Naik2010-01-202-28/+28
| * Remove Base.delete as it's same as Relation#deletePratik Naik2010-01-202-25/+21
| * Delegate exists? to RelationPratik Naik2010-01-202-38/+34
| * Make Relation#destroy_all handle all the casesPratik Naik2010-01-202-34/+34
* | Mail method accepting all headers set via the hashJosé Valim and Mikel Lindsaar2010-01-212-7/+31
* | Created mail method for new APIJosé Valim and Mikel Lindsaar2010-01-203-20/+89