aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Adding collector to ActionMailerJosé Valim and Mikel Lindsaar2010-01-231-0/+32
* | | Added basic explicit multipart rendering and testsJosé Valim and Mikel Lindsaar2010-01-234-19/+79
* | | Move double render check out of AbstractController.José Valim and Mikel Lindsaar2010-01-232-4/+4
* | | Refactor subject with i18n.José Valim and Mikel Lindsaar2010-01-231-3/+7
* | | Added AbstractController::Collector.José Valim and Mikel Lindsaar2010-01-234-26/+91
* | | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-01-2331-103/+177
|\ \ \ | | |/ | |/|
| * | Make default_scope work with RelationsPratik Naik2010-01-233-3/+15
| * | I removed the rdoc task from plugin RakefileJoshua Peek2010-01-221-1/+1
| * | Delegate App calls to instanceJoshua Peek2010-01-225-5/+11
| * | Ensure strings given to render with slash are rendered relative to the config...José Valim2010-01-224-52/+79
| * | Add test case for load initializers before routing behavior.Prem Sichanugrist2010-01-221-0/+28
| * | Add missing require for Object#try [#3771 state:resolved]Xavier Noria2010-01-221-0/+2
| * | Make @controller an internal ivar in the viewJoshua Peek2010-01-224-19/+17
| * | Relation should respond to class methodsPratik Naik2010-01-222-1/+6
| * | Allow calling class methods on a RelationPratik Naik2010-01-222-0/+11
| * | Use expand_path to require environment in metal templateJoshua Peek2010-01-221-1/+1
| * | Include cascade header in metal templateJoshua Peek2010-01-221-1/+1
| * | lib is already included w/ rake test taskJoshua Peek2010-01-221-2/+0
| * | Remove rdoc task from generated plugin RakefileJoshua Peek2010-01-221-10/+0
| * | Template whitespaceJoshua Peek2010-01-228-8/+7
* | | Updated Gemspec to mail 2.0.3 from gemcutterMikel Lindsaar2010-01-231-1/+1
* | | 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