aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Pratik Naik2010-01-211-2/+4
| | | | | | | | supplied. Arel seems to be spending a lot of time figuring out the FROM value otherwise.
| * Cache quoted_table_namePratik Naik2010-01-211-4/+5
| |
| * Relation#spawn is basically clone + resetPratik Naik2010-01-211-12/+2
| |
| * Always use table.* in the finder query unless specifiedPratik Naik2010-01-211-1/+1
| |
| * Add AD::Route#to_sSam Ruby2010-01-201-0/+6
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Use @limit_value and @offset_value instead of calling arelPratik Naik2010-01-202-5/+5
| |
| * Move update and update_all to RelationPratik Naik2010-01-202-70/+65
| |
| * Only send filtered_env for notificationsJoshua Peek2010-01-201-8/+9
| |
| * Request#filter_parameters and filter_envJoshua Peek2010-01-201-2/+24
| |
| * Fix AP's AR integration tests warningPratik Naik2010-01-201-1/+1
| |
| * Base.merge_conditions is no longer neededPratik Naik2010-01-202-16/+2
| |
| * Expose last controller in rack env["action_controller.instance"]Joshua Peek2010-01-202-32/+7
| |
| * fixes the failure of config.plugins without :all option tests [#3718 ↵Santiago Pastorino2010-01-201-4/+3
| | | | | | | | | | | | status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Move ActionController::Translation to AbstractController::Translation.José Valim2010-01-206-4/+4
| |
| * Bring normalize behavior to AbstractController::RenderingJosé Valim2010-01-205-39/+37
| |
| * Dont delegate Relation#update to arelPratik Naik2010-01-203-4/+4
| |
| * Delegate delete_all to RelationPratik Naik2010-01-202-24/+20
| |
| * Move destroy to RelationPratik Naik2010-01-202-28/+28
| |
| * Remove Base.delete as it's same as Relation#deletePratik Naik2010-01-202-25/+21
| |
| * Delegate exists? to RelationPratik Naik2010-01-202-38/+34
| |
| * Make Relation#destroy_all handle all the casesPratik Naik2010-01-202-34/+34
| |
* | Mail method accepting all headers set via the hashJosé Valim and Mikel Lindsaar2010-01-212-7/+31
| |
* | Created mail method for new APIJosé Valim and Mikel Lindsaar2010-01-203-20/+89
| |
* | Moved old API into deprecated_api.rb in preparation for new Rails 3 Mailer APIJosé Valim and Mikel Lindsaar2010-01-205-153/+208
| |
* | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-01-2054-810/+738
|\| | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb
| * Use unscoped instead of with_exclusive_scope for preloadingPratik Naik2010-01-201-14/+13
| |
| * Move array_of_strings? to RelationPratik Naik2010-01-202-6/+6
| |
| * Remove stale methods constructing joinsPratik Naik2010-01-201-28/+0
| |
| * Stop overriding LoadError.new to return a MissingSourceError (and sometimes ↵Yehuda Katz2010-01-196-33/+36
| | | | | | | | nil!)
| * Revert streaming params parser support.Joshua Peek2010-01-191-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 outputJoshua Peek2010-01-193-5/+3
| |
| * Scope#find is no longer needed now that Relation#find handles all the casesPratik Naik2010-01-201-12/+0
| |
| * Delegate all finders to RelationPratik Naik2010-01-204-159/+154
| |
| * Ignore order for simple calculations to make postgresql happyPratik Naik2010-01-201-1/+2
| |
| * Mail should log when raise_delivery_methods is false.José Valim2010-01-192-10/+12
| |
| * Named scopes dont need count() now that Relation#count handles all the casesPratik Naik2010-01-201-5/+0
| |
| * with_scope no longer needs :reverse_mergePratik Naik2010-01-201-13/+2
| |
| * Remove find_with_associations and related code from associations now that ↵Pratik Naik2010-01-202-82/+0
| | | | | | | | Relation handles that stuff
| * Fix bug that causes TimeZone.seconds_to_utc_offset to returns wrong offset ↵Prem Sichanugrist2010-01-192-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é Valim2010-01-191-1/+1
| | | | | | | | not get loaded).
| * Allow railties to specify generators paths.José Valim2010-01-195-15/+67
| |
| * Remove Relation#where_clausePratik Naik2010-01-193-11/+7
| |
| * Give preference to to_a over arel from Relation#method_missingPratik Naik2010-01-193-5/+12
| |
| * Rename CalculationMethods to Calculations and get rid of the old ↵Pratik Naik2010-01-195-14/+5
| | | | | | | | Calculations module
| * Move the only remaining calculation method calculate() to RelationPratik Naik2010-01-192-83/+62
| |
| * Get rid of RAILS_ROOT deprecation on AM::TestCase.José Valim2010-01-191-1/+1
| |
| * Logging thread should not die on logging errors.José Valim2010-01-192-1/+19
| |
| * Get rid of construct_count_options_from_argsPratik Naik2010-01-192-33/+4
| |