Merge branch 'develop' into gitlab-mr-iid-4426

mix.exs

@@ -136,9 +136,7 @@ defmodule Pleroma.Mixfile do
       {:tzdata, "~> 1.0.5"},
       {:plug_cowboy, "~> 2.7"},
       {:oban, "~> 2.19.4"},
-      {:oban_plugins_lazarus,
-       git: "https://git.pleroma.social/pleroma/elixir-libraries/oban_plugins_lazarus.git",
-       ref: "e49fc355baaf0e435208bf5f534d31e26e897711"},
+      {:oban_plugins_lazarus, "~> 0.1.1"},
       {:oban_web, "~> 2.11"},
       {:gettext, "~> 0.24"},
       {:bcrypt_elixir, "~> 2.3"},
@@ -183,14 +181,11 @@ defmodule Pleroma.Mixfile do
       {:plug_static_index_html, "~> 1.0.0"},
       {:flake_id, "~> 0.1.0"},
       {:concurrent_limiter, "~> 0.1.1"},
-      {:remote_ip,
-       git: "https://git.pleroma.social/pleroma/remote_ip.git",
-       ref: "b647d0deecaa3acb140854fe4bda5b7e1dc6d1c8"},
-      {:captcha,
-       git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
-       ref: "e7b7cc34cc16b383461b966484c297e4ec9aeef6"},
+      {:remote_ip, "~> 1.2.0"},
+      {:inet_cidr, "~> 1.0"},
+      {:captcha, "~> 1.0.3", hex: :pleroma_captcha},
       {:restarter, path: "./restarter"},
-      {:majic, "~> 1.1"},
+      {:majic, "~> 1.2"},
       {:open_api_spex, "~> 3.22"},
       {:ecto_psql_extras, "~> 0.8"},
       {:vix, "~> 0.36"},