projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 62010d16697c2777ddb303da6866cfdf5993833d..848c51c66d5dc8f38ac6b8e8a76496da3ee248c7 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-157,7
+157,7
@@
defmodule Pleroma.Mixfile do
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
{:floki, "~> 0.27"},
{:timex, "~> 3.6"},
{:ueberauth, "~> 0.4"},
- {:linkify,
"~> 0.5.1
"},
+ {:linkify,
git: "https://git.ihatebeinga.live/floatingghost/linkify.git", branch: "bugfix/line-ending-buffer
"},
{:http_signatures, "~> 0.1.1"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:http_signatures, "~> 0.1.1"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
@@
-193,6
+193,11
@@
defmodule Pleroma.Mixfile do
{:majic, "~> 1.0"},
{:eblurhash, "~> 1.1.0"},
{:open_api_spex, "~> 3.10"},
{:majic, "~> 1.0"},
{:eblurhash, "~> 1.1.0"},
{:open_api_spex, "~> 3.10"},
+ {:elastix, ">= 0.0.0"},
+ {:search_parser,
+ git: "https://github.com/FloatingGhost/pleroma-contrib-search-parser.git",
+ ref: "08971a81e68686f9ac465cfb6661d51c5e4e1e7f"},
+ {:nimble_parsec, "~> 1.0", override: true},
{:phoenix_live_dashboard, "~> 0.6.2"},
{:ecto_psql_extras, "~> 0.6"},
{:phoenix_live_dashboard, "~> 0.6.2"},
{:ecto_psql_extras, "~> 0.6"},