Merge remote-tracking branch 'origin/load_rails_6_0_defaults' into develop

app/lib/exceptions.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module GabSocial
-  class Error < StandardError; end
-  class NotPermittedError < Error; end
-  class ValidationError < Error; end
-  class HostValidationError < ValidationError; end
-  class LengthValidationError < ValidationError; end
-  class DimensionsValidationError < ValidationError; end
-  class RaceConditionError < Error; end
-
-  class UnexpectedResponseError < Error
-    def initialize(response = nil)
-      if response.respond_to? :uri
-        super("#{response.uri} returned code #{response.code}")
-      else
-        super
-      end
-    end
-  end
-end

app/lib/formatter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require_relative './sanitize_config'
+require_relative './sanitize/config'
 
 class HTMLRenderer < Redcarpet::Render::HTML
   def block_code(code, language)