OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

File cleanup/organization in `controllers/concerns` (#27846)

pull/28161/head
Matt Jankowski 2023-11-30 09:39:41 -05:00 committed by GitHub
parent 0530ce5e95
commit 1f1c75bba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/export_domain_allows_controller.rb
View File

@ -4,7 +4,7 @@ require 'csv'
module Admin module Admin
class ExportDomainAllowsController < BaseController class ExportDomainAllowsController < BaseController
include AdminExportControllerConcern include Admin::ExportControllerConcern
before_action :set_dummy_import!, only: [:new] before_action :set_dummy_import!, only: [:new]

2
app/controllers/admin/export_domain_blocks_controller.rb
View File

@ -4,7 +4,7 @@ require 'csv'
module Admin module Admin
class ExportDomainBlocksController < BaseController class ExportDomainBlocksController < BaseController
include AdminExportControllerConcern include Admin::ExportControllerConcern
before_action :set_dummy_import!, only: [:new] before_action :set_dummy_import!, only: [:new]

6
app/controllers/api/base_controller.rb
View File

@ -4,9 +4,9 @@ class Api::BaseController < ApplicationController
DEFAULT_STATUSES_LIMIT = 20 DEFAULT_STATUSES_LIMIT = 20
DEFAULT_ACCOUNTS_LIMIT = 40 DEFAULT_ACCOUNTS_LIMIT = 40
include RateLimitHeaders include Api::RateLimitHeaders
include AccessTokenTrackingConcern include Api::AccessTokenTrackingConcern
include ApiCachingConcern include Api::CachingConcern
include Api::ContentSecurityPolicy include Api::ContentSecurityPolicy
skip_before_action :require_functional!, unless: :limited_federation_mode? skip_before_action :require_functional!, unless: :limited_federation_mode?

2
app/controllers/auth/confirmations_controller.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Auth::ConfirmationsController < Devise::ConfirmationsController class Auth::ConfirmationsController < Devise::ConfirmationsController
include CaptchaConcern include Auth::CaptchaConcern
layout 'auth' layout 'auth'

2
app/controllers/auth/registrations_controller.rb
View File

@ -2,7 +2,7 @@
class Auth::RegistrationsController < Devise::RegistrationsController class Auth::RegistrationsController < Devise::RegistrationsController
include RegistrationHelper include RegistrationHelper
include RegistrationSpamConcern include Auth::RegistrationSpamConcern
layout :determine_layout layout :determine_layout

2
app/controllers/auth/sessions_controller.rb
View File

@ -10,7 +10,7 @@ class Auth::SessionsController < Devise::SessionsController
prepend_before_action :check_suspicious!, only: [:create] prepend_before_action :check_suspicious!, only: [:create]
include TwoFactorAuthenticationConcern include Auth::TwoFactorAuthenticationConcern
before_action :set_body_classes before_action :set_body_classes

2
app/controllers/concerns/admin_export_controller_concern.rb → app/controllers/concerns/admin/export_controller_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module AdminExportControllerConcern module Admin::ExportControllerConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
private private

2
app/controllers/concerns/access_token_tracking_concern.rb → app/controllers/concerns/api/access_token_tracking_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module AccessTokenTrackingConcern module Api::AccessTokenTrackingConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
ACCESS_TOKEN_UPDATE_FREQUENCY = 24.hours.freeze ACCESS_TOKEN_UPDATE_FREQUENCY = 24.hours.freeze

2
app/controllers/concerns/api_caching_concern.rb → app/controllers/concerns/api/caching_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module ApiCachingConcern module Api::CachingConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
def cache_if_unauthenticated! def cache_if_unauthenticated!

2
app/controllers/concerns/rate_limit_headers.rb → app/controllers/concerns/api/rate_limit_headers.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module RateLimitHeaders module Api::RateLimitHeaders
extend ActiveSupport::Concern extend ActiveSupport::Concern
class_methods do class_methods do

2
app/controllers/concerns/captcha_concern.rb → app/controllers/concerns/auth/captcha_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module CaptchaConcern module Auth::CaptchaConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
include Hcaptcha::Adapters::ViewMethods include Hcaptcha::Adapters::ViewMethods

2
app/controllers/concerns/registration_spam_concern.rb → app/controllers/concerns/auth/registration_spam_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module RegistrationSpamConcern module Auth::RegistrationSpamConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
def set_registration_form_time def set_registration_form_time

2
app/controllers/concerns/two_factor_authentication_concern.rb → app/controllers/concerns/auth/two_factor_authentication_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module TwoFactorAuthenticationConcern module Auth::TwoFactorAuthenticationConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do

2
app/controllers/concerns/export_controller_concern.rb → app/controllers/concerns/settings/export_controller_concern.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
module ExportControllerConcern module Settings::ExportControllerConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
included do included do

2
app/controllers/settings/exports/blocked_accounts_controller.rb
View File

@ -3,7 +3,7 @@
module Settings module Settings
module Exports module Exports
class BlockedAccountsController < BaseController class BlockedAccountsController < BaseController
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file

2
app/controllers/settings/exports/blocked_domains_controller.rb
View File

@ -3,7 +3,7 @@
module Settings module Settings
module Exports module Exports
class BlockedDomainsController < BaseController class BlockedDomainsController < BaseController
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file

2
app/controllers/settings/exports/bookmarks_controller.rb
View File

@ -3,7 +3,7 @@
module Settings module Settings
module Exports module Exports
class BookmarksController < BaseController class BookmarksController < BaseController
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file

2
app/controllers/settings/exports/following_accounts_controller.rb
View File

@ -3,7 +3,7 @@
module Settings module Settings
module Exports module Exports
class FollowingAccountsController < BaseController class FollowingAccountsController < BaseController
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file

2
app/controllers/settings/exports/lists_controller.rb
View File

@ -3,7 +3,7 @@
module Settings module Settings
module Exports module Exports
class ListsController < BaseController class ListsController < BaseController
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file

2
app/controllers/settings/exports/muted_accounts_controller.rb
View File

@ -3,7 +3,7 @@
module Settings module Settings
module Exports module Exports
class MutedAccountsController < BaseController class MutedAccountsController < BaseController
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file

4
spec/controllers/concerns/rate_limit_headers_spec.rb → spec/controllers/concerns/api/rate_limit_headers_spec.rb
View File

@ -2,9 +2,9 @@
require 'rails_helper' require 'rails_helper'
describe RateLimitHeaders do describe Api::RateLimitHeaders do
controller(ApplicationController) do controller(ApplicationController) do
include RateLimitHeaders include Api::RateLimitHeaders
def show def show
head 200 head 200

4
spec/controllers/concerns/export_controller_concern_spec.rb → spec/controllers/concerns/settings/export_controller_concern_spec.rb
View File

@ -2,9 +2,9 @@
require 'rails_helper' require 'rails_helper'
describe ExportControllerConcern do describe Settings::ExportControllerConcern do
controller(ApplicationController) do controller(ApplicationController) do
include ExportControllerConcern include Settings::ExportControllerConcern
def index def index
send_export_file send_export_file