Allow changeset source tag to be settable via url api

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index be2cc0a99bb5813ef68fb761f1a8b49e388d2d97..b6e2ba46788c14d6342e934f31a0364b9e83c43c 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,6 @@
-require File.expand_path("../boot", __FILE__)
+require_relative "boot"
 
-require File.expand_path("../preinitializer", __FILE__)
+require_relative "preinitializer"
 
 if STATUS == :database_offline
   require "action_controller/railtie"
@@ -22,19 +22,8 @@ module OpenStreetMap
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # 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
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true unless STATUS == :database_offline
-
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W[#{config.root}/lib]
 
     # 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,
@@ -45,9 +34,7 @@ module OpenStreetMap
     config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
 
     # Use memcached for caching if required
-    if defined?(MEMCACHE_SERVERS)
-      config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
-    end
+    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS)
 
     # Use logstash for logging if required
     if defined?(LOGSTASH_PATH)
@@ -56,8 +43,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
-
-    # Configure image optimisation
-    config.assets.image_optim = YAML.load_file("#{Rails.root}/config/image_optim.yml")
   end
 end