re-enable the asset pipeline for rails 3.2

pull/1186/head
Martin Linkhorst 12 years ago
parent ef1606fc57
commit b90dc573ff
  1. 4
      config/application.rb
  2. 4
      config/environments/development.rb

@ -50,7 +50,7 @@ module OpenProject
config.filter_parameters += [:password]
# Enable the asset pipeline
config.assets.enabled = false
config.assets.enabled = true
# Enable escaping HTML in JSON.
config.active_support.escape_html_entities_in_json = true
@ -74,6 +74,6 @@ module OpenProject
config.active_record.whitelist_attributes = true
# Version of your assets, change this if you want to expire all your assets
# config.assets.version = '1.0'
config.assets.version = '1.0'
end
end

@ -30,8 +30,8 @@ OpenProject::Application.configure do
config.active_record.auto_explain_threshold_in_seconds = 0.5
# Do not compress assets
# config.assets.compress = false
config.assets.compress = false
# Expands the lines which load the assets
# config.assets.debug = true
config.assets.debug = true
end

Loading…
Cancel
Save