Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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!) | ||||
| * | Revert streaming params parser support. | Joshua Peek | 2010-01-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | AS Xml and Json parsers expect the request body to be a real IO object supporting methods like getc or ungetc which are not specified by the Rack spec and aren't supported by Passenger or the Rewindable input wrapper. We can restore functionality if the AS parsers are rewritten to support Racks subset of supported IO methods. | ||||
| * | Cleanup middleware introspection output | Joshua Peek | 2010-01-19 | 3 | -5/+3 |
| | | |||||
| * | Scope#find is no longer needed now that Relation#find handles all the cases | Pratik Naik | 2010-01-20 | 1 | -12/+0 |
| | | |||||
| * | Delegate all finders to Relation | Pratik Naik | 2010-01-20 | 4 | -159/+154 |
| | | |||||
| * | Ignore order for simple calculations to make postgresql happy | Pratik Naik | 2010-01-20 | 1 | -1/+2 |
| | | |||||
| * | Mail should log when raise_delivery_methods is false. | José Valim | 2010-01-19 | 2 | -10/+12 |
| | | |||||
| * | Named scopes dont need count() now that Relation#count handles all the cases | Pratik Naik | 2010-01-20 | 1 | -5/+0 |
| | | |||||
| * | with_scope no longer needs :reverse_merge | Pratik Naik | 2010-01-20 | 1 | -13/+2 |
| | | |||||
| * | Remove find_with_associations and related code from associations now that ↵ | Pratik Naik | 2010-01-20 | 2 | -82/+0 |
| | | | | | | | | Relation handles that stuff | ||||
| * | Fix bug that causes TimeZone.seconds_to_utc_offset to returns wrong offset ↵ | Prem Sichanugrist | 2010-01-19 | 2 | -3/+10 |
| | | | | | | | | | | | | when hour < 0 and not in hundreds [#3741 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Avoid load tasks from plugins recursively (so stuff in tests or vendor does ↵ | José Valim | 2010-01-19 | 1 | -1/+1 |
| | | | | | | | | not get loaded). | ||||
| * | Allow railties to specify generators paths. | José Valim | 2010-01-19 | 5 | -15/+67 |
| | | |||||
| * | Remove Relation#where_clause | Pratik Naik | 2010-01-19 | 3 | -11/+7 |
| | | |||||
| * | Give preference to to_a over arel from Relation#method_missing | Pratik Naik | 2010-01-19 | 3 | -5/+12 |
| | | |||||
| * | Rename CalculationMethods to Calculations and get rid of the old ↵ | Pratik Naik | 2010-01-19 | 5 | -14/+5 |
| | | | | | | | | Calculations module | ||||
| * | Move the only remaining calculation method calculate() to Relation | Pratik Naik | 2010-01-19 | 2 | -83/+62 |
| | | |||||
| * | Get rid of RAILS_ROOT deprecation on AM::TestCase. | José Valim | 2010-01-19 | 1 | -1/+1 |
| | | |||||
| * | Logging thread should not die on logging errors. | José Valim | 2010-01-19 | 2 | -1/+19 |
| | | |||||
| * | Get rid of construct_count_options_from_args | Pratik Naik | 2010-01-19 | 2 | -33/+4 |
| | |