application.rb in paper_trail-7.0.0

- old
+ new

@@ -2,58 +2,28 @@
 
 # Pick the frameworks you want:
 require "active_record/railtie"
 require "action_controller/railtie"
 
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+Bundler.require(:default, Rails.env)
 require "paper_trail"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # 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
+    config.active_support.test_order = :sorted
 
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
+    # Disable assets in rails 4.2. In rails 5, config does not respond to
+    # assets, probably because it was moved out of railties to some other gem,
+    # and we only have dev. dependencies on railties, not all of rails. When
+    # we drop support for rails 4.2, we can remove this whole conditional.
+    if config.respond_to?(:assets)
+      config.assets.enabled = false
+    end
 
-    # `config.assets` is a `NoMethodError` in rails 5.
-    config.assets.enabled = false if config.respond_to?(:assets)
-
-    # Version of your assets, change this if you want to expire all your assets
-    # config.assets.version = '1.0'
-
-    # Rails 4 key for generating secret key
     config.secret_key_base = "A fox regularly kicked the screaming pile of biscuits."
 
     # `raise_in_transactional_callbacks` was added in rails 4, then deprecated
     # in rails 5. Oh, how fickle are the gods.
     if ActiveRecord.respond_to?(:gem_version)
@@ -63,10 +33,7 @@
       end
       if v >= Gem::Version.new("5.0.0.beta1")
         config.active_record.time_zone_aware_types = [:datetime]
       end
     end
-
-    # Set test order for Test::Unit if possible
-    config.active_support.test_order = :sorted if config.active_support.respond_to?(:test_order=)
   end
 end