Skip to content

Prefer serve_static_files if it exists #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josh merged 2 commits into from
Dec 20, 2014
Merged

Prefer serve_static_files if it exists #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda1b20
Prefer serve_static_files if it exists
josh Dec 20, 2014
66acb62
Switch to 4.2 release
josh Dec 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion test/fixtures/alternate_config_project/config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
config.action_controller.perform_caching = true

# Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
else
config.serve_static_assets = false
end

# Compress JavaScripts and CSS
config.assets.css_compressor = :yui
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/alternate_config_project/config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
config.cache_classes = true

# Configure static asset server for tests with Cache-Control for performance
config.serve_static_assets = true
if config.respond_to?(:serve_static_files)
config.serve_static_files = true
else
config.serve_static_assets = true
end
config.static_cache_control = "public, max-age=3600"

config.eager_load = false
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/engine_project/test/dummy/config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
# config.action_dispatch.rack_cache = true

# Disable Rails's static asset server (Apache or nginx will already do this).
config.serve_static_assets = false
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
else
config.serve_static_assets = false
end

# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/engine_project/test/dummy/config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
config.eager_load = false

# Configure static asset server for tests with Cache-Control for performance.
config.serve_static_assets = true
if config.respond_to?(:serve_static_files)
config.serve_static_files = true
else
config.serve_static_assets = true
end
config.static_cache_control = "public, max-age=3600"

# Show full error reports and disable caching.
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/sass_project/config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
config.action_controller.perform_caching = true

# Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
else
config.serve_static_assets = false
end

# Specify the default JavaScript compressor
config.assets.js_compressor = :uglifier
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/sass_project/config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
config.eager_load = false

# Configure static asset server for tests with Cache-Control for performance
config.serve_static_assets = true
if config.respond_to?(:serve_static_files)
config.serve_static_files = true
else
config.serve_static_assets = true
end
config.static_cache_control = "public, max-age=3600"

# Show full error reports and disable caching
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/scss_project/config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
config.action_controller.perform_caching = true

# Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
else
config.serve_static_assets = false
end

# Specify the default JavaScript compressor
config.assets.js_compressor = :uglifier
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/scss_project/config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
config.eager_load = false

# Configure static asset server for tests with Cache-Control for performance
config.serve_static_assets = true
if config.respond_to?(:serve_static_files)
config.serve_static_files = true
else
config.serve_static_assets = true
end
config.static_cache_control = "public, max-age=3600"

# Show full error reports and disable caching
Expand Down
2 changes: 1 addition & 1 deletion test/gemfiles/Gemfile-rails-4-2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: "../.."

gem "rails", "4.2.0.rc1"
gem "rails", "~> 4.2.0"