aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4984 from raghunadhd/change_orderhashVijay Dev2012-03-033-3/+3
|\
| * Refactored codeRaghunadh2012-02-103-3/+3
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-036-19/+65
|\ \
| * | copy edits [ci skip]Vijay Dev2012-03-031-1/+1
| * | Made documentation of config.assets.precompile slightly more explicit.Guy Bolton King2012-03-021-1/+3
| * | Removed max-stale from the setting the cache-headers in the response as max-s...Anuj Dutta2012-03-021-1/+1
| * | Add documentation for IndexDefinition.Waseem Ahmad2012-03-021-0/+3
| * | Improve header hierarchy.Joost Baaij2012-02-291-1/+3
| * | Include a comment as to why ETag header should be removed from the response.Joost Baaij2012-02-291-0/+1
| * | Changed asset_host config to more specificRahul P. Chaudhari2012-02-291-2/+2
| * | Some cleanup on the upgrading guideMike Gunderloy2012-02-281-14/+40
| * | Merge pull request #85 from whilefalse/rails_32_engine_upgradeVijay Dev2012-02-281-0/+12
| |\ \
| | * | Added guide to updating engines built in previous versions of RailsSteven Anderson2012-02-241-0/+12
* | | | Merge pull request #5258 from guilleiguaran/amo-modelJon Leighton2012-03-031-1/+1
|\ \ \ \
| * | | | Use public_send instead of send in ActiveModel::Model initializeGuillermo Iguaran2012-03-031-1/+1
|/ / / /
* | | | Merge pull request #5256 from carlosantoniodasilva/active-model-modelJosé Valim2012-03-033-1/+81
|\ \ \ \
| * | | | Add docs with usage examples for ActiveModel::ModelCarlos Antonio da Silva2012-03-033-1/+81
|/ / / /
* | | | Merge pull request #5253 from guilleiguaran/amo-modelJeremy Kemper2012-03-024-0/+44
|\ \ \ \
| * | | | Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatlyGuillermo Iguaran2012-03-024-0/+44
|/ / / /
* | | | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that...Santiago Pastorino2012-03-031-1/+1
* | | | only log an error if there is a logger. fixes #5226Aaron Patterson2012-03-023-2/+11
* | | | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
* | | | Merge pull request #5243 from lest/patch-2José Valim2012-03-021-2/+2
|\ \ \ \
| * | | | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
|/ / / /
* | | | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-029-48/+107
|\ \ \ \
| * | | | Optimize url helpers.Sergey Nartimov + José Valim2012-03-026-29/+36
| * | | | Optimize path helpers.José Valim2012-03-025-29/+81
* | | | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
* | | | | Merge pull request #5241 from carlosantoniodasilva/output-safetyJosé Valim2012-03-021-3/+1
|\ \ \ \ \
| * | | | | Stop SafeBuffer#clone_empty from issuing warningsCarlos Antonio da Silva2012-03-021-3/+1
|/ / / / /
* | | | | Merge pull request #5234 from benpickles/allow-empty-fieldsetsPiotr Sarnacki2012-03-022-2/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow fieldsets to be created without a block.Ben Pickles2012-03-012-2/+11
* | | | | revert setting NOT NULL constraints in add_timestampsXavier Noria2012-03-011-2/+2
|/ / / /
* | | | Merge pull request #5232 from claudiob/add_release_date_to_docsVijay Dev2012-03-016-12/+12
|\ \ \ \
| * | | | Add release dates to documentationclaudiob2012-03-016-12/+12
|/ / / /
* | | | Merge branch 'master-security'Aaron Patterson2012-03-015-29/+63
|\ \ \ \
| * | | | Ensure [] respects the status of the buffer.José Valim2012-02-292-16/+41
| * | | | delete vulnerable AS::SafeBuffer#[]Akira Matsuda2012-02-202-12/+0
| * | | | use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| * | | | add AS::SafeBuffer#clone_emptyAkira Matsuda2012-02-202-0/+15
| * | | | fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
* | | | | Tap, tap goes the middlewareJeremy Kemper2012-02-291-4/+1
* | | | | Merge pull request #5203 from avakhov/anonymous-controller-layoutAaron Patterson2012-02-292-0/+16
|\ \ \ \ \
| * | | | | Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-282-0/+16
* | | | | | Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-constrai...Aaron Patterson2012-02-293-4/+17
|\ \ \ \ \ \
| * | | | | | Fix the assert_recognizes test method so that it works when there areMatt Fawcett2012-02-243-4/+17
* | | | | | | fix api doc [ci skip]Vijay Dev2012-03-011-1/+1
* | | | | | | adds a nodoc [ci skip]Vijay Dev2012-03-011-1/+1
* | | | | | | Merge pull request #5221 from kennyj/fix_warning_20120301Jeremy Kemper2012-02-291-3/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix warning: assigned but unused variablekennyj2012-03-011-3/+0
|/ / / / / / /