Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5139 from mhfs/remove_next_migration_number | José Valim | 2012-02-23 | 2 | -17/+0 |
|\ | | | | | Remove unused implementation of next_migration_number | ||||
| * | Remove unused implementation of next_migration_number | Marcelo Silveira | 2012-02-23 | 2 | -17/+0 |
| | | |||||
* | | Document the :host option for force_ssl | Andrew White | 2012-02-23 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #5140 from fbuenemann/fix/autoflush-wrong-template | Santiago Pastorino | 2012-02-23 | 2 | -3/+3 |
|\ \ | | | | | | | Move config.autoflush_log to correct template | ||||
| * | | Use consistent whitespace for commented options. | Felix Bünemann | 2012-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | Move config.autoflush_log to correct template. | Felix Bünemann | 2012-02-23 | 2 | -3/+3 |
| |/ | | | | | | | | | | | This accidentally ended up in the development template instead of the production template, where it makes most sense. | ||||
* | | Update documentation for force_ssl - closes #5023. | Andrew White | 2012-02-23 | 2 | -1/+26 |
| | | |||||
* | | SSL should not be disabled by default in any environment. | Pat Allan | 2012-02-23 | 2 | -15/+1 |
|/ | |||||
* | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 |
| | |||||
* | Merge pull request #5138 from avakhov/remove-unused-global-var | José Valim | 2012-02-23 | 1 | -2/+0 |
|\ | | | | | Remove unused global variable in controller filters test | ||||
| * | Remove unused global variable in controller filters test | Alexey Vakhov | 2012-02-23 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #5137 from avakhov/remove-skip-filter-block-param | José Valim | 2012-02-23 | 1 | -7/+7 |
|\ \ | |/ |/| | Remove skip_filter block param | ||||
| * | Remove skip_filter block param | Alexey Vakhov | 2012-02-23 | 1 | -7/+7 |
|/ | |||||
* | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 |
|\ | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | ||||
| * | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2 #5022 | johndouthat | 2012-02-18 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #4998 from fbuenemann/feature/configurable-log-flushing | Aaron Patterson | 2012-02-22 | 3 | -2/+6 |
|\ \ | | | | | | | Make automatic log flushing configurable | ||||
| * | | Always default to flushing enabled | Felix Bünemann | 2012-02-23 | 2 | -2/+2 |
| | | | |||||
| * | | Advertise autoflush option in production template | Felix Bünemann | 2012-02-23 | 1 | -0/+3 |
| | | | |||||
| * | | Make log autoflushing configurable | Felix Bünemann | 2012-02-23 | 2 | -2/+3 |
|/ / | |||||
* | | updates CHANGELOGs to register changes in 002713c | Xavier Noria | 2012-02-22 | 3 | -0/+21 |
| | | |||||
* | | add some tests, yay! | Aaron Patterson | 2012-02-22 | 1 | -0/+31 |
| | | |||||
* | | Merge pull request #5133 from rafaelfranca/fix-build | Aaron Patterson | 2012-02-22 | 1 | -1/+1 |
|\ \ | | | | | | | Only set ActionView configuration inside the on_load block | ||||
| * | | Only set ActionView configuration inside the on_load block | Rafael Mendonça França | 2012-02-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #5132 from rafaelfranca/fix-build | Aaron Patterson | 2012-02-22 | 1 | -2/+2 |
|\ \ | | | | | | | Fix routes inspection order | ||||
| * | | Fix routes inspection order | Rafael Mendonça França | 2012-02-22 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #5119 from kennyj/fix_5114 | Aaron Patterson | 2012-02-22 | 1 | -0/+26 |
|\ \ \ | |/ / |/| | | Testcase for GH #5114. | ||||
| * | | Testcase for GH #5114. | kennyj | 2012-02-22 | 1 | -0/+26 |
| | | | |||||
* | | | Merge pull request #5130 from dlee/revised_patch_verb | Xavier Noria | 2012-02-22 | 40 | -151/+402 |
|\ \ \ | | | | | | | | | Add config.default_method_for_update to support PATCH | ||||
| * | | | Add config.default_method_for_update to support PATCH | David Lee | 2012-02-22 | 40 | -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_rescuable | José Valim | 2012-02-22 | 4 | -37/+13 |
|\ \ \ \ | | | | | | | | | | | AS::Callbacks: deprecate rescuable option | ||||
| * | | | | AS::Callbacks: deprecate rescuable option | Bogdan Gusiev | 2012-02-22 | 4 | -37/+13 |
|/ / / / | |||||
* | | | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 11 | -36/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
* | | | | Merge pull request #5124 from ↵ | José Valim | 2012-02-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | bquorning/prefer-||-over-'or'-for-boolean-operations Prefer || over 'or' for boolean operations | ||||
| * | | | Prefer || over 'or' for boolean operations | Benjamin Quorning | 2012-02-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | bumping up arel | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | |||||
* | | | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 8 | -30/+56 |
| | | | |||||
* | | | Merge pull request #5118 from castlerock/ordered_options_from_hash | Santiago Pastorino | 2012-02-21 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | ordered_options will work if inherited from Hash, remove OrderedHash usage | ||||
| * | | | ordered_options will work if inherited from Hash, remove OrderedHash usage | Vishnu Atrai | 2012-02-21 | 1 | -3/+1 |
| | | | | |||||
* | | | | more ruby 2.0 respond_to? changes | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | ruby 2.0 makes protected methods return false for respond_to, so pass true ↵ | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | as the second param | ||||
* | | | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 |
| | | | | |||||
* | | | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 2 | -10/+12 |
|/ / / | |||||
* | | | Merge pull request #5108 from mirakui/patch-1 | Aaron Patterson | 2012-02-21 | 1 | -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 Naruta | 2012-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | cache_path is Pathname. | ||||
* | | | | Merge pull request #5116 from rubenfonseca/delete_with_block_refactor | Aaron Patterson | 2012-02-21 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Refactored two methods to use delete with a block | ||||
| * | | | | Refactored two methods to use delete with a block | Ruben Fonseca | 2012-02-21 | 2 | -2/+2 |
|/ / / / | |||||
* | / / | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 2 | -2/+5 |
| |/ / |/| | | | | | | | | view | ||||
* | | | Merge pull request #5112 from nupurjain/activesupport_cache_refactor | Santiago Pastorino | 2012-02-21 | 1 | -5/+1 |
|\ \ \ | |/ / |/| | | suggested changes. | ||||
| * | | suggested changes. | Nupur Jain | 2012-02-21 | 1 | -5/+1 |
| | | | |||||
* | | | Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactor | Jon Leighton | 2012-02-21 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | use Hash#delete on styelsheet_link_tag |