From: feld <feld@feld.me>
Date: Wed, 5 Feb 2020 20:32:45 +0000 (+0000)
Subject: Merge branch 'remove-linker-scheme-option' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=b21e59da5f69505d276ddfa6b00c67a838dcc149;hp=-c;p=akkoma

Merge branch 'remove-linker-scheme-option' into 'develop'

Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
---

b21e59da5f69505d276ddfa6b00c67a838dcc149
diff --combined config/config.exs
index 60c982557,d01dd8d74..34716cf37
--- a/config/config.exs
+++ b/config/config.exs
@@@ -271,8 -271,7 +271,8 @@@ config :pleroma, :instance
    account_field_name_length: 512,
    account_field_value_length: 2048,
    external_user_synchronization: true,
 -  extended_nickname_format: true
 +  extended_nickname_format: true,
 +  cleanup_attachments: false
  
  config :pleroma, :feed,
    post_title: %{
@@@ -509,7 -508,6 +509,6 @@@ config :pleroma, :fetch_initial_posts
  
  config :auto_linker,
    opts: [
-     scheme: true,
      extra: true,
      # TODO: Set to :no_scheme when it works properly
      validate_tld: true,
diff --combined config/description.exs
index 1ffb66287,a0cb03e48..a4d1a74a7
--- a/config/description.exs
+++ b/config/description.exs
@@@ -764,15 -764,6 +764,15 @@@ config :pleroma, :config_description, 
            "Set to `true` to use extended local nicknames format (allows underscores/dashes)." <>
              " This will break federation with older software for theses nicknames."
        },
 +      %{
 +        key: :cleanup_attachments,
 +        type: :boolean,
 +        description: """
 +        "Set to `true` to remove associated attachments when status is removed.
 +        This will not affect duplicates and attachments without status.
 +        Enabling this will increase load to database when deleting statuses on larger instances.
 +        """
 +      },
        %{
          key: :max_pinned_statuses,
          type: :integer,
@@@ -2180,11 -2171,6 +2180,6 @@@
          type: :boolean,
          description: "Set to `false` to remove target='_blank' attribute"
        },
-       %{
-         key: :scheme,
-         type: :boolean,
-         description: "Set to `true` to link urls with schema http://google.com"
-       },
        %{
          key: :truncate,
          type: [:integer, false],