aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-22 09:20:11 +0000
committerrinpatch <rinpatch@sdf.org>2019-06-22 09:20:11 +0000
commit8dbcff2fed0bf6fb20b70388974fcbe9d3a0aeee (patch)
tree58b194ccae293f5e22577a6dd515c20d160763ec
parent53c73cd1a3387dbdde283f563c5be4e45ffab05c (diff)
parent259ffe00620ae8dd0cbfd5313024107e59f96ffc (diff)
downloadpleroma-8dbcff2fed0bf6fb20b70388974fcbe9d3a0aeee.tar.gz
Merge branch 'mix_sem_ver_version_fix' into 'develop'
Fixed mix version computed for underscore-containing branches See merge request pleroma/pleroma!1314
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 0f57c4dae..5484c43ef 100644
--- a/mix.exs
+++ b/mix.exs
@@ -213,7 +213,7 @@ defmodule Pleroma.Mixfile do
true <- branch_name != "master" do
branch_name =
String.trim(branch_name)
- |> String.replace(~r/\W+/, "-")
+ |> String.replace(~r/[^0-9a-z\-\.]+/i, "-")
"-" <> branch_name
end