projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 781560a0a2b4f9097e6824403b8b222c60c08fe8..5484c43ef53a299e5da4099b9bb02cbc523d04be 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-108,7
+108,7
@@
defmodule Pleroma.Mixfile do
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
- {:bbcode, "~> 0.1"},
+ {:bbcode, "~> 0.1
.1
"},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.3", only: :test},
{:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.3", only: :test},
@@
-126,7
+126,7
@@
defmodule Pleroma.Mixfile do
{:ueberauth, "~> 0.4"},
{:auto_linker,
git: "https://git.pleroma.social/pleroma/auto_linker.git",
{:ueberauth, "~> 0.4"},
{:auto_linker,
git: "https://git.pleroma.social/pleroma/auto_linker.git",
- ref: "
e2385402bcd24fc659fee83b3eb8863b0528ad42
"},
+ ref: "
95e8188490e97505c56636c1379ffdf036c1fdde
"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
@@
-154,6
+154,8
@@
defmodule Pleroma.Mixfile do
# See the documentation for `Mix` for more info on aliases.
defp aliases do
[
# See the documentation for `Mix` for more info on aliases.
defp aliases do
[
+ "ecto.migrate": ["pleroma.ecto.migrate"],
+ "ecto.rollback": ["pleroma.ecto.rollback"],
"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate", "test"]
"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate", "test"]
@@
-207,10
+209,11
@@
defmodule Pleroma.Mixfile do
branch_name =
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
branch_name =
with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
+ branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
true <- branch_name != "master" do
branch_name =
String.trim(branch_name)
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
"-" <> branch_name
end