projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a caveat for docker deployment in the config docs
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index bd8a10c66f9e5baa589832acef2d09b294416e1e..19a80ffb205a2e68e35442b82eb0474f88dd6c1b 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-4,7
+4,7
@@
defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
def project do
[
app: :pleroma,
- version: version("
0.9
.0"),
+ version: version("
1.0
.0"),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@
-117,7
+117,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},
@@
-222,7
+222,7
@@
defmodule Pleroma.Mixfile do
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