diff config/application.rb @ 431:68eb23b52864

Rails 5 \o/
author nanaya <me@myconan.net>
date Fri, 13 May 2016 03:56:07 +0900
parents 851432f21603
children d31fe32da7a0
line wrap: on
line diff
--- a/config/application.rb	Tue Mar 01 16:36:10 2016 +0900
+++ b/config/application.rb	Fri May 13 03:56:07 2016 +0900
@@ -1,4 +1,4 @@
-require File.expand_path("../boot", __FILE__)
+require_relative "boot"
 
 # To allow setting environment variable ZP_DATABASE_URL instead of DATABASE_URL.
 ENV["DATABASE_URL"] = ENV["ZP_DATABASE_URL"] if ENV["ZP_DATABASE_URL"]
@@ -10,17 +10,14 @@
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
-require File.expand_path("../init_config", __FILE__)
-suppress(LoadError) { require File.expand_path("../local_config", __FILE__) }
-require File.expand_path("../default_config", __FILE__)
+require_relative "init_config"
+suppress(LoadError) { require_relative "local_config" }
+require_relative "default_config"
 
-# Pick the frameworks you want:
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*CONFIG["bundler_groups"])
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# If you precompile assets before deploying to production, use this line
+Bundler.require(*CONFIG["bundler_groups"])
+# If you want your assets lazily compiled in production, use this line
+# Bundler.require(:default, :assets, Rails.env)
 
 module Zeropaste
   class Application < Rails::Application
@@ -49,9 +46,6 @@
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 
@@ -63,9 +57,6 @@
     # Enable the asset pipeline
     config.assets.enabled = true
 
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = "1.0"
-
     # No need to initialize application when precompiling assets
     config.assets.initialize_on_precompile = false