aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Get all tests passing.José Valim2010-01-192-13/+32
* First pass on fixing delivery methodMikel Lindsaar2010-01-191-8/+4
* latest updatesMikel Lindsaar2010-01-192-12/+11
* Merge branch 'master' of git://github.com/rails/rails into railsMikel Lindsaar2010-01-19357-3120/+6788
|\
| * Fix DoubleRenderError error messagePratik Naik2010-01-191-1/+1
| * Add Relation#construct_relation_for_association_calculations for calculations...Pratik Naik2010-01-194-42/+17
| * Prettier hash dumpJoshua Peek2010-01-181-3/+7
| * Show Rack env dump on exception pageJoshua Peek2010-01-181-1/+4
| * Bring render_message back for 2.3 compatibility.José Valim2010-01-192-13/+33
| * Bring body(Hash) behavior back.José Valim2010-01-193-27/+32
| * `script/generate mailer Notifier` will now create a mailer at app/mailers.José Valim2010-01-195-8/+8
| * Get generators tests running on Ruby 1.9.1José Valim2010-01-1921-31/+53
| * Improve script/generate help.José Valim2010-01-191-1/+11
| * Since Rails will require Ruby >= 1.8.7, we can rely on instance_exec.José Valim2010-01-192-9/+12
| * Add Relation#find_with_associations to load relation with eager loaded associ...Pratik Naik2010-01-192-25/+40
| * Install plugin view paths into AM view load pathJoshua Peek2010-01-181-2/+6
| * Add all folders in app/* to the load pathJoshua Peek2010-01-182-18/+11
| * Simplify calculation scope building. Remove :order from associations as it is...Pratik Naik2010-01-183-20/+5
| * Remove construct_calculation_arel_with_included_associations because it's sam...Pratik Naik2010-01-181-27/+1
| * No need to pass current_scoped_methods to construct_calculation_arel everytimePratik Naik2010-01-181-18/+18
| * Rake tasks should load generators from new paths.José Valim2010-01-182-3/+3
| * Cleanup deprecation notices.Joshua Peek2010-01-183-8/+8
| * Forgot to change named_scope to scope in an ArgumentError raise exception for...Paco Guzman2010-01-181-1/+1
| * Improve generators help.José Valim2010-01-182-34/+57
| * More cleaning up on rails generators load path.José Valim2010-01-188-114/+84
| * Generators load path now will be Ruby load path. If you want to use rspec:ins...José Valim2010-01-18177-95/+77
| * Automatically remove :generators: from namespaces.José Valim2010-01-185-10/+10
| * Ensure generators can be invoked by their shortcut and remove attr_reader tasks.José Valim2010-01-186-10/+34
| * Simplify construct_finder_arel_* methodsPratik Naik2010-01-181-27/+7
| * Handle invalid query IN() generated when a blank array is supplied in hash co...Pratik Naik2010-01-182-1/+7
| * Get rid of Relation#order_clausesPratik Naik2010-01-182-13/+9
| * Fix the named_scope deprecation noticePratik Naik2010-01-181-1/+1
| * Ensure deprecated validate methods are invoked when they are private [#3214 s...José Valim2010-01-182-2/+19
| * Missing rename from named_scope to scope [#3735 status:resolved]Damien Mathieu2010-01-181-1/+1
| * Clear out AS callback method pollution in AC::Base.action_methodsJoshua Peek2010-01-172-9/+39
| * Base#action_methods delegates to Base.action_methodsJoshua Peek2010-01-171-58/+62
| * Accessing nonexistant cookies through the signed jar should not raise anJoshua Peek2010-01-172-1/+8
| * Add missing CHANGELOG entry about relations as scopesPratik Naik2010-01-181-0/+8
| * Rename named_scope to scopePratik Naik2010-01-1810-35/+46
| * Dont check for class equaity when merging relationsPratik Naik2010-01-182-8/+0
| * Inherit named scope class Scope from RelationPratik Naik2010-01-186-94/+55
| * Ensure that Scope#proxy_scope is always klass. Rename proxy_scope to klass too.Pratik Naik2010-01-183-26/+22
| * Make relations work as scopesPratik Naik2010-01-173-12/+32
| * Make sure named_scope names are not used as method names alreadyPratik Naik2010-01-173-7/+18
| * Module lookup issue on flash_test using ruby 1.9 solved [#3716 status:resolved]Sam Elliott and Santiago Pastorino2010-01-171-1/+1
| * Make local_request? to returns true when facing ::1 IPv6 address [#3257 statu...Prem Sichanugrist2010-01-172-12/+14
| * Fix RAILS_ROOT deprecation on guides generation. [#3710 status:resolved]Rizwan Reza2010-01-171-1/+1
| * Fix resources_path_names branch which was sending an array as entity. [#3715 ...José Valim2010-01-171-34/+25
| * Plugin generator should use templates.José Valim2010-01-174-0/+15
| * Take --skip-activerecord into account boot.rb requires. [#3711 status:resolved]Rizwan Reza2010-01-173-7/+17