From f9af90c5aa42169b929f4ac6b352730b4d3416c7 Mon Sep 17 00:00:00 2001
From: Egor <egor@kislitsyn.com>
Date: Fri, 12 Apr 2019 19:25:53 +0000
Subject: Revert "simplify mentions escape"

This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 26a03b70b..e0c870fa7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -101,7 +101,7 @@ defmodule Pleroma.Mixfile do
       {:ueberauth, "~> 0.4"},
       {:auto_linker,
        git: "https://git.pleroma.social/pleroma/auto_linker.git",
-       ref: "479dd343f4e563ff91215c8275f3b5c67e032850"},
+       ref: "90613b4bae875a3610c275b7056b61ffdd53210d"},
       {:pleroma_job_queue, "~> 0.2.0"},
       {:telemetry, "~> 0.3"},
       {:prometheus_ex, "~> 3.0"},
-- 
cgit v1.2.3


From 3a805cc35cff0c46f6b9dd45169d888936cc5c53 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 13 Apr 2019 00:31:18 +0300
Subject: Add a changelog

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

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 26a03b70b..2a14781f7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -22,7 +22,7 @@ defmodule Pleroma.Mixfile do
       homepage_url: "https://pleroma.social/",
       docs: [
         logo: "priv/static/static/logo.png",
-        extras: ["README.md" | Path.wildcard("docs/**/*.md")],
+        extras: ["README.md", "CHANGELOG.md"] ++ Path.wildcard("docs/**/*.md"),
         groups_for_extras: [
           "Installation manuals": Path.wildcard("docs/installation/*.md"),
           Configuration: Path.wildcard("docs/config/*.md"),
-- 
cgit v1.2.3


From 37da03499ea2a87e4ee2366440109eb8a514de4a Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 16 Apr 2019 14:53:17 +0300
Subject: Bump ex_doc

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

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 9531b230a..15e182239 100644
--- a/mix.exs
+++ b/mix.exs
@@ -90,7 +90,7 @@ defmodule Pleroma.Mixfile do
       {:crypt,
        git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
       {:cors_plug, "~> 1.5"},
-      {:ex_doc, "~> 0.19", only: :dev, runtime: false},
+      {:ex_doc, "~> 0.20.2", only: :dev, runtime: false},
       {:web_push_encryption, "~> 0.2.1"},
       {:swoosh, "~> 0.20"},
       {:gen_smtp, "~> 0.13"},
-- 
cgit v1.2.3


From 2bd880be88839746040cd69e60380ab42a005ec4 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 26 Apr 2019 09:22:26 +0000
Subject: mix: add bbcode dependency

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

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 15e182239..efaa06a1c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -84,6 +84,7 @@ defmodule Pleroma.Mixfile do
       {:ex_aws, "~> 2.0"},
       {:ex_aws_s3, "~> 2.0"},
       {:earmark, "~> 1.3"},
+      {:bbcode, "~> 0.1"},
       {:ex_machina, "~> 2.3", only: :test},
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.1", only: :test},
-- 
cgit v1.2.3