diff --git a/.rubocop.yml b/.rubocop.yml index b81f69685..61a117f97 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -10,7 +10,7 @@ AllCops: DisplayStyleGuide: true Exclude: - "db/schema.rb" - - "lib/ckeditor/backend/active_storage.rb" + - "app/lib/ckeditor/backend/active_storage.rb" DisabledByDefault: true Bundler/DuplicatedGem: @@ -480,7 +480,7 @@ Rails/SkipsModelValidations: - update_attribute Exclude: - app/models/tenant.rb - - lib/acts_as_paranoid_aliases.rb + - app/lib/acts_as_paranoid_aliases.rb Rails/TimeZone: Enabled: true diff --git a/lib/active_model/dates.rb b/app/lib/active_model/dates.rb similarity index 100% rename from lib/active_model/dates.rb rename to app/lib/active_model/dates.rb diff --git a/lib/active_storage/service/tenant_disk_service.rb b/app/lib/active_storage/service/tenant_disk_service.rb similarity index 100% rename from lib/active_storage/service/tenant_disk_service.rb rename to app/lib/active_storage/service/tenant_disk_service.rb diff --git a/lib/acts_as_paranoid_aliases.rb b/app/lib/acts_as_paranoid_aliases.rb similarity index 100% rename from lib/acts_as_paranoid_aliases.rb rename to app/lib/acts_as_paranoid_aliases.rb diff --git a/lib/admin_legislation_sanitizer.rb b/app/lib/admin_legislation_sanitizer.rb similarity index 100% rename from lib/admin_legislation_sanitizer.rb rename to app/lib/admin_legislation_sanitizer.rb diff --git a/lib/admin_wysiwyg_sanitizer.rb b/app/lib/admin_wysiwyg_sanitizer.rb similarity index 100% rename from lib/admin_wysiwyg_sanitizer.rb rename to app/lib/admin_wysiwyg_sanitizer.rb diff --git a/lib/age.rb b/app/lib/age.rb similarity index 100% rename from lib/age.rb rename to app/lib/age.rb diff --git a/lib/application_logger.rb b/app/lib/application_logger.rb similarity index 100% rename from lib/application_logger.rb rename to app/lib/application_logger.rb diff --git a/lib/application_responder.rb b/app/lib/application_responder.rb similarity index 100% rename from lib/application_responder.rb rename to app/lib/application_responder.rb diff --git a/lib/asset_finder.rb b/app/lib/asset_finder.rb similarity index 100% rename from lib/asset_finder.rb rename to app/lib/asset_finder.rb diff --git a/lib/authentication_logger.rb b/app/lib/authentication_logger.rb similarity index 100% rename from lib/authentication_logger.rb rename to app/lib/authentication_logger.rb diff --git a/lib/census_api.rb b/app/lib/census_api.rb similarity index 100% rename from lib/census_api.rb rename to app/lib/census_api.rb diff --git a/lib/census_caller.rb b/app/lib/census_caller.rb similarity index 100% rename from lib/census_caller.rb rename to app/lib/census_caller.rb diff --git a/lib/ckeditor/backend/active_storage.rb b/app/lib/ckeditor/backend/active_storage.rb similarity index 100% rename from lib/ckeditor/backend/active_storage.rb rename to app/lib/ckeditor/backend/active_storage.rb diff --git a/lib/comment_tree.rb b/app/lib/comment_tree.rb similarity index 100% rename from lib/comment_tree.rb rename to app/lib/comment_tree.rb diff --git a/lib/consul_form_builder.rb b/app/lib/consul_form_builder.rb similarity index 100% rename from lib/consul_form_builder.rb rename to app/lib/consul_form_builder.rb diff --git a/lib/document_parser.rb b/app/lib/document_parser.rb similarity index 100% rename from lib/document_parser.rb rename to app/lib/document_parser.rb diff --git a/lib/email_digest.rb b/app/lib/email_digest.rb similarity index 100% rename from lib/email_digest.rb rename to app/lib/email_digest.rb diff --git a/lib/evaluation_comment_email.rb b/app/lib/evaluation_comment_email.rb similarity index 100% rename from lib/evaluation_comment_email.rb rename to app/lib/evaluation_comment_email.rb diff --git a/lib/geozone_stats.rb b/app/lib/geozone_stats.rb similarity index 100% rename from lib/geozone_stats.rb rename to app/lib/geozone_stats.rb diff --git a/lib/local_census.rb b/app/lib/local_census.rb similarity index 100% rename from lib/local_census.rb rename to app/lib/local_census.rb diff --git a/lib/manager_authenticator.rb b/app/lib/manager_authenticator.rb similarity index 100% rename from lib/manager_authenticator.rb rename to app/lib/manager_authenticator.rb diff --git a/lib/markdown_converter.rb b/app/lib/markdown_converter.rb similarity index 100% rename from lib/markdown_converter.rb rename to app/lib/markdown_converter.rb diff --git a/lib/merged_comment_tree.rb b/app/lib/merged_comment_tree.rb similarity index 100% rename from lib/merged_comment_tree.rb rename to app/lib/merged_comment_tree.rb diff --git a/lib/omniauth_tenant_setup.rb b/app/lib/omniauth_tenant_setup.rb similarity index 100% rename from lib/omniauth_tenant_setup.rb rename to app/lib/omniauth_tenant_setup.rb diff --git a/lib/percentage_calculator.rb b/app/lib/percentage_calculator.rb similarity index 100% rename from lib/percentage_calculator.rb rename to app/lib/percentage_calculator.rb diff --git a/lib/remote_census_api.rb b/app/lib/remote_census_api.rb similarity index 100% rename from lib/remote_census_api.rb rename to app/lib/remote_census_api.rb diff --git a/lib/remote_translations/caller.rb b/app/lib/remote_translations/caller.rb similarity index 100% rename from lib/remote_translations/caller.rb rename to app/lib/remote_translations/caller.rb diff --git a/lib/remote_translations/microsoft/available_locales.rb b/app/lib/remote_translations/microsoft/available_locales.rb similarity index 100% rename from lib/remote_translations/microsoft/available_locales.rb rename to app/lib/remote_translations/microsoft/available_locales.rb diff --git a/lib/remote_translations/microsoft/client.rb b/app/lib/remote_translations/microsoft/client.rb similarity index 100% rename from lib/remote_translations/microsoft/client.rb rename to app/lib/remote_translations/microsoft/client.rb diff --git a/lib/remote_translations/microsoft/sentences_parser.rb b/app/lib/remote_translations/microsoft/sentences_parser.rb similarity index 100% rename from lib/remote_translations/microsoft/sentences_parser.rb rename to app/lib/remote_translations/microsoft/sentences_parser.rb diff --git a/lib/reply_email.rb b/app/lib/reply_email.rb similarity index 100% rename from lib/reply_email.rb rename to app/lib/reply_email.rb diff --git a/lib/score_calculator.rb b/app/lib/score_calculator.rb similarity index 100% rename from lib/score_calculator.rb rename to app/lib/score_calculator.rb diff --git a/lib/search_dictionary_selector.rb b/app/lib/search_dictionary_selector.rb similarity index 100% rename from lib/search_dictionary_selector.rb rename to app/lib/search_dictionary_selector.rb diff --git a/lib/sms_api.rb b/app/lib/sms_api.rb similarity index 100% rename from lib/sms_api.rb rename to app/lib/sms_api.rb diff --git a/lib/tag_sanitizer.rb b/app/lib/tag_sanitizer.rb similarity index 100% rename from lib/tag_sanitizer.rb rename to app/lib/tag_sanitizer.rb diff --git a/lib/user_segments.rb b/app/lib/user_segments.rb similarity index 100% rename from lib/user_segments.rb rename to app/lib/user_segments.rb diff --git a/lib/wysiwyg_sanitizer.rb b/app/lib/wysiwyg_sanitizer.rb similarity index 100% rename from lib/wysiwyg_sanitizer.rb rename to app/lib/wysiwyg_sanitizer.rb diff --git a/config/application.rb b/config/application.rb index a2cf9bfde..6b6d6c51d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -125,8 +125,6 @@ module Consul config.assets.paths << Rails.root.join("node_modules", "jquery-ui", "themes", "base") config.assets.paths << Rails.root.join("node_modules") - # Add lib to the autoload path - config.autoload_paths << Rails.root.join("lib") config.active_job.queue_adapter = :delayed_job # CONSUL DEMOCRACY specific custom overrides diff --git a/config/environments/production.rb b/config/environments/production.rb index 1b200d1ab..57ba25c25 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -12,11 +12,6 @@ Rails.application.configure do # Rake tasks automatically ignore this option for performance. config.eager_load = true - # Because autoloading is disabled in production environments with Rails 5, - # using autoload_paths will not load needed classes from specified paths. - # The solution to this, is to ask Rails to eager load classes. - config.eager_load_paths += ["#{config.root}/lib"] - # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true