Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
| |/ |/| | |||||
* | | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion | Xavier Noria | 2011-07-08 | 1 | -2/+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. | ||||
* | | Move config.default_asset_host_protocol to the railtie. | José Valim | 2011-07-07 | 2 | -6/+3 |
| | | |||||
* | | Using the sum of bytes instead the hash of the path when replacing the ↵ | Albert Callarisa Roca | 2011-07-08 | 1 | -1/+2 |
| | | | | | | | | 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 | 1 | -38/+5 |
|/ | | | | | | 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 | 1 | -9/+27 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | 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 | 1 | -1/+3 |
| | | | | | | | | | 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 | 1 | -18/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
|\ \ \ | |/ / |/| | | Fixed ActionView::FormOptionsHelper#select with :multiple => false | ||||
| * | | Fixed ActionView::FormOptionsHelper#select with :multiple => false | Bogdan Gusiev | 2011-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | Make sure respond_with with :js tries to render a template in all cases | José Valim | 2011-06-30 | 1 | -0/+5 |
| | | | |||||
* | | | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | | | |||||
* | | | Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8 | José Valim | 2011-06-30 | 1 | -0/+5 |
|/ / | |||||
* | | Move Coffee generators and templates to Coffee Railtie and create ↵ | Santiago Pastorino | 2011-06-29 | 1 | -9/+0 |
| | | | | | | | | javascript_engine ("js") for apps that remove Coffee gem | ||||
* | | sub suffices here | Xavier Noria | 2011-06-29 | 1 | -1/+1 |
| | | |||||
* | | Revert "Delegate to @flashes with 'delegate' instead of manually." | Aaron Patterson | 2011-06-29 | 1 | -2/+24 |
| | | | | | | | | This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b. | ||||
* | | Delegate to @flashes with 'delegate' instead of manually. | Ben Orenstein | 2011-06-29 | 1 | -24/+2 |
| | | |||||
* | | [IMPORTANT] Make "sprockets/railtie" require explicit. | José Valim | 2011-06-29 | 3 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator. | ||||
* | | Fix test to use Mime::Zip | Arun Agrawal | 2011-06-28 | 1 | -3/+3 |
| | | |||||
* | | Make send_file guess content-type from file extension, if type wasn't ↵ | Esad Hajdarevic | 2011-06-28 | 1 | -2/+13 |
| | | | | | | | | supplied (Issue #1847). Update tests & documentation. | ||||
* | | Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default | Esad Hajdarevic | 2011-06-28 | 1 | -0/+12 |
| | | |||||
* | | Merge pull request #1870 from chriseppstein/asset_urls_master | Santiago Pastorino | 2011-06-27 | 4 | -49/+122 |
|\ \ | | | | | | | Asset urls master | ||||
| * | | Added a configuration setting: | Chris Eppstein | 2011-06-27 | 4 | -10/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_controller.default_asset_host_protocol It's best to leave this unset. When unset the :request protocol is used whenever it can be and :relative is used in the other situations. When set to :request then assets hosts will be disabled when there is no request in scope and will use the request protocol whenever a request is in scope. If set to :relative, then a relative protocol is always used except for stylesheet link tags which must use the :request protocol to avoid double downloads in IE6&7. Conflicts: actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb | ||||
| * | | Move the config bootstrapping to initialization to minimize access to the ↵ | Chris Eppstein | 2011-06-27 | 2 | -11/+14 |
| | | | | | | | | | | | | Rails.application global. | ||||
| * | | Stylesheet link tags should use the request protocol to avoid duplicate ↵ | Chris Eppstein | 2011-06-27 | 4 | -19/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | download of stylesheets in IE7 and IE8. Conflicts: actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb actionpack/lib/sprockets/helpers/rails_helper.rb | ||||
| * | | Add asset_url helper and refactor the asset paths so that asset hosts can be ↵ | Chris Eppstein | 2011-06-27 | 3 | -39/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used during asset precompilation. Conflicts: actionpack/lib/action_view/asset_paths.rb actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb | ||||
* | | | the generated ALT attribute for images no longer contains the digest, if any | Xavier Noria | 2011-06-27 | 1 | -1/+5 |
|/ / | |||||
* | | Get the fixture_path from self.class instead of ActiveSupport::TestCase. | David Chelimsky | 2011-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | This allows test classes that are not subclasses of ActiveSupport::TestCase (like those in rspec-rails) to interact with with this variable without having to reference ActiveSupport::TestCase. | ||||
* | | make the logs a little simpler to view, put the render message inline with ↵ | James Cox | 2011-06-24 | 2 | -5/+6 |
|/ | | | | other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev |