logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: e0da0d4f9e669b34afe975e39ae21a558bf4c25c
parent: 8b39d6f93cc6f9aecc76d67a686087366c3c50fd
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 14 Oct 2019 19:17:06 +0000

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

Backport "Fix hiding branch name logic" to develop

See merge request pleroma/pleroma!1846

Diffstat:

Mmix.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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 =