aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Adding failing tests for calling just the action, instead of ↵José Valim and Mikel Lindsaar2010-01-242-2/+18
| | | | | | | | | | | | :create_action_name and :deliver_action_name
* | | Moving AS::Notifications call to one location in baseJosé Valim and Mikel Lindsaar2010-01-242-14/+9
| | |
* | | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵José Valim and Mikel Lindsaar2010-01-2411-49/+70
| | | | | | | | | | | | support in Mail to call ActionMailer on delivery, moved deliver to deprecated API in preparation for new API
* | | Set sort order for explicit parts from the collector's template sequenceJosé Valim and Mikel Lindsaar2010-01-242-14/+17
| | |
* | | Add some tests to collector with templates and any.José Valim and Mikel Lindsaar2010-01-235-14/+50
| | |
* | | Make implicit and explicit templates pass through the same part creation ↵José Valim and Mikel Lindsaar2010-01-233-84/+104
| | | | | | | | | | | | process.
* | | 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 ↵José Valim2010-01-224-52/+79
| | | | | | | | | | | | configured _prefix.
| * | Add test case for load initializers before routing behavior.Prem Sichanugrist2010-01-221-0/+28
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Add missing require for Object#try [#3771 state:resolved]Xavier Noria2010-01-221-0/+2
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f936a1f100e75082081e782e5cceb272885c2df7. Conflicts: activerecord/lib/active_record.rb activerecord/lib/active_record/base.rb Revert "Fixed: #without_typecast should only disable typecasting on the duplicated attributes" [#3387 state:open] This reverts commit 2831996483c6a045f1f38d8030256eb58d9771c3. Reason : It's not generating attribute methods properly, making object.column 5x slower.
| * | Simplify finder method definitionsPratik Naik2010-01-211-13/+11
| |/
| * Make filter parameters based on request, so they can be modified for ↵José Valim2010-01-2110-104/+115
| | | | | | | | anything in the middleware stack.
| * 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 ↵Prem Sichanugrist2010-01-215-78/+22
| | | | | | | | | | | | ActionController::Base, and allow it to be configured in config.filter_parameters Signed-off-by: José Valim <jose.valim@gmail.com>
| * Move filter_parameter_logging logic out of the controller and create ↵Prem Sichanugrist2010-01-218-57/+130
| | | | | | | | | | | | ActionDispatch::ParametersFilter to handle parameter filteration instead. This will make filteration not depending on controller anymore. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Updating functional tests to not compare equality with encoded, ↵José Valim and Mikel Lindsaar2010-01-221-1/+1
| | | | | | | | Mail::Message has an == operator
* | Updating deprecated_body.rb to use :content instead of :data or :body in the ↵José Valim and Mikel Lindsaar2010-01-221-3/+8
| | | | | | | | params hash