Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure that status codes are logged properly | Jesse Storimer | 2011-07-18 | 2 | -4/+23 |
| | | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly. | ||||
* | make tzinfo a development dependency | Aaron Patterson | 2011-07-18 | 1 | -1/+2 |
| | |||||
* | Merge pull request #2124 from arunagw/render_partial_invalid_check_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+1 |
|\ | | | | | Checking with to_s. As regexp fail with 1.8.7 | ||||
| * | Checking with to_s. As regexp fail with 1.8.7 | Arun Agrawal | 2011-07-18 | 1 | -2/+1 |
| | | |||||
* | | Don't do remove_possible_method when delegate is used. Two reasons: 1) ↵ | Jon Leighton | 2011-07-18 | 1 | -1/+2 |
|/ | | | | warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. | ||||
* | 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 | 3 | -0/+16 |
|\ \ | |/ |/| | Render partial invalid check | ||||
| * | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 3 | -0/+16 |
| | | |||||
* | | indeed, if we are going to remove everything in public/assets on ↵ | Xavier Noria | 2011-07-17 | 1 | -4/+1 |
| | | | | | | | | assets:clean, just do that | ||||
* | | if we are cleaning all files, we are cleaning all gz files | Xavier Noria | 2011-07-17 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #2082 from htanata/rake_routes_formatting | Santiago Pastorino | 2011-07-16 | 1 | -7/+7 |
|\ \ | | | | | | | Better formatting of rake routes (issue #1991) | ||||
| * | | Better formatting of route requirements in rake:routes. | Hendy Tanata | 2011-07-16 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/} | ||||
* | | | Fix wildcard route code example in changelog. | Hendy Tanata | 2011-07-16 | 1 | -2/+2 |
|/ / | |||||
* | | assert nothing raised for setting a cookie value to nil in ActionDispatch | Bradford Folkens | 2011-07-14 | 1 | -0/+5 |
| | | |||||
* | | Bump rack up | Santiago Pastorino | 2011-07-13 | 1 | -1/+1 |
|/ | |||||
* | assets.cache_store now defaults to filesystem. You will want to share ↵ | José Valim | 2011-07-12 | 1 | -2/+2 |
| | | | | tmp/assets_cache between deploys. | ||||
* | 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 | 2 | -2/+48 |
| | | | | FormBuilder#select now works with a nested data structure. | ||||
* | Merge pull request #2009 from vatrai/autoload-todo-new | José Valim | 2011-07-11 | 8 | -15/+7 |
|\ | | | | | TODO fix explicitly loading exceptations, autoload removed | ||||
| * | TODO fix explicitly loading exceptations, autoload removed | Vishnu Atrai | 2011-07-11 | 8 | -15/+7 |
| | | |||||
* | | Require assets in all environments by default and provide a way to opt-out ↵ | José Valim | 2011-07-11 | 1 | -2/+7 |
| | | | | | | | | from uglifier. | ||||
* | | Include TagHelper within AssetTagHelper | Sam Pohlenz | 2011-07-10 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-09 | 4 | -5/+5 |
|\ \ | |||||
| * | | find(:all) => all | Akira Matsuda | 2011-07-08 | 4 | -5/+5 |
| | | | |||||
* | | | config should always be an AS::InheritableOptions object. Closes #1992 | Santiago Pastorino | 2011-07-08 | 2 | -1/+5 |
| |/ |/| | |||||
* | | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion | Xavier Noria | 2011-07-08 | 2 | -3/+4 |
| | | | | | | | | | | | | 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. | ||||
* | | Move config.default_asset_host_protocol to the railtie. | José Valim | 2011-07-07 | 2 | -6/+3 |
| | | |||||
* | | 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 | 2 | -3/+5 |
| | | | | | | | | wildcard of the assets path because in ruby 1.9 is not consistent | ||||
* | | Give higher priority to assets.cache_store. | José Valim | 2011-07-06 | 1 | -1/+1 |
| | | |||||
* | | Make compressors lazily load. | José Valim | 2011-07-06 | 2 | -2/+25 |
| | | |||||
* | | Remove stream at the class level. | José Valim | 2011-07-06 | 2 | -39/+6 |
|/ | | | | | | 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 branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-05 | 2 | -11/+13 |
|\ | |||||
| * | document handle_unverified_request method | Vijay Dev | 2011-07-02 | 1 | -0/+2 |
| | | |||||
| * | update doc about resetting the session in case of authenticity token mismatch | Vijay Dev | 2011-07-01 | 1 | -6/+5 |
| | | |||||
| * | clarify which url would be used to cache a page when options are not ↵ | Matt Jankowski | 2011-06-26 | 1 | -2/+2 |
| | | | | | | | | provided to #cache_page to determine that url | ||||
| * | elaborate on how web server configuration to check for static files on disk ↵ | Matt Jankowski | 2011-06-26 | 1 | -3/+4 |
| | | | | | | | | enables page caching to work without hitting the app server stack | ||||
* | | Merge pull request #1925 from spohlenz/refactor-asset-paths | José Valim | 2011-07-02 | 3 | -9/+40 |
|\ \ | | | | | | | Refactor sprockets asset paths to allow for alternate asset environments | ||||
| * | | Add documentation for asset_prefix and asset_environment | Sam Pohlenz | 2011-07-03 | 1 | -0/+9 |
| | | | |||||
| * | | Add tests for alternate asset prefix/environment | Sam Pohlenz | 2011-07-01 | 2 | -0/+13 |
| | | | |||||
| * | | Refactor sprockets asset paths to allow for alternate asset environments | Sam Pohlenz | 2011-07-01 | 1 | -9/+18 |
| | | | |||||
* | | | provide a more explicit message when using url_for with nil | Damien Mathieu | 2011-07-02 | 3 | -1/+18 |
| | | | | | | | | | This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with. | ||||
* | | | require 'thread' before using mutex | José Valim | 2011-07-01 | 1 | -0/+1 |
| | | | |||||
* | | | It's autoload all the way down | Andrew White | 2011-07-01 | 1 | -1/+1 |
| | | | |||||
* | | | Don't require ActionView::Context as it's autoloaded | Andrew White | 2011-07-01 | 1 | -1/+0 |
| | | | |||||
* | | | Revert "Add missing require for ActionView::AssetPaths" | Andrew White | 2011-07-01 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8. | ||||
* | | | Add missing requires for ActionView::Context and Module#instance_method_names | Andrew White | 2011-07-01 | 1 | -0/+2 |
| | | | |||||
* | | | Add missing require for ActionView::AssetPaths | Andrew White | 2011-07-01 | 1 | -0/+1 |
| | | | |||||
* | | | Revert "Add method fields_for_with_index to FormHelper" | José Valim | 2011-07-01 | 3 | -145/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb |