aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* No need for a regexp here.José Valim2011-05-033-5/+5
|
* Static middleware accepts cache control.José Valim2011-05-032-5/+11
|
* Multipart is now fixed in Rack.José Valim2011-05-031-14/+8
|
* Merge pull request #373 from sikachu/bomb.José Valim2011-05-032-37/+81
|\ | | | | Fixing failing test case on 1.8.7 & bump Rack version
| * Fix broken params_wrapper_test on 1.8.7 :bomb:Prem Sichanugrist2011-05-031-36/+80
| | | | | | | | | | I have to keep in mind that 1.8.7 does *not* preserve the hash order. Guys, let's move to use 1.9.2 in production!
| * Update Action Pack to depend on Rack 1.3.0Prem Sichanugrist2011-05-031-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 SprocketsDavid Heinemeier Hansson2011-05-022-1/+2
|
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2011-05-0228-441/+865
|\
| * More performance optimizations.José Valim2011-05-032-18/+17
| |
| * Improve performance for filtered parameters and add tests.José Valim2011-05-035-5/+23
| |
| * Instrumentation should have callbacks.José Valim2011-05-031-4/+4
| |
| * Move most processing to load time for performance and improve test suite.José Valim2011-05-032-37/+76
| |
| * Update CHANGELOG.José Valim2011-05-032-5/+17
| |
| * Merge pull request #370 from joshk/unrolled_map.Aaron Patterson2011-05-022-8/+4
| |\ | | | | | | favor map over each in mysql* adapters
| | * favor collect over each in mysql* adaptersJosh Kalderimis2011-05-032-8/+4
| | |
| * | removing auto_link and moving it to the rails_autolink gem. :bomb:Aaron Patterson2011-05-023-379/+6
| |/
| * Merge pull request #369 from smartinez87/params_wrapper.David Heinemeier Hansson2011-05-021-2/+2
| |\ | | | | | | Fix ParamsWrapper docs errors
| | * Fix ParamsWrapper docs errorsSebastian Martinez2011-05-021-2/+2
| |/
| * Koz asked to test something crazy.José Valim2011-05-021-0/+12
| |
| * Allow ignore_accept_header through configuration option.José Valim2011-05-022-0/+23
| |
| * Add ignore_accept_header config to AD::Request.José Valim2011-05-022-5/+44
| |
| * Merge pull request #359 from sikachu/params_wrapper.David Heinemeier Hansson2011-05-029-0/+503
| |\ | | | | | | Add `ActionController::ParamsWrapper` to wrap JSON parameters into a nested parameters.
| | * Add `ActionController::ParamsWrapper` to wrap parameters into a nested hashPrem Sichanugrist2011-05-039-0/+503
| | | | | | | | | This will allow us to do a rootless JSON/XML request to server.
| * | Merge pull request #367 from sikachu/credit_changelog.José Valim2011-05-021-1/+3
| |\ \ | | | | | | | | Update CHANGELOG file to mention my name
| | * | Update CHANGELOG file to mention my namePrem Sichanugrist2011-05-031-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 streamingAaron Patterson2011-05-023-3/+58
| | |
| * | more tests around cachingAaron Patterson2011-05-021-1/+10
| | |
| * | add a couple test cases surrounding query cache middlewareAaron Patterson2011-05-021-0/+18
| | |
| * | Fix failing AR test.José Valim2011-05-022-17/+12
| | |
| * | Merge pull request #360 from cgriego/activeresource-performance.José Valim2011-05-012-15/+94
| |\ \ | | | | | | | | Optimize ActiveResource::Base.new(attributes)
| | * | Optimize ActiveResource::Base.new(attributes)Chris Griego2011-05-012-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 gemJoshua Peek2011-05-012-7/+5
| |/ /
* / / Flunk makes a lot more sense, doesnt it (hat tip @tenderlove)David Heinemeier Hansson2011-05-021-1/+1
|/ /
* | Make the identity map use the instrumentation infrastructure so we can style ↵David Heinemeier Hansson2011-05-013-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 Hansson2011-05-011-4/+4
| | | | | | | | to all these methods -- will take a pull request!)
* | Merge pull request #357 from joshk/assign_attributes.David Heinemeier Hansson2011-05-017-64/+464
|\ \ | | | | | | Assign protected attributes with create/new and control the role.
| * | singular and collection relations in AR can now specify mass-assignment ↵Josh Kalderimis2011-05-016-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 Kalderimis2011-05-012-29/+142
| | | | | | | | | | | | and AR.create
* | | Merge pull request #340 from joshk/default_scope_changes.David Heinemeier Hansson2011-05-013-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 Kalderimis2011-04-283-56/+41
| | | | | | | | | | | | | | | | reflect its use cases
* | | | made a copy-edit pass on the streaming RDocXavier Noria2011-05-021-33/+35
| |/ / |/| |
* | | convert strings to lambdas so we can use a consistent interface to the ↵Aaron Patterson2011-05-011-5/+5
| |/ |/| | | | | objects in the collection
* | assert_difference can take a callable piece of code rather than just evaling ↵Aaron Patterson2011-05-012-8/+19
| | | | | | | | a string
* | Merge pull request #316 from arunagw/jdbc_postgresql.Aaron Patterson2011-05-011-83/+83
|\ \ | | | | | | Re-factored database.rake to allow Jdbcpostgresql. #jruby
| * | Minor fixes in databases.rake Arun Agrawal2011-04-271-71/+71
| | |
| * | Allowing jdbcsqlite3 to drop database, clone structure. #jrubyArun Agrawal2011-04-271-7/+7
| | |
| * | Re-factored database.rake to allow Jdbcpostgresql. #jrubyArun Agrawal2011-04-271-5/+5
| | |
* | | Tidy up pending TODOs after discussion with Mr. Gatoz (@wycats).José Valim2011-05-017-107/+120
| | |
* | | Streaming docs.José Valim2011-05-013-42/+202
| | |
* | | log errors when an exception happens when streaming.José Valim2011-05-014-3/+37
| | |