diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index 8856a377b4..fe2d3a2327 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter' - class AboutController < ApplicationController requires_login only: [:live_post_counts] diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb index 2fae2e40da..2e4762c05f 100644 --- a/app/controllers/admin/backups_controller.rb +++ b/app/controllers/admin/backups_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "backup_restore/backup_restore" +require "backup_restore" require "backup_restore/backup_store" class Admin::BackupsController < Admin::AdminController diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index e8c81111fa..db89c25ebc 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/renderer' - class Admin::EmailController < Admin::AdminController def index diff --git a/app/controllers/admin/embedding_controller.rb b/app/controllers/admin/embedding_controller.rb index e2559fb85a..c4540edd80 100644 --- a/app/controllers/admin/embedding_controller.rb +++ b/app/controllers/admin/embedding_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'embedding' - class Admin::EmbeddingController < Admin::AdminController before_action :fetch_embedding diff --git a/app/controllers/admin/emojis_controller.rb b/app/controllers/admin/emojis_controller.rb index f8baa5dc39..cc74777778 100644 --- a/app/controllers/admin/emojis_controller.rb +++ b/app/controllers/admin/emojis_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'upload_creator' - class Admin::EmojisController < Admin::AdminController def index diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index fe99dd706a..20b97a6f25 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'report' - class Admin::ReportsController < Admin::AdminController def index reports_methods = ['page_view_total_reqs'] + diff --git a/app/controllers/admin/screened_ip_addresses_controller.rb b/app/controllers/admin/screened_ip_addresses_controller.rb index ac3b1b8b98..400620c4cc 100644 --- a/app/controllers/admin/screened_ip_addresses_controller.rb +++ b/app/controllers/admin/screened_ip_addresses_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'ip_addr' - class Admin::ScreenedIpAddressesController < Admin::AdminController before_action :fetch_screened_ip_address, only: [:update, :destroy] diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb index 14743c3c5a..756974c109 100644 --- a/app/controllers/admin/site_texts_controller.rb +++ b/app/controllers/admin/site_texts_controller.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'seed_data/categories' -require_dependency 'seed_data/topics' - class Admin::SiteTextsController < Admin::AdminController def self.preferred_keys diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb index 9926c3ce1e..5ab3fbe4d0 100644 --- a/app/controllers/admin/staff_action_logs_controller.rb +++ b/app/controllers/admin/staff_action_logs_controller.rb @@ -26,8 +26,6 @@ class Admin::StaffActionLogsController < Admin::AdminController end def diff - require_dependency "discourse_diff" - @history = UserHistory.find(params[:id]) prev = @history.previous_value cur = @history.new_value diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb index b9b34aff74..89c7ef8454 100644 --- a/app/controllers/admin/themes_controller.rb +++ b/app/controllers/admin/themes_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'upload_creator' -require_dependency 'theme_store/tgz_exporter' require 'base64' class Admin::ThemesController < Admin::AdminController diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 59b9f03714..8c860a4d89 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'user_destroyer' -require_dependency 'admin_user_index_query' -require_dependency 'admin_confirmation' - class Admin::UsersController < Admin::AdminController before_action :fetch_user, only: [:suspend, diff --git a/app/controllers/admin/versions_controller.rb b/app/controllers/admin/versions_controller.rb index 94ec89be68..f8da407745 100644 --- a/app/controllers/admin/versions_controller.rb +++ b/app/controllers/admin/versions_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse_updates' - class Admin::VersionsController < Admin::AdminController def show render json: DiscourseUpdates.check_version diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7940565ea5..23467e68ce 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,20 +1,6 @@ # frozen_string_literal: true require 'current_user' -require_dependency 'canonical_url' -require_dependency 'discourse' -require_dependency 'custom_renderer' -require_dependency 'archetype' -require_dependency 'rate_limiter' -require_dependency 'crawler_detection' -require_dependency 'json_error' -require_dependency 'letter_avatar' -require_dependency 'distributed_cache' -require_dependency 'global_path' -require_dependency 'secure_session' -require_dependency 'topic_query' -require_dependency 'hijack' -require_dependency 'read_only_header' class ApplicationController < ActionController::Base include CurrentUser diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 774171395d..47fbd2ab8f 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'category_serializer' - class CategoriesController < ApplicationController requires_login except: [:index, :categories_and_latest, :categories_and_top, :show, :redirect, :find_by_slug] diff --git a/app/controllers/composer_controller.rb b/app/controllers/composer_controller.rb index 0f54f282b7..7f275027e5 100644 --- a/app/controllers/composer_controller.rb +++ b/app/controllers/composer_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'html_to_markdown' - class ComposerController < ApplicationController requires_login diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb index 97d91a4d3e..c5d4de3c64 100644 --- a/app/controllers/composer_messages_controller.rb +++ b/app/controllers/composer_messages_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'composer_messages_finder' - class ComposerMessagesController < ApplicationController requires_login diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb index 5490fa59fa..0d8f53eed2 100644 --- a/app/controllers/embed_controller.rb +++ b/app/controllers/embed_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'topic_query_params' - class EmbedController < ApplicationController include TopicQueryParams diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb index 4fa1db159c..16e4cf267b 100644 --- a/app/controllers/inline_onebox_controller.rb +++ b/app/controllers/inline_onebox_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'inline_oneboxer' - class InlineOneboxController < ApplicationController requires_login diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index cef597971f..6c1d9b7579 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter' - class InvitesController < ApplicationController requires_login only: [ diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 6d2bace341..c94520d3bd 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'topic_list_responder' -require_dependency 'topic_query_params' - class ListController < ApplicationController include TopicListResponder include TopicQueryParams diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 2ec11b39c8..94779fc0a1 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'notification_serializer' - class NotificationsController < ApplicationController requires_login diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb index 877504df34..10c500317b 100644 --- a/app/controllers/onebox_controller.rb +++ b/app/controllers/onebox_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'oneboxer' - class OneboxController < ApplicationController requires_login diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb index 642c40dd4e..9cfbbc1b11 100644 --- a/app/controllers/post_action_users_controller.rb +++ b/app/controllers/post_action_users_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse' - class PostActionUsersController < ApplicationController def index params.require(:post_action_type_id) diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb index e652fb4ce2..594c7062ce 100644 --- a/app/controllers/post_actions_controller.rb +++ b/app/controllers/post_actions_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse' - class PostActionsController < ApplicationController requires_login diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index d5a9a12c0d..b63d2539fe 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,14 +1,5 @@ # frozen_string_literal: true -require_dependency 'new_post_manager' -require_dependency 'post_creator' -require_dependency 'post_action_destroyer' -require_dependency 'post_destroyer' -require_dependency 'post_merger' -require_dependency 'distributed_memoizer' -require_dependency 'new_post_result_serializer' -require_dependency 'post_locker' - class PostsController < ApplicationController requires_login except: [ diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rb index dffe6cd172..2e9816bab1 100644 --- a/app/controllers/reviewables_controller.rb +++ b/app/controllers/reviewables_controller.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -require_dependency 'reviewable_explanation_serializer' class ReviewablesController < ApplicationController requires_login diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 82d8ac74bc..919303e3be 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'search' - class SearchController < ApplicationController skip_before_action :check_xhr, only: :show diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index c060fb7faf..16aa29c809 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -1,11 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter' -require_dependency 'single_sign_on' -require_dependency 'single_sign_on_provider' -require_dependency 'url_helper' -require_dependency 'webauthn/webauthn' - class SessionController < ApplicationController class LocalLoginNotAllowed < StandardError; end rescue_from LocalLoginNotAllowed do diff --git a/app/controllers/similar_topics_controller.rb b/app/controllers/similar_topics_controller.rb index b2a5809505..a42677893d 100644 --- a/app/controllers/similar_topics_controller.rb +++ b/app/controllers/similar_topics_controller.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'similar_topic_serializer' -require_dependency 'search/grouped_search_results' - class SimilarTopicsController < ApplicationController class SimilarTopic diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 8c1ed8d2de..f1ea98d34d 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'site_serializer' - class SiteController < ApplicationController layout false skip_before_action :preload_json, :check_xhr diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index b546c2bc86..51b291403c 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_memoizer' -require_dependency 'file_helper' - class StaticController < ApplicationController skip_before_action :check_xhr, :redirect_to_login_if_required diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index 5569841838..1f17ae6af9 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'wizard' -require_dependency 'wizard/builder' -require_dependency 'wizard/step_updater' - class StepsController < ApplicationController requires_login diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 7e06d03d6b..edf6402439 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency 'topic_list_responder' -require_dependency 'topic_query_params' -require_dependency 'topics_bulk_action' -require_dependency 'topic_query' - class TagsController < ::ApplicationController include TopicListResponder include TopicQueryParams diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 087d00fc10..981a3454ad 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -1,14 +1,5 @@ # frozen_string_literal: true -require_dependency 'topic_view' -require_dependency 'promotion' -require_dependency 'url_helper' -require_dependency 'topics_bulk_action' -require_dependency 'discourse_event' -require_dependency 'rate_limiter' -require_dependency 'topic_publisher' -require_dependency 'post_action_destroyer' - class TopicsController < ApplicationController requires_login only: [ :timings, diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 2fe9c0c9c9..78c1623704 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require "mini_mime" -require_dependency 'upload_creator' -require_dependency "file_store/local_store" class UploadsController < ApplicationController requires_login except: [:show, :show_short] diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index 11f4f25cf5..288fb8bc3f 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'letter_avatar' - class UserAvatarsController < ApplicationController skip_before_action :preload_json, :redirect_to_login_if_required, :check_xhr, :verify_authenticity_token, only: [:show, :show_letter, :show_proxy_letter] diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index f1f43f1f85..e2cf35a072 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -1,10 +1,6 @@ # -*- encoding : utf-8 -*- # frozen_string_literal: true -require_dependency 'email' -require_dependency 'enum' -require_dependency 'user_name_suggester' - class Users::OmniauthCallbacksController < ApplicationController skip_before_action :redirect_to_login_if_required diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5557b8030e..8f552871c6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,13 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse_hub' -require_dependency 'user_name_suggester' -require_dependency 'rate_limiter' -require_dependency 'wizard' -require_dependency 'wizard/builder' -require_dependency 'admin_confirmation' -require_dependency 'webauthn/webauthn' - class UsersController < ApplicationController skip_before_action :authorize_mini_profiler, only: [:avatar] diff --git a/app/controllers/users_email_controller.rb b/app/controllers/users_email_controller.rb index 53d4cc2871..f74f60a94a 100644 --- a/app/controllers/users_email_controller.rb +++ b/app/controllers/users_email_controller.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter' -require_dependency 'email_validator' -require_dependency 'email_updater' - class UsersEmailController < ApplicationController requires_login only: [:index, :update] diff --git a/app/controllers/wizard_controller.rb b/app/controllers/wizard_controller.rb index 77c44055cc..6b573bdace 100644 --- a/app/controllers/wizard_controller.rb +++ b/app/controllers/wizard_controller.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'wizard' -require_dependency 'wizard/builder' - class WizardController < ApplicationController requires_login except: [:qunit] diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 34f92d7985..c45ade5fb2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,14 +2,6 @@ # frozen_string_literal: true require 'current_user' require 'canonical_url' -require_dependency 'guardian' -require_dependency 'unread' -require_dependency 'age_words' -require_dependency 'configurable_urls' -require_dependency 'mobile_detection' -require_dependency 'category_badge' -require_dependency 'global_path' -require_dependency 'emoji' module ApplicationHelper include CurrentUser diff --git a/app/jobs/base.rb b/app/jobs/base.rb index aae9c8a107..9ad78f4564 100644 --- a/app/jobs/base.rb +++ b/app/jobs/base.rb @@ -187,7 +187,7 @@ module Jobs def perform(*args) opts = args.extract_options!.with_indifferent_access - if Jobs.run_later? + if ::Jobs.run_later? Sidekiq.redis do |r| r.set('last_job_perform_at', Time.now.to_i) end @@ -275,7 +275,7 @@ module Jobs extend MiniScheduler::Schedule def perform(*args) - if (Jobs::Heartbeat === self) || !Discourse.readonly_mode? + if (::Jobs::Heartbeat === self) || !Discourse.readonly_mode? super end end @@ -290,7 +290,8 @@ module Jobs end # If we are able to queue a job, do it - if Jobs.run_later? + + if ::Jobs.run_later? hash = { 'class' => klass, 'args' => [opts] @@ -361,7 +362,3 @@ module Jobs end end end - -Dir["#{Rails.root}/app/jobs/onceoff/*.rb"].each { |file| require_dependency file } -Dir["#{Rails.root}/app/jobs/regular/*.rb"].each { |file| require_dependency file } -Dir["#{Rails.root}/app/jobs/scheduled/*.rb"].each { |file| require_dependency file } diff --git a/app/jobs/onceoff/clean_up_post_timings.rb b/app/jobs/onceoff/clean_up_post_timings.rb index 43c0e5caba..1399ddaa80 100644 --- a/app/jobs/onceoff/clean_up_post_timings.rb +++ b/app/jobs/onceoff/clean_up_post_timings.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpPostTimings < Jobs::Onceoff + class CleanUpPostTimings < ::Jobs::Onceoff # Remove post timings that are remnants of previous post moves # or other shenanigans and don't reference a valid user or post anymore. diff --git a/app/jobs/onceoff/clean_up_sidekiq_statistic.rb b/app/jobs/onceoff/clean_up_sidekiq_statistic.rb index c99a87656d..397fc4f79b 100644 --- a/app/jobs/onceoff/clean_up_sidekiq_statistic.rb +++ b/app/jobs/onceoff/clean_up_sidekiq_statistic.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpSidekiqStatistic < Jobs::Onceoff + class CleanUpSidekiqStatistic < ::Jobs::Onceoff def execute_onceoff(args) $redis.without_namespace.del('sidekiq:sidekiq:statistic') end diff --git a/app/jobs/onceoff/clean_up_user_export_topics.rb b/app/jobs/onceoff/clean_up_user_export_topics.rb index 9a5b19e05a..8e5be5bf27 100644 --- a/app/jobs/onceoff/clean_up_user_export_topics.rb +++ b/app/jobs/onceoff/clean_up_user_export_topics.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpUserExportTopics < Jobs::Onceoff + class CleanUpUserExportTopics < ::Jobs::Onceoff def execute_onceoff(args) translated_keys = I18n.available_locales.map do |l| I18n.with_locale(:"#{l}") { I18n.t("system_messages.csv_export_succeeded.subject_template") } diff --git a/app/jobs/onceoff/clear_width_and_height.rb b/app/jobs/onceoff/clear_width_and_height.rb index 070c16056a..7c82840740 100644 --- a/app/jobs/onceoff/clear_width_and_height.rb +++ b/app/jobs/onceoff/clear_width_and_height.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class ClearWidthAndHeight < Jobs::Onceoff + class ClearWidthAndHeight < ::Jobs::Onceoff def execute_onceoff(args) # we have to clear all old uploads cause # we could have old versions of height / width diff --git a/app/jobs/onceoff/correct_missing_dualstack_urls.rb b/app/jobs/onceoff/correct_missing_dualstack_urls.rb index a8de7b4c69..6cdfa55e84 100644 --- a/app/jobs/onceoff/correct_missing_dualstack_urls.rb +++ b/app/jobs/onceoff/correct_missing_dualstack_urls.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CorrectMissingDualstackUrls < Jobs::Onceoff + class CorrectMissingDualstackUrls < ::Jobs::Onceoff def execute_onceoff(args) # s3 now uses dualstack urls, keep them around correctly # in both uploads and optimized_image tables diff --git a/app/jobs/onceoff/create_tags_search_index.rb b/app/jobs/onceoff/create_tags_search_index.rb index f683834e65..f761707426 100644 --- a/app/jobs/onceoff/create_tags_search_index.rb +++ b/app/jobs/onceoff/create_tags_search_index.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CreateTagsSearchIndex < Jobs::Onceoff + class CreateTagsSearchIndex < ::Jobs::Onceoff def execute_onceoff(args) DB.query('select id, name from tags').each do |t| SearchIndexer.update_tags_index(t.id, t.name) diff --git a/app/jobs/onceoff/fix_featured_link_for_topics.rb b/app/jobs/onceoff/fix_featured_link_for_topics.rb index 4d3c48c913..337d7d2efa 100644 --- a/app/jobs/onceoff/fix_featured_link_for_topics.rb +++ b/app/jobs/onceoff/fix_featured_link_for_topics.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class FixFeaturedLinkForTopics < Jobs::Onceoff + class FixFeaturedLinkForTopics < ::Jobs::Onceoff def execute_onceoff(args) Topic.where("featured_link IS NOT NULL").find_each do |topic| featured_link = topic.featured_link diff --git a/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb b/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb index 80fc0f1d27..bbbc942603 100644 --- a/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb +++ b/app/jobs/onceoff/fix_invalid_gravatar_uploads.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class FixInvalidGravatarUploads < Jobs::Onceoff + class FixInvalidGravatarUploads < ::Jobs::Onceoff def execute_onceoff(args) Upload.where(original_filename: "gravatar.png").find_each do |upload| # note, this still feels pretty expensive for a once off diff --git a/app/jobs/onceoff/fix_invalid_upload_extensions.rb b/app/jobs/onceoff/fix_invalid_upload_extensions.rb index 8c62bdbfc1..a5a6f98921 100644 --- a/app/jobs/onceoff/fix_invalid_upload_extensions.rb +++ b/app/jobs/onceoff/fix_invalid_upload_extensions.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency "upload_fixer" - module Jobs - class FixInvalidUploadExtensions < Jobs::Onceoff + class FixInvalidUploadExtensions < ::Jobs::Onceoff def execute_onceoff(args) UploadFixer.fix_all_extensions end diff --git a/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb b/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb index 1029edc916..2a167697c2 100644 --- a/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb +++ b/app/jobs/onceoff/fix_out_of_sync_user_uploaded_avatar.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class FixOutOfSyncUserUploadedAvatar < Jobs::Onceoff + class FixOutOfSyncUserUploadedAvatar < ::Jobs::Onceoff def execute_onceoff(args) DB.exec(<<~SQL) WITH X AS ( diff --git a/app/jobs/onceoff/fix_posts_read.rb b/app/jobs/onceoff/fix_posts_read.rb index 206b5bc41f..9d4787065a 100644 --- a/app/jobs/onceoff/fix_posts_read.rb +++ b/app/jobs/onceoff/fix_posts_read.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class FixPostsRead < Jobs::Onceoff + class FixPostsRead < ::Jobs::Onceoff def execute_onceoff(args) # Skipping to the last post in a topic used to count all posts in the topic # as read in user stats. Cap the posts read count to 50 * topics_entered. diff --git a/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb b/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb index a60b1d6315..5fb9ff218e 100644 --- a/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb +++ b/app/jobs/onceoff/fix_primary_emails_for_staged_users.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency 'user_destroyer' - module Jobs - class FixPrimaryEmailsForStagedUsers < Jobs::Onceoff + class FixPrimaryEmailsForStagedUsers < ::Jobs::Onceoff def execute_onceoff(args) users = User.where(active: false, staged: true).joins(:email_tokens) acting_user = Discourse.system_user diff --git a/app/jobs/onceoff/fix_retro_anniversary.rb b/app/jobs/onceoff/fix_retro_anniversary.rb index bec4d8d62f..a6ab1c566f 100644 --- a/app/jobs/onceoff/fix_retro_anniversary.rb +++ b/app/jobs/onceoff/fix_retro_anniversary.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -require_dependency 'jobs/scheduled/grant_anniversary_badges' - module Jobs - class FixRetroAnniversary < Jobs::Onceoff + class FixRetroAnniversary < ::Jobs::Onceoff def execute_onceoff(args) return unless SiteSetting.enable_badges diff --git a/app/jobs/onceoff/fix_s3_etags.rb b/app/jobs/onceoff/fix_s3_etags.rb index 13cc3b0670..226b09e937 100644 --- a/app/jobs/onceoff/fix_s3_etags.rb +++ b/app/jobs/onceoff/fix_s3_etags.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class FixS3Etags < Jobs::Onceoff + class FixS3Etags < ::Jobs::Onceoff def execute_onceoff(args) [Upload, OptimizedImage].each do |model| diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb index 1b3b5d6a75..5f85b431b8 100644 --- a/app/jobs/onceoff/grant_emoji.rb +++ b/app/jobs/onceoff/grant_emoji.rb @@ -2,7 +2,7 @@ module Jobs - class GrantEmoji < Jobs::Onceoff + class GrantEmoji < ::Jobs::Onceoff def execute_onceoff(args) return unless SiteSetting.enable_badges to_award = {} diff --git a/app/jobs/onceoff/grant_first_reply_by_email.rb b/app/jobs/onceoff/grant_first_reply_by_email.rb index 7a9eb93361..c0287205d7 100644 --- a/app/jobs/onceoff/grant_first_reply_by_email.rb +++ b/app/jobs/onceoff/grant_first_reply_by_email.rb @@ -2,7 +2,7 @@ module Jobs - class GrantFirstReplyByEmail < Jobs::Onceoff + class GrantFirstReplyByEmail < ::Jobs::Onceoff def execute_onceoff(args) return unless SiteSetting.enable_badges diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb index ad01a2832b..59cf443f4e 100644 --- a/app/jobs/onceoff/grant_onebox.rb +++ b/app/jobs/onceoff/grant_onebox.rb @@ -2,7 +2,7 @@ module Jobs - class GrantOnebox < Jobs::Onceoff + class GrantOnebox < ::Jobs::Onceoff sidekiq_options queue: 'low' def execute_onceoff(args) diff --git a/app/jobs/onceoff/init_category_tag_stats.rb b/app/jobs/onceoff/init_category_tag_stats.rb index a296880f33..2189f47471 100644 --- a/app/jobs/onceoff/init_category_tag_stats.rb +++ b/app/jobs/onceoff/init_category_tag_stats.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class InitCategoryTagStats < Jobs::Onceoff + class InitCategoryTagStats < ::Jobs::Onceoff def execute_onceoff(args) DB.exec "DELETE FROM category_tag_stats" diff --git a/app/jobs/onceoff/migrate_censored_words.rb b/app/jobs/onceoff/migrate_censored_words.rb index 25d49a1b7b..5de876107b 100644 --- a/app/jobs/onceoff/migrate_censored_words.rb +++ b/app/jobs/onceoff/migrate_censored_words.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class MigrateCensoredWords < Jobs::Onceoff + class MigrateCensoredWords < ::Jobs::Onceoff def execute_onceoff(args) row = DB.query_single("SELECT value FROM site_settings WHERE name = 'censored_words'") if row.count > 0 diff --git a/app/jobs/onceoff/migrate_custom_emojis.rb b/app/jobs/onceoff/migrate_custom_emojis.rb index 8986aeb896..866ec4e421 100644 --- a/app/jobs/onceoff/migrate_custom_emojis.rb +++ b/app/jobs/onceoff/migrate_custom_emojis.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency 'upload_creator' - module Jobs - class MigrateCustomEmojis < Jobs::Onceoff + class MigrateCustomEmojis < ::Jobs::Onceoff def execute_onceoff(args) return if Rails.env.test? diff --git a/app/jobs/onceoff/migrate_featured_links.rb b/app/jobs/onceoff/migrate_featured_links.rb index e8da50f94d..45f4c11def 100644 --- a/app/jobs/onceoff/migrate_featured_links.rb +++ b/app/jobs/onceoff/migrate_featured_links.rb @@ -2,7 +2,7 @@ module Jobs - class MigrateFeaturedLinks < Jobs::Onceoff + class MigrateFeaturedLinks < ::Jobs::Onceoff def execute_onceoff(args) TopicCustomField.where(name: "featured_link").find_each do |tcf| diff --git a/app/jobs/onceoff/migrate_tagging_plugin.rb b/app/jobs/onceoff/migrate_tagging_plugin.rb index a9d2f71040..d92d5692f4 100644 --- a/app/jobs/onceoff/migrate_tagging_plugin.rb +++ b/app/jobs/onceoff/migrate_tagging_plugin.rb @@ -2,7 +2,7 @@ module Jobs - class MigrateTaggingPlugin < Jobs::Onceoff + class MigrateTaggingPlugin < ::Jobs::Onceoff def execute_onceoff(args) all_tags = TopicCustomField.where(name: "tags").select('DISTINCT value').all.map(&:value) diff --git a/app/jobs/onceoff/migrate_upload_extensions.rb b/app/jobs/onceoff/migrate_upload_extensions.rb index e5d3366031..846944e285 100644 --- a/app/jobs/onceoff/migrate_upload_extensions.rb +++ b/app/jobs/onceoff/migrate_upload_extensions.rb @@ -2,7 +2,7 @@ module Jobs - class MigrateUploadExtensions < Jobs::Onceoff + class MigrateUploadExtensions < ::Jobs::Onceoff def execute_onceoff(args) Upload.find_each do |upload| upload.extension = File.extname(upload.original_filename)[1..10] diff --git a/app/jobs/onceoff/migrate_url_site_settings.rb b/app/jobs/onceoff/migrate_url_site_settings.rb index c2641b7e1f..89ca6e67b7 100644 --- a/app/jobs/onceoff/migrate_url_site_settings.rb +++ b/app/jobs/onceoff/migrate_url_site_settings.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class MigrateUrlSiteSettings < Jobs::Onceoff + class MigrateUrlSiteSettings < ::Jobs::Onceoff SETTINGS = [ ['logo_url', 'logo'], ['logo_small_url', 'logo_small'], diff --git a/app/jobs/onceoff.rb b/app/jobs/onceoff/onceoff.rb similarity index 93% rename from app/jobs/onceoff.rb rename to app/jobs/onceoff/onceoff.rb index def68e4e64..4de373399d 100644 --- a/app/jobs/onceoff.rb +++ b/app/jobs/onceoff/onceoff.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true -class Jobs::Onceoff < Jobs::Base +require_relative '../base.rb' + +class Jobs::Onceoff < ::Jobs::Base sidekiq_options retry: false def self.name_for(klass) diff --git a/app/jobs/onceoff/post_uploads_recovery.rb b/app/jobs/onceoff/post_uploads_recovery.rb index 4d92e402bc..5f942209eb 100644 --- a/app/jobs/onceoff/post_uploads_recovery.rb +++ b/app/jobs/onceoff/post_uploads_recovery.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency "upload_recovery" - module Jobs - class PostUploadsRecovery < Jobs::Onceoff + class PostUploadsRecovery < ::Jobs::Onceoff MIN_PERIOD = 30 MAX_PERIOD = 120 diff --git a/app/jobs/onceoff/remove_old_auto_close_jobs.rb b/app/jobs/onceoff/remove_old_auto_close_jobs.rb index 90af80415d..c7015b480d 100644 --- a/app/jobs/onceoff/remove_old_auto_close_jobs.rb +++ b/app/jobs/onceoff/remove_old_auto_close_jobs.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class RemoveOldAutoCloseJobs < Jobs::Onceoff + class RemoveOldAutoCloseJobs < ::Jobs::Onceoff def execute_onceoff(args) Jobs.cancel_scheduled_job(:close_topic) diff --git a/app/jobs/onceoff/retro_grant_anniversary.rb b/app/jobs/onceoff/retro_grant_anniversary.rb index a4c9c98b2a..dd73fe215f 100644 --- a/app/jobs/onceoff/retro_grant_anniversary.rb +++ b/app/jobs/onceoff/retro_grant_anniversary.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -require_dependency 'jobs/scheduled/grant_anniversary_badges' - module Jobs - class RetroGrantAnniversary < Jobs::Onceoff + class RetroGrantAnniversary < ::Jobs::Onceoff def execute_onceoff(args) return unless SiteSetting.enable_badges diff --git a/app/jobs/onceoff/retro_recent_time_read.rb b/app/jobs/onceoff/retro_recent_time_read.rb index 0cf43669a3..0750103adf 100644 --- a/app/jobs/onceoff/retro_recent_time_read.rb +++ b/app/jobs/onceoff/retro_recent_time_read.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class RetroRecentTimeRead < Jobs::Onceoff + class RetroRecentTimeRead < ::Jobs::Onceoff def execute_onceoff(args) # update past records by evenly distributing total time reading among each post read sql = <<~SQL diff --git a/app/jobs/regular/admin_confirmation_email.rb b/app/jobs/regular/admin_confirmation_email.rb index d525ea62c3..23fd5b3d06 100644 --- a/app/jobs/regular/admin_confirmation_email.rb +++ b/app/jobs/regular/admin_confirmation_email.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency 'email/sender' - module Jobs - class AdminConfirmationEmail < Jobs::Base + class AdminConfirmationEmail < ::Jobs::Base sidekiq_options queue: 'critical' def execute(args) diff --git a/app/jobs/regular/anonymize_user.rb b/app/jobs/regular/anonymize_user.rb index 90c855fd3f..8dca0ca403 100644 --- a/app/jobs/regular/anonymize_user.rb +++ b/app/jobs/regular/anonymize_user.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class AnonymizeUser < Jobs::Base + class AnonymizeUser < ::Jobs::Base sidekiq_options queue: 'low' diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb index 8695737ab2..e10bc7a013 100644 --- a/app/jobs/regular/automatic_group_membership.rb +++ b/app/jobs/regular/automatic_group_membership.rb @@ -2,7 +2,7 @@ module Jobs - class AutomaticGroupMembership < Jobs::Base + class AutomaticGroupMembership < ::Jobs::Base def execute(args) group_id = args[:group_id] diff --git a/app/jobs/regular/backup_chunks_merger.rb b/app/jobs/regular/backup_chunks_merger.rb index 35695d10a8..5deb37f333 100644 --- a/app/jobs/regular/backup_chunks_merger.rb +++ b/app/jobs/regular/backup_chunks_merger.rb @@ -1,11 +1,8 @@ # frozen_string_literal: true -require_dependency "backup_restore/local_backup_store" -require_dependency "backup_restore/backup_store" - module Jobs - class BackupChunksMerger < Jobs::Base + class BackupChunksMerger < ::Jobs::Base sidekiq_options queue: 'critical', retry: false def execute(args) diff --git a/app/jobs/regular/bulk_grant_trust_level.rb b/app/jobs/regular/bulk_grant_trust_level.rb index 886e604361..f61b747d20 100644 --- a/app/jobs/regular/bulk_grant_trust_level.rb +++ b/app/jobs/regular/bulk_grant_trust_level.rb @@ -2,7 +2,7 @@ module Jobs - class BulkGrantTrustLevel < Jobs::Base + class BulkGrantTrustLevel < ::Jobs::Base def execute(args) trust_level = args[:trust_level] diff --git a/app/jobs/regular/bulk_invite.rb b/app/jobs/regular/bulk_invite.rb index f7ccd44fd6..b5980a0db9 100644 --- a/app/jobs/regular/bulk_invite.rb +++ b/app/jobs/regular/bulk_invite.rb @@ -1,10 +1,7 @@ # frozen_string_literal: true -require_dependency 'system_message' - module Jobs - - class BulkInvite < Jobs::Base + class BulkInvite < ::Jobs::Base sidekiq_options retry: false def initialize diff --git a/app/jobs/regular/bump_topic.rb b/app/jobs/regular/bump_topic.rb index e8176316b1..e795592393 100644 --- a/app/jobs/regular/bump_topic.rb +++ b/app/jobs/regular/bump_topic.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class BumpTopic < Jobs::Base + class BumpTopic < ::Jobs::Base def execute(args) topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id]) diff --git a/app/jobs/regular/confirm_sns_subscription.rb b/app/jobs/regular/confirm_sns_subscription.rb index d37fdcfd79..073747067b 100644 --- a/app/jobs/regular/confirm_sns_subscription.rb +++ b/app/jobs/regular/confirm_sns_subscription.rb @@ -2,7 +2,7 @@ module Jobs - class ConfirmSnsSubscription < Jobs::Base + class ConfirmSnsSubscription < ::Jobs::Base sidekiq_options retry: false def execute(args) diff --git a/app/jobs/regular/crawl_topic_link.rb b/app/jobs/regular/crawl_topic_link.rb index 36c10ff0c2..da7659ec53 100644 --- a/app/jobs/regular/crawl_topic_link.rb +++ b/app/jobs/regular/crawl_topic_link.rb @@ -3,11 +3,9 @@ require 'open-uri' require 'nokogiri' require 'excon' -require_dependency 'retrieve_title' -require_dependency 'topic_link' module Jobs - class CrawlTopicLink < Jobs::Base + class CrawlTopicLink < ::Jobs::Base sidekiq_options queue: 'low' diff --git a/app/jobs/regular/create_avatar_thumbnails.rb b/app/jobs/regular/create_avatar_thumbnails.rb index aa9e4711c1..540c5803d5 100644 --- a/app/jobs/regular/create_avatar_thumbnails.rb +++ b/app/jobs/regular/create_avatar_thumbnails.rb @@ -2,7 +2,7 @@ module Jobs - class CreateAvatarThumbnails < Jobs::Base + class CreateAvatarThumbnails < ::Jobs::Base sidekiq_options queue: 'low' def execute(args) diff --git a/app/jobs/regular/create_backup.rb b/app/jobs/regular/create_backup.rb index 62c67575c1..dcd3a466f5 100644 --- a/app/jobs/regular/create_backup.rb +++ b/app/jobs/regular/create_backup.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require "backup_restore/backup_restore" +require "backup_restore" module Jobs - class CreateBackup < Jobs::Base + class CreateBackup < ::Jobs::Base sidekiq_options retry: false def execute(args) diff --git a/app/jobs/regular/create_user_reviewable.rb b/app/jobs/regular/create_user_reviewable.rb index f68902ec2b..58d0c8e15a 100644 --- a/app/jobs/regular/create_user_reviewable.rb +++ b/app/jobs/regular/create_user_reviewable.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Jobs::CreateUserReviewable < Jobs::Base +class Jobs::CreateUserReviewable < ::Jobs::Base attr_reader :reviewable def execute(args) diff --git a/app/jobs/regular/critical_user_email.rb b/app/jobs/regular/critical_user_email.rb index 7592c7244b..469729e77f 100644 --- a/app/jobs/regular/critical_user_email.rb +++ b/app/jobs/regular/critical_user_email.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true # base.rb uses this style of require, so maintain usage of it here -require_dependency "#{Rails.root}/app/jobs/regular/user_email.rb" module Jobs class CriticalUserEmail < UserEmail diff --git a/app/jobs/regular/delete_inaccessible_notifications.rb b/app/jobs/regular/delete_inaccessible_notifications.rb index ca38dc4ec8..e33bfd6fb1 100644 --- a/app/jobs/regular/delete_inaccessible_notifications.rb +++ b/app/jobs/regular/delete_inaccessible_notifications.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class DeleteInaccessibleNotifications < Jobs::Base + class DeleteInaccessibleNotifications < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:topic_id) if args[:topic_id].blank? diff --git a/app/jobs/regular/delete_topic.rb b/app/jobs/regular/delete_topic.rb index 9b07166862..be6ab194e7 100644 --- a/app/jobs/regular/delete_topic.rb +++ b/app/jobs/regular/delete_topic.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class DeleteTopic < Jobs::Base + class DeleteTopic < ::Jobs::Base def execute(args) topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id]) diff --git a/app/jobs/regular/download_avatar_from_url.rb b/app/jobs/regular/download_avatar_from_url.rb index d87baf0e27..e1864c80b3 100644 --- a/app/jobs/regular/download_avatar_from_url.rb +++ b/app/jobs/regular/download_avatar_from_url.rb @@ -2,7 +2,7 @@ module Jobs - class DownloadAvatarFromUrl < Jobs::Base + class DownloadAvatarFromUrl < ::Jobs::Base sidekiq_options retry: false def execute(args) diff --git a/app/jobs/regular/download_backup_email.rb b/app/jobs/regular/download_backup_email.rb index 73c31347c7..0977098e97 100644 --- a/app/jobs/regular/download_backup_email.rb +++ b/app/jobs/regular/download_backup_email.rb @@ -1,11 +1,8 @@ # frozen_string_literal: true -require_dependency 'email/sender' -require_dependency "email_backup_token" - module Jobs - class DownloadBackupEmail < Jobs::Base + class DownloadBackupEmail < ::Jobs::Base sidekiq_options queue: 'critical' diff --git a/app/jobs/regular/download_profile_background_from_url.rb b/app/jobs/regular/download_profile_background_from_url.rb index 554c7425c1..5d39c3d8c8 100644 --- a/app/jobs/regular/download_profile_background_from_url.rb +++ b/app/jobs/regular/download_profile_background_from_url.rb @@ -2,7 +2,7 @@ module Jobs - class DownloadProfileBackgroundFromUrl < Jobs::Base + class DownloadProfileBackgroundFromUrl < ::Jobs::Base sidekiq_options retry: false def execute(args) diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb index 5160fd7dff..fd7f8ae2a7 100644 --- a/app/jobs/regular/emit_web_hook_event.rb +++ b/app/jobs/regular/emit_web_hook_event.rb @@ -3,7 +3,7 @@ require 'excon' module Jobs - class EmitWebHookEvent < Jobs::Base + class EmitWebHookEvent < ::Jobs::Base PING_EVENT = 'ping'.freeze MAX_RETRY_COUNT = 4.freeze RETRY_BACKOFF = 5 diff --git a/app/jobs/regular/enable_bootstrap_mode.rb b/app/jobs/regular/enable_bootstrap_mode.rb index 6deaef171b..bf804e24db 100644 --- a/app/jobs/regular/enable_bootstrap_mode.rb +++ b/app/jobs/regular/enable_bootstrap_mode.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class EnableBootstrapMode < Jobs::Base + class EnableBootstrapMode < ::Jobs::Base sidekiq_options queue: 'critical' def execute(args) diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index cea8c1ec81..afd32e8a73 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -2,13 +2,10 @@ require 'csv' require 'zip' -require_dependency 'system_message' -require_dependency 'upload_creator' -require_dependency 'upload_markdown' module Jobs - class ExportCsvFile < Jobs::Base + class ExportCsvFile < ::Jobs::Base sidekiq_options retry: false HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new( diff --git a/app/jobs/regular/feature_topic_users.rb b/app/jobs/regular/feature_topic_users.rb index 8ab797d7c5..84210a6baf 100644 --- a/app/jobs/regular/feature_topic_users.rb +++ b/app/jobs/regular/feature_topic_users.rb @@ -2,7 +2,7 @@ module Jobs - class FeatureTopicUsers < Jobs::Base + class FeatureTopicUsers < ::Jobs::Base def execute(args) topic_id = args[:topic_id] diff --git a/app/jobs/regular/invite_email.rb b/app/jobs/regular/invite_email.rb index c91e67ae35..b8278ff40a 100644 --- a/app/jobs/regular/invite_email.rb +++ b/app/jobs/regular/invite_email.rb @@ -1,11 +1,9 @@ # frozen_string_literal: true -require_dependency 'email/sender' - module Jobs # Asynchronously send an email - class InviteEmail < Jobs::Base + class InviteEmail < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:invite_id) unless args[:invite_id].present? diff --git a/app/jobs/regular/invite_password_instructions_email.rb b/app/jobs/regular/invite_password_instructions_email.rb index 009a6b3792..14ccec97c4 100644 --- a/app/jobs/regular/invite_password_instructions_email.rb +++ b/app/jobs/regular/invite_password_instructions_email.rb @@ -1,11 +1,9 @@ # frozen_string_literal: true -require_dependency 'email/sender' - module Jobs # Asynchronously send an email - class InvitePasswordInstructionsEmail < Jobs::Base + class InvitePasswordInstructionsEmail < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:username) unless args[:username].present? diff --git a/app/jobs/regular/notify_category_change.rb b/app/jobs/regular/notify_category_change.rb index c37cf44215..bac94a20e0 100644 --- a/app/jobs/regular/notify_category_change.rb +++ b/app/jobs/regular/notify_category_change.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency "post_alerter" - module Jobs - class NotifyCategoryChange < Jobs::Base + class NotifyCategoryChange < ::Jobs::Base def execute(args) post = Post.find_by(id: args[:post_id]) diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb index 50230a380b..ba63d13af2 100644 --- a/app/jobs/regular/notify_mailing_list_subscribers.rb +++ b/app/jobs/regular/notify_mailing_list_subscribers.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -require_dependency 'post' - module Jobs - class NotifyMailingListSubscribers < Jobs::Base + class NotifyMailingListSubscribers < ::Jobs::Base include Skippable RETRY_TIMES = [5.minute, 15.minute, 30.minute, 45.minute, 90.minute, 180.minute, 300.minute] diff --git a/app/jobs/regular/notify_moved_posts.rb b/app/jobs/regular/notify_moved_posts.rb index e12af831fe..f02feec7a6 100644 --- a/app/jobs/regular/notify_moved_posts.rb +++ b/app/jobs/regular/notify_moved_posts.rb @@ -2,7 +2,7 @@ module Jobs - class NotifyMovedPosts < Jobs::Base + class NotifyMovedPosts < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:post_ids) if args[:post_ids].blank? diff --git a/app/jobs/regular/notify_post_revision.rb b/app/jobs/regular/notify_post_revision.rb index 2331c6655a..8d2160699c 100644 --- a/app/jobs/regular/notify_post_revision.rb +++ b/app/jobs/regular/notify_post_revision.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class NotifyPostRevision < Jobs::Base + class NotifyPostRevision < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:user_ids) unless args[:user_ids] diff --git a/app/jobs/regular/notify_reviewable.rb b/app/jobs/regular/notify_reviewable.rb index 8bed238b54..589b09510e 100644 --- a/app/jobs/regular/notify_reviewable.rb +++ b/app/jobs/regular/notify_reviewable.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Jobs::NotifyReviewable < Jobs::Base +class Jobs::NotifyReviewable < ::Jobs::Base def execute(args) reviewable = Reviewable.find_by(id: args[:reviewable_id]) diff --git a/app/jobs/regular/notify_tag_change.rb b/app/jobs/regular/notify_tag_change.rb index 370227eef7..4725896cd4 100644 --- a/app/jobs/regular/notify_tag_change.rb +++ b/app/jobs/regular/notify_tag_change.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency "post_alerter" - module Jobs - class NotifyTagChange < Jobs::Base + class NotifyTagChange < ::Jobs::Base def execute(args) post = Post.find_by(id: args[:post_id]) diff --git a/app/jobs/regular/post_alert.rb b/app/jobs/regular/post_alert.rb index 4c28b95947..dc6b8b1440 100644 --- a/app/jobs/regular/post_alert.rb +++ b/app/jobs/regular/post_alert.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency 'post_alerter' - module Jobs - class PostAlert < Jobs::Base + class PostAlert < ::Jobs::Base def execute(args) post = Post.find_by(id: args[:post_id]) diff --git a/app/jobs/regular/process_bulk_invite_emails.rb b/app/jobs/regular/process_bulk_invite_emails.rb index f4d057e7c2..c7901d29c0 100644 --- a/app/jobs/regular/process_bulk_invite_emails.rb +++ b/app/jobs/regular/process_bulk_invite_emails.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -require_dependency 'email/sender' - module Jobs - class ProcessBulkInviteEmails < Jobs::Base + class ProcessBulkInviteEmails < ::Jobs::Base def execute(args) pending_invite_ids = Invite.where(emailed_status: Invite.emailed_status_types[:bulk_pending]).limit(Invite::BULK_INVITE_EMAIL_LIMIT).pluck(:id) diff --git a/app/jobs/regular/process_email.rb b/app/jobs/regular/process_email.rb index d29b410dbb..f738fc5be3 100644 --- a/app/jobs/regular/process_email.rb +++ b/app/jobs/regular/process_email.rb @@ -2,7 +2,7 @@ module Jobs - class ProcessEmail < Jobs::Base + class ProcessEmail < ::Jobs::Base sidekiq_options retry: 3 def execute(args) diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb index c2eea3e3ad..266072de01 100644 --- a/app/jobs/regular/process_post.rb +++ b/app/jobs/regular/process_post.rb @@ -1,11 +1,10 @@ # frozen_string_literal: true require 'image_sizer' -require_dependency 'cooked_post_processor' module Jobs - class ProcessPost < Jobs::Base + class ProcessPost < ::Jobs::Base def execute(args) post = Post.find_by(id: args[:post_id]) diff --git a/app/jobs/regular/process_sns_notification.rb b/app/jobs/regular/process_sns_notification.rb index be51110dd0..ff25dc83fe 100644 --- a/app/jobs/regular/process_sns_notification.rb +++ b/app/jobs/regular/process_sns_notification.rb @@ -2,7 +2,7 @@ module Jobs - class ProcessSnsNotification < Jobs::Base + class ProcessSnsNotification < ::Jobs::Base sidekiq_options retry: false def execute(args) diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb index 7e26fdd8c6..1b86fc9034 100644 --- a/app/jobs/regular/publish_topic_to_category.rb +++ b/app/jobs/regular/publish_topic_to_category.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency 'topic_publisher' - module Jobs - class PublishTopicToCategory < Jobs::Base + class PublishTopicToCategory < ::Jobs::Base def execute(args) topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id]) return if topic_timer.blank? diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb index c741b659d4..0b4823b54d 100644 --- a/app/jobs/regular/pull_hotlinked_images.rb +++ b/app/jobs/regular/pull_hotlinked_images.rb @@ -1,12 +1,8 @@ # frozen_string_literal: true -require_dependency 'url_helper' -require_dependency 'file_helper' -require_dependency 'upload_creator' - module Jobs - class PullHotlinkedImages < Jobs::Base + class PullHotlinkedImages < ::Jobs::Base sidekiq_options queue: 'low' def initialize diff --git a/app/jobs/regular/push_notification.rb b/app/jobs/regular/push_notification.rb index 3a16d626d6..a03da1373c 100644 --- a/app/jobs/regular/push_notification.rb +++ b/app/jobs/regular/push_notification.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class PushNotification < Jobs::Base + class PushNotification < ::Jobs::Base def execute(args) notification = args["payload"] notification["url"] = UrlHelper.absolute_without_cdn(notification["post_url"]) diff --git a/app/jobs/regular/rebake_custom_emoji_posts.rb b/app/jobs/regular/rebake_custom_emoji_posts.rb index dbf8fdfbca..492fa42f9b 100644 --- a/app/jobs/regular/rebake_custom_emoji_posts.rb +++ b/app/jobs/regular/rebake_custom_emoji_posts.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class RebakeCustomEmojiPosts < Jobs::Base + class RebakeCustomEmojiPosts < ::Jobs::Base def execute(args) Post.where("raw LIKE ?", "%:#{args[:name]}:%").find_each(&:rebake!) end diff --git a/app/jobs/regular/retrieve_topic.rb b/app/jobs/regular/retrieve_topic.rb index 5c41ebf866..ac3f0aacad 100644 --- a/app/jobs/regular/retrieve_topic.rb +++ b/app/jobs/regular/retrieve_topic.rb @@ -1,12 +1,9 @@ # frozen_string_literal: true -require_dependency 'email/sender' -require_dependency 'topic_retriever' - module Jobs # Asynchronously retrieve a topic from an embedded site - class RetrieveTopic < Jobs::Base + class RetrieveTopic < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:embed_url) unless args[:embed_url].present? diff --git a/app/jobs/regular/run_heartbeat.rb b/app/jobs/regular/run_heartbeat.rb index 364343d043..708c45f7db 100644 --- a/app/jobs/regular/run_heartbeat.rb +++ b/app/jobs/regular/run_heartbeat.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class RunHeartbeat < Jobs::Base + class RunHeartbeat < ::Jobs::Base sidekiq_options queue: 'critical' diff --git a/app/jobs/regular/send_push_notification.rb b/app/jobs/regular/send_push_notification.rb index 9eb072da76..4fbd7c761b 100644 --- a/app/jobs/regular/send_push_notification.rb +++ b/app/jobs/regular/send_push_notification.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class SendPushNotification < Jobs::Base + class SendPushNotification < ::Jobs::Base def execute(args) user = User.find_by(id: args[:user_id]) PushNotificationPusher.push(user, args[:payload]) if user diff --git a/app/jobs/regular/send_system_message.rb b/app/jobs/regular/send_system_message.rb index 80fbc4e7e8..23ebe656b2 100644 --- a/app/jobs/regular/send_system_message.rb +++ b/app/jobs/regular/send_system_message.rb @@ -1,11 +1,10 @@ # frozen_string_literal: true require 'image_sizer' -require_dependency 'system_message' module Jobs - class SendSystemMessage < Jobs::Base + class SendSystemMessage < ::Jobs::Base def execute(args) raise Discourse::InvalidParameters.new(:user_id) unless args[:user_id].present? diff --git a/app/jobs/regular/suspicious_login.rb b/app/jobs/regular/suspicious_login.rb index a2f15d32bc..4ba98be381 100644 --- a/app/jobs/regular/suspicious_login.rb +++ b/app/jobs/regular/suspicious_login.rb @@ -2,7 +2,7 @@ module Jobs - class SuspiciousLogin < Jobs::Base + class SuspiciousLogin < ::Jobs::Base def execute(args) if UserAuthToken.is_suspicious(args[:user_id], args[:client_ip]) diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb index 96e631d066..246eda4db6 100644 --- a/app/jobs/regular/toggle_topic_closed.rb +++ b/app/jobs/regular/toggle_topic_closed.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class ToggleTopicClosed < Jobs::Base + class ToggleTopicClosed < ::Jobs::Base def execute(args) topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id]) state = !!args[:state] diff --git a/app/jobs/regular/topic_action_converter.rb b/app/jobs/regular/topic_action_converter.rb index d047bc8361..dff892d06a 100644 --- a/app/jobs/regular/topic_action_converter.rb +++ b/app/jobs/regular/topic_action_converter.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Jobs::TopicActionConverter < Jobs::Base +class Jobs::TopicActionConverter < ::Jobs::Base # Re-creating all the user actions could be very slow, so let's do it in a job # to avoid a N+1 query on a front facing operation. diff --git a/app/jobs/regular/topic_reminder.rb b/app/jobs/regular/topic_reminder.rb index 5b63e11fd4..a9eed2b36e 100644 --- a/app/jobs/regular/topic_reminder.rb +++ b/app/jobs/regular/topic_reminder.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class TopicReminder < Jobs::Base + class TopicReminder < ::Jobs::Base def execute(args) topic_timer = TopicTimer.find_by(id: args[:topic_timer_id]) diff --git a/app/jobs/regular/truncate_user_flag_stats.rb b/app/jobs/regular/truncate_user_flag_stats.rb index 30dae8695a..d75f7bb5aa 100644 --- a/app/jobs/regular/truncate_user_flag_stats.rb +++ b/app/jobs/regular/truncate_user_flag_stats.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Jobs::TruncateUserFlagStats < Jobs::Base +class Jobs::TruncateUserFlagStats < ::Jobs::Base def self.truncate_to 100 diff --git a/app/jobs/regular/unpin_topic.rb b/app/jobs/regular/unpin_topic.rb index 8dc0fe439b..b99e505904 100644 --- a/app/jobs/regular/unpin_topic.rb +++ b/app/jobs/regular/unpin_topic.rb @@ -2,7 +2,7 @@ module Jobs - class UnpinTopic < Jobs::Base + class UnpinTopic < ::Jobs::Base def execute(args) topic_id = args[:topic_id] diff --git a/app/jobs/regular/update_gravatar.rb b/app/jobs/regular/update_gravatar.rb index 795018c57f..7ae721759d 100644 --- a/app/jobs/regular/update_gravatar.rb +++ b/app/jobs/regular/update_gravatar.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true module Jobs - - class UpdateGravatar < Jobs::Base + class UpdateGravatar < ::Jobs::Base sidekiq_options queue: 'low' diff --git a/app/jobs/regular/update_group_mentions.rb b/app/jobs/regular/update_group_mentions.rb index a26151b073..4df6b9145f 100644 --- a/app/jobs/regular/update_group_mentions.rb +++ b/app/jobs/regular/update_group_mentions.rb @@ -2,7 +2,7 @@ module Jobs - class UpdateGroupMentions < Jobs::Base + class UpdateGroupMentions < ::Jobs::Base def execute(args) group = Group.find_by(id: args[:group_id]) diff --git a/app/jobs/regular/update_private_uploads_acl.rb b/app/jobs/regular/update_private_uploads_acl.rb index 80a6993dc7..4437ea9649 100644 --- a/app/jobs/regular/update_private_uploads_acl.rb +++ b/app/jobs/regular/update_private_uploads_acl.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class UpdatePrivateUploadsAcl < Jobs::Base + class UpdatePrivateUploadsAcl < ::Jobs::Base # only runs when SiteSetting.prevent_anons_from_downloading_files is updated def execute(args) return if !SiteSetting.enable_s3_uploads diff --git a/app/jobs/regular/update_s3_inventory.rb b/app/jobs/regular/update_s3_inventory.rb index dae3b06a56..2d279268f0 100644 --- a/app/jobs/regular/update_s3_inventory.rb +++ b/app/jobs/regular/update_s3_inventory.rb @@ -4,7 +4,7 @@ require "s3_inventory" module Jobs # if upload bucket changes or inventory bucket changes we want to update s3 bucket policy and inventory configuration - class UpdateS3Inventory < Jobs::Base + class UpdateS3Inventory < ::Jobs::Base def execute(args) return unless SiteSetting.enable_s3_inventory? && SiteSetting.Upload.enable_s3_uploads diff --git a/app/jobs/regular/update_top_redirection.rb b/app/jobs/regular/update_top_redirection.rb index 706fc2e697..80ad6acefb 100644 --- a/app/jobs/regular/update_top_redirection.rb +++ b/app/jobs/regular/update_top_redirection.rb @@ -2,7 +2,7 @@ module Jobs - class UpdateTopRedirection < Jobs::Base + class UpdateTopRedirection < ::Jobs::Base def execute(args) return if args[:user_id].blank? || args[:redirected_at].blank? diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb index 6fdf60fa17..308dc75c99 100644 --- a/app/jobs/regular/update_username.rb +++ b/app/jobs/regular/update_username.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class UpdateUsername < Jobs::Base + class UpdateUsername < ::Jobs::Base sidekiq_options queue: 'low' diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb index 447872fd7f..5bdea4fb86 100644 --- a/app/jobs/regular/user_email.rb +++ b/app/jobs/regular/user_email.rb @@ -1,12 +1,9 @@ # frozen_string_literal: true -require_dependency 'email/sender' -require_dependency 'user_notifications' - module Jobs # Asynchronously send an email to a user - class UserEmail < Jobs::Base + class UserEmail < ::Jobs::Base include Skippable sidekiq_options queue: 'low' diff --git a/app/jobs/scheduled/about_stats.rb b/app/jobs/scheduled/about_stats.rb index 998acf1db5..adf40c613b 100644 --- a/app/jobs/scheduled/about_stats.rb +++ b/app/jobs/scheduled/about_stats.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class AboutStats < Jobs::Scheduled + class AboutStats < ::Jobs::Scheduled every 30.minutes def execute(args) diff --git a/app/jobs/scheduled/activation_reminder_emails.rb b/app/jobs/scheduled/activation_reminder_emails.rb index 5151bec780..df0b1f86ec 100644 --- a/app/jobs/scheduled/activation_reminder_emails.rb +++ b/app/jobs/scheduled/activation_reminder_emails.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class ActivationReminderEmails < Jobs::Scheduled + class ActivationReminderEmails < ::Jobs::Scheduled every 2.hours def execute(args) diff --git a/app/jobs/scheduled/auto_expire_user_api_keys.rb b/app/jobs/scheduled/auto_expire_user_api_keys.rb index 7217608ef4..4a4e041f7c 100644 --- a/app/jobs/scheduled/auto_expire_user_api_keys.rb +++ b/app/jobs/scheduled/auto_expire_user_api_keys.rb @@ -2,7 +2,7 @@ module Jobs - class AutoExpireUserApiKeys < Jobs::Scheduled + class AutoExpireUserApiKeys < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/auto_queue_handler.rb b/app/jobs/scheduled/auto_queue_handler.rb index 659aa92c64..500a45b079 100644 --- a/app/jobs/scheduled/auto_queue_handler.rb +++ b/app/jobs/scheduled/auto_queue_handler.rb @@ -3,7 +3,7 @@ # This job will automatically act on records that have gone unhandled on a # queue for a long time. module Jobs - class AutoQueueHandler < Jobs::Scheduled + class AutoQueueHandler < ::Jobs::Scheduled every 1.day diff --git a/app/jobs/scheduled/badge_grant.rb b/app/jobs/scheduled/badge_grant.rb index ccddc6d582..b4fd367c69 100644 --- a/app/jobs/scheduled/badge_grant.rb +++ b/app/jobs/scheduled/badge_grant.rb @@ -2,7 +2,7 @@ module Jobs - class BadgeGrant < Jobs::Scheduled + class BadgeGrant < ::Jobs::Scheduled def self.run self.new.execute(nil) end diff --git a/app/jobs/scheduled/category_stats.rb b/app/jobs/scheduled/category_stats.rb index 44843a67e3..b1de99224e 100644 --- a/app/jobs/scheduled/category_stats.rb +++ b/app/jobs/scheduled/category_stats.rb @@ -2,7 +2,7 @@ module Jobs - class CategoryStats < Jobs::Scheduled + class CategoryStats < ::Jobs::Scheduled every 24.hours def execute(args) diff --git a/app/jobs/scheduled/check_out_of_date_themes.rb b/app/jobs/scheduled/check_out_of_date_themes.rb index 31f8b1547a..1003e25a90 100644 --- a/app/jobs/scheduled/check_out_of_date_themes.rb +++ b/app/jobs/scheduled/check_out_of_date_themes.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CheckOutOfDateThemes < Jobs::Scheduled + class CheckOutOfDateThemes < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_associated_accounts.rb b/app/jobs/scheduled/clean_up_associated_accounts.rb index 0d009d2fee..ac2ba4802b 100644 --- a/app/jobs/scheduled/clean_up_associated_accounts.rb +++ b/app/jobs/scheduled/clean_up_associated_accounts.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpAssociatedAccounts < Jobs::Scheduled + class CleanUpAssociatedAccounts < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_crawler_stats.rb b/app/jobs/scheduled/clean_up_crawler_stats.rb index 40dc386f8d..09f704bd34 100644 --- a/app/jobs/scheduled/clean_up_crawler_stats.rb +++ b/app/jobs/scheduled/clean_up_crawler_stats.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpCrawlerStats < Jobs::Scheduled + class CleanUpCrawlerStats < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb b/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb index b7c4fc212d..6352c92857 100644 --- a/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb +++ b/app/jobs/scheduled/clean_up_deprecated_url_site_settings.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpDeprecatedUrlSiteSettings < Jobs::Scheduled + class CleanUpDeprecatedUrlSiteSettings < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_email_logs.rb b/app/jobs/scheduled/clean_up_email_logs.rb index 083f9b8b36..9799764e71 100644 --- a/app/jobs/scheduled/clean_up_email_logs.rb +++ b/app/jobs/scheduled/clean_up_email_logs.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpEmailLogs < Jobs::Scheduled + class CleanUpEmailLogs < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_exports.rb b/app/jobs/scheduled/clean_up_exports.rb index 8352aa105a..7a29ff2eb6 100644 --- a/app/jobs/scheduled/clean_up_exports.rb +++ b/app/jobs/scheduled/clean_up_exports.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpExports < Jobs::Scheduled + class CleanUpExports < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_inactive_users.rb b/app/jobs/scheduled/clean_up_inactive_users.rb index f0ccc89a99..a0a4ab5f61 100644 --- a/app/jobs/scheduled/clean_up_inactive_users.rb +++ b/app/jobs/scheduled/clean_up_inactive_users.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpInactiveUsers < Jobs::Scheduled + class CleanUpInactiveUsers < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_post_reply_keys.rb b/app/jobs/scheduled/clean_up_post_reply_keys.rb index a520061ebd..748da603f3 100644 --- a/app/jobs/scheduled/clean_up_post_reply_keys.rb +++ b/app/jobs/scheduled/clean_up_post_reply_keys.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpPostReplyKeys < Jobs::Scheduled + class CleanUpPostReplyKeys < ::Jobs::Scheduled every 1.day def execute(_) diff --git a/app/jobs/scheduled/clean_up_search_logs.rb b/app/jobs/scheduled/clean_up_search_logs.rb index 0f04764197..03f934bee7 100644 --- a/app/jobs/scheduled/clean_up_search_logs.rb +++ b/app/jobs/scheduled/clean_up_search_logs.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpSearchLogs < Jobs::Scheduled + class CleanUpSearchLogs < ::Jobs::Scheduled every 1.week def execute(args) diff --git a/app/jobs/scheduled/clean_up_unmatched_emails.rb b/app/jobs/scheduled/clean_up_unmatched_emails.rb index 6ce5299255..58fb112e17 100644 --- a/app/jobs/scheduled/clean_up_unmatched_emails.rb +++ b/app/jobs/scheduled/clean_up_unmatched_emails.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpUnmatchedEmails < Jobs::Scheduled + class CleanUpUnmatchedEmails < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_unmatched_ips.rb b/app/jobs/scheduled/clean_up_unmatched_ips.rb index f535f5b450..fa16315f2d 100644 --- a/app/jobs/scheduled/clean_up_unmatched_ips.rb +++ b/app/jobs/scheduled/clean_up_unmatched_ips.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpUnmatchedIPs < Jobs::Scheduled + class CleanUpUnmatchedIPs < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_unsubscribe_keys.rb b/app/jobs/scheduled/clean_up_unsubscribe_keys.rb index 70f6b99473..ed8dfb5566 100644 --- a/app/jobs/scheduled/clean_up_unsubscribe_keys.rb +++ b/app/jobs/scheduled/clean_up_unsubscribe_keys.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpUnsubscribeKeys < Jobs::Scheduled + class CleanUpUnsubscribeKeys < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_unused_staged_users.rb b/app/jobs/scheduled/clean_up_unused_staged_users.rb index ffcac8a0af..3769dffe6b 100644 --- a/app/jobs/scheduled/clean_up_unused_staged_users.rb +++ b/app/jobs/scheduled/clean_up_unused_staged_users.rb @@ -2,7 +2,7 @@ module Jobs - class CleanUpUnusedStagedUsers < Jobs::Scheduled + class CleanUpUnusedStagedUsers < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb index a6ff2e3a6b..97af8b0240 100644 --- a/app/jobs/scheduled/clean_up_uploads.rb +++ b/app/jobs/scheduled/clean_up_uploads.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CleanUpUploads < Jobs::Scheduled + class CleanUpUploads < ::Jobs::Scheduled every 1.hour def execute(args) diff --git a/app/jobs/scheduled/create_missing_avatars.rb b/app/jobs/scheduled/create_missing_avatars.rb index 42e5365d41..0847b84f2e 100644 --- a/app/jobs/scheduled/create_missing_avatars.rb +++ b/app/jobs/scheduled/create_missing_avatars.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class CreateMissingAvatars < Jobs::Scheduled + class CreateMissingAvatars < ::Jobs::Scheduled every 1.hour def execute(args) diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index 26cc43afff..c256466642 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -1,11 +1,7 @@ # frozen_string_literal: true -require_dependency 'admin_dashboard_data' -require_dependency 'group' -require_dependency 'group_message' - module Jobs - class DashboardStats < Jobs::Scheduled + class DashboardStats < ::Jobs::Scheduled every 30.minutes def execute(args) diff --git a/app/jobs/scheduled/destroy_old_deletion_stubs.rb b/app/jobs/scheduled/destroy_old_deletion_stubs.rb index 8624b7ea48..0762bbbaac 100644 --- a/app/jobs/scheduled/destroy_old_deletion_stubs.rb +++ b/app/jobs/scheduled/destroy_old_deletion_stubs.rb @@ -2,7 +2,7 @@ module Jobs # various consistency checks - class DestroyOldDeletionStubs < Jobs::Scheduled + class DestroyOldDeletionStubs < ::Jobs::Scheduled every 30.minutes def execute(args) diff --git a/app/jobs/scheduled/destroy_old_hidden_posts.rb b/app/jobs/scheduled/destroy_old_hidden_posts.rb index ee7819240c..fa282fcbdb 100644 --- a/app/jobs/scheduled/destroy_old_hidden_posts.rb +++ b/app/jobs/scheduled/destroy_old_hidden_posts.rb @@ -2,7 +2,7 @@ module Jobs - class DestroyOldHiddenPosts < Jobs::Scheduled + class DestroyOldHiddenPosts < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/directory_refresh_daily.rb b/app/jobs/scheduled/directory_refresh_daily.rb index 90311bbad2..4840f23f22 100644 --- a/app/jobs/scheduled/directory_refresh_daily.rb +++ b/app/jobs/scheduled/directory_refresh_daily.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class DirectoryRefreshDaily < Jobs::Scheduled + class DirectoryRefreshDaily < ::Jobs::Scheduled every 1.hour def execute(args) diff --git a/app/jobs/scheduled/directory_refresh_older.rb b/app/jobs/scheduled/directory_refresh_older.rb index 523be14b2f..a1f792cc44 100644 --- a/app/jobs/scheduled/directory_refresh_older.rb +++ b/app/jobs/scheduled/directory_refresh_older.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class DirectoryRefreshOlder < Jobs::Scheduled + class DirectoryRefreshOlder < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/disable_bootstrap_mode.rb b/app/jobs/scheduled/disable_bootstrap_mode.rb index e41cf8577b..61650b3094 100644 --- a/app/jobs/scheduled/disable_bootstrap_mode.rb +++ b/app/jobs/scheduled/disable_bootstrap_mode.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class DisableBootstrapMode < Jobs::Scheduled + class DisableBootstrapMode < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb index e8db948ca6..59b091263c 100644 --- a/app/jobs/scheduled/enqueue_digest_emails.rb +++ b/app/jobs/scheduled/enqueue_digest_emails.rb @@ -2,7 +2,7 @@ module Jobs - class EnqueueDigestEmails < Jobs::Scheduled + class EnqueueDigestEmails < ::Jobs::Scheduled every 30.minutes def execute(args) diff --git a/app/jobs/scheduled/enqueue_onceoffs.rb b/app/jobs/scheduled/enqueue_onceoffs.rb index d529fad062..29692c6311 100644 --- a/app/jobs/scheduled/enqueue_onceoffs.rb +++ b/app/jobs/scheduled/enqueue_onceoffs.rb @@ -2,11 +2,11 @@ module Jobs - class EnqueueOnceoffs < Jobs::Scheduled + class EnqueueOnceoffs < ::Jobs::Scheduled every 10.minutes def execute(args) - Jobs::Onceoff.enqueue_all + ::Jobs::Onceoff.enqueue_all end end diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb index 4d602187ae..6d7f3fbbb8 100644 --- a/app/jobs/scheduled/ensure_db_consistency.rb +++ b/app/jobs/scheduled/ensure_db_consistency.rb @@ -2,7 +2,7 @@ module Jobs # various consistency checks - class EnsureDbConsistency < Jobs::Scheduled + class EnsureDbConsistency < ::Jobs::Scheduled every 12.hours def execute(args) diff --git a/app/jobs/scheduled/ensure_s3_uploads_existence.rb b/app/jobs/scheduled/ensure_s3_uploads_existence.rb index df29c38527..ccde386f3e 100644 --- a/app/jobs/scheduled/ensure_s3_uploads_existence.rb +++ b/app/jobs/scheduled/ensure_s3_uploads_existence.rb @@ -2,7 +2,7 @@ module Jobs - class EnsureS3UploadsExistence < Jobs::Scheduled + class EnsureS3UploadsExistence < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb b/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb index 4158e2e7a2..d176217d55 100644 --- a/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb +++ b/app/jobs/scheduled/fix_user_usernames_and_groups_names_clash.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class FixUserUsernamesAndGroupNamesClash < Jobs::Scheduled + class FixUserUsernamesAndGroupsNamesClash < ::Jobs::Scheduled every 1.week def execute(args) diff --git a/app/jobs/scheduled/grant_anniversary_badges.rb b/app/jobs/scheduled/grant_anniversary_badges.rb index a091c3032b..a5246c3243 100644 --- a/app/jobs/scheduled/grant_anniversary_badges.rb +++ b/app/jobs/scheduled/grant_anniversary_badges.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class GrantAnniversaryBadges < Jobs::Scheduled + class GrantAnniversaryBadges < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index fe55007195..59fb77bc94 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require 'badge_granter' - module Jobs - class GrantNewUserOfTheMonthBadges < Jobs::Scheduled + class GrantNewUserOfTheMonthBadges < ::Jobs::Scheduled every 1.day MAX_AWARDED = 2 diff --git a/app/jobs/scheduled/heartbeat.rb b/app/jobs/scheduled/heartbeat.rb index c1b8a8cb24..0f0d9fc020 100644 --- a/app/jobs/scheduled/heartbeat.rb +++ b/app/jobs/scheduled/heartbeat.rb @@ -3,7 +3,7 @@ module Jobs # used to ensure at least 1 sidekiq is running correctly - class Heartbeat < Jobs::Scheduled + class Heartbeat < ::Jobs::Scheduled every 3.minute def execute(args) diff --git a/app/jobs/scheduled/ignored_users_summary.rb b/app/jobs/scheduled/ignored_users_summary.rb index c84122e0a2..59483c2b52 100644 --- a/app/jobs/scheduled/ignored_users_summary.rb +++ b/app/jobs/scheduled/ignored_users_summary.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class IgnoredUsersSummary < Jobs::Scheduled + class IgnoredUsersSummary < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/invalidate_inactive_admins.rb b/app/jobs/scheduled/invalidate_inactive_admins.rb index fbe8929d04..8b1468d762 100644 --- a/app/jobs/scheduled/invalidate_inactive_admins.rb +++ b/app/jobs/scheduled/invalidate_inactive_admins.rb @@ -2,7 +2,7 @@ module Jobs - class InvalidateInactiveAdmins < Jobs::Scheduled + class InvalidateInactiveAdmins < ::Jobs::Scheduled every 1.day def execute(_) diff --git a/app/jobs/scheduled/migrate_upload_scheme.rb b/app/jobs/scheduled/migrate_upload_scheme.rb index 6d4683ccd5..601ad3afd8 100644 --- a/app/jobs/scheduled/migrate_upload_scheme.rb +++ b/app/jobs/scheduled/migrate_upload_scheme.rb @@ -2,7 +2,7 @@ module Jobs - class MigrateUploadScheme < Jobs::Scheduled + class MigrateUploadScheme < ::Jobs::Scheduled every 10.minutes sidekiq_options retry: false diff --git a/app/jobs/scheduled/pending_queued_posts_reminder.rb b/app/jobs/scheduled/pending_queued_posts_reminder.rb index f0d3608889..599446374e 100644 --- a/app/jobs/scheduled/pending_queued_posts_reminder.rb +++ b/app/jobs/scheduled/pending_queued_posts_reminder.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class PendingQueuedPostReminder < Jobs::Scheduled + class PendingQueuedPostsReminder < ::Jobs::Scheduled every 1.hour diff --git a/app/jobs/scheduled/pending_reviewables_reminder.rb b/app/jobs/scheduled/pending_reviewables_reminder.rb index 92642b0327..f06e8a7ed2 100644 --- a/app/jobs/scheduled/pending_reviewables_reminder.rb +++ b/app/jobs/scheduled/pending_reviewables_reminder.rb @@ -2,7 +2,7 @@ module Jobs - class PendingReviewablesReminder < Jobs::Scheduled + class PendingReviewablesReminder < ::Jobs::Scheduled every 1.hour attr_reader :sent_reminder diff --git a/app/jobs/scheduled/pending_users_reminder.rb b/app/jobs/scheduled/pending_users_reminder.rb index bf11df2900..8ef1332485 100644 --- a/app/jobs/scheduled/pending_users_reminder.rb +++ b/app/jobs/scheduled/pending_users_reminder.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -require_dependency 'admin_user_index_query' - module Jobs - class PendingUsersReminder < Jobs::Scheduled + class PendingUsersReminder < ::Jobs::Scheduled every 1.hour def execute(args) diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb index 12c1414ef4..2ae53c951d 100644 --- a/app/jobs/scheduled/periodical_updates.rb +++ b/app/jobs/scheduled/periodical_updates.rb @@ -1,12 +1,10 @@ # frozen_string_literal: true -require_dependency 'score_calculator' - module Jobs # This job will run on a regular basis to update statistics and denormalized data. # If it does not run, the site will not function properly. - class PeriodicalUpdates < Jobs::Scheduled + class PeriodicalUpdates < ::Jobs::Scheduled every 15.minutes def self.should_update_long_topics? diff --git a/app/jobs/scheduled/poll_feed.rb b/app/jobs/scheduled/poll_feed.rb index 54f47578b3..14411da2a5 100644 --- a/app/jobs/scheduled/poll_feed.rb +++ b/app/jobs/scheduled/poll_feed.rb @@ -5,13 +5,9 @@ # require 'digest/sha1' require 'excon' -require_dependency 'final_destination' -require_dependency 'post_creator' -require_dependency 'post_revisor' -require_dependency 'encodings' module Jobs - class PollFeed < Jobs::Scheduled + class PollFeed < ::Jobs::Scheduled every 5.minutes sidekiq_options retry: false @@ -41,8 +37,6 @@ module Jobs def ensure_rss_loaded return if @@rss_loaded require 'rss' - require_dependency 'feed_item_accessor' - require_dependency 'feed_element_installer' @@rss_loaded = true end diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index 80b858a11a..2202899483 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -1,13 +1,9 @@ # frozen_string_literal: true require 'net/pop' -require_dependency 'email/receiver' -require_dependency 'email/processor' -require_dependency 'email/sender' -require_dependency 'email/message_builder' module Jobs - class PollMailbox < Jobs::Scheduled + class PollMailbox < ::Jobs::Scheduled every SiteSetting.pop3_polling_period_mins.minutes sidekiq_options retry: false diff --git a/app/jobs/scheduled/process_badge_backlog.rb b/app/jobs/scheduled/process_badge_backlog.rb index 370165d4b2..61136aae1f 100644 --- a/app/jobs/scheduled/process_badge_backlog.rb +++ b/app/jobs/scheduled/process_badge_backlog.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class ProcessBadgeBacklog < Jobs::Scheduled + class ProcessBadgeBacklog < ::Jobs::Scheduled every 1.minute def execute(args) BadgeGranter.process_queue! diff --git a/app/jobs/scheduled/purge_deleted_uploads.rb b/app/jobs/scheduled/purge_deleted_uploads.rb index 56497f1ab5..73c3de5054 100644 --- a/app/jobs/scheduled/purge_deleted_uploads.rb +++ b/app/jobs/scheduled/purge_deleted_uploads.rb @@ -2,7 +2,7 @@ module Jobs - class PurgeDeletedUploads < Jobs::Scheduled + class PurgeDeletedUploads < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/purge_expired_ignored_users.rb b/app/jobs/scheduled/purge_expired_ignored_users.rb index abf360b66a..96b10837a6 100644 --- a/app/jobs/scheduled/purge_expired_ignored_users.rb +++ b/app/jobs/scheduled/purge_expired_ignored_users.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class PurgeExpiredIgnoredUsers < Jobs::Scheduled + class PurgeExpiredIgnoredUsers < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/purge_old_web_hook_events.rb b/app/jobs/scheduled/purge_old_web_hook_events.rb index 53704bcaac..cf4a009410 100644 --- a/app/jobs/scheduled/purge_old_web_hook_events.rb +++ b/app/jobs/scheduled/purge_old_web_hook_events.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class PurgeOldWebHookEvents < Jobs::Scheduled + class PurgeOldWebHookEvents < ::Jobs::Scheduled every 1.day def execute(_) diff --git a/app/jobs/scheduled/purge_unactivated.rb b/app/jobs/scheduled/purge_unactivated.rb index c693822e3b..c221bd8178 100644 --- a/app/jobs/scheduled/purge_unactivated.rb +++ b/app/jobs/scheduled/purge_unactivated.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class PurgeUnactivated < Jobs::Scheduled + class PurgeUnactivated < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/reindex_search.rb b/app/jobs/scheduled/reindex_search.rb index 50ed5e0bf3..2ffb811094 100644 --- a/app/jobs/scheduled/reindex_search.rb +++ b/app/jobs/scheduled/reindex_search.rb @@ -2,7 +2,7 @@ module Jobs # if locale changes or search algorithm changes we may want to reindex stuff - class ReindexSearch < Jobs::Scheduled + class ReindexSearch < ::Jobs::Scheduled every 2.hours CLEANUP_GRACE_PERIOD = 1.day.ago diff --git a/app/jobs/scheduled/reviewable_priorities.rb b/app/jobs/scheduled/reviewable_priorities.rb index b1133a89e4..7e0f5bbd7e 100644 --- a/app/jobs/scheduled/reviewable_priorities.rb +++ b/app/jobs/scheduled/reviewable_priorities.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Jobs::ReviewablePriorities < Jobs::Scheduled +class Jobs::ReviewablePriorities < ::Jobs::Scheduled every 1.day # We need this many reviewables before we'll calculate priorities diff --git a/app/jobs/scheduled/schedule_backup.rb b/app/jobs/scheduled/schedule_backup.rb index a33cf3c34c..8b9d43aff4 100644 --- a/app/jobs/scheduled/schedule_backup.rb +++ b/app/jobs/scheduled/schedule_backup.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class ScheduleBackup < Jobs::Scheduled + class ScheduleBackup < ::Jobs::Scheduled daily at: 0.hours sidekiq_options retry: false diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb index 2bd9613c59..848f409b9c 100644 --- a/app/jobs/scheduled/tl3_promotions.rb +++ b/app/jobs/scheduled/tl3_promotions.rb @@ -2,7 +2,7 @@ module Jobs - class Tl3Promotions < Jobs::Scheduled + class Tl3Promotions < ::Jobs::Scheduled daily at: 4.hours def execute(args) diff --git a/app/jobs/scheduled/top_refresh_older.rb b/app/jobs/scheduled/top_refresh_older.rb index e24ec87587..74878de8d5 100644 --- a/app/jobs/scheduled/top_refresh_older.rb +++ b/app/jobs/scheduled/top_refresh_older.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class TopRefreshOlder < Jobs::Scheduled + class TopRefreshOlder < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/top_refresh_today.rb b/app/jobs/scheduled/top_refresh_today.rb index 4259a95241..237ed37121 100644 --- a/app/jobs/scheduled/top_refresh_today.rb +++ b/app/jobs/scheduled/top_refresh_today.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class TopRefreshToday < Jobs::Scheduled + class TopRefreshToday < ::Jobs::Scheduled every 1.hour def execute(args) diff --git a/app/jobs/scheduled/unsilence_users.rb b/app/jobs/scheduled/unsilence_users.rb index 94c343f4c2..f6f5f5e0ff 100644 --- a/app/jobs/scheduled/unsilence_users.rb +++ b/app/jobs/scheduled/unsilence_users.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class UnsilenceUsers < Jobs::Scheduled + class UnsilenceUsers < ::Jobs::Scheduled every 15.minutes def execute(args) diff --git a/app/jobs/scheduled/update_heat_settings.rb b/app/jobs/scheduled/update_heat_settings.rb index 9dafbbf118..887df93e8e 100644 --- a/app/jobs/scheduled/update_heat_settings.rb +++ b/app/jobs/scheduled/update_heat_settings.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class UpdateHeatSettings < Jobs::Scheduled + class UpdateHeatSettings < ::Jobs::Scheduled every 1.month def execute(args) diff --git a/app/jobs/scheduled/version_check.rb b/app/jobs/scheduled/version_check.rb index c52bb97d4b..d28d943d93 100644 --- a/app/jobs/scheduled/version_check.rb +++ b/app/jobs/scheduled/version_check.rb @@ -1,10 +1,7 @@ # frozen_string_literal: true -require_dependency 'discourse_hub' -require_dependency 'discourse_updates' - module Jobs - class VersionCheck < Jobs::Scheduled + class VersionCheck < ::Jobs::Scheduled every 1.day def execute(args) diff --git a/app/jobs/scheduled/weekly.rb b/app/jobs/scheduled/weekly.rb index 705cf60024..19895bfef6 100644 --- a/app/jobs/scheduled/weekly.rb +++ b/app/jobs/scheduled/weekly.rb @@ -1,12 +1,10 @@ # frozen_string_literal: true -require_dependency 'score_calculator' - module Jobs # This job will run on a regular basis to update statistics and denormalized data. # If it does not run, the site will not function properly. - class Weekly < Jobs::Scheduled + class Weekly < ::Jobs::Scheduled every 1.week def execute(args) diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb index a546db497b..e7ff1cde99 100644 --- a/app/mailers/admin_confirmation_mailer.rb +++ b/app/mailers/admin_confirmation_mailer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' - class AdminConfirmationMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/mailers/download_backup_mailer.rb b/app/mailers/download_backup_mailer.rb index fe291f0614..62d5e58368 100644 --- a/app/mailers/download_backup_mailer.rb +++ b/app/mailers/download_backup_mailer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' - class DownloadBackupMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb index 469a380415..050f6e8a7c 100644 --- a/app/mailers/invite_mailer.rb +++ b/app/mailers/invite_mailer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' - class InviteMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/mailers/rejection_mailer.rb b/app/mailers/rejection_mailer.rb index f91b98c4d8..99d6feb310 100644 --- a/app/mailers/rejection_mailer.rb +++ b/app/mailers/rejection_mailer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' +require 'email/message_builder' class RejectionMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb index 0b13cb6a51..535dec5387 100644 --- a/app/mailers/subscription_mailer.rb +++ b/app/mailers/subscription_mailer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' - class SubscriptionMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/mailers/test_mailer.rb b/app/mailers/test_mailer.rb index a9eba9e9e5..ab65d300e8 100644 --- a/app/mailers/test_mailer.rb +++ b/app/mailers/test_mailer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' - class TestMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 0ffc6f77ba..ee5a516a73 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -1,12 +1,5 @@ # frozen_string_literal: true -require_dependency 'markdown_linker' -require_dependency 'email/message_builder' -require_dependency 'age_words' -require_dependency 'rtl' -require_dependency 'discourse_ip_info' -require_dependency 'browser_detection' - class UserNotifications < ActionMailer::Base include UserNotificationsHelper include ApplicationHelper diff --git a/app/mailers/version_mailer.rb b/app/mailers/version_mailer.rb index 4c12dffc17..0b9445f452 100644 --- a/app/mailers/version_mailer.rb +++ b/app/mailers/version_mailer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/message_builder' - class VersionMailer < ActionMailer::Base include Email::BuildEmailHelper diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index c558954c3d..633b1a0019 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'mem_info' - class AdminDashboardData include StatsCacheable diff --git a/app/models/auto_track_duration_site_setting.rb b/app/models/auto_track_duration_site_setting.rb index 3659d81ce6..9764d0d525 100644 --- a/app/models/auto_track_duration_site_setting.rb +++ b/app/models/auto_track_duration_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class AutoTrackDurationSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/backup_location_site_setting.rb b/app/models/backup_location_site_setting.rb index 4763c3be04..4236ca1de7 100644 --- a/app/models/backup_location_site_setting.rb +++ b/app/models/backup_location_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class BackupLocationSiteSetting < EnumSiteSetting LOCAL ||= "local" S3 ||= "s3" diff --git a/app/models/badge.rb b/app/models/badge.rb index 561b562583..3596190a8a 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'slug' - class Badge < ActiveRecord::Base # NOTE: These badge ids are not in order! They are grouped logically. # When picking an id, *search* for it. diff --git a/app/models/category.rb b/app/models/category.rb index af7b073166..9efc7ab0f2 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_cache' - class Category < ActiveRecord::Base self.ignored_columns = %w{ uploaded_meta_id diff --git a/app/models/category_list.rb b/app/models/category_list.rb index 2d8bfb3d74..f1f7b6a0d9 100644 --- a/app/models/category_list.rb +++ b/app/models/category_list.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'pinned_check' - class CategoryList include ActiveModel::Serialization diff --git a/app/models/category_user.rb b/app/models/category_user.rb index acf29cbefc..e25f917d32 100644 --- a/app/models/category_user.rb +++ b/app/models/category_user.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'notification_levels' - class CategoryUser < ActiveRecord::Base belongs_to :category belongs_to :user diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb index c242b63442..f69a96031c 100644 --- a/app/models/color_scheme.rb +++ b/app/models/color_scheme.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_cache' - class ColorScheme < ActiveRecord::Base # rubocop:disable Layout/AlignHash diff --git a/app/models/developer.rb b/app/models/developer.rb index db0958303a..0b0dcd9320 100644 --- a/app/models/developer.rb +++ b/app/models/developer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_cache' - class Developer < ActiveRecord::Base belongs_to :user diff --git a/app/models/digest_email_site_setting.rb b/app/models/digest_email_site_setting.rb index d0cc1be913..23cc4e28ec 100644 --- a/app/models/digest_email_site_setting.rb +++ b/app/models/digest_email_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class DigestEmailSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb index ed6d73013e..6b6e392683 100644 --- a/app/models/discourse_single_sign_on.rb +++ b/app/models/discourse_single_sign_on.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'single_sign_on' - class DiscourseSingleSignOn < SingleSignOn class BlankExternalId < StandardError; end diff --git a/app/models/email_change_request.rb b/app/models/email_change_request.rb index b9f9e7bfeb..f54df4bf23 100644 --- a/app/models/email_change_request.rb +++ b/app/models/email_change_request.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email_validator' - class EmailChangeRequest < ActiveRecord::Base belongs_to :old_email_token, class_name: 'EmailToken' belongs_to :new_email_token, class_name: 'EmailToken' diff --git a/app/models/email_level_site_setting.rb b/app/models/email_level_site_setting.rb index a3eccdf11c..9f805dd253 100644 --- a/app/models/email_level_site_setting.rb +++ b/app/models/email_level_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class EmailLevelSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/email_log.rb b/app/models/email_log.rb index bc7df7ae2a..4ca15594f1 100644 --- a/app/models/email_log.rb +++ b/app/models/email_log.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_mutex' - class EmailLog < ActiveRecord::Base CRITICAL_EMAIL_TYPES ||= Set.new %w{ account_created diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb index 788fc8b4d9..8944a4fcd7 100644 --- a/app/models/embeddable_host.rb +++ b/app/models/embeddable_host.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'url_helper' - class EmbeddableHost < ActiveRecord::Base validate :host_must_be_valid belongs_to :category diff --git a/app/models/group.rb b/app/models/group.rb index c3f632acd1..a773593107 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' - class Group < ActiveRecord::Base include HasCustomFields include AnonCacheInvalidator diff --git a/app/models/group_user.rb b/app/models/group_user.rb index 456cbfbc42..664a333e9b 100644 --- a/app/models/group_user.rb +++ b/app/models/group_user.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'notification_levels' - class GroupUser < ActiveRecord::Base belongs_to :group, counter_cache: "user_count" belongs_to :user diff --git a/app/models/invite.rb b/app/models/invite.rb index e92d5cd408..34ff75b282 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter' - class Invite < ActiveRecord::Base self.ignored_columns = %w{ via_email diff --git a/app/models/like_notification_frequency_site_setting.rb b/app/models/like_notification_frequency_site_setting.rb index 80cdf1c882..19d7043627 100644 --- a/app/models/like_notification_frequency_site_setting.rb +++ b/app/models/like_notification_frequency_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class LikeNotificationFrequencySiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb index 4e5522a478..947fe5724a 100644 --- a/app/models/locale_site_setting.rb +++ b/app/models/locale_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class LocaleSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/mailing_list_mode_site_setting.rb b/app/models/mailing_list_mode_site_setting.rb index 3d7d4881bc..2192a6fbf7 100644 --- a/app/models/mailing_list_mode_site_setting.rb +++ b/app/models/mailing_list_mode_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class MailingListModeSiteSetting < EnumSiteSetting def self.valid_value?(val) val.to_i.to_s == val.to_s && diff --git a/app/models/new_topic_duration_site_setting.rb b/app/models/new_topic_duration_site_setting.rb index e2a944f877..3ed58210ae 100644 --- a/app/models/new_topic_duration_site_setting.rb +++ b/app/models/new_topic_duration_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class NewTopicDurationSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/notification.rb b/app/models/notification.rb index b31812c75a..9b32cae7c0 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' -require_dependency 'notification_emailer' - class Notification < ActiveRecord::Base belongs_to :user belongs_to :topic diff --git a/app/models/notification_level_when_replying_site_setting.rb b/app/models/notification_level_when_replying_site_setting.rb index 97e444a984..c71927815f 100644 --- a/app/models/notification_level_when_replying_site_setting.rb +++ b/app/models/notification_level_when_replying_site_setting.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' -require_dependency 'notification_levels' - class NotificationLevelWhenReplyingSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index 1f5b287f4d..cd50f70b58 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency "file_helper" -require_dependency "url_helper" -require_dependency "db_helper" -require_dependency "file_store/local_store" - class OptimizedImage < ActiveRecord::Base include HasUrl belongs_to :upload diff --git a/app/models/post.rb b/app/models/post.rb index 2d2cb253e4..d2ad8be435 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,13 +1,5 @@ # frozen_string_literal: true -require_dependency 'pretty_text' -require_dependency 'rate_limiter' -require_dependency 'post_revisor' -require_dependency 'enum' -require_dependency 'post_analyzer' -require_dependency 'validators/post_validator' -require_dependency 'plugin/filter' - require 'archetype' require 'digest/sha1' @@ -55,7 +47,7 @@ class Post < ActiveRecord::Base has_many :user_actions, foreign_key: :target_post_id - validates_with ::Validators::PostValidator, unless: :skip_validation + validates_with PostValidator, unless: :skip_validation after_save :index_search diff --git a/app/models/post_action.rb b/app/models/post_action.rb index bf79a2a16e..5affd3b809 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter' -require_dependency 'system_message' -require_dependency 'post_action_creator' -require_dependency 'post_action_destroyer' - class PostAction < ActiveRecord::Base include RateLimiter::OnCreateRecord include Trashable diff --git a/app/models/post_action_type.rb b/app/models/post_action_type.rb index a15ac36fd0..3a895f14d5 100644 --- a/app/models/post_action_type.rb +++ b/app/models/post_action_type.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' -require_dependency 'distributed_cache' -require_dependency 'flag_settings' - class PostActionType < ActiveRecord::Base after_save :expire_cache after_destroy :expire_cache diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index cfc64e5308..1b5ca6970e 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'oneboxer' -require_dependency 'email_cook' - class PostAnalyzer def initialize(raw, topic_id) diff --git a/app/models/post_revision.rb b/app/models/post_revision.rb index d4961eb865..4557f0f4da 100644 --- a/app/models/post_revision.rb +++ b/app/models/post_revision.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "discourse_diff" - class PostRevision < ActiveRecord::Base belongs_to :post belongs_to :user diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb index 9d7b2f1d30..21a2e31d82 100644 --- a/app/models/post_timing.rb +++ b/app/models/post_timing.rb @@ -1,6 +1,4 @@ # frozen_string_literal: true -# -require_dependency 'archetype' class PostTiming < ActiveRecord::Base belongs_to :topic diff --git a/app/models/previous_replies_site_setting.rb b/app/models/previous_replies_site_setting.rb index 85f273cc70..59b7c2d246 100644 --- a/app/models/previous_replies_site_setting.rb +++ b/app/models/previous_replies_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class PreviousRepliesSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb index 16b58579ca..3f3cdeca70 100644 --- a/app/models/remote_theme.rb +++ b/app/models/remote_theme.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'theme_store/git_importer' -require_dependency 'theme_store/tgz_importer' -require_dependency 'upload_creator' - class RemoteTheme < ActiveRecord::Base METADATA_PROPERTIES = %i{ license_url diff --git a/app/models/remove_muted_tags_from_latest_site_setting.rb b/app/models/remove_muted_tags_from_latest_site_setting.rb index 5c23198e24..9ca328e328 100644 --- a/app/models/remove_muted_tags_from_latest_site_setting.rb +++ b/app/models/remove_muted_tags_from_latest_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class RemoveMutedTagsFromLatestSiteSetting < EnumSiteSetting ALWAYS ||= "always" diff --git a/app/models/report.rb b/app/models/report.rb index d4387b0f61..5271e0bef3 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'topic_subtype' - class Report # Change this line each time report format change # and you want to ensure cache is reset diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb index 6fa2eccb6c..539ae3c2f9 100644 --- a/app/models/reviewable.rb +++ b/app/models/reviewable.rb @@ -1,12 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' -require_dependency 'reviewable/actions' -require_dependency 'reviewable/conversation' -require_dependency 'reviewable/editable_fields' -require_dependency 'reviewable/perform_result' -require_dependency 'reviewable_serializer' - class Reviewable < ActiveRecord::Base class UpdateConflict < StandardError; end diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb index 43622b1476..340d63c8b5 100644 --- a/app/models/reviewable_flagged_post.rb +++ b/app/models/reviewable_flagged_post.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'reviewable' - class ReviewableFlaggedPost < Reviewable # Penalties are handled by the modal after the action is performed diff --git a/app/models/reviewable_priority_setting.rb b/app/models/reviewable_priority_setting.rb index eb89b18a5a..42afd49775 100644 --- a/app/models/reviewable_priority_setting.rb +++ b/app/models/reviewable_priority_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class ReviewablePrioritySetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb index 8602a0fb72..9c99be4c3d 100644 --- a/app/models/reviewable_queued_post.rb +++ b/app/models/reviewable_queued_post.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'reviewable' -require_dependency 'user_destroyer' - class ReviewableQueuedPost < Reviewable after_create do diff --git a/app/models/reviewable_sensitivity_setting.rb b/app/models/reviewable_sensitivity_setting.rb index 1135c03a0d..4207d14260 100644 --- a/app/models/reviewable_sensitivity_setting.rb +++ b/app/models/reviewable_sensitivity_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class ReviewableSensitivitySetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/reviewable_user.rb b/app/models/reviewable_user.rb index 31b8776ef8..59e107105c 100644 --- a/app/models/reviewable_user.rb +++ b/app/models/reviewable_user.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'reviewable' - class ReviewableUser < Reviewable def self.create_for(user) diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb index 5d892d3192..0f6e03a208 100644 --- a/app/models/s3_region_site_setting.rb +++ b/app/models/s3_region_site_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class S3RegionSiteSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb index 316d898fba..73119db3b2 100644 --- a/app/models/screened_email.rb +++ b/app/models/screened_email.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'screening_model' - # A ScreenedEmail record represents an email address that is being watched, # typically when creating a new User account. If the email of the signup form # (or some other form) matches a ScreenedEmail record, an action can be diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb index e4d89e5118..10ce1ce4f1 100644 --- a/app/models/screened_ip_address.rb +++ b/app/models/screened_ip_address.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require_dependency 'screening_model' -require_dependency 'ip_addr' +require 'screening_model' +require 'ip_addr' # A ScreenedIpAddress record represents an IP address or subnet that is being watched, # and possibly blocked from creating accounts. diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb index a5bbaec497..0140dd2b47 100644 --- a/app/models/screened_url.rb +++ b/app/models/screened_url.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'screening_model' - # A ScreenedUrl record represents a URL that is being watched. # If the URL is found in a post, some action can be performed. diff --git a/app/models/search_log.rb b/app/models/search_log.rb index c628524238..a3899ff318 100644 --- a/app/models/search_log.rb +++ b/app/models/search_log.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' - class SearchLog < ActiveRecord::Base validates_presence_of :term diff --git a/app/models/site.rb b/app/models/site.rb index efddc9cb4f..3a30f02381 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true # A class we can use to serialize the site data -require_dependency 'score_calculator' -require_dependency 'trust_level' - class Site include ActiveModel::Serialization diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb index 703dce9adb..945b1d3e1b 100644 --- a/app/models/site_setting.rb +++ b/app/models/site_setting.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require 'site_setting_extension' -require_dependency 'global_path' -require_dependency 'site_settings/yaml_loader' - class SiteSetting < ActiveRecord::Base extend GlobalPath extend SiteSettingExtension diff --git a/app/models/slug_setting.rb b/app/models/slug_setting.rb index 2feec4bd2a..65460f8390 100644 --- a/app/models/slug_setting.rb +++ b/app/models/slug_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class SlugSetting < EnumSiteSetting VALUES = %w(ascii encoded none) diff --git a/app/models/tag_user.rb b/app/models/tag_user.rb index dc0164ebb1..820d750b66 100644 --- a/app/models/tag_user.rb +++ b/app/models/tag_user.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'notification_levels' - class TagUser < ActiveRecord::Base belongs_to :tag belongs_to :user diff --git a/app/models/theme.rb b/app/models/theme.rb index 613af2069d..aae30f6612 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -1,13 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_cache' -require_dependency 'stylesheet/compiler' -require_dependency 'stylesheet/manager' -require_dependency 'theme_settings_parser' -require_dependency 'theme_settings_manager' -require_dependency 'theme_translation_parser' -require_dependency 'theme_translation_manager' - class Theme < ActiveRecord::Base @cache = DistributedCache.new('theme') diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb index 8d8a0c6c99..a18da47c5f 100644 --- a/app/models/theme_field.rb +++ b/app/models/theme_field.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'theme_settings_parser' -require_dependency 'theme_translation_parser' -require_dependency 'theme_javascript_compiler' - class ThemeField < ActiveRecord::Base belongs_to :upload diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index 33933779c8..739f6ce66c 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "distributed_memoizer" - class TopTopic < ActiveRecord::Base belongs_to :topic diff --git a/app/models/topic.rb b/app/models/topic.rb index 208b639d50..f2e04a2f9e 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -1,19 +1,5 @@ # frozen_string_literal: true -require_dependency 'slug' -require_dependency 'avatar_lookup' -require_dependency 'topic_view' -require_dependency 'rate_limiter' -require_dependency 'text_sentinel' -require_dependency 'text_cleaner' -require_dependency 'archetype' -require_dependency 'html_prettify' -require_dependency 'discourse_tagging' -require_dependency 'search_indexer' -require_dependency 'list_controller' -require_dependency 'topic_posters_summary' -require_dependency 'topic_featured_users' - class Topic < ActiveRecord::Base class UserExists < StandardError; end include ActionView::Helpers::SanitizeHelper diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb index 973b4896c5..895f0d5986 100644 --- a/app/models/topic_embed.rb +++ b/app/models/topic_embed.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'nokogiri' -require_dependency 'url_helper' - class TopicEmbed < ActiveRecord::Base include Trashable diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb index cdd0cc4a2d..5222d438dc 100644 --- a/app/models/topic_link.rb +++ b/app/models/topic_link.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'uri' -require_dependency 'slug' -require_dependency 'discourse' class TopicLink < ActiveRecord::Base diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb index 452fb709f3..6b45f7e9af 100644 --- a/app/models/topic_link_click.rb +++ b/app/models/topic_link_click.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse' require 'ipaddr' require 'url_helper' diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb index e546df96f0..27730561d7 100644 --- a/app/models/topic_list.rb +++ b/app/models/topic_list.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'avatar_lookup' -require_dependency 'primary_group_lookup' - class TopicList include ActiveModel::Serialization diff --git a/app/models/topic_posters_summary.rb b/app/models/topic_posters_summary.rb index b054401617..a4299561e2 100644 --- a/app/models/topic_posters_summary.rb +++ b/app/models/topic_posters_summary.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true # This is used in topic lists -require_dependency 'topic_poster' - class TopicPostersSummary # localization is fast, but this allows us to avoid diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index 5b83e66f5f..65df38666f 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'notification_levels' - class TopicUser < ActiveRecord::Base belongs_to :user belongs_to :topic diff --git a/app/models/trust_level_and_staff_setting.rb b/app/models/trust_level_and_staff_setting.rb index 2795de8266..ecab020b93 100644 --- a/app/models/trust_level_and_staff_setting.rb +++ b/app/models/trust_level_and_staff_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class TrustLevelAndStaffSetting < TrustLevelSetting def self.valid_value?(val) special_group?(val) || diff --git a/app/models/trust_level_setting.rb b/app/models/trust_level_setting.rb index a7d887c747..4660adc580 100644 --- a/app/models/trust_level_setting.rb +++ b/app/models/trust_level_setting.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum_site_setting' - class TrustLevelSetting < EnumSiteSetting def self.valid_value?(val) diff --git a/app/models/upload.rb b/app/models/upload.rb index b013ece4b4..5821afea84 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -1,12 +1,6 @@ # frozen_string_literal: true require "digest/sha1" -require_dependency "file_helper" -require_dependency "url_helper" -require_dependency "db_helper" -require_dependency "validators/upload_validator" -require_dependency "file_store/local_store" -require_dependency "base62" class Upload < ActiveRecord::Base include ActionView::Helpers::NumberHelper @@ -34,7 +28,7 @@ class Upload < ActiveRecord::Base validates_presence_of :filesize validates_presence_of :original_filename - validates_with ::Validators::UploadValidator + validates_with UploadValidator after_destroy do User.where(uploaded_avatar_id: self.id).update_all(uploaded_avatar_id: nil) diff --git a/app/models/user.rb b/app/models/user.rb index 0b8f18da70..04c6af225a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,21 +1,5 @@ # frozen_string_literal: true -require_dependency 'jobs/base' -require_dependency 'email' -require_dependency 'email_token' -require_dependency 'email_validator' -require_dependency 'trust_level' -require_dependency 'pbkdf2' -require_dependency 'discourse' -require_dependency 'post_destroyer' -require_dependency 'user_name_suggester' -require_dependency 'pretty_text' -require_dependency 'url_helper' -require_dependency 'letter_avatar' -require_dependency 'promotion' -require_dependency 'password_validator' -require_dependency 'notification_serializer' - class User < ActiveRecord::Base include Searchable include Roleable diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb index 741f952aca..215524a743 100644 --- a/app/models/user_avatar.rb +++ b/app/models/user_avatar.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'letter_avatar' -require_dependency 'upload_creator' - class UserAvatar < ActiveRecord::Base belongs_to :user belongs_to :gravatar_upload, class_name: 'Upload' diff --git a/app/models/user_email.rb b/app/models/user_email.rb index 8b3729f1fb..e6fdaa8fc6 100644 --- a/app/models/user_email.rb +++ b/app/models/user_email.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email_validator' - class UserEmail < ActiveRecord::Base belongs_to :user diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb index 3e51fd9173..7f16cfe90e 100644 --- a/app/models/user_profile.rb +++ b/app/models/user_profile.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require_dependency 'upload_creator' class UserProfile < ActiveRecord::Base self.ignored_columns = %w{ card_background diff --git a/app/models/user_search.rb b/app/models/user_search.rb index 86ae6d5d75..ffb23e46f9 100644 --- a/app/models/user_search.rb +++ b/app/models/user_search.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true # Searches for a user by username or full text or name (if enabled in SiteSettings) -require_dependency 'search' - class UserSearch MAX_SIZE_PRIORITY_MENTION ||= 500 diff --git a/app/models/username_validator.rb b/app/models/username_validator.rb index 1f2e9b9799..8a588ad56c 100644 --- a/app/models/username_validator.rb +++ b/app/models/username_validator.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'user' - class UsernameValidator # Public: Perform the validation of a field in a given object # it adds the errors (if any) to the object that we're giving as parameter diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb index 959dfb011d..57cc69f1fc 100644 --- a/app/models/watched_word.rb +++ b/app/models/watched_word.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' - class WatchedWord < ActiveRecord::Base def self.actions diff --git a/app/serializers/admin_user_serializer.rb b/app/serializers/admin_user_serializer.rb index fed45ea732..e864578f91 100644 --- a/app/serializers/admin_user_serializer.rb +++ b/app/serializers/admin_user_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'admin_user_list_serializer' - class AdminUserSerializer < AdminUserListSerializer attributes :name, diff --git a/app/serializers/concerns/user_auth_tokens_mixin.rb b/app/serializers/concerns/user_auth_tokens_mixin.rb index 5b9ae19673..8e963f7fad 100644 --- a/app/serializers/concerns/user_auth_tokens_mixin.rb +++ b/app/serializers/concerns/user_auth_tokens_mixin.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'browser_detection' -require_dependency 'discourse_ip_info' - module UserAuthTokensMixin extend ActiveSupport::Concern diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb index 8cfb348e62..4ba1a982f8 100644 --- a/app/serializers/current_user_serializer.rb +++ b/app/serializers/current_user_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'new_post_manager' - class CurrentUserSerializer < BasicUserSerializer attributes :name, diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb index 2b110290e8..1336a92c14 100644 --- a/app/serializers/listable_topic_serializer.rb +++ b/app/serializers/listable_topic_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'pinned_check' - class ListableTopicSerializer < BasicTopicSerializer attributes :reply_count, diff --git a/app/serializers/new_post_result_serializer.rb b/app/serializers/new_post_result_serializer.rb index 3031348da7..ca6eee7f9c 100644 --- a/app/serializers/new_post_result_serializer.rb +++ b/app/serializers/new_post_result_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'application_serializer' - class NewPostResultSerializer < ApplicationSerializer attributes :action, :post, diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb index f6aec43499..7c492cb1a3 100644 --- a/app/serializers/post_action_type_serializer.rb +++ b/app/serializers/post_action_type_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'configurable_urls' - class PostActionTypeSerializer < ApplicationSerializer attributes( diff --git a/app/serializers/post_stream_serializer_mixin.rb b/app/serializers/post_stream_serializer_mixin.rb index 794b1bffb4..9b435155d9 100644 --- a/app/serializers/post_stream_serializer_mixin.rb +++ b/app/serializers/post_stream_serializer_mixin.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'gap_serializer' -require_dependency 'post_serializer' -require_dependency 'timeline_lookup' - module PostStreamSerializerMixin def self.included(klass) klass.attributes :post_stream diff --git a/app/serializers/reviewable_explanation_serializer.rb b/app/serializers/reviewable_explanation_serializer.rb index 057c4dc3ce..f268d12794 100644 --- a/app/serializers/reviewable_explanation_serializer.rb +++ b/app/serializers/reviewable_explanation_serializer.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -require_dependency 'reviewable_score_explanation_serializer' class ReviewableExplanationSerializer < ApplicationSerializer attributes( diff --git a/app/serializers/reviewable_score_serializer.rb b/app/serializers/reviewable_score_serializer.rb index 8bcf089098..4232c0c25c 100644 --- a/app/serializers/reviewable_score_serializer.rb +++ b/app/serializers/reviewable_score_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'reviewable_score_type_serializer' - class ReviewableScoreSerializer < ApplicationSerializer attributes :id, :score, :agree_stats, :status, :reason, :created_at, :reviewed_at diff --git a/app/serializers/reviewable_serializer.rb b/app/serializers/reviewable_serializer.rb index d1a99c8a20..b2cbdab459 100644 --- a/app/serializers/reviewable_serializer.rb +++ b/app/serializers/reviewable_serializer.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'reviewable_action_serializer' -require_dependency 'reviewable_editable_field_serializer' - class ReviewableSerializer < ApplicationSerializer class_attribute :_payload_for_serialization diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb index 6e579d7719..3f8a653d96 100644 --- a/app/serializers/site_serializer.rb +++ b/app/serializers/site_serializer.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse_tagging' -require_dependency 'wizard' -require_dependency 'wizard/builder' - class SiteSerializer < ApplicationSerializer attributes( diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index 1f17764516..233303f8f0 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'pinned_check' -require_dependency 'new_post_manager' - class TopicViewSerializer < ApplicationSerializer include PostStreamSerializerMixin include SuggestedTopicsMixin diff --git a/app/serializers/trust_level3_requirements_serializer.rb b/app/serializers/trust_level3_requirements_serializer.rb index 6f5a726830..2cf8331759 100644 --- a/app/serializers/trust_level3_requirements_serializer.rb +++ b/app/serializers/trust_level3_requirements_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'penalty_counts_serializer' - class TrustLevel3RequirementsSerializer < ApplicationSerializer has_one :penalty_counts, embed: :object, serializer: PenaltyCountsSerializer diff --git a/app/serializers/web_hook_topic_view_serializer.rb b/app/serializers/web_hook_topic_view_serializer.rb index 0d83cee5ae..90defd183f 100644 --- a/app/serializers/web_hook_topic_view_serializer.rb +++ b/app/serializers/web_hook_topic_view_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'pinned_check' - class WebHookTopicViewSerializer < TopicViewSerializer attributes :created_by, :last_poster diff --git a/app/services/group_message.rb b/app/services/group_message.rb index 0bc9a9005c..5c22d90d52 100644 --- a/app/services/group_message.rb +++ b/app/services/group_message.rb @@ -10,10 +10,6 @@ # limit_once_per: (seconds) Limit sending the given type of message once every X seconds. # The default is 24 hours. Set to false to always send the message. -require_dependency 'post_creator' -require_dependency 'topic_subtype' -require_dependency 'discourse' - class GroupMessage include Rails.application.routes.url_helpers diff --git a/app/services/inline_uploads.rb b/app/services/inline_uploads.rb index 66fead7921..8168543b24 100644 --- a/app/services/inline_uploads.rb +++ b/app/services/inline_uploads.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "pretty_text" - class InlineUploads PLACEHOLDER = "__replace__" PATH_PLACEHOLDER = "__replace_path__" diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index d48fc2a2dd..3fe1a8899a 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_mutex' -require_dependency 'user_action_manager' - class PostAlerter def self.post_created(post, opts = {}) PostAlerter.new(opts).after_save_post(post, true) diff --git a/app/services/post_owner_changer.rb b/app/services/post_owner_changer.rb index 45ed22688c..9a2d128c45 100644 --- a/app/services/post_owner_changer.rb +++ b/app/services/post_owner_changer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'post_action_destroyer' - class PostOwnerChanger def initialize(params) diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb index 82d65196d6..93ae8a4e4e 100644 --- a/app/services/push_notification_pusher.rb +++ b/app/services/push_notification_pusher.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'webpush' - class PushNotificationPusher TOKEN_VALID_FOR_SECONDS ||= 5 * 60 diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb index 4ea9b7b972..8b3c84944b 100644 --- a/app/services/search_indexer.rb +++ b/app/services/search_indexer.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -require_dependency 'search' class SearchIndexer INDEX_VERSION = 3 diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 765a05b542..e564c6c790 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'staff_message_format' - # Responsible for logging the actions of admins and moderators. class StaffActionLogger diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb index dbdbc1daef..abb5b9b3ca 100644 --- a/app/services/user_destroyer.rb +++ b/app/services/user_destroyer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'ip_addr' - # Responsible for destroying a User record class UserDestroyer diff --git a/app/services/user_silencer.rb b/app/services/user_silencer.rb index 014d65aa5d..6dd2edf736 100644 --- a/app/services/user_silencer.rb +++ b/app/services/user_silencer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'staff_message_format' - class UserSilencer attr_reader :user_history diff --git a/app/services/username_changer.rb b/app/services/username_changer.rb index 6b23d3ec5d..7c6cec61cc 100644 --- a/app/services/username_changer.rb +++ b/app/services/username_changer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'jobs/regular/update_username' - class UsernameChanger def initialize(user, new_username, actor = nil) diff --git a/config/application.rb b/config/application.rb index 7b58fcd96e..59bf4180fb 100644 --- a/config/application.rb +++ b/config/application.rb @@ -93,14 +93,21 @@ module Discourse # issue is image_optim crashes on missing dependencies config.assets.image_optim = false - config.autoloader = :classic + config.autoloader = :zeitwerk # Custom directories with classes and modules you want to be autoloadable. - config.autoload_paths += Dir["#{config.root}/app/serializers"] - config.autoload_paths += Dir["#{config.root}/lib/validators/"] config.autoload_paths += Dir["#{config.root}/app"] + config.autoload_paths += Dir["#{config.root}/app/jobs"] + config.autoload_paths += Dir["#{config.root}/app/serializers"] + config.autoload_paths += Dir["#{config.root}/lib/active_record/connection_adapters"] + config.autoload_paths += Dir["#{config.root}/lib/common_passwords"] + config.autoload_paths += Dir["#{config.root}/lib/highlight_js"] + config.autoload_paths += Dir["#{config.root}/lib/i18n"] + config.autoload_paths += Dir["#{config.root}/lib/validators/"] - if Rails.env.development? && !Sidekiq.server? + Rails.autoloaders.main.ignore(Dir["#{config.root}/app/models/reports"]) + + if !Sidekiq.server? config.autoload_paths += Dir["#{config.root}/lib"] end diff --git a/config/initializers/013-excon_defaults.rb b/config/initializers/013-excon_defaults.rb index cfade5b7cc..40389051db 100644 --- a/config/initializers/013-excon_defaults.rb +++ b/config/initializers/013-excon_defaults.rb @@ -1,3 +1,4 @@ # frozen_string_literal: true +require 'excon' Excon::DEFAULTS[:omit_default_port] = true diff --git a/config/initializers/014-track-setting-changes.rb b/config/initializers/014-track-setting-changes.rb index 00150af49e..e5ca134122 100644 --- a/config/initializers/014-track-setting-changes.rb +++ b/config/initializers/014-track-setting-changes.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "site_icon_manager" - DiscourseEvent.on(:site_setting_changed) do |name, old_value, new_value| # Enabling `must_approve_users` on an existing site is odd, so we assume that the # existing users are approved. diff --git a/config/initializers/099-defer.rb b/config/initializers/099-defer.rb deleted file mode 100644 index 96f1456b64..0000000000 --- a/config/initializers/099-defer.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -require_dependency 'scheduler/defer' diff --git a/config/initializers/100-onebox_options.rb b/config/initializers/100-onebox_options.rb index c6bd15fad9..e9d0f21c71 100644 --- a/config/initializers/100-onebox_options.rb +++ b/config/initializers/100-onebox_options.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'twitter_api' - Onebox.options = { twitter_client: TwitterApi, redirect_limit: 3, diff --git a/config/routes.rb b/config/routes.rb index 44a66d3f60..55f2cd7a53 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,10 +2,6 @@ require "sidekiq/web" require "mini_scheduler/web" -require_dependency "admin_constraint" -require_dependency "staff_constraint" -require_dependency "homepage_constraint" -require_dependency "permalink_constraint" # The following constants have been replaced with `RouteFormat` and are deprecated. USERNAME_ROUTE_FORMAT = /[%\w.\-]+?/ unless defined? USERNAME_ROUTE_FORMAT diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb index f7077b7e7d..2fd16b90b3 100644 --- a/lib/admin_constraint.rb +++ b/lib/admin_constraint.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'current_user' - class AdminConstraint def initialize(options = {}) diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb index 69498329c4..ea6afa0192 100644 --- a/lib/admin_user_index_query.rb +++ b/lib/admin_user_index_query.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'trust_level' - class AdminUserIndexQuery def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels) diff --git a/lib/auth.rb b/lib/auth.rb index 74e924bf46..b48a22d6c4 100644 --- a/lib/auth.rb +++ b/lib/auth.rb @@ -2,14 +2,14 @@ module Auth; end -require_dependency 'auth/auth_provider' -require_dependency 'auth/result' -require_dependency 'auth/authenticator' -require_dependency 'auth/managed_authenticator' -require_dependency 'auth/facebook_authenticator' -require_dependency 'auth/open_id_authenticator' -require_dependency 'auth/github_authenticator' -require_dependency 'auth/twitter_authenticator' -require_dependency 'auth/google_oauth2_authenticator' -require_dependency 'auth/instagram_authenticator' -require_dependency 'auth/discord_authenticator' +require 'auth/auth_provider' +require 'auth/result' +require 'auth/authenticator' +require 'auth/managed_authenticator' +require 'auth/facebook_authenticator' +require 'auth/open_id_authenticator' +require 'auth/github_authenticator' +require 'auth/twitter_authenticator' +require 'auth/google_oauth2_authenticator' +require 'auth/instagram_authenticator' +require 'auth/discord_authenticator' diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb index 9e8d88faa0..24ed4122fe 100644 --- a/lib/auth/default_current_user_provider.rb +++ b/lib/auth/default_current_user_provider.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency "auth/current_user_provider" -require_dependency "rate_limiter" - class Auth::DefaultCurrentUserProvider CURRENT_USER_KEY ||= "_DISCOURSE_CURRENT_USER" diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore.rb similarity index 98% rename from lib/backup_restore/backup_restore.rb rename to lib/backup_restore.rb index 81b05196b3..d3d59079e6 100644 --- a/lib/backup_restore/backup_restore.rb +++ b/lib/backup_restore.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency "backup_restore/backuper" -require_dependency "backup_restore/restorer" - module BackupRestore class OperationRunningError < RuntimeError; end diff --git a/lib/backup_restore/local_backup_store.rb b/lib/backup_restore/local_backup_store.rb index 5717329e42..1b1cb977f5 100644 --- a/lib/backup_restore/local_backup_store.rb +++ b/lib/backup_restore/local_backup_store.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency "backup_restore/backup_store" -require_dependency "disk_space" - module BackupRestore class LocalBackupStore < BackupStore def self.base_directory(db: nil, root_directory: nil) diff --git a/lib/backup_restore/s3_backup_store.rb b/lib/backup_restore/s3_backup_store.rb index 6425478c11..2c1bfc0c6d 100644 --- a/lib/backup_restore/s3_backup_store.rb +++ b/lib/backup_restore/s3_backup_store.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency "backup_restore/backup_store" -require_dependency "s3_helper" - module BackupRestore class S3BackupStore < BackupStore UPLOAD_URL_EXPIRES_AFTER_SECONDS ||= 21_600 # 6 hours diff --git a/lib/content_security_policy.rb b/lib/content_security_policy.rb index fd38fd543a..87ad1947ce 100644 --- a/lib/content_security_policy.rb +++ b/lib/content_security_policy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency 'content_security_policy/builder' -require_dependency 'content_security_policy/extension' +require 'content_security_policy/builder' +require 'content_security_policy/extension' class ContentSecurityPolicy class << self diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb index f709b3d9cf..00c50e5b9a 100644 --- a/lib/cooked_post_processor.rb +++ b/lib/cooked_post_processor.rb @@ -3,10 +3,6 @@ # Post processing that we can do after a post has already been cooked. # For example, inserting the onebox content, or image sizes/thumbnails. -require_dependency 'url_helper' -require_dependency 'pretty_text' -require_dependency 'quote_comparer' - class CookedPostProcessor INLINE_ONEBOX_LOADING_CSS_CLASS = "inline-onebox-loading" INLINE_ONEBOX_CSS_CLASS = "inline-onebox" diff --git a/lib/demon/base.rb b/lib/demon/demon_base.rb similarity index 97% rename from lib/demon/base.rb rename to lib/demon/demon_base.rb index d1626114d7..8524222863 100644 --- a/lib/demon/base.rb +++ b/lib/demon/demon_base.rb @@ -3,7 +3,7 @@ module Demon; end # intelligent fork based demonizer -class Demon::Base +class Demon::DemonBase def self.demons @demons @@ -57,7 +57,7 @@ class Demon::Base def alive?(pid = nil) pid ||= @pid if pid - Demon::Base.alive?(pid) + Demon::DemonBase.alive?(pid) else false end @@ -143,7 +143,7 @@ class Demon::Base def already_running? if File.exists? pid_file pid = File.read(pid_file).to_i - if Demon::Base.alive?(pid) + if Demon::DemonBase.alive?(pid) return pid end end diff --git a/lib/demon/rails_autospec.rb b/lib/demon/rails_autospec.rb index babf5a5e7e..c48931b411 100644 --- a/lib/demon/rails_autospec.rb +++ b/lib/demon/rails_autospec.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require "demon/base" +require "demon/demon_base" -class Demon::RailsAutospec < Demon::Base +class Demon::RailsAutospec < Demon::DemonBase def self.prefix "rails-autospec" diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb index d6da3b55d6..666cfe6353 100644 --- a/lib/demon/sidekiq.rb +++ b/lib/demon/sidekiq.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require "demon/base" +require "demon/demon_base" -class Demon::Sidekiq < Demon::Base +class Demon::Sidekiq < ::Demon::DemonBase def self.prefix "sidekiq" diff --git a/lib/discourse_diff.rb b/lib/discourse_diff.rb index 6cac77603a..6445ac88cd 100644 --- a/lib/discourse_diff.rb +++ b/lib/discourse_diff.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "onpdiff" - class DiscourseDiff MAX_DIFFERENCE = 200 diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb index cf42009b3f..eead8cfdc4 100644 --- a/lib/discourse_hub.rb +++ b/lib/discourse_hub.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'version' -require_dependency 'site_setting' - module DiscourseHub STATS_FETCHED_AT_KEY = "stats_fetched_at" diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index e63ec530ab..89e588806f 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -3,7 +3,6 @@ # # A wrapper around redis that namespaces keys with the current site id # -require_dependency 'cache' class DiscourseRedis class FallbackHandler diff --git a/lib/email.rb b/lib/email.rb index 44417b721a..1f2dac5a80 100644 --- a/lib/email.rb +++ b/lib/email.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true require 'mail' -require_dependency 'email/message_builder' -require_dependency 'email/renderer' -require_dependency 'email/sender' -require_dependency 'email/styles' module Email diff --git a/lib/email/build_email_helper.rb b/lib/email/build_email_helper.rb new file mode 100644 index 0000000000..80677942a0 --- /dev/null +++ b/lib/email/build_email_helper.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Email + module BuildEmailHelper + def build_email(*builder_args) + builder = Email::MessageBuilder.new(*builder_args) + headers(builder.header_args) if builder.header_args.present? + mail(builder.build_args).tap { |message| + if message && h = builder.html_part + message.html_part = h + end + } + end + end +end diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb index 88669eb729..d1e83b03e0 100644 --- a/lib/email/message_builder.rb +++ b/lib/email/message_builder.rb @@ -3,19 +3,6 @@ # Builds a Mail::Message we can use for sending. Optionally supports using a template # for the body and subject module Email - - module BuildEmailHelper - def build_email(*builder_args) - builder = Email::MessageBuilder.new(*builder_args) - headers(builder.header_args) if builder.header_args.present? - mail(builder.build_args).tap { |message| - if message && h = builder.html_part - message.html_part = h - end - } - end - end - class MessageBuilder attr_reader :template_args diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index 418d8d2aad..724adc06ab 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -1,11 +1,6 @@ # frozen_string_literal: true require "digest" -require_dependency "new_post_manager" -require_dependency "html_to_markdown" -require_dependency "plain_text_to_markdown" -require_dependency "upload_creator" -require_dependency "upload_markdown" module Email diff --git a/lib/email/renderer.rb b/lib/email/renderer.rb index 0c616be043..641fb207be 100644 --- a/lib/email/renderer.rb +++ b/lib/email/renderer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'email/styles' - module Email class Renderer diff --git a/lib/email/sender.rb b/lib/email/sender.rb index 60c3e9a223..2ae0654eb9 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -8,7 +8,6 @@ # # It also adds an HTML part for the plain text body # -require_dependency 'email/renderer' require 'uri' require 'net/smtp' diff --git a/lib/email_cook.rb b/lib/email_cook.rb index 751b190d1d..9bc96fef76 100644 --- a/lib/email_cook.rb +++ b/lib/email_cook.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'pretty_text' - # A very simple formatter for imported emails class EmailCook diff --git a/lib/email_updater.rb b/lib/email_updater.rb index 9c2797aa9f..023389fc02 100644 --- a/lib/email_updater.rb +++ b/lib/email_updater.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'email' -require_dependency 'has_errors' -require_dependency 'email_validator' - class EmailUpdater include HasErrors diff --git a/lib/freedom_patches/zeitwerk.rb b/lib/freedom_patches/zeitwerk.rb new file mode 100644 index 0000000000..12d22051ac --- /dev/null +++ b/lib/freedom_patches/zeitwerk.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +module ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector + CUSTOM_PATHS = { + 'base' => 'Jobs', + 'canonical_url' => 'CanonicalURL', + 'clean_up_unmatched_ips' => 'CleanUpUnmatchedIPs', + 'homepage_constraint' => 'HomePageConstraint', + 'ip_addr' => 'IPAddr', + 'onpdiff' => 'ONPDiff', + 'onceoff' => 'Jobs', + 'pop3_polling_enabled_setting_validator' => 'POP3PollingEnabledSettingValidator', + 'postgresql_fallback_adapter' => 'PostgreSQLFallbackHandler', + 'regular' => 'Jobs', + 'scheduled' => 'Jobs', + 'source_url' => 'SourceURL', + 'topic_query_sql' => 'TopicQuerySQL', + 'version' => 'Discourse', + } + + def self.camelize(basename, _abspath) + return basename.camelize if _abspath =~ /onceoff\.rb$/ + CUSTOM_PATHS.fetch(basename, basename.camelize) + end +end diff --git a/lib/generators/plugin/templates/scheduled_job.rb.erb b/lib/generators/plugin/templates/scheduled_job.rb.erb index 21d9e17b77..c2b6ed0384 100644 --- a/lib/generators/plugin/templates/scheduled_job.rb.erb +++ b/lib/generators/plugin/templates/scheduled_job.rb.erb @@ -1,5 +1,5 @@ module Jobs - class ::<%= classified_name %>::Check < Jobs::Scheduled + class ::<%= classified_name %>::Check < ::Jobs::Scheduled every 1.day def execute(args = nil) diff --git a/lib/guardian.rb b/lib/guardian.rb index 883386ef23..41a93f5fee 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require_dependency 'guardian/category_guardian' -require_dependency 'guardian/ensure_magic' -require_dependency 'guardian/post_guardian' -require_dependency 'guardian/topic_guardian' -require_dependency 'guardian/user_guardian' -require_dependency 'guardian/post_revision_guardian' -require_dependency 'guardian/group_guardian' -require_dependency 'guardian/tag_guardian' +require 'guardian/category_guardian' +require 'guardian/ensure_magic' +require 'guardian/post_guardian' +require 'guardian/topic_guardian' +require 'guardian/user_guardian' +require 'guardian/post_revision_guardian' +require 'guardian/group_guardian' +require 'guardian/tag_guardian' # The guardian is responsible for confirming access to various site resources and operations class Guardian diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb index 6578091f6d..27da5e1894 100644 --- a/lib/i18n/backend/discourse_i18n.rb +++ b/lib/i18n/backend/discourse_i18n.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'i18n/backend/pluralization' -require_dependency 'locale_site_setting' module I18n module Backend diff --git a/lib/import_export/import_export.rb b/lib/import_export.rb similarity index 100% rename from lib/import_export/import_export.rb rename to lib/import_export.rb diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb index 04d8ea348c..1405edc234 100644 --- a/lib/inline_oneboxer.rb +++ b/lib/inline_oneboxer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'retrieve_title' - class InlineOneboxer MIN_TITLE_LENGTH = 2 diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb index 5db5cd5ef3..c047b78495 100644 --- a/lib/new_post_manager.rb +++ b/lib/new_post_manager.rb @@ -1,9 +1,5 @@ # frozen_string_literal: true -require_dependency 'post_creator' -require_dependency 'new_post_result' -require_dependency 'word_watcher' - # Determines what actions should be taken with new posts. # # The default action is to create the post, but this can be extended @@ -127,7 +123,7 @@ class NewPostManager reason = post_needs_approval?(manager) return if reason == :skip - validator = Validators::PostValidator.new + validator = PostValidator.new post = Post.new(raw: manager.args[:raw]) post.user = manager.user validator.validate(post) diff --git a/lib/new_post_result.rb b/lib/new_post_result.rb index b8d4fe49f0..70bf3f7262 100644 --- a/lib/new_post_result.rb +++ b/lib/new_post_result.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'has_errors' - class NewPostResult include HasErrors diff --git a/lib/onebox/discourse_onebox_sanitize_config.rb b/lib/onebox/discourse_onebox_sanitize_config.rb index 5072f53c30..93902fa347 100644 --- a/lib/onebox/discourse_onebox_sanitize_config.rb +++ b/lib/onebox/discourse_onebox_sanitize_config.rb @@ -1,11 +1,13 @@ # frozen_string_literal: true -class Sanitize - module Config - - DISCOURSE_ONEBOX ||= freeze_config merge(ONEBOX, - attributes: merge(ONEBOX[:attributes], 'aside' => [:data]) - ) - +module Onebox + class DiscourseOneboxSanitizeConfig + module Config + DISCOURSE_ONEBOX ||= + Sanitize::Config.freeze_config( + Sanitize::Config.merge(Sanitize::Config::ONEBOX, + attributes: Sanitize::Config.merge(Sanitize::Config::ONEBOX[:attributes], + 'aside' => [:data]))) + end end end diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb index a4c9163804..863b1a782a 100644 --- a/lib/oneboxer.rb +++ b/lib/oneboxer.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'uri' -require_dependency "onebox/discourse_onebox_sanitize_config" -require_dependency 'final_destination' Dir["#{Rails.root}/lib/onebox/engine/*_onebox.rb"].sort.each { |f| require f } @@ -277,7 +275,7 @@ module Oneboxer options = { cache: {}, max_width: 695, - sanitize_config: Sanitize::Config::DISCOURSE_ONEBOX + sanitize_config: Onebox::DiscourseOneboxSanitizeConfig::Config::DISCOURSE_ONEBOX } options[:cookie] = fd.cookie if fd.cookie diff --git a/lib/plugin/filter.rb b/lib/plugin/filter.rb index 78c5d65254..27a1a483a9 100644 --- a/lib/plugin/filter.rb +++ b/lib/plugin/filter.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require_dependency 'plugin/filter_manager' # this concept is borrowed straight out of wordpress module Plugin class Filter diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb index fa2b87ab09..b4bb11f086 100644 --- a/lib/post_action_creator.rb +++ b/lib/post_action_creator.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'post_action_result' - class PostActionCreator class CreateResult < PostActionResult attr_accessor :post_action, :reviewable, :reviewable_score diff --git a/lib/post_action_destroyer.rb b/lib/post_action_destroyer.rb index c06e8d30aa..cf2280a587 100644 --- a/lib/post_action_destroyer.rb +++ b/lib/post_action_destroyer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'post_action_result' - class PostActionDestroyer class DestroyResult < PostActionResult attr_accessor :post diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 9614a518e6..bf1fe848d7 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -2,11 +2,6 @@ # Responsible for creating posts and topics # -require_dependency 'rate_limiter' -require_dependency 'topic_creator' -require_dependency 'post_jobs_enqueuer' -require_dependency 'distributed_mutex' -require_dependency 'has_errors' class PostCreator include HasErrors @@ -158,7 +153,7 @@ class PostCreator DiscourseEvent.trigger :before_create_post, @post DiscourseEvent.trigger :validate_post, @post - post_validator = Validators::PostValidator.new(skip_topic: true) + post_validator = PostValidator.new(skip_topic: true) post_validator.validate(@post) valid = @post.errors.blank? diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 787d455c57..d620320f1b 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -3,10 +3,6 @@ require 'mini_racer' require 'nokogiri' require 'erb' -require_dependency 'url_helper' -require_dependency 'excerpt_parser' -require_dependency 'discourse_tagging' -require_dependency 'pretty_text/helpers' module PrettyText @mutex = Mutex.new diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb index 31c2136eea..9c898882a7 100644 --- a/lib/pretty_text/helpers.rb +++ b/lib/pretty_text/helpers.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'inline_oneboxer' - module PrettyText module Helpers extend self diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb index 99defc6010..98fdfc7df5 100644 --- a/lib/rate_limiter.rb +++ b/lib/rate_limiter.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'rate_limiter/limit_exceeded' -require_dependency 'rate_limiter/on_create_record' - # A redis backed rate limiter. class RateLimiter diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb index 6fc724075f..9089707722 100644 --- a/lib/retrieve_title.rb +++ b/lib/retrieve_title.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'final_destination' - module RetrieveTitle CRAWL_TIMEOUT = 1 diff --git a/lib/reviewable/editable_fields.rb b/lib/reviewable/editable_fields.rb index 12aa60fad3..d68ac13835 100644 --- a/lib/reviewable/editable_fields.rb +++ b/lib/reviewable/editable_fields.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'reviewable/collection' - class Reviewable < ActiveRecord::Base class EditableFields < Reviewable::Collection class Field < Item diff --git a/lib/search.rb b/lib/search.rb index 9fcd1b76e7..7eba399d14 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'search/grouped_search_results' - class Search DIACRITICS ||= /([\u0300-\u036f]|[\u1AB0-\u1AFF]|[\u1DC0-\u1DFF]|[\u20D0-\u20FF])/ diff --git a/lib/single_sign_on_provider.rb b/lib/single_sign_on_provider.rb index 774c5eeb08..d97ecdf6c8 100644 --- a/lib/single_sign_on_provider.rb +++ b/lib/single_sign_on_provider.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'single_sign_on' - class SingleSignOnProvider < SingleSignOn class BlankSecret < RuntimeError; end diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index 8b9e49f1b1..899f1338b5 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency 'site_settings/deprecated_settings' -require_dependency 'site_settings/type_supervisor' -require_dependency 'site_settings/defaults_provider' -require_dependency 'site_settings/db_provider' - module SiteSettingExtension include SiteSettings::DeprecatedSettings diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb index f90a231241..0f96b37908 100644 --- a/lib/site_settings/type_supervisor.rb +++ b/lib/site_settings/type_supervisor.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'site_settings/validations' -require_dependency 'enum' - module SiteSettings; end class SiteSettings::TypeSupervisor diff --git a/lib/staff_constraint.rb b/lib/staff_constraint.rb index a310cc65ad..a90e264da1 100644 --- a/lib/staff_constraint.rb +++ b/lib/staff_constraint.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'current_user' - class StaffConstraint def matches?(request) diff --git a/lib/stylesheet/common.rb b/lib/stylesheet/common.rb index 880d1945a5..b64f9257fb 100644 --- a/lib/stylesheet/common.rb +++ b/lib/stylesheet/common.rb @@ -3,5 +3,7 @@ require 'sassc' module Stylesheet - ASSET_ROOT = "#{Rails.root}/app/assets/stylesheets" unless defined? ASSET_ROOT + module Common + ASSET_ROOT = "#{Rails.root}/app/assets/stylesheets" unless defined? ASSET_ROOT + end end diff --git a/lib/stylesheet/compiler.rb b/lib/stylesheet/compiler.rb index f1519aca5d..08532a6c70 100644 --- a/lib/stylesheet/compiler.rb +++ b/lib/stylesheet/compiler.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true -require_dependency 'stylesheet/common' -require_dependency 'stylesheet/importer' -require_dependency 'stylesheet/functions' +require 'stylesheet/common' +require 'stylesheet/importer' +require 'stylesheet/functions' module Stylesheet @@ -17,7 +17,7 @@ module Stylesheet file += " @import \"#{asset}\";" else filename = "#{asset}.scss" - path = "#{ASSET_ROOT}/#{filename}" + path = "#{Stylesheet::Common::ASSET_ROOT}/#{filename}" file = File.read path end @@ -37,7 +37,7 @@ module Stylesheet theme_id: options[:theme_id], theme: options[:theme], theme_field: options[:theme_field], - load_paths: [ASSET_ROOT]) + load_paths: [Stylesheet::Common::ASSET_ROOT]) result = engine.render diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb index a0fccd0fa5..060243ae9f 100644 --- a/lib/stylesheet/importer.rb +++ b/lib/stylesheet/importer.rb @@ -202,7 +202,7 @@ module Stylesheet def imports(asset, parent_path) if asset[-1] == "*" - Dir["#{Stylesheet::ASSET_ROOT}/#{asset}.scss"].map do |path| + Dir["#{Stylesheet::Common::ASSET_ROOT}/#{asset}.scss"].map do |path| Import.new(asset[0..-2] + File.basename(path, ".*")) end elsif callback = Importer.special_imports[asset] diff --git a/lib/suggested_topics_builder.rb b/lib/suggested_topics_builder.rb index 701922b708..273289671a 100644 --- a/lib/suggested_topics_builder.rb +++ b/lib/suggested_topics_builder.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'topic_list' - class SuggestedTopicsBuilder attr_reader :excluded_topic_ids diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb index 3630efc0c5..0408fc2817 100644 --- a/lib/svg_sprite/svg_sprite.rb +++ b/lib/svg_sprite/svg_sprite.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'distributed_cache' - module SvgSprite SVG_ICONS ||= Set.new([ "adjust", diff --git a/lib/system_message.rb b/lib/system_message.rb index f6186d1871..b6eaab6e67 100644 --- a/lib/system_message.rb +++ b/lib/system_message.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true # Handle sending a message to a user from the system. -require_dependency 'post_creator' -require_dependency 'topic_subtype' -require_dependency 'discourse' class SystemMessage diff --git a/lib/tasks/maxminddb.rake b/lib/tasks/maxminddb.rake index 5023f1a98f..e85e748641 100644 --- a/lib/tasks/maxminddb.rake +++ b/lib/tasks/maxminddb.rake @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'discourse_ip_info' - desc "downloads MaxMind's GeoLite2-City database" task "maxminddb:get" do puts "Downloading MaxMindDb's GeoLite2-City..." diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake index 7913df4bc0..f1b42dd90d 100644 --- a/lib/tasks/s3.rake +++ b/lib/tasks/s3.rake @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "s3_helper" - def brotli_s3_path(path) ext = File.extname(path) "#{path[0..-ext.length]}br#{ext}" diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake index 05b803026f..f21ddd6e62 100644 --- a/lib/tasks/uploads.rake +++ b/lib/tasks/uploads.rake @@ -886,7 +886,6 @@ task "uploads:analyze", [:cache_path, :limit] => :environment do |_, args| end task "uploads:fix_incorrect_extensions" => :environment do - require_dependency "upload_fixer" UploadFixer.fix_all_extensions end @@ -895,7 +894,6 @@ task "uploads:recover_from_tombstone" => :environment do end task "uploads:recover" => :environment do - require_dependency "upload_recovery" dry_run = ENV["DRY_RUN"].present? stop_on_error = ENV["STOP_ON_ERROR"].present? diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb index cf44169ceb..a0b2a0ce77 100644 --- a/lib/theme_store/git_importer.rb +++ b/lib/theme_store/git_importer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'theme_store/tgz_exporter' - module ThemeStore; end class ThemeStore::GitImporter diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index 34e38487b5..dfbaf74d29 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'has_errors' - class TopicCreator attr_reader :user, :guardian, :opts diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 06a89f4f2c..991ed94dfb 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -5,11 +5,6 @@ # Returns a TopicList object containing the topics found. # -require_dependency 'topic_list' -require_dependency 'suggested_topics_builder' -require_dependency 'topic_query_sql' -require_dependency 'avatar_lookup' - class TopicQuery PG_MAX_INT ||= 2147483647 diff --git a/lib/topic_view.rb b/lib/topic_view.rb index 69c3ca6440..c93461e035 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency 'guardian' -require_dependency 'topic_query' -require_dependency 'filter_best_posts' -require_dependency 'gaps' - class TopicView MEGA_TOPIC_POSTS_COUNT = 10000 MIN_POST_READ_TIME = 4.0 diff --git a/lib/trust_level.rb b/lib/trust_level.rb index f3dcd55084..20787bb418 100644 --- a/lib/trust_level.rb +++ b/lib/trust_level.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency 'enum' - class InvalidTrustLevel < StandardError; end class TrustLevel diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb index e28f33e022..54abb69b15 100644 --- a/lib/upload_creator.rb +++ b/lib/upload_creator.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "fastimage" -require_dependency "image_sizer" class UploadCreator diff --git a/lib/upload_markdown.rb b/lib/upload_markdown.rb index d6476417a0..c176ae6710 100644 --- a/lib/upload_markdown.rb +++ b/lib/upload_markdown.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "file_helper" - class UploadMarkdown def initialize(upload) @upload = upload diff --git a/lib/validators/allowed_ip_address_validator.rb b/lib/validators/allowed_ip_address_validator.rb index c0a50e7e83..d2f008f27d 100644 --- a/lib/validators/allowed_ip_address_validator.rb +++ b/lib/validators/allowed_ip_address_validator.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "spam_handler" - class AllowedIpAddressValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) diff --git a/lib/validators/alternative_reply_by_email_addresses_validator.rb b/lib/validators/alternative_reply_by_email_addresses_validator.rb index 106828025d..0c39cde739 100644 --- a/lib/validators/alternative_reply_by_email_addresses_validator.rb +++ b/lib/validators/alternative_reply_by_email_addresses_validator.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'validators/reply_by_email_address_validator' - class AlternativeReplyByEmailAddressesValidator def initialize(opts = {}) @opts = opts diff --git a/lib/validators/password_validator.rb b/lib/validators/password_validator.rb index 1b0f9374a9..4c3e881331 100644 --- a/lib/validators/password_validator.rb +++ b/lib/validators/password_validator.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require_dependency "common_passwords/common_passwords" - class PasswordValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb index dc391b63bf..5b16002660 100644 --- a/lib/validators/post_validator.rb +++ b/lib/validators/post_validator.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true -require_dependency 'validators/stripped_length_validator' - -module Validators; end - -class Validators::PostValidator < ActiveModel::Validator +class PostValidator < ActiveModel::Validator def validate(record) presence(record) @@ -51,7 +47,7 @@ class Validators::PostValidator < ActiveModel::Validator SiteSetting.post_length end - Validators::StrippedLengthValidator.validate(post, :raw, post.raw, range) + StrippedLengthValidator.validate(post, :raw, post.raw, range) end def raw_quality(post) diff --git a/lib/validators/stripped_length_validator.rb b/lib/validators/stripped_length_validator.rb index e65b7d2e7f..628866cb9c 100644 --- a/lib/validators/stripped_length_validator.rb +++ b/lib/validators/stripped_length_validator.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true -module Validators; end -class Validators::StrippedLengthValidator < ActiveModel::EachValidator +class StrippedLengthValidator < ActiveModel::EachValidator def self.validate(record, attribute, value, range) unless value.nil? stripped_length = value.strip.length diff --git a/lib/validators/upload_validator.rb b/lib/validators/upload_validator.rb index 7e2d13779a..deb49854bf 100644 --- a/lib/validators/upload_validator.rb +++ b/lib/validators/upload_validator.rb @@ -4,7 +4,7 @@ require_dependency "file_helper" module Validators; end -class Validators::UploadValidator < ActiveModel::Validator +class UploadValidator < ActiveModel::Validator def validate(upload) # staff can upload any file in PM diff --git a/lib/webauthn/webauthn.rb b/lib/webauthn.rb similarity index 100% rename from lib/webauthn/webauthn.rb rename to lib/webauthn.rb diff --git a/lib/wizard.rb b/lib/wizard.rb index 06f507ca8e..dbf4d8967e 100644 --- a/lib/wizard.rb +++ b/lib/wizard.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency 'wizard/step' -require_dependency 'wizard/field' -require_dependency 'wizard/step_updater' -require_dependency 'wizard/builder' - class Wizard attr_reader :steps, :user diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb index 8731f4b233..210f0bd8e1 100644 --- a/lib/wizard/builder.rb +++ b/lib/wizard/builder.rb @@ -1,10 +1,5 @@ # frozen_string_literal: true -require_dependency 'introduction_updater' -require_dependency 'emoji_set_site_setting' -require_dependency 'seed_data/categories' -require_dependency 'seed_data/topics' - class Wizard class Builder diff --git a/plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb b/plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb index 9daa0283ae..b38a9eb83c 100644 --- a/plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb +++ b/plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class BotInput < Jobs::Base + class BotInput < ::Jobs::Base sidekiq_options queue: 'critical', retry: false diff --git a/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb b/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb index ac88154bbb..560a2256e7 100644 --- a/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb +++ b/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb @@ -1,9 +1,7 @@ # frozen_string_literal: true -require_dependency 'user' - module Jobs - class NarrativeInit < Jobs::Base + class NarrativeInit < ::Jobs::Base sidekiq_options queue: 'critical' def execute(args) diff --git a/plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb b/plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb index 726dc5657a..a5697199ab 100644 --- a/plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb +++ b/plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class NarrativeTimeout < Jobs::Base + class NarrativeTimeout < ::Jobs::Base def execute(args) if user = User.find_by(id: args[:user_id]) I18n.with_locale(user.effective_locale) do diff --git a/plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb b/plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb index 5bc1f0b6fb..1b2c54aa6c 100644 --- a/plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb +++ b/plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class SendDefaultWelcomeMessage < Jobs::Base + class SendDefaultWelcomeMessage < ::Jobs::Base def execute(args) if user = User.find_by(id: args[:user_id]) type = user.invited_by ? 'welcome_invite' : 'welcome_user' diff --git a/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb b/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb index 90e5870641..f79c3a20d5 100644 --- a/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb +++ b/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Jobs - class DailyPerformanceReport < Jobs::Scheduled + class DailyPerformanceReport < ::Jobs::Scheduled every 1.day per_host diff --git a/plugins/poll/jobs/regular/close_poll.rb b/plugins/poll/jobs/regular/close_poll.rb index 5e85a00ee1..864bef086d 100644 --- a/plugins/poll/jobs/regular/close_poll.rb +++ b/plugins/poll/jobs/regular/close_poll.rb @@ -2,7 +2,7 @@ module Jobs - class ClosePoll < Jobs::Base + class ClosePoll < ::Jobs::Base def execute(args) %i{ diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 731a4c1975..6a4ea272d8 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -300,8 +300,6 @@ after_initialize do end end - require_dependency "application_controller" - class DiscoursePoll::PollsController < ::ApplicationController requires_plugin PLUGIN_NAME diff --git a/script/demon_test/parent.rb b/script/demon_test/parent.rb index a6edd1ea54..4762a015f1 100644 --- a/script/demon_test/parent.rb +++ b/script/demon_test/parent.rb @@ -4,7 +4,7 @@ require File.expand_path("../../../config/environment", __FILE__) puts "Parent is now loaded" -class ForkExecDemon < Demon::Base +class ForkExecDemon < Demon::DemonBase def self.prefix "fork-exec-child" end diff --git a/script/discourse b/script/discourse index a8fc444eaa..97b47861da 100755 --- a/script/discourse +++ b/script/discourse @@ -59,7 +59,7 @@ class DiscourseCLI < Thor desc "backup", "Backup a discourse forum" def backup(filename = nil) load_rails - require "backup_restore/backup_restore" + require "backup_restore" require "backup_restore/backuper" store = BackupRestore::BackupStore.create @@ -117,7 +117,7 @@ class DiscourseCLI < Thor end load_rails - require "backup_restore/backup_restore" + require "backup_restore" require "backup_restore/restorer" require "backup_restore/backup_store" diff --git a/script/import_scripts/base/uploader.rb b/script/import_scripts/base/uploader.rb index 8e38850a6b..45404bba21 100644 --- a/script/import_scripts/base/uploader.rb +++ b/script/import_scripts/base/uploader.rb @@ -1,8 +1,5 @@ # frozen_string_literal: true -require_dependency 'url_helper' -require_dependency 'upload_markdown' - module ImportScripts class Uploader # Creates an upload. diff --git a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb index 36aca1c50c..0e9efa94a7 100644 --- a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb +++ b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'active_record/connection_adapters/postgresql_fallback_adapter' describe ActiveRecord::ConnectionHandling do let(:replica_host) { "1.1.1.1" } diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb index 2e23232c8a..5471bcd059 100644 --- a/spec/components/admin_user_index_query_spec.rb +++ b/spec/components/admin_user_index_query_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'admin_user_index_query' describe AdminUserIndexQuery do def real_users(query) diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb index 62761fa181..14715096a8 100644 --- a/spec/components/auth/default_current_user_provider_spec.rb +++ b/spec/components/auth/default_current_user_provider_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'auth/default_current_user_provider' describe Auth::DefaultCurrentUserProvider do diff --git a/spec/components/avatar_lookup_spec.rb b/spec/components/avatar_lookup_spec.rb index 33f01f5f29..24112bd5d4 100644 --- a/spec/components/avatar_lookup_spec.rb +++ b/spec/components/avatar_lookup_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'avatar_lookup' describe AvatarLookup do fab!(:user) { Fabricate(:user, username: "john_doe", name: "John Doe") } diff --git a/spec/components/common_passwords/common_passwords_spec.rb b/spec/components/common_passwords/common_passwords_spec.rb index e05f5a2430..deccf6a5d5 100644 --- a/spec/components/common_passwords/common_passwords_spec.rb +++ b/spec/components/common_passwords/common_passwords_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "rails_helper" -require_dependency "common_passwords/common_passwords" describe CommonPasswords do diff --git a/spec/components/crawler_detection_spec.rb b/spec/components/crawler_detection_spec.rb index 7d5393342d..dd9ce42d22 100644 --- a/spec/components/crawler_detection_spec.rb +++ b/spec/components/crawler_detection_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'crawler_detection' describe CrawlerDetection do diff --git a/spec/components/current_user_spec.rb b/spec/components/current_user_spec.rb index e1cf988a13..78310be245 100644 --- a/spec/components/current_user_spec.rb +++ b/spec/components/current_user_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'current_user' describe CurrentUser do it "allows us to lookup a user from our environment" do diff --git a/spec/components/directory_helper_spec.rb b/spec/components/directory_helper_spec.rb index 1792bfdf8d..0b2d687fd5 100644 --- a/spec/components/directory_helper_spec.rb +++ b/spec/components/directory_helper_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'directory_helper' describe DirectoryHelper do class DummyClass diff --git a/spec/components/discourse_event_spec.rb b/spec/components/discourse_event_spec.rb index 3b867a3124..158204688a 100644 --- a/spec/components/discourse_event_spec.rb +++ b/spec/components/discourse_event_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'discourse_event' describe DiscourseEvent do diff --git a/spec/components/discourse_hub_spec.rb b/spec/components/discourse_hub_spec.rb index 384995bff9..eafb579a8d 100644 --- a/spec/components/discourse_hub_spec.rb +++ b/spec/components/discourse_hub_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'discourse_hub' describe DiscourseHub do describe '.discourse_version_check' do diff --git a/spec/components/discourse_plugin_spec.rb b/spec/components/discourse_plugin_spec.rb index 42c4a72cb6..12a19d94c5 100644 --- a/spec/components/discourse_plugin_spec.rb +++ b/spec/components/discourse_plugin_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'discourse_plugin' describe DiscoursePlugin do diff --git a/spec/components/discourse_updates_spec.rb b/spec/components/discourse_updates_spec.rb index ccdd45ac4d..d57493d672 100644 --- a/spec/components/discourse_updates_spec.rb +++ b/spec/components/discourse_updates_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'discourse_updates' describe DiscourseUpdates do diff --git a/spec/components/distributed_memoizer_spec.rb b/spec/components/distributed_memoizer_spec.rb index d620542d56..c040ed92a5 100644 --- a/spec/components/distributed_memoizer_spec.rb +++ b/spec/components/distributed_memoizer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'distributed_memoizer' describe DistributedMemoizer do diff --git a/spec/components/distributed_mutex_spec.rb b/spec/components/distributed_mutex_spec.rb index e04727a8a8..e15b20f36c 100644 --- a/spec/components/distributed_mutex_spec.rb +++ b/spec/components/distributed_mutex_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'distributed_mutex' describe DistributedMutex do let(:key) { "test_mutex_key" } diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb index a6a9030dfb..81018733dc 100644 --- a/spec/components/email_updater_spec.rb +++ b/spec/components/email_updater_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'email_updater' describe EmailUpdater do let(:old_email) { 'old.email@example.com' } diff --git a/spec/components/file_store/base_store_spec.rb b/spec/components/file_store/base_store_spec.rb index 3c2e30eef9..f633b1e455 100644 --- a/spec/components/file_store/base_store_spec.rb +++ b/spec/components/file_store/base_store_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'file_store/base_store' RSpec.describe FileStore::BaseStore do fab!(:upload) { Fabricate(:upload, id: 9999, sha1: Digest::SHA1.hexdigest('9999')) } diff --git a/spec/components/freedom_patches/safe_buffer_spec.rb b/spec/components/freedom_patches/safe_buffer_spec.rb index 622d50924a..f7653bb0b7 100644 --- a/spec/components/freedom_patches/safe_buffer_spec.rb +++ b/spec/components/freedom_patches/safe_buffer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency "freedom_patches/safe_buffer" describe ActiveSupport::SafeBuffer do it "can cope with encoding weirdness" do diff --git a/spec/components/freedom_patches/schema_migration_details_spec.rb b/spec/components/freedom_patches/schema_migration_details_spec.rb index 6d4a7a57fb..02e0a898c3 100644 --- a/spec/components/freedom_patches/schema_migration_details_spec.rb +++ b/spec/components/freedom_patches/schema_migration_details_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency "freedom_patches/schema_migration_details" describe FreedomPatches::SchemaMigrationDetails do diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index ac8efd88a9..34a66c9b8c 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -3,8 +3,6 @@ require 'rails_helper' require 'guardian' -require_dependency 'post_destroyer' -require_dependency 'post_locker' describe Guardian do diff --git a/spec/components/highlight_js/highlight_js_spec.rb b/spec/components/highlight_js/highlight_js_spec.rb index 5488faa80b..aaf12f4c8b 100644 --- a/spec/components/highlight_js/highlight_js_spec.rb +++ b/spec/components/highlight_js/highlight_js_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'highlight_js/highlight_js' describe HighlightJs do it 'can list languages' do diff --git a/spec/components/import/normalize_spec.rb b/spec/components/import/normalize_spec.rb index a85aa5746d..b89ab8b414 100644 --- a/spec/components/import/normalize_spec.rb +++ b/spec/components/import/normalize_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "rails_helper" -require_dependency "import/normalize" describe Import::Normalize do describe "#normalize_code_blocks" do diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb index d9bb7ebbf3..bdb08b2c91 100644 --- a/spec/components/inline_oneboxer_spec.rb +++ b/spec/components/inline_oneboxer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'inline_oneboxer' describe InlineOneboxer do diff --git a/spec/components/json_error_spec.rb b/spec/components/json_error_spec.rb index 4dfbc37211..3b064a6381 100644 --- a/spec/components/json_error_spec.rb +++ b/spec/components/json_error_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'json_error' shared_examples "a generic error" do let(:result) { creator.create_errors_json(obj) } diff --git a/spec/components/method_profiler_spec.rb b/spec/components/method_profiler_spec.rb index b11cc55808..df2e2fdd72 100644 --- a/spec/components/method_profiler_spec.rb +++ b/spec/components/method_profiler_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'method_profiler' describe MethodProfiler do class Sneetch diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb index 74fe7f3174..ed09e6149b 100644 --- a/spec/components/middleware/anonymous_cache_spec.rb +++ b/spec/components/middleware/anonymous_cache_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "rails_helper" -require_dependency "middleware/anonymous_cache" describe Middleware::AnonymousCache::Helper do diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb index 394e26013c..b7433f4af6 100644 --- a/spec/components/middleware/request_tracker_spec.rb +++ b/spec/components/middleware/request_tracker_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "rails_helper" -require_dependency "middleware/request_tracker" describe Middleware::RequestTracker do diff --git a/spec/components/migration/column_dropper_spec.rb b/spec/components/migration/column_dropper_spec.rb index 2a8cfd1cd7..4dd4758633 100644 --- a/spec/components/migration/column_dropper_spec.rb +++ b/spec/components/migration/column_dropper_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'migration/column_dropper' RSpec.describe Migration::ColumnDropper do def has_column?(table, column) diff --git a/spec/components/migration/safe_migrate_spec.rb b/spec/components/migration/safe_migrate_spec.rb index 9bd0b690ae..f7d3a3839d 100644 --- a/spec/components/migration/safe_migrate_spec.rb +++ b/spec/components/migration/safe_migrate_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'migration/safe_migrate' describe Migration::SafeMigrate do before do diff --git a/spec/components/migration/table_dropper_spec.rb b/spec/components/migration/table_dropper_spec.rb index a59da8b943..9966aeb3e8 100644 --- a/spec/components/migration/table_dropper_spec.rb +++ b/spec/components/migration/table_dropper_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'migration/table_dropper' describe Migration::TableDropper do diff --git a/spec/components/oneboxer_spec.rb b/spec/components/oneboxer_spec.rb index 659a975bcd..f90eb5ba75 100644 --- a/spec/components/oneboxer_spec.rb +++ b/spec/components/oneboxer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'oneboxer' describe Oneboxer do diff --git a/spec/components/plugin/filter_manager_spec.rb b/spec/components/plugin/filter_manager_spec.rb index 886e815358..a9d40c4b1f 100644 --- a/spec/components/plugin/filter_manager_spec.rb +++ b/spec/components/plugin/filter_manager_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'plugin/filter_manager' describe Plugin::FilterManager do let(:instance) { Plugin::FilterManager.new } diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb index 76ecc02cac..0ff7846986 100644 --- a/spec/components/plugin/instance_spec.rb +++ b/spec/components/plugin/instance_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'plugin/instance' describe Plugin::Instance do diff --git a/spec/components/plugin/metadata_spec.rb b/spec/components/plugin/metadata_spec.rb index d982175d60..b8ad2ab97c 100644 --- a/spec/components/plugin/metadata_spec.rb +++ b/spec/components/plugin/metadata_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'plugin/metadata' describe Plugin::Metadata do context "parse" do diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb index f8d050c0a8..76c1fd9220 100644 --- a/spec/components/post_destroyer_spec.rb +++ b/spec/components/post_destroyer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_destroyer' describe PostDestroyer do diff --git a/spec/components/post_locker_spec.rb b/spec/components/post_locker_spec.rb index 9696d39c56..9525e5c31c 100644 --- a/spec/components/post_locker_spec.rb +++ b/spec/components/post_locker_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_locker' describe PostLocker do fab!(:moderator) { Fabricate(:moderator) } diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb index a7f2c8fe45..84ca621ef0 100644 --- a/spec/components/retrieve_title_spec.rb +++ b/spec/components/retrieve_title_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'retrieve_title' describe RetrieveTitle do diff --git a/spec/components/rtl_spec.rb b/spec/components/rtl_spec.rb index f2622735d3..77e6634883 100644 --- a/spec/components/rtl_spec.rb +++ b/spec/components/rtl_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'rtl' describe Rtl do diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb index f93b8a046e..c5ac81786b 100644 --- a/spec/components/scheduler/defer_spec.rb +++ b/spec/components/scheduler/defer_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'scheduler/defer' describe Scheduler::Defer do class DeferInstance diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 3cf118811f..815302501b 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'search' describe Search do fab!(:admin) { Fabricate(:admin) } diff --git a/spec/components/secure_session_spec.rb b/spec/components/secure_session_spec.rb index cb0a885c30..1e2aad5060 100644 --- a/spec/components/secure_session_spec.rb +++ b/spec/components/secure_session_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'secure_session' describe SecureSession do it "operates correctly" do diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb index 809a1b77c8..9a82c1912e 100644 --- a/spec/components/site_setting_extension_spec.rb +++ b/spec/components/site_setting_extension_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site_setting_extension' -require_dependency 'site_settings/local_process_provider' describe SiteSettingExtension do diff --git a/spec/components/site_settings/db_provider_spec.rb b/spec/components/site_settings/db_provider_spec.rb index 7caa07862b..8e9092ccc2 100644 --- a/spec/components/site_settings/db_provider_spec.rb +++ b/spec/components/site_settings/db_provider_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site_settings/db_provider' describe SiteSettings::DbProvider do diff --git a/spec/components/site_settings/defaults_provider_spec.rb b/spec/components/site_settings/defaults_provider_spec.rb index bbcf524f52..77d3afc1e5 100644 --- a/spec/components/site_settings/defaults_provider_spec.rb +++ b/spec/components/site_settings/defaults_provider_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site_settings/defaults_provider' describe SiteSettings::DefaultsProvider do let(:provider_local) do diff --git a/spec/components/site_settings/local_process_provider_spec.rb b/spec/components/site_settings/local_process_provider_spec.rb index 40a4b53994..ac32d97793 100644 --- a/spec/components/site_settings/local_process_provider_spec.rb +++ b/spec/components/site_settings/local_process_provider_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site_settings/local_process_provider' describe SiteSettings::LocalProcessProvider do diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb index b6d01e0f3e..c46cde843a 100644 --- a/spec/components/site_settings/type_supervisor_spec.rb +++ b/spec/components/site_settings/type_supervisor_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site_settings/type_supervisor' describe SiteSettings::TypeSupervisor do let :provider_local do diff --git a/spec/components/timeline_lookup_spec.rb b/spec/components/timeline_lookup_spec.rb index f47fb93e6f..0ae24563f5 100644 --- a/spec/components/timeline_lookup_spec.rb +++ b/spec/components/timeline_lookup_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'timeline_lookup' describe TimelineLookup do it "returns an empty array for empty input" do diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb index 4c2d97d31d..5ab908476b 100644 --- a/spec/components/topic_retriever_spec.rb +++ b/spec/components/topic_retriever_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'topic_retriever' describe TopicRetriever do diff --git a/spec/components/topics_bulk_action_spec.rb b/spec/components/topics_bulk_action_spec.rb index a88fcc60f0..b0788c8b78 100644 --- a/spec/components/topics_bulk_action_spec.rb +++ b/spec/components/topics_bulk_action_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'topics_bulk_action' describe TopicsBulkAction do fab!(:topic) { Fabricate(:topic) } diff --git a/spec/components/trashable_spec.rb b/spec/components/trashable_spec.rb index 16a3cafb49..75bc6642a3 100644 --- a/spec/components/trashable_spec.rb +++ b/spec/components/trashable_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'trashable' describe Trashable do # post is trashable, just use it. diff --git a/spec/components/url_helper_spec.rb b/spec/components/url_helper_spec.rb index 5da5c8323f..53da4a688d 100644 --- a/spec/components/url_helper_spec.rb +++ b/spec/components/url_helper_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'url_helper' describe UrlHelper do diff --git a/spec/components/validators/password_validator_spec.rb b/spec/components/validators/password_validator_spec.rb index c4cf64216b..c419b8ca58 100644 --- a/spec/components/validators/password_validator_spec.rb +++ b/spec/components/validators/password_validator_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency "common_passwords/common_passwords" describe PasswordValidator do diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb index 275a32b786..5b5826e1a3 100644 --- a/spec/components/validators/post_validator_spec.rb +++ b/spec/components/validators/post_validator_spec.rb @@ -1,12 +1,11 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'validators/post_validator' -describe Validators::PostValidator do +describe PostValidator do fab!(:topic) { Fabricate(:topic) } let(:post) { build(:post, topic: topic) } - let(:validator) { Validators::PostValidator.new({}) } + let(:validator) { PostValidator.new({}) } context "#post_body_validator" do it 'should not allow a post with an empty raw' do @@ -16,7 +15,7 @@ describe Validators::PostValidator do end context "when empty raw can bypass validation" do - let(:validator) { Validators::PostValidator.new(skip_post_body: true) } + let(:validator) { PostValidator.new(skip_post_body: true) } it "should be allowed for empty raw based on site setting" do post.raw = "" diff --git a/spec/components/validators/upload_validator_spec.rb b/spec/components/validators/upload_validator_spec.rb index 9348c85e79..898279216c 100644 --- a/spec/components/validators/upload_validator_spec.rb +++ b/spec/components/validators/upload_validator_spec.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'validators/upload_validator' -describe Validators::UploadValidator do +describe UploadValidator do subject(:validator) { described_class.new } describe 'validate' do diff --git a/spec/components/wizard/step_updater_spec.rb b/spec/components/wizard/step_updater_spec.rb index ef43bb8f19..5c2fee8555 100644 --- a/spec/components/wizard/step_updater_spec.rb +++ b/spec/components/wizard/step_updater_spec.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'wizard' -require_dependency 'wizard/builder' -require_dependency 'wizard/step_updater' describe Wizard::StepUpdater do before do diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb index b42839a18d..b20829778b 100644 --- a/spec/integration/category_tag_spec.rb +++ b/spec/integration/category_tag_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_creator' describe "category tag restrictions" do diff --git a/spec/integrity/onceoff_integrity_spec.rb b/spec/integrity/onceoff_integrity_spec.rb index 1d782f406b..7918995448 100644 --- a/spec/integrity/onceoff_integrity_spec.rb +++ b/spec/integrity/onceoff_integrity_spec.rb @@ -2,14 +2,14 @@ require "rails_helper" -describe Jobs::Onceoff do +describe ::Jobs::Onceoff do it "can run all once off jobs without errors" do # load all once offs Dir[Rails.root + 'app/jobs/onceoff/*.rb'].each do |f| require_relative '../../app/jobs/onceoff/' + File.basename(f) end - ObjectSpace.each_object(Class).select { |klass| klass < Jobs::Onceoff }.each do |j| + ObjectSpace.each_object(Class).select { |klass| klass < ::Jobs::Onceoff }.each do |j| j.new.execute_onceoff(nil) end end diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb index 697b684361..afac2b7f3f 100644 --- a/spec/jobs/automatic_group_membership_spec.rb +++ b/spec/jobs/automatic_group_membership_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/regular/automatic_group_membership' describe Jobs::AutomaticGroupMembership do diff --git a/spec/jobs/bulk_grant_trust_level_spec.rb b/spec/jobs/bulk_grant_trust_level_spec.rb index 47f4aad1e9..45bf56c38e 100644 --- a/spec/jobs/bulk_grant_trust_level_spec.rb +++ b/spec/jobs/bulk_grant_trust_level_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/regular/bulk_grant_trust_level' describe Jobs::BulkGrantTrustLevel do diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb index 934ca6eb21..2626aad980 100644 --- a/spec/jobs/clean_up_uploads_spec.rb +++ b/spec/jobs/clean_up_uploads_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'jobs/scheduled/clean_up_uploads' - describe Jobs::CleanUpUploads do def fabricate_upload(attributes = {}) diff --git a/spec/jobs/correct_missing_dualstack_urls_spec.rb b/spec/jobs/correct_missing_dualstack_urls_spec.rb index 08d2035185..c41f12c989 100644 --- a/spec/jobs/correct_missing_dualstack_urls_spec.rb +++ b/spec/jobs/correct_missing_dualstack_urls_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'jobs/onceoff/correct_missing_dualstack_urls' - describe Jobs::CorrectMissingDualstackUrls do it 'corrects the urls' do diff --git a/spec/jobs/crawl_topic_link_spec.rb b/spec/jobs/crawl_topic_link_spec.rb index ffeaa60114..328ee70aaf 100644 --- a/spec/jobs/crawl_topic_link_spec.rb +++ b/spec/jobs/crawl_topic_link_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' -require_dependency 'jobs/regular/crawl_topic_link' describe Jobs::CrawlTopicLink do diff --git a/spec/jobs/create_missing_avatars_spec.rb b/spec/jobs/create_missing_avatars_spec.rb index 3832e7e974..1a8ff7a66d 100644 --- a/spec/jobs/create_missing_avatars_spec.rb +++ b/spec/jobs/create_missing_avatars_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'jobs/scheduled/create_missing_avatars' - describe Jobs::CreateMissingAvatars do it "runs correctly without crashing" do Jobs::CreateMissingAvatars.new.execute(nil) diff --git a/spec/jobs/create_user_reviewable_spec.rb b/spec/jobs/create_user_reviewable_spec.rb index d30e218a83..2de253b57e 100644 --- a/spec/jobs/create_user_reviewable_spec.rb +++ b/spec/jobs/create_user_reviewable_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/regular/create_user_reviewable' describe Jobs::CreateUserReviewable do diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb index b6ee018849..029be5a814 100644 --- a/spec/jobs/enqueue_digest_emails_spec.rb +++ b/spec/jobs/enqueue_digest_emails_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' describe Jobs::EnqueueDigestEmails do diff --git a/spec/jobs/feature_topic_users_spec.rb b/spec/jobs/feature_topic_users_spec.rb index ac74f37891..5fd58f3bb9 100644 --- a/spec/jobs/feature_topic_users_spec.rb +++ b/spec/jobs/feature_topic_users_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' require 'jobs/regular/process_post' describe Jobs::FeatureTopicUsers do diff --git a/spec/jobs/fix_user_usernames_and_group_names_clash_spec.rb b/spec/jobs/fix_user_usernames_and_groups_names_clash_spec.rb similarity index 76% rename from spec/jobs/fix_user_usernames_and_group_names_clash_spec.rb rename to spec/jobs/fix_user_usernames_and_groups_names_clash_spec.rb index bfb9e5b8ca..67cdd33642 100644 --- a/spec/jobs/fix_user_usernames_and_group_names_clash_spec.rb +++ b/spec/jobs/fix_user_usernames_and_groups_names_clash_spec.rb @@ -2,14 +2,14 @@ require 'rails_helper' -RSpec.describe Jobs::FixUserUsernamesAndGroupNamesClash do +RSpec.describe Jobs::FixUserUsernamesAndGroupsNamesClash do it 'update usernames of users that clashes with a group name' do user = Fabricate(:user) Fabricate(:user, username: 'test1') group = Fabricate(:group, name: 'test') user.update_columns(username: 'test', username_lower: 'test') - Jobs::FixUserUsernamesAndGroupNamesClash.new.execute({}) + Jobs::FixUserUsernamesAndGroupsNamesClash.new.execute({}) expect(user.reload.username).to eq('test2') expect(group.reload.name).to eq('test') diff --git a/spec/jobs/grant_anniversary_badges_spec.rb b/spec/jobs/grant_anniversary_badges_spec.rb index d60b6291d5..cb8e4e2626 100644 --- a/spec/jobs/grant_anniversary_badges_spec.rb +++ b/spec/jobs/grant_anniversary_badges_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/scheduled/grant_anniversary_badges' describe Jobs::GrantAnniversaryBadges do diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index db3b65a424..5deaa1f2ad 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/scheduled/grant_new_user_of_the_month_badges' describe Jobs::GrantNewUserOfTheMonthBadges do diff --git a/spec/jobs/heartbeat_spec.rb b/spec/jobs/heartbeat_spec.rb index 315fe4172b..fb39ffd36b 100644 --- a/spec/jobs/heartbeat_spec.rb +++ b/spec/jobs/heartbeat_spec.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' -describe Jobs::Heartbeat do +describe ::Jobs::Heartbeat do after do Discourse.disable_readonly_mode end @@ -14,8 +13,8 @@ describe Jobs::Heartbeat do Discourse.enable_readonly_mode Sidekiq::Testing.inline! do - Jobs::Heartbeat.new.perform(nil) - expect(Jobs::RunHeartbeat.last_heartbeat).to eq(Time.new.to_i) + ::Jobs::Heartbeat.new.perform(nil) + expect(::Jobs::RunHeartbeat.last_heartbeat).to eq(Time.new.to_i) end end end diff --git a/spec/jobs/ignored_users_summary_spec.rb b/spec/jobs/ignored_users_summary_spec.rb index b98e6e0dac..b05b0d7673 100644 --- a/spec/jobs/ignored_users_summary_spec.rb +++ b/spec/jobs/ignored_users_summary_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'jobs/scheduled/ignored_users_summary' - describe Jobs::IgnoredUsersSummary do before do SiteSetting.ignored_users_count_message_threshold = 1 diff --git a/spec/jobs/invalidate_inactive_admins_spec.rb b/spec/jobs/invalidate_inactive_admins_spec.rb index dfae43525b..e7b5b435d1 100644 --- a/spec/jobs/invalidate_inactive_admins_spec.rb +++ b/spec/jobs/invalidate_inactive_admins_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'jobs/scheduled/invalidate_inactive_admins' - describe Jobs::InvalidateInactiveAdmins do fab!(:active_admin) { Fabricate(:admin, last_seen_at: 1.hour.ago) } before { active_admin.email_tokens.update_all(confirmed: true) } diff --git a/spec/jobs/invite_email_spec.rb b/spec/jobs/invite_email_spec.rb index f67fd135e7..d998b85bae 100644 --- a/spec/jobs/invite_email_spec.rb +++ b/spec/jobs/invite_email_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' describe Jobs::InviteEmail do diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb index a107fea9eb..473710ba4b 100644 --- a/spec/jobs/jobs_base_spec.rb +++ b/spec/jobs/jobs_base_spec.rb @@ -1,10 +1,9 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' -describe Jobs::Base do - class GoodJob < Jobs::Base +describe ::Jobs::Base do + class GoodJob < ::Jobs::Base attr_accessor :count def execute(args) self.count ||= 0 @@ -12,7 +11,7 @@ describe Jobs::Base do end end - class BadJob < Jobs::Base + class BadJob < ::Jobs::Base attr_accessor :fail_count def execute(args) @@ -39,13 +38,13 @@ describe Jobs::Base do end it 'delegates the process call to execute' do - Jobs::Base.any_instance.expects(:execute).with('hello' => 'world') - Jobs::Base.new.perform('hello' => 'world', 'sync_exec' => true) + ::Jobs::Base.any_instance.expects(:execute).with('hello' => 'world') + ::Jobs::Base.new.perform('hello' => 'world', 'sync_exec' => true) end it 'converts to an indifferent access hash' do - Jobs::Base.any_instance.expects(:execute).with(instance_of(HashWithIndifferentAccess)) - Jobs::Base.new.perform('hello' => 'world', 'sync_exec' => true) + ::Jobs::Base.any_instance.expects(:execute).with(instance_of(HashWithIndifferentAccess)) + ::Jobs::Base.new.perform('hello' => 'world', 'sync_exec' => true) end end diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb index 0f4c00c1ce..d956b92a98 100644 --- a/spec/jobs/jobs_spec.rb +++ b/spec/jobs/jobs_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' describe Jobs do diff --git a/spec/jobs/notify_moved_posts_spec.rb b/spec/jobs/notify_moved_posts_spec.rb index 68b1e68267..903b99cace 100644 --- a/spec/jobs/notify_moved_posts_spec.rb +++ b/spec/jobs/notify_moved_posts_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' -require_dependency 'jobs/regular/process_post' describe Jobs::NotifyMovedPosts do diff --git a/spec/jobs/pending_queued_posts_reminder_spec.rb b/spec/jobs/pending_queued_posts_reminder_spec.rb index cc5bd387bb..8a5fe59bfe 100644 --- a/spec/jobs/pending_queued_posts_reminder_spec.rb +++ b/spec/jobs/pending_queued_posts_reminder_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" -describe Jobs::PendingQueuedPostReminder do +describe Jobs::PendingQueuedPostsReminder do let(:job) { described_class.new } context "notify_about_queued_posts_after is 0" do diff --git a/spec/jobs/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb index 788efe6ade..52729471d4 100644 --- a/spec/jobs/periodical_updates_spec.rb +++ b/spec/jobs/periodical_updates_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/scheduled/periodical_updates' describe Jobs::PeriodicalUpdates do diff --git a/spec/jobs/poll_feed_spec.rb b/spec/jobs/poll_feed_spec.rb index cee8520e0d..5ddc7a7d6d 100644 --- a/spec/jobs/poll_feed_spec.rb +++ b/spec/jobs/poll_feed_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/regular/process_post' describe Jobs::PollFeed do let(:poller) { Jobs::PollFeed.new } diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb index 90f59a7f05..078bb55fd7 100644 --- a/spec/jobs/poll_mailbox_spec.rb +++ b/spec/jobs/poll_mailbox_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/regular/process_post' describe Jobs::PollMailbox do diff --git a/spec/jobs/purge_expired_ignored_users_spec.rb b/spec/jobs/purge_expired_ignored_users_spec.rb index c49a45bd34..e0627de959 100644 --- a/spec/jobs/purge_expired_ignored_users_spec.rb +++ b/spec/jobs/purge_expired_ignored_users_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'jobs/scheduled/purge_expired_ignored_users' - describe Jobs::PurgeExpiredIgnoredUsers do subject { Jobs::PurgeExpiredIgnoredUsers.new.execute({}) } diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb index 56d5a62ed2..39844fdb17 100644 --- a/spec/jobs/user_email_spec.rb +++ b/spec/jobs/user_email_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'jobs/base' describe Jobs::UserEmail do diff --git a/spec/lib/db_helper_spec.rb b/spec/lib/db_helper_spec.rb index af834dc197..b178cd1e19 100644 --- a/spec/lib/db_helper_spec.rb +++ b/spec/lib/db_helper_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'db_helper' -require_dependency 'migration/column_dropper' RSpec.describe DbHelper do describe '.remap' do diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb index e1c9695509..cf80db014d 100644 --- a/spec/lib/theme_javascript_compiler_spec.rb +++ b/spec/lib/theme_javascript_compiler_spec.rb @@ -2,8 +2,6 @@ require 'rails_helper' -require_dependency 'theme_javascript_compiler' - describe ThemeJavascriptCompiler do let(:theme_id) { 22 } diff --git a/spec/lib/upload_recovery_spec.rb b/spec/lib/upload_recovery_spec.rb index afcff5025c..f248d009f5 100644 --- a/spec/lib/upload_recovery_spec.rb +++ b/spec/lib/upload_recovery_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency "upload_recovery" RSpec.describe UploadRecovery do fab!(:user) { Fabricate(:user) } diff --git a/spec/lib/webauthn/security_key_authentication_service_spec.rb b/spec/lib/webauthn/security_key_authentication_service_spec.rb index e448bf32c5..8f6ce0c529 100644 --- a/spec/lib/webauthn/security_key_authentication_service_spec.rb +++ b/spec/lib/webauthn/security_key_authentication_service_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require 'webauthn/webauthn' +require 'webauthn' require 'webauthn/security_key_registration_service' describe Webauthn::SecurityKeyAuthenticationService do diff --git a/spec/lib/webauthn/security_key_registration_service_spec.rb b/spec/lib/webauthn/security_key_registration_service_spec.rb index e412d2284b..17bc9ff149 100644 --- a/spec/lib/webauthn/security_key_registration_service_spec.rb +++ b/spec/lib/webauthn/security_key_registration_service_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require 'webauthn/webauthn' +require 'webauthn' require 'webauthn/security_key_registration_service' describe Webauthn::SecurityKeyRegistrationService do diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb index 288916e8b9..fd6ac20303 100644 --- a/spec/models/api_key_spec.rb +++ b/spec/models/api_key_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'api_key' describe ApiKey do fab!(:user) { Fabricate(:user) } diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb index 81e136cad1..41cf3edcfd 100644 --- a/spec/models/badge_spec.rb +++ b/spec/models/badge_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'badge' describe Badge do it { is_expected.to belong_to(:badge_type) } diff --git a/spec/models/badge_type_spec.rb b/spec/models/badge_type_spec.rb index b5a35b14c8..99a9330c0e 100644 --- a/spec/models/badge_type_spec.rb +++ b/spec/models/badge_type_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'badge_type' describe BadgeType do diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb index 6694483429..298bfc2b44 100644 --- a/spec/models/category_spec.rb +++ b/spec/models/category_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_creator' describe Category do fab!(:user) { Fabricate(:user) } diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb index a386a575eb..f777b9e820 100644 --- a/spec/models/category_user_spec.rb +++ b/spec/models/category_user_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_creator' describe CategoryUser do fab!(:user) { Fabricate(:user) } diff --git a/spec/models/plugin_store_spec.rb b/spec/models/plugin_store_spec.rb index b134339d45..ca2e178b50 100644 --- a/spec/models/plugin_store_spec.rb +++ b/spec/models/plugin_store_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "rails_helper" -require_dependency "plugin_store" describe PluginStore do let(:store) { PluginStore.new("my_plugin_2") } diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb index ce0a53cf83..5c8f973ccc 100644 --- a/spec/models/site_setting_spec.rb +++ b/spec/models/site_setting_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site_setting' -require_dependency 'site_setting_extension' describe SiteSetting do diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb index b90011e866..53b5f7493e 100644 --- a/spec/models/site_spec.rb +++ b/spec/models/site_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site' describe Site do diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb index cce48a6a09..258aa19f66 100644 --- a/spec/models/tag_user_spec.rb +++ b/spec/models/tag_user_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_creator' describe TagUser do before do diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 0c3f638353..23dfdf5b75 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_destroyer' describe Topic do let(:now) { Time.zone.local(2013, 11, 20, 8, 0) } diff --git a/spec/models/unsubscribe_key_spec.rb b/spec/models/unsubscribe_key_spec.rb index 13b11df9b7..e2d4eeb1f2 100644 --- a/spec/models/unsubscribe_key_spec.rb +++ b/spec/models/unsubscribe_key_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'unsubscribe_key' describe UnsubscribeKey do diff --git a/spec/models/user_badge_spec.rb b/spec/models/user_badge_spec.rb index 68c591248b..72fa8a01f6 100644 --- a/spec/models/user_badge_spec.rb +++ b/spec/models/user_badge_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user_badge' describe UserBadge do diff --git a/spec/models/user_email_spec.rb b/spec/models/user_email_spec.rb index 1e53a56f93..ee48170269 100644 --- a/spec/models/user_email_spec.rb +++ b/spec/models/user_email_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user_email' describe UserEmail do context "validation" do diff --git a/spec/models/user_option_spec.rb b/spec/models/user_option_spec.rb index d02eefd08f..30112859a6 100644 --- a/spec/models/user_option_spec.rb +++ b/spec/models/user_option_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user_option' describe UserOption do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 431ca1dacc..29dcad458b 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user' describe User do let(:user) { Fabricate(:user) } diff --git a/spec/multisite/pausable_spec.rb b/spec/multisite/pausable_spec.rb index 5bc1262af9..fe764faabb 100644 --- a/spec/multisite/pausable_spec.rb +++ b/spec/multisite/pausable_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'sidekiq/pausable' RSpec.describe "Pausing/Unpausing Sidekiq", type: :multisite do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 714407c46d..53136f48b4 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -196,7 +196,6 @@ RSpec.configure do |config| SiteSetting.defaults.set_regardless_of_locale(k, v) if SiteSetting.respond_to? k end - require_dependency 'site_settings/local_process_provider' SiteSetting.provider = SiteSettings::LocalProcessProvider.new WebMock.disable_net_connect! diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb index b777131ad1..22b5a36829 100644 --- a/spec/requests/admin/dashboard_controller_spec.rb +++ b/spec/requests/admin/dashboard_controller_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'discourse_version_check' describe Admin::DashboardController do before do diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb index b3d5acd729..891d260bb8 100644 --- a/spec/requests/admin/themes_controller_spec.rb +++ b/spec/requests/admin/themes_controller_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'theme_serializer' describe Admin::ThemesController do fab!(:admin) { Fabricate(:admin) } diff --git a/spec/requests/admin/versions_controller_spec.rb b/spec/requests/admin/versions_controller_spec.rb index b6f8db943d..8922c99585 100644 --- a/spec/requests/admin/versions_controller_spec.rb +++ b/spec/requests/admin/versions_controller_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'version' describe Admin::VersionsController do diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb index 48bb6ac6ff..d72f9f71dc 100644 --- a/spec/requests/omniauth_callbacks_controller_spec.rb +++ b/spec/requests/omniauth_callbacks_controller_spec.rb @@ -582,8 +582,6 @@ RSpec.describe Users::OmniauthCallbacksController do end context 'after changing email' do - require_dependency 'email_updater' - def login(identity) OmniAuth.config.mock_auth[:google_oauth2] = OmniAuth::AuthHash.new( provider: 'google_oauth2', diff --git a/spec/serializers/admin_user_list_serializer_spec.rb b/spec/serializers/admin_user_list_serializer_spec.rb index e5c429fc8a..508c8c790f 100644 --- a/spec/serializers/admin_user_list_serializer_spec.rb +++ b/spec/serializers/admin_user_list_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user' describe AdminUserListSerializer do fab!(:user) { Fabricate(:user_second_factor_totp).user } diff --git a/spec/serializers/basic_post_serializer_spec.rb b/spec/serializers/basic_post_serializer_spec.rb index faad10498a..04f70583c4 100644 --- a/spec/serializers/basic_post_serializer_spec.rb +++ b/spec/serializers/basic_post_serializer_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post' -require_dependency 'user' describe BasicPostSerializer do diff --git a/spec/serializers/basic_user_serializer_spec.rb b/spec/serializers/basic_user_serializer_spec.rb index 9dfb787798..9109e068f6 100644 --- a/spec/serializers/basic_user_serializer_spec.rb +++ b/spec/serializers/basic_user_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user' describe BasicUserSerializer do describe '#as_json' do diff --git a/spec/serializers/category_detailed_serializer_spec.rb b/spec/serializers/category_detailed_serializer_spec.rb index 48324823b3..9c78eac8ef 100644 --- a/spec/serializers/category_detailed_serializer_spec.rb +++ b/spec/serializers/category_detailed_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'category' describe CategoryDetailedSerializer do diff --git a/spec/serializers/category_serializer_spec.rb b/spec/serializers/category_serializer_spec.rb index a8f2ce9edf..1557850efd 100644 --- a/spec/serializers/category_serializer_spec.rb +++ b/spec/serializers/category_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'category' describe CategorySerializer do fab!(:group) { Fabricate(:group) } diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb index 1e710b5e31..cd21e838ab 100644 --- a/spec/serializers/post_serializer_spec.rb +++ b/spec/serializers/post_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_action' describe PostSerializer do fab!(:post) { Fabricate(:post) } diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb index c66bac51a5..6574b3e4b2 100644 --- a/spec/serializers/site_serializer_spec.rb +++ b/spec/serializers/site_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'site' describe SiteSerializer do let(:guardian) { Guardian.new } diff --git a/spec/serializers/topic_list_item_serializer_spec.rb b/spec/serializers/topic_list_item_serializer_spec.rb index 09f51f5c8b..f798ec3498 100644 --- a/spec/serializers/topic_list_item_serializer_spec.rb +++ b/spec/serializers/topic_list_item_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_action' describe TopicListItemSerializer do let(:topic) do diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb index 7f896a285f..262166422a 100644 --- a/spec/serializers/user_serializer_spec.rb +++ b/spec/serializers/user_serializer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user' describe UserSerializer do diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb index c0a6843e2e..7bb6ab4abf 100644 --- a/spec/services/topic_status_updater_spec.rb +++ b/spec/services/topic_status_updater_spec.rb @@ -2,7 +2,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'post_destroyer' # TODO - test pinning, create_moderator_post diff --git a/spec/services/user_authenticator_spec.rb b/spec/services/user_authenticator_spec.rb index 7ee4543d14..c7f6b989f4 100644 --- a/spec/services/user_authenticator_spec.rb +++ b/spec/services/user_authenticator_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user_authenticator' def github_auth(email_valid) { diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb index 2fbefd9acf..ed11feb011 100644 --- a/spec/services/user_destroyer_spec.rb +++ b/spec/services/user_destroyer_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'rails_helper' -require_dependency 'user_destroyer' describe UserDestroyer do diff --git a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb index 028213e521..177c580533 100644 --- a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb +++ b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb @@ -3,7 +3,6 @@ require "rails_helper" require "auth/authenticator" -require_dependency "auth/result" describe "users/omniauth_callbacks/complete.html.erb" do