| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #3884 from sikachu/master-fix_layout | José Valim | 2011-12-07 | 6 | -40/+125 | |
| |\ \ | | | | | | | Allow layout fallback when using `layout` method | |||||
| | * | | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 3 | -26/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. For example, consider this snippet: class CarsController layout 'single_car', :only => :show end Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions. | |||||
| | * | | Fix bug in assert_template when using only `:layout` option | Prem Sichanugrist | 2011-12-06 | 3 | -14/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if you're do this: assert_template :layout => "foo" Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f]. We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative. | |||||
| * | | | Merge pull request #3878 from kennyj/should_use_default_charset | José Valim | 2011-12-07 | 2 | -1/+12 | |
| |\ \ \ | |/ / |/| / | |/ | Use default charset when we read content type without charset. | |||||
| | * | Use default charset when we read content type without charset. | kennyj | 2011-12-07 | 2 | -1/+12 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-06 | 1 | -4/+4 | |
| |\ \ | |/ |/| | ||||||
| | * | Use do end for multiline block. | Uģis Ozols | 2011-12-05 | 1 | -2/+2 | |
| | | | ||||||
| | * | .rhtml and .rxml was removed in Rails 3. | Uģis Ozols | 2011-12-05 | 1 | -2/+2 | |
| | | | ||||||
| * | | Sync AP CHANGELOG with 3-1-stable | Santiago Pastorino | 2011-12-06 | 1 | -0/+8 | |
| | | | ||||||
| * | | Merge pull request #3428 from adrianpike/asset_path_conflicts | Santiago Pastorino | 2011-12-06 | 2 | -8/+66 | |
| |\ \ | | | | | | | Issue #3427 - asset_path_conflicts | |||||
| | * | | Let's do the same trick for asset_path that we do for ↵ | Adrian Pike | 2011-12-05 | 2 | -8/+66 | |
| | | | | | | | | | | | | | | | | | | | [image,javascript,stylesheet]_path to avoid namespace conflicts on named routes. Closes #3427 | |||||
| * | | | Allowing string as url argument for expire_action | Thomas von Deyen | 2011-12-06 | 2 | -3/+22 | |
| |/ / | ||||||
| * | | Merge pull request #3861 from andyjeffries/master | José Valim | 2011-12-05 | 2 | -3/+3 | |
| |\ \ | | | | | | | Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match) | |||||
| | * | | Named Routes shouldn't override existing ones (currently route recognition ↵ | Andy Jeffries | 2011-12-05 | 2 | -3/+3 | |
| | | | | | | | | | | | | | goes with the earliest match, named routes use the latest match) | |||||
| * | | | use classify in ParamsWrapper to derive model name from controller name | lest | 2011-12-05 | 2 | -1/+36 | |
| |/ / | ||||||
| * | | Minor enhancement by not unnecessarely escaping forward slashing within a ↵ | Overbryd | 2011-12-05 | 1 | -1/+2 | |
| | | | | | | | | | curly regexp and by mentoining the protocol relative scheme in the internal comment | |||||
| * | | Fix for redirect_to to respect urls with a network path reference like ↵ | Overbryd | 2011-12-05 | 2 | -2/+12 | |
| | | | | | | | | | "//asset.host.com/resources/1235" see issue #3856 | |||||
| * | | form_for with +:as+ option uses "action_as" as css class and id | Vasiliy Ermolovich | 2011-12-04 | 3 | -13/+25 | |
| |/ | ||||||
| * | Fix failing cascade exception. | José Valim | 2011-12-03 | 3 | -2/+12 | |
| | | ||||||
| * | Try to play nice with plugins doing monkey patches. | José Valim | 2011-12-02 | 1 | -0/+5 | |
| | | ||||||
| * | Merge branch 'exceptions' with the following features: | José Valim | 2011-12-01 | 11 | -230/+359 | |
| |\ | | | | | | | | | | | | | | | | | * A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example) * Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions Conflicts: actionpack/CHANGELOG.md | |||||
| | * | Remove unnecessary test setup. | José Valim | 2011-12-01 | 1 | -6/+1 | |
| | | | ||||||
| | * | Split and improve show and debug exceptions middlewares. | José Valim | 2011-12-01 | 3 | -87/+141 | |
| | | | ||||||
| | * | Split ShowExceptions responsibilities in two middlewares. | José Valim | 2011-12-01 | 7 | -93/+123 | |
| | | | ||||||
| | * | Add a deprecation to old show exceptions API (even though it was not public). | José Valim | 2011-12-01 | 1 | -0/+14 | |
| | | | ||||||
| | * | Add an ExceptionWrapper that wraps an exception and provide convenience helpers. | José Valim | 2011-12-01 | 5 | -77/+104 | |
| | | | ||||||
| | * | Allow rescue responses to be configured through a railtie. | José Valim | 2011-12-01 | 3 | -9/+18 | |
| | | | ||||||
| * | | Revert "Added ActiveRecord::Base#last_modified to work with the new ↵ | David Heinemeier Hansson | 2011-12-01 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | fresh_when/stale? conditional get methods from Action Pack" Needless indirection with no added value. This reverts commit 535853e83b9092078035a5abb2aa242fba815c05. | |||||
| * | | Added ActiveRecord::Base#last_modified to work with the new ↵ | David Heinemeier Hansson | 2011-12-01 | 2 | -4/+4 | |
| | | | | | | | | | fresh_when/stale? conditional get methods from Action Pack | |||||
| * | | Allow fresh_when/stale? to take a record instead of an options hash [DHH] | David Heinemeier Hansson | 2011-12-01 | 3 | -4/+97 | |
| |/ | ||||||
| * | Update CHANGELOG. | José Valim | 2011-12-01 | 1 | -1/+3 | |
| | | ||||||
| * | Leave default_asset_host_protocol unset | Jonathan del Strother | 2011-12-01 | 1 | -2/+0 | |
| | | | | When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation) | |||||
| * | minor typo fix | Vijay Dev | 2011-12-01 | 1 | -1/+1 | |
| | | ||||||
| * | fix exception page when template contains utf-8 and parameters contain utf-8 | lest | 2011-11-30 | 1 | -1/+5 | |
| | | ||||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -7/+7 | |
| |\ | ||||||
| | * | Fixing incorrect documentation | Aviv Ben-Yosef | 2011-11-30 | 1 | -2/+2 | |
| | | | | | | | `path_names` can only be used for affecting `new` and `edit` | |||||
| | * | Fix ActionDispatch::Request method explanations | Travis Pew | 2011-11-28 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | The methods, "post?", "put?", "head?", etc. contain an incorrect explanation. They state that they are equivalent to request_method == :type, but this is not accurate because the methods convert the string to a symbol. They are actually equivalent to: request_method_symbol == :type | |||||
| * | | fix method redefined warnings in tests | lest | 2011-11-30 | 3 | -12/+5 | |
| | | | ||||||
| * | | fix warning in tests when using render_erb helper | lest | 2011-11-30 | 1 | -0/+2 | |
| | | | ||||||
| * | | test helpers in erb using erb | lest | 2011-11-30 | 6 | -17/+31 | |
| | | | ||||||
| * | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵ | José Valim | 2011-11-30 | 4 | -2/+24 | |
| | | | | | | | | | a before callback halts. | |||||
| * | | Update sprockets which theoretically fixes the regression we have seen. | José Valim | 2011-11-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fixes for using action view template in isolation. | José Valim | 2011-11-30 | 3 | -2/+12 | |
| | | | ||||||
| * | | Deprecate set_sequence_name in favour of self.sequence_name= | Jon Leighton | 2011-11-29 | 1 | -2/+2 | |
| | | | ||||||
| * | | Deprecate set_table_name in favour of self.table_name= or defining your own ↵ | Jon Leighton | 2011-11-29 | 2 | -9/+9 | |
| | | | | | | | | | method. | |||||
| * | | Handle correctly optional parameters for callable asset_host. | Marc-Andre Lafortune | 2011-11-29 | 2 | -2/+10 | |
| | | | ||||||
| * | | put backtrace_cleaner to env | lest | 2011-11-28 | 2 | -13/+20 | |
| | | | ||||||
| * | | Revert "use any? to check for size" | Vijay Dev | 2011-11-28 | 1 | -1/+1 | |
| | | | | | | | | | This reverts commit c4af5f00f602b9e1c3166872902265836daf321b. | |||||
| * | | update CHANGELOG | Vasiliy Ermolovich | 2011-11-28 | 1 | -0/+10 | |
| | | | ||||||
| * | | add namespace options to form_for | Vasiliy Ermolovich | 2011-11-27 | 2 | -2/+85 | |
| | | | | | | | | | | | You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionpack