From: rinpatch <rinpatch@sdf.org>
Date: Mon, 14 Oct 2019 19:17:06 +0000 (+0000)
Subject: Merge branch 'backport/develop-branch-hiding-fix' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=e0da0d4f9e669b34afe975e39ae21a558bf4c25c;hp=8b39d6f93cc6f9aecc76d67a686087366c3c50fd;p=akkoma

Merge branch 'backport/develop-branch-hiding-fix' into 'develop'

Backport "Fix hiding branch name logic" to develop

See merge request pleroma/pleroma!1846
---

diff --git a/mix.exs b/mix.exs
index 329ce3d89..6cf766c52 100644
--- 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 =