aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #1927 from bogdan/select_multiple_indexJosé Valim2011-07-012-1/+8
|\ \ | |/ |/| Fixed ActionView::FormOptionsHelper#select with :multiple => false
| * Fixed ActionView::FormOptionsHelper#select with :multiple => falseBogdan Gusiev2011-06-302-1/+8
| |
* | Make sure respond_with with :js tries to render a template in all casesJosé Valim2011-06-304-6/+23
| |
* | Master version is 3.2.0.betaSantiago Pastorino2011-06-301-2/+2
| |
* | Bump up rack-cache and tzinfoSantiago Pastorino2011-06-301-2/+2
| |
* | Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8José Valim2011-06-302-0/+14
|/
* Move Coffee generators and templates to Coffee Railtie and create ↵Santiago Pastorino2011-06-291-9/+0
| | | | javascript_engine ("js") for apps that remove Coffee gem
* sub suffices hereXavier Noria2011-06-291-1/+1
|
* Revert "Delegate to @flashes with 'delegate' instead of manually."Aaron Patterson2011-06-291-2/+24
| | | | This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b.
* Delegate to @flashes with 'delegate' instead of manually.Ben Orenstein2011-06-291-24/+2
|
* [IMPORTANT] Make "sprockets/railtie" require explicit.José Valim2011-06-293-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.
* No need to register again. As it's default now.Arun Agrawal2011-06-281-3/+3
| | | Removing gif from here because when it got unregister it start failing other places.
* Fix test to use Mime::ZipArun Agrawal2011-06-282-4/+4
|
* Edited actionpack/CHANGELOG via GitHubJosé Valim2011-06-281-0/+4
|
* Make send_file guess content-type from file extension, if type wasn't ↵Esad Hajdarevic2011-06-282-2/+32
| | | | supplied (Issue #1847). Update tests & documentation.
* Register some commonly used mime types (png, jpeg, pdf, zip etc.) per defaultEsad Hajdarevic2011-06-281-0/+12
|
* Merge pull request #1870 from chriseppstein/asset_urls_masterSantiago Pastorino2011-06-276-63/+209
|\ | | | | Asset urls master
| * Added a configuration setting:Chris Eppstein2011-06-276-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Eppstein2011-06-272-11/+14
| | | | | | | | Rails.application global.
| * Stylesheet link tags should use the request protocol to avoid duplicate ↵Chris Eppstein2011-06-275-27/+50
| | | | | | | | | | | | | | | | | | 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 Eppstein2011-06-275-47/+129
| | | | | | | | | | | | | | | | | | | | 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 anyXavier Noria2011-06-272-1/+13
|/
* Get the fixture_path from self.class instead of ActiveSupport::TestCase.David Chelimsky2011-06-252-1/+8
| | | | | | 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 Cox2011-06-242-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
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-233-25/+28
|\
| * grammar changes in named routes description and clarity around possibilities ↵Matt Jankowski2011-06-221-10/+10
| | | | | | | | for options
| * use present tense on examplesMatt Jankowski2011-06-211-5/+5
| |
| * more detail on how the flow between redirect and show works, and minor grammarMatt Jankowski2011-06-211-7/+9
| |
| * remove extra space and clarify how an exception is made for controller wide ↵Matt Jankowski2011-06-211-3/+3
| | | | | | | | layouts
| * reorder layout selection examples to occur in the order that the code does, ↵Matt Jankowski2011-06-211-5/+6
| | | | | | | | and provide more detail on why each selection is made
* | Edited actionpack/actionpack.gemspec via GitHubJosé Valim2011-06-231-1/+1
| |
* | Minor refactorSantiago Pastorino2011-06-231-2/+2
| |
* | Merge pull request #1796 from jdeseno/masterSantiago Pastorino2011-06-222-1/+10
|\ \ | | | | | | link_to doesn't allow rel attribute when also specifying method
| * | Adds a test to check link_to with method & rel optionsJosh2011-06-211-0/+7
| | |
| * | Allow additional link relations when using method attribute with link_toJosh2011-06-201-1/+3
| | |
* | | Merge pull request #1798 from jeroenj/cachesweeper-fixSantiago Pastorino2011-06-222-0/+6
|\ \ \ | | | | | | | | Fixes an issue where cache sweepers with only after filters would have no controller object
| * | | Tests only after filters in cache sweepersJeroen Jacobs2011-06-221-0/+5
| | | |
| * | | Fixes an issue where cache sweepers with only after filters would have no ↵Jeroen Jacobs2011-06-211-0/+1
| |/ / | | | | | | | | | | | | | | | controller object It would raise undefined method controller_name for nil