Commit Graph

7199 Commits

Author SHA1 Message Date
José Valim
86e2f888e7 Give higher priority to assets.cache_store. 2011-07-06 17:59:56 -07:00
José Valim
2f6e3895a8 Make compressors lazily load. 2011-07-06 21:41:13 -03:00
José Valim
7da88c5b29 Remove stream at the class level.
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.
2011-07-06 20:24:30 -03:00
Xavier Noria
289b5253ce Merge branch 'master' of git://github.com/lifo/docrails 2011-07-05 01:42:13 +02:00
José Valim
3875e449ab Merge pull request #1925 from spohlenz/refactor-asset-paths
Refactor sprockets asset paths to allow for alternate asset environments
2011-07-02 20:23:47 -07:00
Sam Pohlenz
21344bc33b Add documentation for asset_prefix and asset_environment 2011-07-03 10:29:04 +09:30
Damien Mathieu
ac15bcebf2 provide a more explicit message when using url_for with nil
This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
2011-07-02 18:53:54 +02:00
Vijay Dev
2949e30a05 document handle_unverified_request method 2011-07-02 21:18:46 +05:30
José Valim
13990d50fa require 'thread' before using mutex 2011-07-01 14:52:07 -07:00
Andrew White
2d16515e52 It's autoload all the way down 2011-07-01 21:44:16 +01:00
Andrew White
79924c637d Don't require ActionView::Context as it's autoloaded 2011-07-01 20:36:23 +01:00
Andrew White
505b6a43f7 Revert "Add missing require for ActionView::AssetPaths"
This reverts commit 987eb7d423.
2011-07-01 20:34:15 +01:00
Andrew White
fdaecbed84 Add missing requires for ActionView::Context and Module#instance_method_names 2011-07-01 20:17:48 +01:00
Andrew White
987eb7d423 Add missing require for ActionView::AssetPaths 2011-07-01 20:17:48 +01:00
José Valim
3da608e0b4 Revert "Add method fields_for_with_index to FormHelper"
This reverts commit 7c562d5e46.

Conflicts:

	actionpack/lib/action_view/helpers/form_helper.rb
2011-07-01 14:52:18 -03:00
Sam Pohlenz
0613f3bcdb Add tests for alternate asset prefix/environment 2011-07-01 21:56:41 +09:30
José Valim
b31ce90e99 Merge pull request #1927 from bogdan/select_multiple_index
Fixed ActionView::FormOptionsHelper#select with :multiple => false
2011-07-01 04:31:48 -07:00
Sam Pohlenz
d5f7253206 Refactor sprockets asset paths to allow for alternate asset environments 2011-07-01 17:08:58 +09:30
Vijay Dev
5fe67fa7a3 update doc about resetting the session in case of authenticity token mismatch 2011-07-01 00:00:38 +05:30
José Valim
9c9ec2172e Make sure respond_with with :js tries to render a template in all cases 2011-06-30 11:47:36 -03:00
Bogdan Gusiev
0fdac01876 Fixed ActionView::FormOptionsHelper#select with :multiple => false 2011-06-30 16:27:01 +03:00
Santiago Pastorino
35cdd256c0 Master version is 3.2.0.beta 2011-06-30 10:18:36 -03:00
Santiago Pastorino
a2a7a19d26 Bump up rack-cache and tzinfo 2011-06-30 10:07:26 -03:00
José Valim
f34f0b7e08 Add has_key? and key? methods to CookieJar removed in 0ca69ca65f 2011-06-30 08:01:53 -03:00
Santiago Pastorino
539752a54c Move Coffee generators and templates to Coffee Railtie and create javascript_engine ("js") for apps that remove Coffee gem 2011-06-29 21:16:09 -03:00
Xavier Noria
9378d7e213 sub suffices here 2011-06-29 23:46:58 +02:00
Aaron Patterson
1d43409d32 Revert "Delegate to @flashes with 'delegate' instead of manually."
This reverts commit 701e8554a8.
2011-06-29 13:52:44 -07:00
Ben Orenstein
701e8554a8 Delegate to @flashes with 'delegate' instead of manually. 2011-06-29 15:16:57 -04:00
José Valim
c690b7124d [IMPORTANT] Make "sprockets/railtie" require explicit.
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.
2011-06-29 09:41:16 -03:00
Arun Agrawal
8c1f62acda No need to register again. As it's default now.
Removing gif from here because when it got unregister it start failing other places.
2011-06-28 18:20:28 +05:30
Arun Agrawal
1b957177e7 Fix test to use Mime::Zip 2011-06-28 16:51:19 +05:30
José Valim
76581d0f1b Edited actionpack/CHANGELOG via GitHub 2011-06-28 02:45:27 -07:00
Esad Hajdarevic
2a61d47b55 Make send_file guess content-type from file extension, if type wasn't supplied (Issue #1847). Update tests & documentation. 2011-06-28 06:58:28 +02:00
Esad Hajdarevic
d73269ba53 Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default 2011-06-28 06:56:47 +02:00
Santiago Pastorino
4bcb05de2d Merge pull request #1870 from chriseppstein/asset_urls_master
Asset urls master
2011-06-27 14:01:34 -07:00
Xavier Noria
a0960ec2d4 the generated ALT attribute for images no longer contains the digest, if any 2011-06-27 23:00:05 +02:00
Chris Eppstein
024bed387b Added a configuration setting:
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
2011-06-27 13:58:51 -07:00
Chris Eppstein
2cc1bc3773 Move the config bootstrapping to initialization to minimize access to the Rails.application global. 2011-06-27 13:55:10 -07:00
Chris Eppstein
6c64e1e3a3 Stylesheet link tags should use the request protocol to avoid duplicate 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
2011-06-27 13:54:54 -07:00
Chris Eppstein
96137e8bd0 Add asset_url helper and refactor the asset paths so that asset hosts can be 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
2011-06-27 13:48:36 -07:00
Matt Jankowski
2fd1f2e843 clarify which url would be used to cache a page when options are not provided to #cache_page to determine that url 2011-06-26 19:44:55 -04:00
Matt Jankowski
eccd5cb610 elaborate on how web server configuration to check for static files on disk enables page caching to work without hitting the app server stack 2011-06-26 19:41:49 -04:00
David Chelimsky
a7af1e0051 Get the fixture_path from self.class instead of ActiveSupport::TestCase.
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.
2011-06-25 13:59:49 -05:00
James Cox
d446c798a5 make the logs a little simpler to view, put the render message inline with 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 2011-06-24 13:10:06 -07:00
Xavier Noria
1f505a8ef2 Merge branch 'master' of git://github.com/lifo/docrails 2011-06-23 18:08:11 +02:00
José Valim
d49622a1f2 Edited actionpack/actionpack.gemspec via GitHub 2011-06-23 07:38:41 -07:00
Santiago Pastorino
87b548ccac Minor refactor 2011-06-23 00:35:54 -03:00
Santiago Pastorino
7f6eed0447 Merge pull request #1796 from jdeseno/master
link_to doesn't allow rel attribute when also specifying method
2011-06-22 20:34:33 -07:00
Santiago Pastorino
6b3342d971 Merge pull request #1798 from jeroenj/cachesweeper-fix
Fixes an issue where cache sweepers with only after filters would have no controller object
2011-06-22 10:48:19 -07:00
Joshua Peek
a1f8421060 Revert "Bump sprockets requirement"
This reverts commit 458512c8fa.
2011-06-22 11:29:11 -05:00