| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix stringify_keys destructive behavior for most FormTagHelper functions | Waynn Lue | 2011-08-03 | 1 | -0/+24 |
| | | | | | add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355 | ||||
| * | Instead of removing the instance variable just set it to nil, resolves the ↵ | Brian Cardarella | 2011-07-29 | 1 | -2/+2 |
| | | | | | warnings because of a missing instance variable | ||||
| * | Merge pull request #2330 from thedarkone/resources-router-fix | José Valim | 2011-07-28 | 1 | -0/+9 |
| |\ | | | | | Inline resources router fix | ||||
| | * | There is no need to be destructive with the passed-in options. | thedarkone | 2011-07-28 | 1 | -0/+9 |
| | | | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations. | ||||
| * | | Merge pull request #2034 from Casecommons/to_path | José Valim | 2011-07-28 | 2 | -0/+41 |
| |\ \ | | | | | | | Allow ActiveModel-compatible instances to define their own partial paths | ||||
| | * | | Let ActiveModel instances define partial paths. | Grant Hutchins & Peter Jaros | 2011-07-25 | 2 | -0/+41 |
| | | | | | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances. | ||||
| * | | | fixing wildcard path matching when wildcard is inside parenthesis | Aaron Patterson | 2011-07-26 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge pull request #2095 from dgeb/issue-2094 | Aaron Patterson | 2011-07-26 | 1 | -0/+17 |
| |\ \ \ | | | | | | | | | Fixes overriding of options[:html][:remote] in form_for() (Issue #2094) | ||||
| | * | | | added test case for fix to issue #2094 | Dan Gebhardt | 2011-07-16 | 1 | -0/+17 |
| | | | | | |||||
| * | | | | use sprocket's append_path and assert_match | Damien Mathieu | 2011-07-26 | 1 | -26/+26 |
| | | | | | |||||
| * | | | | Allow a route to have :format => true | Erik Michaels-Ober | 2011-07-25 | 1 | -0/+7 |
| | |/ / |/| | | | | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default. | ||||
| * | | | Merge pull request #2245 from ↵ | Santiago Pastorino | 2011-07-25 | 1 | -0/+20 |
| |\ \ \ | | | | | | | | | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly | ||||
| | * | | | Ensure the constraints block is only applied to the correct route | Dave Rogers | 2011-07-25 | 1 | -0/+20 |
| | | |/ | |/| | | | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints. | ||||
| * | | | no need for an anonymous class on every setup call | Aaron Patterson | 2011-07-25 | 1 | -10/+9 |
| | | | | |||||
| * | | | Merge pull request #2258 from thedarkone/no-file-stat | José Valim | 2011-07-25 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Use shorter class-level File methods instead of going through File.stat | ||||
| | * | | | Use shorter class-level File methods instead of going through File.stat. | thedarkone | 2011-07-25 | 1 | -2/+2 |
| | |/ / | |||||
| * / / | Make polymorphic_url calls go through application helpers again. | thedarkone | 2011-07-25 | 2 | -1/+13 |
| |/ / | | | | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs. | ||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Changed a few instances of of words in the API docs written in British ↵ | Oemuer Oezkir | 2011-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | English to American English(according to Weber) | ||||
| * | | | Merge pull request #2233 from gramos/fix-issue-1951-master | Aaron Patterson | 2011-07-23 | 1 | -0/+14 |
| |\ \ \ | | | | | | | | | Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers | ||||
| | * | | | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial) | Gaston Ramos | 2011-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | fix issues/1951 | ||||
| | * | | | - added test case for issue: | Gaston Ramos | 2011-07-24 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/1951 Namespaced model partial_path is wrong in namespaced controllers | ||||
| * | | | | just use normal ruby for stubbing | Aaron Patterson | 2011-07-23 | 1 | -5/+3 |
| |/ / / | |||||
| * / / | Simple fix to the NoMethodError noted in #2177. | Ben Woosley | 2011-07-23 | 1 | -1/+0 |
| |/ / | | | | | Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it. | ||||
| * | | Check Accept and Content-Type headers before evaluating them in xhr ↵ | ogeidix | 2011-07-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | requests. Closes #2119 An xhr request must have an "Accept" or "Content-type" header in order to be considered a request with valid_accept_header. | ||||
| * | | Ensure that status codes are logged properly | Jesse Storimer | 2011-07-18 | 1 | -0/+19 |
| | | | | | | | | | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly. | ||||
| * | | Merge pull request #2046 from sikachu/master-test_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+6 |
| |\ \ | | | | | | | Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a | ||||
| | * | | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to ↵ | Prem Sichanugrist | 2011-07-17 | 1 | -2/+6 |
| | |/ | | | | | | | be in its method | ||||
| * | | Merge pull request #2018 from bhus/render_partial_invalid_check | Santiago Pastorino | 2011-07-17 | 2 | -0/+10 |
| |\ \ | |/ |/| | Render partial invalid check | ||||
| | * | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 2 | -0/+10 |
| | | | |||||
| * | | assert nothing raised for setting a cookie value to nil in ActionDispatch | Bradford Folkens | 2011-07-14 | 1 | -0/+5 |
| |/ | |||||
| * | Fixed session ID fixation for ActiveRecord::SessionStore | Joseph Wong | 2011-07-12 | 1 | -0/+31 |
| | | | | | | | | | | | | | | | | | | I have found that Rails will take an invalid session ID specified by the client and materialize a session based on that session ID. This means that it is possible, among other things, for a client to use an arbitrarily weak session ID or for a client to resurrect a previous used session ID. In other words, we cannot guarantee that all session IDs are generated by the server and that they are (statistically) unique through time. The fix is to always generate a new session ID in #get_session if an existing session cannot be found under the incoming session ID. Also added new tests that make sure that an invalid session ID is never materialized into a new session, regardless of whether it comes in via a cookie or a URL parameter (when :cookie_only => false). | ||||
| * | Grouped select helper | Andrew Radev | 2011-07-11 | 1 | -0/+36 |
| | | | | | FormBuilder#select now works with a nested data structure. | ||||
| * | config should always be an AS::InheritableOptions object. Closes #1992 | Santiago Pastorino | 2011-07-08 | 1 | -0/+4 |
| | | |||||
| * | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion | Xavier Noria | 2011-07-08 | 1 | -1/+2 |
| | | | | | | | That integer is rather irrelevant, the only thing that matters is that it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times faster than bytes.sum, so use that. | ||||
| * | removing brittle assertion | Aaron Patterson | 2011-07-07 | 1 | -1/+0 |
| | | |||||
| * | Using the sum of bytes instead the hash of the path when replacing the ↵ | Albert Callarisa Roca | 2011-07-08 | 1 | -2/+3 |
| | | | | | wildcard of the assets path because in ruby 1.9 is not consistent | ||||
| * | Remove stream at the class level. | José Valim | 2011-07-06 | 1 | -1/+1 |
| | | | | | | | This is because only template rendering works with streaming. Setting it at the class level was also changing the behavior of JSON and XML responses, closes #1337. | ||||
| * | Merge pull request #1925 from spohlenz/refactor-asset-paths | José Valim | 2011-07-02 | 2 | -0/+13 |
| |\ | | | | | Refactor sprockets asset paths to allow for alternate asset environments | ||||
| | * | Add tests for alternate asset prefix/environment | Sam Pohlenz | 2011-07-01 | 2 | -0/+13 |
| | | | |||||
| * | | provide a more explicit message when using url_for with nil | Damien Mathieu | 2011-07-02 | 2 | -0/+15 |
| | | | | | | | This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with. | ||||
| * | | Revert "Add method fields_for_with_index to FormHelper" | José Valim | 2011-07-01 | 1 | -125/+0 |
| | | | | | | | | | | | | | | | | | This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb | ||||
| * | | Merge pull request #1927 from bogdan/select_multiple_index | José Valim | 2011-07-01 | 1 | -0/+7 |
| |\ \ | |/ |/| | Fixed ActionView::FormOptionsHelper#select with :multiple => false | ||||
| | * | Fixed ActionView::FormOptionsHelper#select with :multiple => false | Bogdan Gusiev | 2011-06-30 | 1 | -0/+7 |
| | | | |||||
| * | | Make sure respond_with with :js tries to render a template in all cases | José Valim | 2011-06-30 | 2 | -6/+16 |
| | | | |||||
| * | | Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8 | José Valim | 2011-06-30 | 1 | -0/+9 |
| |/ | |||||
| * | No need to register again. As it's default now. | Arun Agrawal | 2011-06-28 | 1 | -3/+3 |
| | | | | Removing gif from here because when it got unregister it start failing other places. | ||||
| * | Fix test to use Mime::Zip | Arun Agrawal | 2011-06-28 | 1 | -1/+1 |
| | | |||||
| * | Make send_file guess content-type from file extension, if type wasn't ↵ | Esad Hajdarevic | 2011-06-28 | 1 | -0/+19 |
| | | | | | supplied (Issue #1847). Update tests & documentation. | ||||
| * | Merge pull request #1870 from chriseppstein/asset_urls_master | Santiago Pastorino | 2011-06-27 | 2 | -14/+87 |
| |\ | | | | | Asset urls master | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |