aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2009-01-0138-313/+778
|\
| * Only silence backtrace from plugin lib dirsJeremy Kemper2008-12-301-1/+2
| |
| * Test that exceptions raised in filters are properly rescuedJeremy Kemper2008-12-302-4/+22
| |
| * Fix formatted_* deprecation messageJeremy Kemper2008-12-301-2/+2
| |
| * Clean trailing / after rails root from backtracesJeremy Kemper2008-12-301-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-3021-149/+165
| |\
| | * Merge commit 'fred/pullable'Pratik Naik2008-12-307-10/+52
| | |\
| | | * Fixed incorrect parsing of query parameters with mixed-depth nesting inside ↵Mark Reginald James2008-12-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | an array [#1622 state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | | * Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | | |
| | | * Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵Roman Shterenzon2008-12-272-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | | * Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-262-1/+17
| | | |
| | | * Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-263-2/+19
| | | |
| | * | Fix named scope tests for sqlite3 [#1667 state:resolved]Mike Gunderloy2008-12-301-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | Add transaction check to SQLite2 adapter to fix ↵Mike Gunderloy2008-12-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2008-12-2912-138/+108
| | | | | | | | | | | | | | | | and Template::EagerPath
| * | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-29125-1651/+4177
| |\| |
| | * | Fix failing gem dependency tests [#1659 state:resolved]Mike Gunderloy2008-12-291-12/+12
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | Fix FCGI dispatching testsMike Gunderloy2008-12-291-42/+7
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * | Use rack namespace for routing argsJoshua Peek2008-12-281-2/+2
| | | |
| | * | Make router and controller classes better rack citizensJoshua Peek2008-12-288-87/+88
| | | |
| | * | HTTP Digest authentication [#1230 state:resolved]Joshua Peek2008-12-284-2/+432
| | | |
| | * | Allow custom rails generators to pass in their own binding to Create command ↵Joshua Peek2008-12-281-1/+1
| | | | | | | | | | | | | | | | so that the corresponding erb templates get rendered with the proper binding [#1493 state:resolved]
| | * | Allow multiple conditions for callbacks [#1627 state:resolved]Joshua Peek2008-12-282-8/+43
| | | |
| * | | Don't construct object deprecation proxy if unneededJeremy Kemper2008-12-221-4/+3
| | | |
* | | | Fixed the AssetTagHelper cache to use the computed asset host as part of the ↵David Heinemeier Hansson2009-01-013-5/+27
| |/ / |/| | | | | | | | cache key instead of just assuming the its a string [#1299 state:committed]
* | | Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [#1658 state:committed]Yaroslav Markin2008-12-281-1/+1
| | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | Update i18n gem to version 0.1.1 (Rails' changes were backported) [#1635 ↵Yaroslav Markin2008-12-2816-71/+884
| | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-2828-296/+373
|\ \ \
| * | | Inline code comments for class_eval/module_eval [#1657 state:resolved]Xavier Noria2008-12-2828-296/+373
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵Yaroslav Markin2008-12-285-1/+72
|/ / / | | | | | | | | | | | | | | | like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | Ensure template runner tests don't depend on hash ordering [#1654 ↵Mike Gunderloy2008-12-282-2/+2
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Request#env['SERVER_NAME'] does not contain port numberPratik Naik2008-12-283-8/+4
| | |
* | | Use SimpleLogger for Rails::TemplateRunner outside of the Generator context ↵Aaron Quint2008-12-281-0/+10
| | | | | | | | | | | | | | | | | | [#1618 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Adding test coverage and better logging to Rails::TemplateRunner [#1618 ↵Aaron Quint2008-12-272-66/+243
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Fix ActionPack build on Windows: we really should not test anything ↵Yaroslav Markin2008-12-271-10/+12
| | | | | | | | | | | | | | | | | | regarding symlinks on Windows. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed]Yaroslav Markin2008-12-271-1/+1
| | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | ActiveRecord::Base#new_record? now returns false for existing records (was ↵Yaroslav Markin2008-12-273-2/+9
| | | | | | | | | | | | | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | | More optimizations on respond_to after a profile and benching:Yehuda Katz2008-12-271-6/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | App with simple respond_to: def index respond_to do |format| format.html format.xml format.json end end On JRuby (after complete hotspot warmup) -- 8% improvement: 550 requests per second after this commit 510 requests per second with old method_missing technique On MRI (8% improvement): 430 requests per second after this commit 400 requests per second with old method_missing technique
* | Merge commit 'fred/pullable'Pratik Naik2008-12-2611-27/+101
|\ \
| * | Preload uses exclusive scope [#643 state:resolved]Frederick Cheung2008-12-265-16/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | With self referential associations, the scope for the the top level should not affect fetching of associations, for example when doing Person.male.find :all, :include => :friends we should load all of the friends for each male, not just the male friends.
| * | Association preloading no longer stops if it hits a nil object [#1630 ↵Pivotal Labs2008-12-262-2/+10
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * | MaKe Hash#slice! return removed values, akin to Array [#971 state:resolved]trans2008-12-262-4/+25
| | | | | | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| * | Fix assert_select_rjs not checking id for inserts [#540 state:resolved]Frederick Cheung2008-12-262-0/+9
| | |
| * | Fix randomly failing cookie store testsFrederick Cheung2008-12-261-5/+4
| | | | | | | | | | | | | | | Marshal.dump(Marshal.load(marshaled_hash)) is not guarenteed to be equal to marshaled_hash because of the lack of ordering of hash
* | | Remove method missing use in respond_toYehuda Katz2008-12-261-4/+23
| | |
* | | Merge docrailsPratik Naik2008-12-263-84/+334
| | |
* | | Don't recurse when ActionController#render is called without any argumentsPratik Naik2008-12-261-1/+1
| | |
* | | Make ActionController#render(symbol) behave same as ↵Pratik Naik2008-12-263-6/+16
| | | | | | | | | | | | ActionController#render(string) [#1435]
* | | Make ActionController#render(string) work as a shortcut for render :action ↵Pratik Naik2008-12-253-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | => string. [#1435] Examples: # Instead of render(:action => 'other_action') render('other_action') Note : Argument must not have any '/'
* | | Make ActionController#render(string) work as a shortcut for render :template ↵Pratik Naik2008-12-253-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | => string. [#1435] Examples: # Instead of render(:template => 'controller/action') render('controller/action') Note : Argument must not begin with a '/', but have at least one '/'
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 01:58:54 +0000