Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Some refactoring. | José Valim and Mikel Lindsaar | 2010-01-24 | 4 | -164/+164 |
| | |||||
* | Adding failing tests for calling just the action, instead of ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -2/+18 |
| | | | | :create_action_name and :deliver_action_name | ||||
* | Moving AS::Notifications call to one location in base | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -14/+9 |
| | |||||
* | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 11 | -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 sequence | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -14/+17 |
| | |||||
* | Add some tests to collector with templates and any. | José Valim and Mikel Lindsaar | 2010-01-23 | 5 | -14/+50 |
| | |||||
* | Make implicit and explicit templates pass through the same part creation ↵ | José Valim and Mikel Lindsaar | 2010-01-23 | 3 | -84/+104 |
| | | | | process. | ||||
* | Adding collector to ActionMailer | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -0/+32 |
| | |||||
* | Added basic explicit multipart rendering and tests | José Valim and Mikel Lindsaar | 2010-01-23 | 4 | -19/+79 |
| | |||||
* | Move double render check out of AbstractController. | José Valim and Mikel Lindsaar | 2010-01-23 | 2 | -4/+4 |
| | |||||
* | Refactor subject with i18n. | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -3/+7 |
| | |||||
* | Added AbstractController::Collector. | José Valim and Mikel Lindsaar | 2010-01-23 | 4 | -26/+91 |
| | |||||
* | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-01-23 | 31 | -103/+177 |
|\ | |||||
| * | Make default_scope work with Relations | Pratik Naik | 2010-01-23 | 3 | -3/+15 |
| | | |||||
| * | I removed the rdoc task from plugin Rakefile | Joshua Peek | 2010-01-22 | 1 | -1/+1 |
| | | |||||
| * | Delegate App calls to instance | Joshua Peek | 2010-01-22 | 5 | -5/+11 |
| | | |||||
| * | Ensure strings given to render with slash are rendered relative to the ↵ | José Valim | 2010-01-22 | 4 | -52/+79 |
| | | | | | | | | configured _prefix. | ||||
| * | Add test case for load initializers before routing behavior. | Prem Sichanugrist | 2010-01-22 | 1 | -0/+28 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Add missing require for Object#try [#3771 state:resolved] | Xavier Noria | 2010-01-22 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Make @controller an internal ivar in the view | Joshua Peek | 2010-01-22 | 4 | -19/+17 |
| | | |||||
| * | Relation should respond to class methods | Pratik Naik | 2010-01-22 | 2 | -1/+6 |
| | | |||||
| * | Allow calling class methods on a Relation | Pratik Naik | 2010-01-22 | 2 | -0/+11 |
| | | |||||
| * | Use expand_path to require environment in metal template | Joshua Peek | 2010-01-22 | 1 | -1/+1 |
| | | |||||
| * | Include cascade header in metal template | Joshua Peek | 2010-01-22 | 1 | -1/+1 |
| | | |||||
| * | lib is already included w/ rake test task | Joshua Peek | 2010-01-22 | 1 | -2/+0 |
| | | |||||
| * | Remove rdoc task from generated plugin Rakefile | Joshua Peek | 2010-01-22 | 1 | -10/+0 |
| | | |||||
| * | Template whitespace | Joshua Peek | 2010-01-22 | 8 | -8/+7 |
| | | |||||
* | | Updated Gemspec to mail 2.0.3 from gemcutter | Mikel Lindsaar | 2010-01-23 | 1 | -1/+1 |
| | | |||||
* | | Get implicit multipart and attachments working together. | José Valim and Mikel Lindsaar | 2010-01-22 | 4 | -40/+109 |
| | | |||||
* | | First work on implicit multipart. | José Valim and Mikel Lindsaar | 2010-01-22 | 4 | -25/+44 |
| | | |||||
* | | Add basic template rendering to new DSL. | José Valim and Mikel Lindsaar | 2010-01-22 | 8 | -70/+90 |
| | | |||||
* | | Merge branch 'master' of github.com:mikel/rails | Mikel Lindsaar | 2010-01-22 | 3 | -48/+107 |
|\ \ | |||||
| * | | Add more tests to new API. | José Valim and Mikel Lindsaar | 2010-01-22 | 3 | -48/+107 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mikel/rails | Mikel Lindsaar | 2010-01-22 | 7 | -208/+172 |
|\| | | |||||
| * | | Move class methods to deprecated stuff. | José Valim and Mikel Lindsaar | 2010-01-22 | 2 | -47/+54 |
| | | | |||||
| * | | Moved deprecated_body.rb to deprecatead_api.rb | José Valim and Mikel Lindsaar | 2010-01-22 | 7 | -161/+118 |
| | | | |||||
* | | | Fixing typo in config.frameworks error | Mikel Lindsaar | 2010-01-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim and Mikel Lindsaar | 2010-01-22 | 68 | -1322/+492 |
|\| | |||||
| * | Revert "Refactoring attributes/types" [#3348 state:open] | Pratik Naik | 2010-01-22 | 25 | -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 definitions | Pratik Naik | 2010-01-21 | 1 | -13/+11 |
| | | |||||
| * | Make filter parameters based on request, so they can be modified for ↵ | José Valim | 2010-01-21 | 10 | -104/+115 |
| | | | | | | | | anything in the middleware stack. | ||||
| * | Give higher priority to rails generators. | José Valim | 2010-01-21 | 4 | -9/+23 |
| | | |||||
| * | Supplying Arel::SqlLiteral is much faster | Pratik Naik | 2010-01-21 | 2 | -7/+17 |
| | | |||||
| * | Default to sync instrumentation. | José Valim | 2010-01-21 | 21 | -369/+80 |
| | | |||||
| * | Add shortcut test to abstract/render_test.rb | José Valim | 2010-01-21 | 1 | -0/+9 |
| | | |||||
| * | Don't let generators die if rubygems puts crap in your load path. | José Valim | 2010-01-21 | 1 | -1/+3 |
| | | |||||
| * | Tidy up new filter_parameters implementation. | José Valim | 2010-01-21 | 13 | -125/+150 |
| | | |||||
| * | Add deprecation warning for calling filter_parameter_logging ↵ | Prem Sichanugrist | 2010-01-21 | 5 | -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 Sichanugrist | 2010-01-21 | 8 | -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 Lindsaar | 2010-01-22 | 1 | -1/+1 |
| | | | | | | | | Mail::Message has an == operator |