aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #4998 from fbuenemann/feature/configurable-log-flushingAaron Patterson2012-02-223-2/+6
|\ \ \ \ | | | | | | | | | | Make automatic log flushing configurable
| * | | | Always default to flushing enabledFelix Bünemann2012-02-232-2/+2
| | | | |
| * | | | Advertise autoflush option in production templateFelix Bünemann2012-02-231-0/+3
| | | | |
| * | | | Make log autoflushing configurableFelix Bünemann2012-02-232-2/+3
|/ / / /
* | | | updates CHANGELOGs to register changes in 002713cXavier Noria2012-02-223-0/+21
| | | |
* | | | add some tests, yay!Aaron Patterson2012-02-221-0/+31
| | | |
* | | | Merge pull request #5133 from rafaelfranca/fix-buildAaron Patterson2012-02-221-1/+1
|\ \ \ \ | | | | | | | | | | Only set ActionView configuration inside the on_load block
| * | | | Only set ActionView configuration inside the on_load blockRafael Mendonça França2012-02-221-1/+1
|/ / / /
* | | | Merge pull request #5132 from rafaelfranca/fix-buildAaron Patterson2012-02-221-2/+2
|\ \ \ \ | | | | | | | | | | Fix routes inspection order
| * | | | Fix routes inspection orderRafael Mendonça França2012-02-221-2/+2
| | | | |
* | | | | Merge pull request #5119 from kennyj/fix_5114Aaron Patterson2012-02-221-0/+26
|\ \ \ \ \ | |/ / / / |/| | | | Testcase for GH #5114.
| * | | | Testcase for GH #5114.kennyj2012-02-221-0/+26
| | |/ / | |/| |
* | | | Merge pull request #5130 from dlee/revised_patch_verbXavier Noria2012-02-2240-151/+402
|\ \ \ \ | | | | | | | | | | Add config.default_method_for_update to support PATCH
| * | | | Add config.default_method_for_update to support PATCHDavid Lee2012-02-2240-151/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PATCH is the correct HTML verb to map to the #update action. The semantics for PATCH allows for partial updates, whereas PUT requires a complete replacement. Changes: * adds config.default_method_for_update you can set to :patch * optionally use PATCH instead of PUT in resource routes and forms * adds the #patch verb to routes to detect PATCH requests * adds #patch? to Request * changes documentation and comments to indicate support for PATCH This change maintains complete backwards compatibility by keeping :put as the default for config.default_method_for_update.
* | | | | Merge pull request #5128 from bogdan/deprecate_rescuableJosé Valim2012-02-224-37/+13
|\ \ \ \ \ | | | | | | | | | | | | AS::Callbacks: deprecate rescuable option
| * | | | | AS::Callbacks: deprecate rescuable optionBogdan Gusiev2012-02-224-37/+13
|/ / / / /
* | | | | format lookup for partials is derived from the format in which the template ↵Santiago Pastorino2012-02-2211-36/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is being rendered Closes #5025 part 2
* | | | | Merge pull request #5124 from ↵José Valim2012-02-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | bquorning/prefer-||-over-'or'-for-boolean-operations Prefer || over 'or' for boolean operations
| * | | | Prefer || over 'or' for boolean operationsBenjamin Quorning2012-02-221-1/+1
|/ / / /
* | | | bumping up arelAaron Patterson2012-02-211-1/+1
| | | |
* | | | prepared statements can be disabledAaron Patterson2012-02-218-30/+56
| | | |
* | | | Merge pull request #5118 from castlerock/ordered_options_from_hashSantiago Pastorino2012-02-211-3/+1
|\ \ \ \ | | | | | | | | | | ordered_options will work if inherited from Hash, remove OrderedHash usage
| * | | | ordered_options will work if inherited from Hash, remove OrderedHash usageVishnu Atrai2012-02-211-3/+1
| | | | |
* | | | | more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
| | | | |
* | | | | ruby 2.0 makes protected methods return false for respond_to, so pass true ↵Aaron Patterson2012-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | as the second param
* | | | | fix bad docs from f373f296 [ci skip]Vijay Dev2012-02-211-3/+3
| | | | |
* | | | | Don't wrap the raise with ensureSantiago Pastorino2012-02-212-10/+12
|/ / / /
* | | | Merge pull request #5108 from mirakui/patch-1Aaron Patterson2012-02-211-1/+1
|\ \ \ \ | | | | | | | | | | Bug: cache_key.size doesn't return length of filename but size of file
| * | | | Bug: cache_path.size doesn't return length of filename but size of file if ↵Issei Naruta2012-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | cache_path is Pathname.
* | | | | Merge pull request #5116 from rubenfonseca/delete_with_block_refactorAaron Patterson2012-02-212-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Refactored two methods to use delete with a block
| * | | | | Refactored two methods to use delete with a blockRuben Fonseca2012-02-212-2/+2
|/ / / / /
* | / / / Restore lookup formats to the previous value after searching for the failing ↵Santiago Pastorino2012-02-212-2/+5
| |/ / / |/| | | | | | | | | | | view
* | | | Merge pull request #5112 from nupurjain/activesupport_cache_refactorSantiago Pastorino2012-02-211-5/+1
|\ \ \ \ | |/ / / |/| | | suggested changes.
| * | | suggested changes.Nupur Jain2012-02-211-5/+1
| | | |
* | | | Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactorJon Leighton2012-02-211-3/+3
|\ \ \ \ | | | | | | | | | | use Hash#delete on styelsheet_link_tag
| * | | | use Hash#delete on styelsheet_link_tagRuben Fonseca2012-02-211-3/+3
|/ / / /
* | | | Merge pull request #5033 from markmcspadden/inherited_headersJeremy Kemper2012-02-202-0/+41
|\ \ \ \ | | | | | | | | | | Allow ActiveResource subclasses to inherit headers from parent
| * | | | Remove double test for header inheritance leaksMark McSpadden2012-02-141-11/+0
| | | | |
| * | | | Allow ActiveResource subclasses to inherit headers from parentMark McSpadden2012-02-132-0/+52
| | | | |
* | | | | tag bind params with a bind param objectAaron Patterson2012-02-203-3/+3
| | | | |
* | | | | use Hash#delete with a default blockAaron Patterson2012-02-201-3/+3
| | | | |
* | | | | Merge pull request #5102 from nashby/form-option-refactorJosé Valim2012-02-202-28/+29
|\ \ \ \ \ | | | | | | | | | | | | form option refactor
| * | | | | refactor options_for_selectVasiliy Ermolovich2012-02-202-23/+24
| | | | | |
| * | | | | refactor grouped_options_for_selectVasiliy Ermolovich2012-02-201-5/+5
| | | | | |
* | | | | | Fix a failing testSantiago Pastorino2012-02-201-0/+2
| | | | | |
* | | | | | Use the right format when a partial is missing.Santiago Pastorino2012-02-203-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Closes #5025
* | | | | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_resetJosé Valim2012-02-202-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered Conflicts: actionpack/lib/action_view/template/handlers.rb
* | | | | | search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
|/ / / / /
* | | | | Merge pull request #5082 from ↵Aaron Patterson2012-02-202-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | willbryant/assigns_should_not_stringify_values_master assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash
| * | | | | assigns(:foo) should not convert @foo's keys to strings if it happens to be ↵Will Bryant2012-02-182-1/+7
| | |_|/ / | |/| | | | | | | | | | | | | a hash