Merge branch 'release/2.0.1' into 'stable'v2.0.1

2.0.1 release

See merge request pleroma/pleroma!2298

3 files changed, 2 insertions, 23 deletions

diff --git a/config/config.exs b/config/config.exs
index 2cd741213..3357e23e7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -504,10 +504,6 @@ config :pleroma, :workers,
     federator_outgoing: 5
   ]
 
-config :pleroma, :fetch_initial_posts,
-  enabled: false,
-  pages: 5
-
 config :auto_linker,
   opts: [
     extra: true,
diff --git a/config/description.exs b/config/description.exs
index 9fdcfcd96..c0e403b2e 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2008,25 +2008,6 @@ config :pleroma, :config_description, [
     ]
   },
   %{
-    group: :pleroma,
-    key: :fetch_initial_posts,
-    type: :group,
-    description: "Fetching initial posts settings",
-    children: [
-      %{
-        key: :enabled,
-        type: :boolean,
-        description: "Fetch posts when a new user is federated with"
-      },
-      %{
-        key: :pages,
-        type: :integer,
-        description: "The amount of pages to fetch",
-        suggestions: [5]
-      }
-    ]
-  },
-  %{
     group: :auto_linker,
     key: :opts,
     type: :group,
diff --git a/config/test.exs b/config/test.exs
index a17886265..b8ea63c94 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -92,6 +92,8 @@ config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
 
 config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
 
+config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else