aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* More AV::Base cleanup.José Valim2011-05-044-43/+55
* Merge pull request #384 from arunagw/new_plugin_test.Xavier Noria2011-05-041-2/+0
|\
| * Fixed tests for new_plugin_generator.Arun Agrawal2011-05-041-2/+0
* | Move prefixes to view paths as they are now a lookup context dependency.José Valim2011-05-045-23/+30
|/
* restores the -j option, but now it accepts the name of any libraryXavier Noria2011-05-0410-34/+46
* removes the :update_ujs task in railtiesXavier Noria2011-05-041-4/+0
* jQuery is no longer vendoredXavier Noria2011-05-043-8465/+2
* Also allow prefixes as third argument to lookup context.José Valim2011-05-043-6/+4
* Merge remote branch 'apotonick/presentation'José Valim2011-05-049-21/+32
|\
| * no @controller dependency in Renderers.Nick Sutterer2011-05-045-19/+14
| * fixed test to assert initialization value.Nick Sutterer2011-05-041-1/+1
| * initialize prefixes in LookupContext.Nick Sutterer2011-05-041-0/+1
| * controller's prefixes are now added to LookupContext.Nick Sutterer2011-05-032-2/+9
| * added :prefixes accessor to LookupContext.Nick Sutterer2011-05-032-0/+8
|/
* Use latest rack-test.José Valim2011-05-032-2/+1
* Merge pull request #381 from joshk/mysql2_schema_test.Aaron Patterson2011-05-033-3/+54
|\
| * added the mysql schema test to mysql2 adapter, and fixed the corresponding fa...Josh Kalderimis2011-05-033-3/+54
|/
* Merge pull request #380 from vijaydev/master.José Valim2011-05-031-3/+3
|\
| * Fix typos in test method namesVijay Dev2011-05-031-3/+3
|/
* make sure IM repository is cleared after body is closedAaron Patterson2011-05-032-0/+12
* proxying the body in the IM middleware so that IM is available for streaming ERbAaron Patterson2011-05-032-3/+47
* adding a test case for the identity map middlewareAaron Patterson2011-05-031-0/+34
* cache strings in the AST for faster comparison than include?Aaron Patterson2011-05-031-6/+3
* Merge pull request #378 from danielvlopes/master.José Valim2011-05-032-8/+24
|\
| * fix select_tag to have the same behavior of selectDaniel Lopes2011-05-032-8/+24
* | Add a shared entry point for AV and AC render which can be used as extension ...José Valim2011-05-033-8/+11
* | Merge pull request #377 from joshk/rails_legacy_mapper_message.José Valim2011-05-032-0/+11
|\ \ | |/ |/|
| * raise an error if the old router draw method is used, along with a message ad...Josh Kalderimis2011-05-032-0/+11
* | Merge pull request #375 from k33l0r/master.José Valim2011-05-033-3/+12
|\ \
| * | Sets the HTTP charset parameter for rescue response.Matias Korhonen2011-05-032-1/+8
| * | Rescues template HTML5 doctype and the utf8 charset meta tag, and better font...Matias Korhonen2011-05-031-2/+4
|/ /
* | Add static_cache_control as configuration option and set a default for test. ...José Valim2011-05-033-3/+8
* | We no longer depend on those git repos.José Valim2011-05-033-9/+2
* | 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
|\
| * Fix broken params_wrapper_test on 1.8.7 :bomb:Prem Sichanugrist2011-05-031-36/+80
| * Update Action Pack to depend on Rack 1.3.0Prem Sichanugrist2011-05-031-1/+1
|/
* 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 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
| |\