Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't construct object deprecation proxy if unneeded | Jeremy Kemper | 2009-01-01 | 1 | -4/+3 |
| | |||||
* | It was decided that Multibyte does not belong to as/mini. | Michael S. Klishin | 2008-12-29 | 1 | -8/+2 |
| | |||||
* | Sync with rails/rails/master | Michael S. Klishin | 2008-12-29 | 8 | -87/+88 |
|\ | |||||
| * | Use rack namespace for routing args | Joshua Peek | 2008-12-28 | 1 | -2/+2 |
| | | |||||
| * | Make router and controller classes better rack citizens | Joshua Peek | 2008-12-28 | 8 | -87/+88 |
| | | |||||
* | | Pull up some other changes from rails/rails/master | Michael S. Klishin | 2008-12-29 | 7 | -11/+476 |
|\| | |||||
| * | HTTP Digest authentication [#1230 state:resolved] | Joshua Peek | 2008-12-28 | 4 | -2/+432 |
| | | |||||
| * | Allow custom rails generators to pass in their own binding to Create command ↵ | Joshua Peek | 2008-12-28 | 1 | -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 Peek | 2008-12-28 | 2 | -8/+43 |
| | | |||||
* | | Sync i18n update from rails/rails/master | Michael S. Klishin | 2008-12-28 | 16 | -71/+884 |
|\| | |||||
| * | Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [#1658 state:committed] | Yaroslav Markin | 2008-12-28 | 1 | -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 Markin | 2008-12-28 | 16 | -71/+884 |
| | | | | | | | | | | | | state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Sync with rails/rails/master, merge two metaprogramming annotation efforts | Michael S. Klishin | 2008-12-28 | 34 | -285/+437 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-12-28 | 28 | -296/+373 |
| |\ | |||||
| | * | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 28 | -296/+373 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵ | Yaroslav Markin | 2008-12-28 | 5 | -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 Gunderloy | 2008-12-28 | 2 | -2/+2 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Request#env['SERVER_NAME'] does not contain port number | Pratik Naik | 2008-12-28 | 3 | -8/+4 |
| | | |||||
| * | Use SimpleLogger for Rails::TemplateRunner outside of the Generator context ↵ | Aaron Quint | 2008-12-28 | 1 | -0/+10 |
| | | | | | | | | | | | | [#1618 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Use active_support/mini instead of active_support/minimalistic | Michael S. Klishin | 2008-12-28 | 1 | -15/+0 |
| | | |||||
* | | Sync with wycats/rails/master | Michael S. Klishin | 2008-12-28 | 16 | -179/+202 |
|\ \ | |||||
| * | | Annotated metaprogramming code across ActiveSupport | Michael S. Klishin | 2008-12-28 | 20 | -246/+449 |
| | | | |||||
| * | | Merge commit 'rails/master' | Yehuda Katz | 2008-12-26 | 12 | -31/+124 |
| |\ \ | |||||
| * \ \ | Merge commit 'rails/master' | Yehuda Katz | 2008-12-26 | 6 | -94/+402 |
| |\ \ \ | |||||
| * | | | | Inline the only call site of Mime::Type#browser_generated? | Michael S. Klishin | 2008-12-26 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael S. Klishin <michael@novemberain.com> | ||||
| * | | | | Initial work to merge several places with similar logic | Yehuda Katz | 2008-12-25 | 4 | -13/+23 |
| | | | | | |||||
* | | | | | active_support/minimalistic.rb => active_support/mini.rb | Michael S. Klishin | 2008-12-28 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | Introduce minimalistic package for ActiveSupport. | Michael S. Klishin | 2008-12-28 | 2 | -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 Quint | 2008-12-27 | 2 | -66/+243 |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | | Fix ActionPack build on Windows: we really should not test anything ↵ | Yaroslav Markin | 2008-12-27 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | regarding symlinks on Windows. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | | Refactor ActiveRecord::Base#new_record? [#1647 state:committed] | Yaroslav Markin | 2008-12-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | | | ActiveRecord::Base#new_record? now returns false for existing records (was ↵ | Yaroslav Markin | 2008-12-27 | 3 | -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 Katz | 2008-12-27 | 1 | -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 Naik | 2008-12-26 | 11 | -27/+101 |
|\ \ \ | |||||
| * | | | Preload uses exclusive scope [#643 state:resolved] | Frederick Cheung | 2008-12-26 | 5 | -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 Labs | 2008-12-26 | 2 | -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] | trans | 2008-12-26 | 2 | -4/+25 |
| | | | | | | | | | | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com> | ||||
| * | | | Fix assert_select_rjs not checking id for inserts [#540 state:resolved] | Frederick Cheung | 2008-12-26 | 2 | -0/+9 |
| | | | | |||||
| * | | | Fix randomly failing cookie store tests | Frederick Cheung | 2008-12-26 | 1 | -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_to | Yehuda Katz | 2008-12-26 | 1 | -4/+23 |
| |_|/ |/| | | |||||
* | | | Merge docrails | Pratik Naik | 2008-12-26 | 3 | -84/+334 |
| | | | |||||
* | | | Don't recurse when ActionController#render is called without any arguments | Pratik Naik | 2008-12-26 | 1 | -1/+1 |
| | | | |||||
* | | | Make ActionController#render(symbol) behave same as ↵ | Pratik Naik | 2008-12-26 | 3 | -6/+16 |
| | | | | | | | | | | | | ActionController#render(string) [#1435] | ||||
* | | | Make ActionController#render(string) work as a shortcut for render :action ↵ | Pratik Naik | 2008-12-25 | 3 | -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 Naik | 2008-12-25 | 3 | -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 '/' | ||||
* | | Make ActionController#render(string) work as a shortcut for render :file => ↵ | Pratik Naik | 2008-12-25 | 3 | -9/+36 |
| | | | | | | | | | | | | | | | | | | | | string. [#1435] Examples: # Instead of render(:file => '/Users/lifo/home.html.erb') render('/Users/lifo/home.html.erb') Note : Filename must begin with a forward slash ('/') | ||||
* | | Move ActionController::Base#render arguments validation to a separate method | Pratik Naik | 2008-12-25 | 1 | -8/+14 |
| | | |||||
* | | Make render_test.rb run in isolation | Pratik Naik | 2008-12-25 | 1 | -0/+2 |
| | | |||||
* | | Undry ActionController::TestCase#<HTTP_METHODS> for better documentation | Pratik Naik | 2008-12-25 | 2 | -14/+26 |
|/ | |||||
* | Move request parsing related code to ActionController::RequestParser | Pratik Naik | 2008-12-25 | 7 | -460/+512 |
| |