Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update Action Pack to depend on Rack 1.3.0 | Prem Sichanugrist | 2011-05-03 | 1 | -1/+1 |
| | | | Rack 1.3.0 was released a while ago, which break the hard dependency we set in Action Pack. This dependency bump won't be the issue, as we always depends on edge Rack. Also, we was waiting for Rack 1.3.x release before we can release Rails 3.1 beta anyway. | ||||
* | Use require_self from latest Sprockets | David Heinemeier Hansson | 2011-05-02 | 2 | -1/+2 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2011-05-02 | 28 | -441/+865 |
|\ | |||||
| * | More performance optimizations. | José Valim | 2011-05-03 | 2 | -18/+17 |
| | | |||||
| * | Improve performance for filtered parameters and add tests. | José Valim | 2011-05-03 | 5 | -5/+23 |
| | | |||||
| * | Instrumentation should have callbacks. | José Valim | 2011-05-03 | 1 | -4/+4 |
| | | |||||
| * | Move most processing to load time for performance and improve test suite. | José Valim | 2011-05-03 | 2 | -37/+76 |
| | | |||||
| * | Update CHANGELOG. | José Valim | 2011-05-03 | 2 | -5/+17 |
| | | |||||
| * | Merge pull request #370 from joshk/unrolled_map. | Aaron Patterson | 2011-05-02 | 2 | -8/+4 |
| |\ | | | | | | | favor map over each in mysql* adapters | ||||
| | * | favor collect over each in mysql* adapters | Josh Kalderimis | 2011-05-03 | 2 | -8/+4 |
| | | | |||||
| * | | removing auto_link and moving it to the rails_autolink gem. :bomb: | Aaron Patterson | 2011-05-02 | 3 | -379/+6 |
| |/ | |||||
| * | Merge pull request #369 from smartinez87/params_wrapper. | David Heinemeier Hansson | 2011-05-02 | 1 | -2/+2 |
| |\ | | | | | | | Fix ParamsWrapper docs errors | ||||
| | * | Fix ParamsWrapper docs errors | Sebastian Martinez | 2011-05-02 | 1 | -2/+2 |
| |/ | |||||
| * | Koz asked to test something crazy. | José Valim | 2011-05-02 | 1 | -0/+12 |
| | | |||||
| * | Allow ignore_accept_header through configuration option. | José Valim | 2011-05-02 | 2 | -0/+23 |
| | | |||||
| * | Add ignore_accept_header config to AD::Request. | José Valim | 2011-05-02 | 2 | -5/+44 |
| | | |||||
| * | Merge pull request #359 from sikachu/params_wrapper. | David Heinemeier Hansson | 2011-05-02 | 9 | -0/+503 |
| |\ | | | | | | | Add `ActionController::ParamsWrapper` to wrap JSON parameters into a nested parameters. | ||||
| | * | Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash | Prem Sichanugrist | 2011-05-03 | 9 | -0/+503 |
| | | | | | | | | | This will allow us to do a rootless JSON/XML request to server. | ||||
| * | | Merge pull request #367 from sikachu/credit_changelog. | José Valim | 2011-05-02 | 1 | -1/+3 |
| |\ \ | | | | | | | | | Update CHANGELOG file to mention my name | ||||
| | * | | Update CHANGELOG file to mention my name | Prem Sichanugrist | 2011-05-03 | 1 | -1/+3 |
| |/ / | | | | | | | | | | | | | | | | On the commit for updating :format parameters, seems like I've left out the credit name after the CHANGELOG entry. This should fix it, and in case someone has a problem they could seek assistance easier. | ||||
| * | | introduce a body proxy to ensure that query cache is enabled during streaming | Aaron Patterson | 2011-05-02 | 3 | -3/+58 |
| | | | |||||
| * | | more tests around caching | Aaron Patterson | 2011-05-02 | 1 | -1/+10 |
| | | | |||||
| * | | add a couple test cases surrounding query cache middleware | Aaron Patterson | 2011-05-02 | 1 | -0/+18 |
| | | | |||||
| * | | Fix failing AR test. | José Valim | 2011-05-02 | 2 | -17/+12 |
| | | | |||||
| * | | Merge pull request #360 from cgriego/activeresource-performance. | José Valim | 2011-05-01 | 2 | -15/+94 |
| |\ \ | | | | | | | | | Optimize ActiveResource::Base.new(attributes) | ||||
| | * | | Optimize ActiveResource::Base.new(attributes) | Chris Griego | 2011-05-01 | 2 | -15/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add performance benchmark similar to ActiveRecord * Lazily find_or_create_resource_for_collection to not incur the overhead for empty arrays and arrays of primatives * #duplicable? is faster than inline rescues when the object is not duplicable * Don't constantly raise and handle NameError, raising is expensive * Even when a resource is nested inside a module, always look inside the class first for the resource definition so we don't overwrite classes all the time Before: user system total real Model.new (instantiation) 0.120000 0.000000 0.120000 ( 0.119961) Nested::Model.new (instantiation) 0.150000 0.010000 0.160000 ( 0.151183) Model.new (setting attributes) 28.540000 0.680000 29.220000 ( 29.271775) Nested::Model.new (setting attributes) 29.740000 0.580000 30.320000 ( 30.486210) After: user system total real Model.new (instantiation) 0.120000 0.000000 0.120000 ( 0.121249) Nested::Model.new (instantiation) 0.150000 0.010000 0.160000 ( 0.152429) Model.new (setting attributes) 11.480000 0.170000 11.650000 ( 11.656163) Nested::Model.new (setting attributes) 11.510000 0.210000 11.720000 ( 11.724249) | ||||
| * | | | Use sprockets beta gem | Joshua Peek | 2011-05-01 | 2 | -7/+5 |
| |/ / | |||||
* / / | Flunk makes a lot more sense, doesnt it (hat tip @tenderlove) | David Heinemeier Hansson | 2011-05-02 | 1 | -1/+1 |
|/ / | |||||
* | | Make the identity map use the instrumentation infrastructure so we can style ↵ | David Heinemeier Hansson | 2011-05-01 | 3 | -10/+31 |
| | | | | | | | | the messages nicely with colors (FIXME: Can someone look into why the test is not working?) | ||||
* | | Remove schema noise from logging (TODO: Deprecate/remove the name attribute ↵ | David Heinemeier Hansson | 2011-05-01 | 1 | -4/+4 |
| | | | | | | | | to all these methods -- will take a pull request!) | ||||
* | | Merge pull request #357 from joshk/assign_attributes. | David Heinemeier Hansson | 2011-05-01 | 7 | -64/+464 |
|\ \ | | | | | | | Assign protected attributes with create/new and control the role. | ||||
| * | | singular and collection relations in AR can now specify mass-assignment ↵ | Josh Kalderimis | 2011-05-01 | 6 | -59/+346 |
| | | | | | | | | | | | | security options (:as and :without_protection) in build, create and create! methods. | ||||
| * | | Added mass-assignment security :as and :without_protection support to AR.new ↵ | Josh Kalderimis | 2011-05-01 | 2 | -29/+142 |
| | | | | | | | | | | | | and AR.create | ||||
* | | | Merge pull request #340 from joshk/default_scope_changes. | David Heinemeier Hansson | 2011-05-01 | 3 | -56/+41 |
|\ \ \ | | | | | | | | | removed the default_scope deprecations and updated the docs and tests to | ||||
| * | | | removed the default_scope deprecations and updated the docs and tests to ↵ | Josh Kalderimis | 2011-04-28 | 3 | -56/+41 |
| | | | | | | | | | | | | | | | | reflect its use cases | ||||
* | | | | made a copy-edit pass on the streaming RDoc | Xavier Noria | 2011-05-02 | 1 | -33/+35 |
| |/ / |/| | | |||||
* | | | convert strings to lambdas so we can use a consistent interface to the ↵ | Aaron Patterson | 2011-05-01 | 1 | -5/+5 |
| |/ |/| | | | | | objects in the collection | ||||
* | | assert_difference can take a callable piece of code rather than just evaling ↵ | Aaron Patterson | 2011-05-01 | 2 | -8/+19 |
| | | | | | | | | a string | ||||
* | | Merge pull request #316 from arunagw/jdbc_postgresql. | Aaron Patterson | 2011-05-01 | 1 | -83/+83 |
|\ \ | | | | | | | Re-factored database.rake to allow Jdbcpostgresql. #jruby | ||||
| * | | Minor fixes in databases.rake | Arun Agrawal | 2011-04-27 | 1 | -71/+71 |
| | | | |||||
| * | | Allowing jdbcsqlite3 to drop database, clone structure. #jruby | Arun Agrawal | 2011-04-27 | 1 | -7/+7 |
| | | | |||||
| * | | Re-factored database.rake to allow Jdbcpostgresql. #jruby | Arun Agrawal | 2011-04-27 | 1 | -5/+5 |
| | | | |||||
* | | | Tidy up pending TODOs after discussion with Mr. Gatoz (@wycats). | José Valim | 2011-05-01 | 7 | -107/+120 |
| | | | |||||
* | | | Streaming docs. | José Valim | 2011-05-01 | 3 | -42/+202 |
| | | | |||||
* | | | log errors when an exception happens when streaming. | José Valim | 2011-05-01 | 4 | -3/+37 |
| | | | |||||
* | | | Add a test for rendering from the controller context. | José Valim | 2011-05-01 | 1 | -0/+54 |
| | | | |||||
* | | | Introduce view renderer. | José Valim | 2011-05-01 | 5 | -33/+37 |
| | | | |||||
* | | | Remove view dependency from AV::Renderer. | José Valim | 2011-05-01 | 7 | -74/+100 |
| | | | |||||
* | | | More cleanup and moving responsibilities around. | José Valim | 2011-05-01 | 9 | -112/+83 |
| | | | |||||
* | | | Remove more dependencies from the view. | José Valim | 2011-05-01 | 5 | -24/+21 |
| | | |