| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Make ActiveSupport::Benchmarkable a default module for ↵ | David Heinemeier Hansson | 2011-12-09 | 1 | -0/+2 | |
| | | | | | | | | | ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH* | |||||
| * | | Deprecate implicit layout lookup in favor of inheriting the _layout config. | José Valim | 2011-12-09 | 1 | -32/+86 | |
| | | | ||||||
| * | | Simplify path traversal logic | José Valim | 2011-12-09 | 1 | -7/+7 | |
| | | | ||||||
| * | | load the encoding converter to work around [ruby-core:41556] when switching ↵ | Aaron Patterson | 2011-12-08 | 2 | -115/+0 | |
| | | | | | | | | | encodings | |||||
| * | | Fix another regression related to the layout optimization. | José Valim | 2011-12-08 | 1 | -0/+2 | |
| | | | ||||||
| * | | Move symbolize keys to the inner options as we can assume url_options will ↵ | José Valim | 2011-12-08 | 2 | -2/+2 | |
| | | | | | | | | | be properly symbolized. | |||||
| * | | Fix a regression and also fix broken test. | José Valim | 2011-12-08 | 1 | -4/+9 | |
| | | | ||||||
| * | | Improve cache on route_key lookup. | José Valim | 2011-12-08 | 1 | -4/+6 | |
| | | | ||||||
| * | | Revert accidental change from cattr_accessor to class_attribute. | José Valim | 2011-12-08 | 1 | -1/+1 | |
| | | | ||||||
| * | | Just use the proc if there is a chance of layout lookup. | José Valim | 2011-12-08 | 1 | -5/+6 | |
| | | | ||||||
| * | | Optimize layout lookup to avoid double calls. | José Valim | 2011-12-08 | 4 | -33/+41 | |
| | | | ||||||
| * | | Some small optimizations and improvements to benchmark code. | José Valim | 2011-12-08 | 3 | -16/+11 | |
| | | | ||||||
| * | | Merge pull request #3900 from jfturcot/accessible_wrap_params | José Valim | 2011-12-08 | 1 | -1/+8 | |
| |\ \ | | | | | | | ParamsWrapper only wrap the accessible attributes when they were set | |||||
| | * | | ParamsWrapper only wrap the accessible attributes when they were set | Jean-Francois Turcot | 2011-12-07 | 1 | -1/+8 | |
| | | | | ||||||
| * | | | Remove dead broken code from AD::Request | José Valim | 2011-12-08 | 1 | -8/+0 | |
| | | | | ||||||
| * | | | Merge pull request #3888 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 1 | -0/+1 | |
| |\ \ \ | |/ / |/| | | Assign config.encoding to AD::Response.default_charset at the initialization time. | |||||
| | * | | Assign config.encoding to AD::Response.default_charset at the initialization ↵ | kennyj | 2011-12-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | time. | |||||
| * | | | Remove #:nodoc: from partial renderer. | José Valim | 2011-12-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Use freezed string constant. Some string literals is used repeatedly. | kennyj | 2011-12-08 | 3 | -24/+40 | |
| | | | | ||||||
| * | | | Merge pull request #3884 from sikachu/master-fix_layout | José Valim | 2011-12-07 | 2 | -38/+49 | |
| |\ \ \ | | | | | | | | | Allow layout fallback when using `layout` method | |||||
| | * | | | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 1 | -25/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -13/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | Use default charset when we read content type without charset. | |||||
| | * | | Use default charset when we read content type without charset. | kennyj | 2011-12-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 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 | |
| | | | | ||||||
| * | | | Merge pull request #3428 from adrianpike/asset_path_conflicts | Santiago Pastorino | 2011-12-06 | 1 | -8/+9 | |
| |\ \ \ | | | | | | | | | Issue #3427 - asset_path_conflicts | |||||
| | * | | | Let's do the same trick for asset_path that we do for ↵ | Adrian Pike | 2011-12-05 | 1 | -8/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | [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 | 1 | -3/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #3861 from andyjeffries/master | José Valim | 2011-12-05 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | 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 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | 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 | 1 | -2/+2 | |
| | | | | | | | | | | | | | "//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 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | Fix failing cascade exception. | José Valim | 2011-12-03 | 2 | -2/+3 | |
| | | | ||||||
| * | | 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 | 6 | -140/+213 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
| | * | | Split and improve show and debug exceptions middlewares. | José Valim | 2011-12-01 | 1 | -11/+11 | |
| | | | | ||||||
| | * | | Split ShowExceptions responsibilities in two middlewares. | José Valim | 2011-12-01 | 4 | -82/+107 | |
| | | | | ||||||
| | * | | 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 | 2 | -9/+16 | |
| | | | | ||||||
| * | | | Revert "Added ActiveRecord::Base#last_modified to work with the new ↵ | David Heinemeier Hansson | 2011-12-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+2 | |
| | | | | | | | | | | | | | 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 | 1 | -4/+49 | |
| |/ / | ||||||
| * | | 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 | |
| | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |