Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add more tests to new API. | José Valim and Mikel Lindsaar | 2010-01-22 | 3 | -48/+107 |
| | |||||
* | 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 |
| | |||||
* | 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 | ||||
* | | Updating deprecated_body.rb to use :content instead of :data or :body in the ↵ | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -3/+8 |
| | | | | | | | | params hash | ||||
* | | Added use of AS::Notifications for tmail_compat.rb | José Valim and Mikel Lindsaar | 2010-01-22 | 2 | -5/+6 |
| | | |||||
* | | Updating deprecated API to sanitize old style attachments hash to work with ↵ | José Valim and Mikel Lindsaar | 2010-01-22 | 2 | -11/+36 |
| | | | | | | | | new mail.attachments method | ||||
* | | Adding tests for attachments['blah.rb'] = {} et al | José Valim and Mikel Lindsaar | 2010-01-21 | 5 | -3/+44 |
| | | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim and Mikel Lindsaar | 2010-01-21 | 22 | -347/+310 |
|\| | |||||
| * | Use quoted_table_name with arel.from() if no from values explicitly ↵ | Pratik Naik | 2010-01-21 | 1 | -2/+4 |
| | | | | | | | | supplied. Arel seems to be spending a lot of time figuring out the FROM value otherwise. | ||||
| * | Cache quoted_table_name | Pratik Naik | 2010-01-21 | 1 | -4/+5 |
| | | |||||
| * | Relation#spawn is basically clone + reset | Pratik Naik | 2010-01-21 | 1 | -12/+2 |
| | | |||||
| * | Always use table.* in the finder query unless specified | Pratik Naik | 2010-01-21 | 1 | -1/+1 |
| | | |||||
| * | Add AD::Route#to_s | Sam Ruby | 2010-01-20 | 1 | -0/+6 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Use @limit_value and @offset_value instead of calling arel | Pratik Naik | 2010-01-20 | 2 | -5/+5 |
| | | |||||
| * | Move update and update_all to Relation | Pratik Naik | 2010-01-20 | 2 | -70/+65 |
| | | |||||
| * | Only send filtered_env for notifications | Joshua Peek | 2010-01-20 | 1 | -8/+9 |
| | | |||||
| * | Request#filter_parameters and filter_env | Joshua Peek | 2010-01-20 | 1 | -2/+24 |
| | | |||||
| * | Fix AP's AR integration tests warning | Pratik Naik | 2010-01-20 | 1 | -1/+1 |
| | | |||||
| * | Base.merge_conditions is no longer needed | Pratik Naik | 2010-01-20 | 2 | -16/+2 |
| | | |||||
| * | Expose last controller in rack env["action_controller.instance"] | Joshua Peek | 2010-01-20 | 2 | -32/+7 |
| | | |||||
| * | fixes the failure of config.plugins without :all option tests [#3718 ↵ | Santiago Pastorino | 2010-01-20 | 1 | -4/+3 |
| | | | | | | | | | | | | status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Move ActionController::Translation to AbstractController::Translation. | José Valim | 2010-01-20 | 6 | -4/+4 |
| | | |||||
| * | Bring normalize behavior to AbstractController::Rendering | José Valim | 2010-01-20 | 5 | -39/+37 |
| | | |||||
| * | Dont delegate Relation#update to arel | Pratik Naik | 2010-01-20 | 3 | -4/+4 |
| | | |||||
| * | Delegate delete_all to Relation | Pratik Naik | 2010-01-20 | 2 | -24/+20 |
| | | |||||
| * | Move destroy to Relation | Pratik Naik | 2010-01-20 | 2 | -28/+28 |
| | | |||||
| * | Remove Base.delete as it's same as Relation#delete | Pratik Naik | 2010-01-20 | 2 | -25/+21 |
| | | |||||
| * | Delegate exists? to Relation | Pratik Naik | 2010-01-20 | 2 | -38/+34 |
| | | |||||
| * | Make Relation#destroy_all handle all the cases | Pratik Naik | 2010-01-20 | 2 | -34/+34 |
| | | |||||
* | | Mail method accepting all headers set via the hash | José Valim and Mikel Lindsaar | 2010-01-21 | 2 | -7/+31 |
| | | |||||
* | | Created mail method for new API | José Valim and Mikel Lindsaar | 2010-01-20 | 3 | -20/+89 |
| | | |||||
* | | Moved old API into deprecated_api.rb in preparation for new Rails 3 Mailer API | José Valim and Mikel Lindsaar | 2010-01-20 | 5 | -153/+208 |
| | | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-01-20 | 54 | -810/+738 |
|\| | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb | ||||
| * | Use unscoped instead of with_exclusive_scope for preloading | Pratik Naik | 2010-01-20 | 1 | -14/+13 |
| | | |||||
| * | Move array_of_strings? to Relation | Pratik Naik | 2010-01-20 | 2 | -6/+6 |
| | | |||||
| * | Remove stale methods constructing joins | Pratik Naik | 2010-01-20 | 1 | -28/+0 |
| | | |||||
| * | Stop overriding LoadError.new to return a MissingSourceError (and sometimes ↵ | Yehuda Katz | 2010-01-19 | 6 | -33/+36 |
| | | | | | | | | nil!) |