aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2009-01-0112-138/+108
| | | | and Template::EagerPath
* Fix failing gem dependency tests [#1659 state:resolved]Mike Gunderloy2009-01-011-12/+12
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Fix FCGI dispatching testsMike Gunderloy2009-01-011-42/+7
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Fixed incorrect parsing of query parameters with mixed-depth nesting inside ↵Mark Reginald James2009-01-012-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 Cheung2009-01-011-1/+1
|
* Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵Roman Shterenzon2009-01-012-1/+10
| | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* Fix :include of has_one with :primary_key optionFrederick Cheung2009-01-012-1/+17
|
* Fix :include of has_many associations with :primary_key optionFrederick Cheung2009-01-013-2/+19
|
* Don't construct object deprecation proxy if unneededJeremy Kemper2009-01-011-4/+3
|
* It was decided that Multibyte does not belong to as/mini.Michael S. Klishin2008-12-291-8/+2
|
* Sync with rails/rails/masterMichael S. Klishin2008-12-298-87/+88
|\
| * Use rack namespace for routing argsJoshua Peek2008-12-281-2/+2
| |
| * Make router and controller classes better rack citizensJoshua Peek2008-12-288-87/+88
| |
* | Pull up some other changes from rails/rails/masterMichael S. Klishin2008-12-297-11/+476
|\|
| * 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
| |
* | Sync i18n update from rails/rails/masterMichael S. Klishin2008-12-2816-71/+884
|\|
| * 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>
* | Sync with rails/rails/master, merge two metaprogramming annotation effortsMichael S. Klishin2008-12-2834-285/+437
|\|
| * 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>
* | Use active_support/mini instead of active_support/minimalisticMichael S. Klishin2008-12-281-15/+0
| |
* | Sync with wycats/rails/masterMichael S. Klishin2008-12-2816-179/+202
|\ \
| * | Annotated metaprogramming code across ActiveSupportMichael S. Klishin2008-12-2820-246/+449
| | |
| * | Merge commit 'rails/master'Yehuda Katz2008-12-2612-31/+124
| |\ \
| * \ \ Merge commit 'rails/master'Yehuda Katz2008-12-266-94/+402
| |\ \ \
| * | | | Inline the only call site of Mime::Type#browser_generated?Michael S. Klishin2008-12-261-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael S. Klishin <michael@novemberain.com>
| * | | | Initial work to merge several places with similar logicYehuda Katz2008-12-254-13/+23
| | | | |
* | | | | active_support/minimalistic.rb => active_support/mini.rbMichael S. Klishin2008-12-281-0/+0
| | | | |
* | | | | Introduce minimalistic package for ActiveSupport.Michael S. Klishin2008-12-282-1/+20
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To simplify using of ActiveSupport in 3rd party libraries, a simple way to require only minimum of commonly used extensions (multibyte, inflections, array and hash extensions, #blank?, and a few others) is needed. For exactly this reason some out-of-Rails-space libraries adopted Extlib, originally from DataMapper. To keep it 2067% backwards compatible, and still available to everyone even in 2.x releases, active_support/minimalistic.rb was added. Use it like this: gem 'active_support', '>=2.3' require 'active_support/minimalistic' instead of require 'activesupport' Right now this package with RubyGems uses about 10 megs of RAM (10.01 or so). It can be further slimmed down though, once we simplify multibyte implementation that right now uses advanced accessors from Module extensions. To compare RAM usage with previous ActiveSupport versions and Extlib, at the time of writing, see http://gist.github.com/40401.
* | | | 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
| | |