From 718882b326f00c8315bca5acc439b92aa37bf021 Mon Sep 17 00:00:00 2001
From: Artik Banana <lid@tuta.io>
Date: Wed, 27 Jun 2018 19:35:38 +0000
Subject: [PATCH 1/2] Update mix.exs

---
 mix.exs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/mix.exs b/mix.exs
index 281687294..d632e0593 100644
--- a/mix.exs
+++ b/mix.exs
@@ -30,24 +30,24 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.3.0"},
-      {:phoenix_pubsub, "~> 1.0"},
-      {:phoenix_ecto, "~> 3.2"},
-      {:postgrex, ">= 0.0.0"},
-      {:gettext, "~> 0.11"},
-      {:cowboy, "~> 1.0", override: true},
-      {:comeonin, "~> 4.0"},
-      {:pbkdf2_elixir, "~> 0.12"},
-      {:trailing_format_plug, "~> 0.0.5"},
-      {:html_sanitize_ex, "~> 1.3.0-rc1"},
+      {:phoenix, "~> 1.3.3"},
+      {:phoenix_pubsub, "~> 1.0.2"},
+      {:phoenix_ecto, "~> 3.3"},
+      {:postgrex, ">= 0.13.5"},
+      {:gettext, "~> 0.15"},
+      {:cowboy, "~> 1.1.2", override: true},
+      {:comeonin, "~> 4.1.1"},
+      {:pbkdf2_elixir, "~> 0.12.3"},
+      {:trailing_format_plug, "~> 0.0.7"},
+      {:html_sanitize_ex, "~> 1.3.0"},
       {:phoenix_html, "~> 2.10"},
-      {:calendar, "~> 0.16.1"},
-      {:cachex, "~> 3.0"},
-      {:httpoison, "~> 1.1.0"},
+      {:calendar, "~> 0.17.4"},
+      {:cachex, "~> 3.0.2"},
+      {:httpoison, "~> 1.2.0"},
       {:jason, "~> 1.0"},
-      {:ex_machina, "~> 2.0", only: :test},
-      {:credo, "~> 0.7", only: [:dev, :test]},
-      {:mock, "~> 0.3.0", only: :test}
+      {:ex_machina, "~> 2.2", only: :test},
+      {:credo, "~> 0.9.3", only: [:dev, :test]},
+      {:mock, "~> 0.3.1", only: :test}
     ]
   end
 

From 05738e7643141776ee59ee156cf18af9d54899f9 Mon Sep 17 00:00:00 2001
From: kaniini <nenolod@gmail.com>
Date: Thu, 16 Aug 2018 15:37:58 +0000
Subject: [PATCH 2/2] fix compile

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index 7a90d8a9e..941b9c149 100644
--- a/mix.exs
+++ b/mix.exs
@@ -45,7 +45,7 @@ defmodule Pleroma.Mixfile do
       {:cachex, "~> 3.0.2"},
       {:httpoison, "~> 1.2.0"},
       {:jason, "~> 1.0"},
-      {:mogrify, "~> 0.6.1"}
+      {:mogrify, "~> 0.6.1"},
       {:ex_machina, "~> 2.2", only: :test},
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.1", only: :test}