Merge remote-tracking branch 'origin/develop' into benchmark-finishing

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index 861b94ad0af1e5ad92bfef4dd8e3de875a0d7b9c..270491269e642ad88caf82db3ae52dade294db70 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -69,6 +69,7 @@ defmodule Pleroma.Mixfile do
   end
 
   # Specifies which paths to compile per environment.
+  defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"]
   defp elixirc_paths(:test), do: ["lib", "test/support"]
   defp elixirc_paths(_), do: ["lib"]
 
@@ -159,6 +160,9 @@ defmodule Pleroma.Mixfile do
       {:plug_static_index_html, "~> 1.0.0"},
       {:excoveralls, "~> 0.11.1", only: :test},
       {:flake_id, "~> 0.1.0"},
+      {:remote_ip,
+       git: "https://git.pleroma.social/pleroma/remote_ip.git",
+       ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"},
       {:mox, "~> 0.5", only: :test}
     ] ++ oauth_deps()
   end