~cytrogen/masto-fe

7bef11630d6decac46bc006bf12e7d962dffa57e — Matt Jankowski 3 years ago bdeb6ff
Remove references to non-existent actions (#24183)

M .rubocop_todo.yml => .rubocop_todo.yml +0 -2
@@ 1670,8 1670,6 @@ Rails/InverseOf:
# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
Rails/LexicallyScopedActionFilter:
  Exclude:
    - 'app/controllers/admin/domain_blocks_controller.rb'
    - 'app/controllers/admin/email_domain_blocks_controller.rb'
    - 'app/controllers/auth/passwords_controller.rb'
    - 'app/controllers/auth/registrations_controller.rb'
    - 'app/controllers/auth/sessions_controller.rb'

M app/controllers/admin/domain_blocks_controller.rb => app/controllers/admin/domain_blocks_controller.rb +1 -1
@@ 2,7 2,7 @@

module Admin
  class DomainBlocksController < BaseController
    before_action :set_domain_block, only: [:show, :destroy, :edit, :update]
    before_action :set_domain_block, only: [:destroy, :edit, :update]

    def batch
      authorize :domain_block, :create?

M app/controllers/admin/email_domain_blocks_controller.rb => app/controllers/admin/email_domain_blocks_controller.rb +0 -6
@@ 2,8 2,6 @@

module Admin
  class EmailDomainBlocksController < BaseController
    before_action :set_email_domain_block, only: [:show, :destroy]

    def index
      authorize :email_domain_block, :index?



@@ 59,10 57,6 @@ module Admin

    private

    def set_email_domain_block
      @email_domain_block = EmailDomainBlock.find(params[:id])
    end

    def set_resolved_records
      Resolv::DNS.open do |dns|
        dns.timeouts = 5

M config/routes.rb => config/routes.rb +1 -1
@@ 229,7 229,7 @@ Rails.application.routes.draw do
    get '/dashboard', to: 'dashboard#index'

    resources :domain_allows, only: [:new, :create, :show, :destroy]
    resources :domain_blocks, only: [:new, :create, :show, :destroy, :update, :edit] do
    resources :domain_blocks, only: [:new, :create, :destroy, :update, :edit] do
      collection do
        post :batch
      end