Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 19:17:06 +0000 (19:17 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 19:17:06 +0000 (19:17 +0000)
Backport "Fix hiding branch name logic" to develop

See merge request pleroma/pleroma!1846

mix.exs

diff --git a/mix.exs b/mix.exs
index 329ce3d893429e210f6405ca26f22d13f8a00db6..6cf766c521cdbd109387b2b471b58b5c07c17397 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -221,7 +221,7 @@ defmodule Pleroma.Mixfile do
            branch_name <- String.trim(branch_name),
            branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
            true <-
-             !Enum.all?(["master", "HEAD", "release/", "stable"], fn name ->
+             !Enum.any?(["master", "HEAD", "release/", "stable"], fn name ->
                String.starts_with?(name, branch_name)
              end) do
         branch_name =