X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=mix.exs;h=6cf766c521cdbd109387b2b471b58b5c07c17397;hb=b08b1d5d91968fbe94e20897ee3529216dd50a0a;hp=f2635da2427feacc994c00d08ea7400d12f86f97;hpb=5c78131ee2718d31d264e158607219ab801eb10e;p=akkoma

diff --git a/mix.exs b/mix.exs
index f2635da24..6cf766c52 100644
--- a/mix.exs
+++ b/mix.exs
@@ -158,6 +158,10 @@ defmodule Pleroma.Mixfile do
       {:ex_const, "~> 0.2"},
       {: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
@@ -216,7 +220,10 @@ defmodule Pleroma.Mixfile do
       with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
            branch_name <- String.trim(branch_name),
            branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
-           true <- branch_name not in ["master", "HEAD"] do
+           true <-
+             !Enum.any?(["master", "HEAD", "release/", "stable"], fn name ->
+               String.starts_with?(name, branch_name)
+             end) do
         branch_name =
           branch_name
           |> String.trim()