Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/sass/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Sass
module Rails
VERSION = "5.0.4"
VERSION = "5.0.5"
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
config.action_controller.perform_caching = true

# Disable Rails's static asset server (Apache or nginx will already do this)
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
if config.respond_to?(:public_file_server)
config.public_file_server.enabled = false
else
config.serve_static_assets = false
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
config.cache_classes = true

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

config.eager_load = false

Expand Down
12 changes: 6 additions & 6 deletions test/fixtures/engine_project/engine_project.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ require "engine_project/version"
Gem::Specification.new do |s|
s.name = "engine_project"
s.version = EngineProject::VERSION
s.authors = ["TODO: Your name"]
s.email = ["TODO: Your email"]
s.homepage = "TODO"
s.summary = "TODO: Summary of EngineProject."
s.description = "TODO: Description of EngineProject."
s.authors = ["Your name"]
s.email = ["Your email"]
s.homepage = "http://example.com"
s.summary = "Summary of EngineProject."
s.description = "Description of EngineProject."

s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
s.test_files = Dir["test/**/*"]

s.add_dependency "rails", ">= 4.0.0.beta", "< 5.0"
s.add_dependency "rails", ">= 4.0.0.beta", "< 6"
# s.add_dependency "jquery-rails"

s.add_development_dependency "sqlite3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
# config.action_dispatch.rack_cache = true

# Disable Rails's static asset server (Apache or nginx will already do this).
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
if config.respond_to?(:public_file_server)
config.public_file_server.enabled = false
else
config.serve_static_assets = false
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
config.eager_load = false

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

# Show full error reports and disable caching.
config.consider_all_requests_local = true
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/sass_project/config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
config.action_controller.perform_caching = true

# Disable Rails's static asset server (Apache or nginx will already do this)
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
if config.respond_to?(:public_file_server)
config.public_file_server.enabled = false
else
config.serve_static_assets = false
end
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/sass_project/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
config.eager_load = false

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

# Show full error reports and disable caching
config.consider_all_requests_local = true
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/scss_project/config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
config.action_controller.perform_caching = true

# Disable Rails's static asset server (Apache or nginx will already do this)
if config.respond_to?(:serve_static_files)
config.serve_static_files = false
if config.respond_to?(:public_file_server)
config.public_file_server.enabled = false
else
config.serve_static_assets = false
end
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/scss_project/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
config.eager_load = false

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

# Show full error reports and disable caching
config.consider_all_requests_local = true
Expand Down