aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that status codes are logged properlyJesse Storimer2011-07-182-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 dependencyAaron Patterson2011-07-181-1/+2
|
* Merge pull request #2124 from arunagw/render_partial_invalid_check_fixSantiago Pastorino2011-07-171-2/+1
|\ | | | | Checking with to_s. As regexp fail with 1.8.7
| * Checking with to_s. As regexp fail with 1.8.7Arun Agrawal2011-07-181-2/+1
| |
* | Don't do remove_possible_method when delegate is used. Two reasons: 1) ↵Jon Leighton2011-07-181-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_fixSantiago Pastorino2011-07-171-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 Sichanugrist2011-07-171-2/+6
| | | | | | | | be in its method
* | Merge pull request #2018 from bhus/render_partial_invalid_checkSantiago Pastorino2011-07-173-0/+16
|\ \ | |/ |/| Render partial invalid check
| * Added view template invalid name check, along with tests. No merges in commit.huskins2011-07-133-0/+16
| |
* | indeed, if we are going to remove everything in public/assets on ↵Xavier Noria2011-07-171-4/+1
| | | | | | | | assets:clean, just do that
* | if we are cleaning all files, we are cleaning all gz filesXavier Noria2011-07-171-1/+0
| |
* | Merge pull request #2082 from htanata/rake_routes_formattingSantiago Pastorino2011-07-161-7/+7
|\ \ | | | | | | Better formatting of rake routes (issue #1991)
| * | Better formatting of route requirements in rake:routes.Hendy Tanata2011-07-161-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 Tanata2011-07-161-2/+2
|/ /
* | assert nothing raised for setting a cookie value to nil in ActionDispatchBradford Folkens2011-07-141-0/+5
| |
* | Bump rack upSantiago Pastorino2011-07-131-1/+1
|/
* assets.cache_store now defaults to filesystem. You will want to share ↵José Valim2011-07-121-2/+2
| | | | tmp/assets_cache between deploys.
* Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-121-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 helperAndrew Radev2011-07-112-2/+48
| | | | FormBuilder#select now works with a nested data structure.
* Merge pull request #2009 from vatrai/autoload-todo-newJosé Valim2011-07-118-15/+7
|\ | | | | TODO fix explicitly loading exceptations, autoload removed
| * TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-118-15/+7
| |
* | Require assets in all environments by default and provide a way to opt-out ↵José Valim2011-07-111-2/+7
| | | | | | | | from uglifier.
* | Include TagHelper within AssetTagHelperSam Pohlenz2011-07-101-0/+2
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-094-5/+5
|\ \
| * | find(:all) => allAkira Matsuda2011-07-084-5/+5
| | |
* | | config should always be an AS::InheritableOptions object. Closes #1992Santiago Pastorino2011-07-082-1/+5
| |/ |/|
* | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestionXavier Noria2011-07-082-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é Valim2011-07-072-6/+3
| |
* | removing brittle assertionAaron Patterson2011-07-071-1/+0
| |
* | Using the sum of bytes instead the hash of the path when replacing the ↵Albert Callarisa Roca2011-07-082-3/+5
| | | | | | | | wildcard of the assets path because in ruby 1.9 is not consistent
* | Give higher priority to assets.cache_store.José Valim2011-07-061-1/+1
| |
* | Make compressors lazily load.José Valim2011-07-062-2/+25
| |
* | Remove stream at the class level.José Valim2011-07-062-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/docrailsXavier Noria2011-07-052-11/+13
|\
| * document handle_unverified_request methodVijay Dev2011-07-021-0/+2
| |
| * update doc about resetting the session in case of authenticity token mismatchVijay Dev2011-07-011-6/+5
| |
| * clarify which url would be used to cache a page when options are not ↵Matt Jankowski2011-06-261-2/+2
| | | | | | | | provided to #cache_page to determine that url
| * elaborate on how web server configuration to check for static files on disk ↵Matt Jankowski2011-06-261-3/+4
| | | | | | | | enables page caching to work without hitting the app server stack
* | Merge pull request #1925 from spohlenz/refactor-asset-pathsJosé Valim2011-07-023-9/+40
|\ \ | | | | | | Refactor sprockets asset paths to allow for alternate asset environments
| * | Add documentation for asset_prefix and asset_environmentSam Pohlenz2011-07-031-0/+9
| | |
| * | Add tests for alternate asset prefix/environmentSam Pohlenz2011-07-012-0/+13
| | |
| * | Refactor sprockets asset paths to allow for alternate asset environmentsSam Pohlenz2011-07-011-9/+18
| | |
* | | provide a more explicit message when using url_for with nilDamien Mathieu2011-07-023-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 mutexJosé Valim2011-07-011-0/+1
| | |
* | | It's autoload all the way downAndrew White2011-07-011-1/+1
| | |
* | | Don't require ActionView::Context as it's autoloadedAndrew White2011-07-011-1/+0
| | |
* | | Revert "Add missing require for ActionView::AssetPaths"Andrew White2011-07-011-1/+0
| | | | | | | | | | | | This reverts commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8.
* | | Add missing requires for ActionView::Context and Module#instance_method_namesAndrew White2011-07-011-0/+2
| | |
* | | Add missing require for ActionView::AssetPathsAndrew White2011-07-011-0/+1
| | |
* | | Revert "Add method fields_for_with_index to FormHelper"José Valim2011-07-013-145/+6
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb