X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=6438740c56d44ba9a14360b7fa72f00136b129ad;hb=1629fa2412b877f69c5cf0df09782227827b272b;hp=c0f3b105bffaa27411e192c66acb2f07fc9de471;hpb=2b6cd10b68c01bb16f94c911da6fce51511a1a5a;p=akkoma

diff --git a/mix.exs b/mix.exs
index c0f3b105b..6438740c5 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("1.0.91"),
+      version: version("1.1.8"),
       elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -106,7 +106,7 @@ defmodule Pleroma.Mixfile do
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
       {:html_sanitize_ex, "~> 1.3.0"},
-      {:html_entities, "~> 0.4"},
+      {:html_entities, "~> 0.5", override: true},
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
@@ -158,6 +158,9 @@ defmodule Pleroma.Mixfile do
       {:plug_static_index_html, "~> 1.0.0"},
       {:excoveralls, "~> 0.11.1", only: :test},
       {:flake_id, "~> 0.1.0"},
+      {:captcha,
+       git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
+       ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
       {:mox, "~> 0.5", only: :test}
     ] ++ oauth_deps()
   end
@@ -216,7 +219,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 =