logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c00797d08ef3e6c57250c9f013b6f912292b031b
parent 988654a720e4e61215a5c3dc72a2ca76b6a38042
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 14 Oct 2019 19:14:47 +0000

Merge branch 'fix/version-branch-skip' into 'stable'

Fix hiding branch name logic

See merge request pleroma/pleroma!1845

Diffstat:

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

diff --git a/mix.exs b/mix.exs @@ -216,7 +216,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 =