From cc7b35e0976a44d21c9f43999f42387ad0a87845 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Mon, 4 Mar 2019 20:47:34 +0300 Subject: Add status text to notifications (mentions and reposts) --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 0fe9c6ec3..70b5e4bd6 100644 --- a/mix.exs +++ b/mix.exs @@ -76,7 +76,7 @@ defmodule Pleroma.Mixfile do {:ex_aws, "~> 2.0"}, {:ex_aws_s3, "~> 2.0"}, {:earmark, "~> 1.3"}, - {:ex_machina, "~> 2.2", only: :test}, + {:ex_machina, "~> 2.3", only: :test}, {:credo, "~> 0.9.3", only: [:dev, :test]}, {:mock, "~> 0.3.1", only: :test}, {:crypt, -- cgit v1.2.3 From 63ab61ed3f4988bfaf9080bcdc4fc8d5046fa57e Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Mon, 11 Mar 2019 20:37:26 +0300 Subject: Sign in via Twitter (WIP). --- mix.exs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 70b5e4bd6..dcd273d72 100644 --- a/mix.exs +++ b/mix.exs @@ -41,7 +41,7 @@ defmodule Pleroma.Mixfile do def application do [ mod: {Pleroma.Application, []}, - extra_applications: [:logger, :runtime_tools, :comeonin], + extra_applications: [:logger, :runtime_tools, :comeonin, :ueberauth_twitter], included_applications: [:ex_syslogger] ] end @@ -69,7 +69,8 @@ defmodule Pleroma.Mixfile do {:phoenix_html, "~> 2.10"}, {:calendar, "~> 0.17.4"}, {:cachex, "~> 3.0.2"}, - {:httpoison, "~> 1.2.0"}, + {:httpoison, "~> 1.2.0", override: true}, + {:poison, "~> 3.0", override: true}, {:tesla, "~> 1.2"}, {:jason, "~> 1.0"}, {:mogrify, "~> 0.6.1"}, @@ -90,6 +91,10 @@ defmodule Pleroma.Mixfile do {:floki, "~> 0.20.0"}, {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"}, {:timex, "~> 3.5"}, + {:oauth, github: "tim/erlang-oauth"}, + # {:oauth2, "~> 0.8", override: true}, + {:ueberauth, "~> 0.4"}, + {:ueberauth_twitter, "~> 0.2"}, {:auto_linker, git: "https://git.pleroma.social/pleroma/auto_linker.git", ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"} -- cgit v1.2.3 From f5b54acc8160dc1ecf4523d98e971eff8bc983de Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 15 Mar 2019 10:58:15 +0100 Subject: Fix headers and add !929 docs to extras [ci skip] --- mix.exs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 70b5e4bd6..efdf15d3a 100644 --- a/mix.exs +++ b/mix.exs @@ -23,11 +23,14 @@ defmodule Pleroma.Mixfile do logo: "priv/static/static/logo.png", extras: [ "README.md", - "docs/config.md", - "docs/Pleroma-API.md", "docs/Admin-API.md", "docs/Clients.md", - "docs/Differences-in-MastodonAPI-Responses.md" + "docs/config.md", + "docs/Custom-Emoji.md", + "docs/Differences-in-MastodonAPI-Responses.md", + "docs/Message-Rewrite-Facility-configuration.md", + "docs/Pleroma-API.md", + "docs/static_dir.md" ], main: "readme", output: "priv/static/doc" -- cgit v1.2.3 From 40c58d3383001a63a787f1e0956aeaad902afb64 Mon Sep 17 00:00:00 2001 From: link0ff Date: Wed, 20 Mar 2019 13:28:06 +0200 Subject: Ignore compilation warnings for undefined module :eldap --- mix.exs | 1 + 1 file changed, 1 insertion(+) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index efdf15d3a..352620e63 100644 --- a/mix.exs +++ b/mix.exs @@ -9,6 +9,7 @@ defmodule Pleroma.Mixfile do elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), elixirc_options: [warnings_as_errors: true], + xref: [exclude: [:eldap]], start_permanent: Mix.env() == :prod, aliases: aliases(), deps: deps(), -- cgit v1.2.3 From 9a7b817c9a785171368a9b6d61122c7b4b33547c Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 20 Mar 2019 15:59:27 +0300 Subject: Ecto 3.0.5 migration kms --- mix.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index efdf15d3a..3f3c8cd35 100644 --- a/mix.exs +++ b/mix.exs @@ -61,7 +61,8 @@ defmodule Pleroma.Mixfile do {:phoenix, "~> 1.4.1"}, {:plug_cowboy, "~> 2.0"}, {:phoenix_pubsub, "~> 1.1"}, - {:phoenix_ecto, "~> 3.3"}, + {:phoenix_ecto, "~> 4.0"}, + {:ecto_sql, "~>3.0.5"}, {:postgrex, ">= 0.13.5"}, {:gettext, "~> 0.15"}, {:comeonin, "~> 4.1.1"}, -- cgit v1.2.3 From af68a42ef7841013476831e92d3841088fa875df Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Wed, 20 Mar 2019 20:25:48 +0300 Subject: [#923] Support for multiple OAuth consumer strategies. --- mix.exs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 25711bc26..f7ab008ac 100644 --- a/mix.exs +++ b/mix.exs @@ -44,7 +44,7 @@ defmodule Pleroma.Mixfile do def application do [ mod: {Pleroma.Application, []}, - extra_applications: [:logger, :runtime_tools, :comeonin, :ueberauth_twitter], + extra_applications: [:logger, :runtime_tools, :comeonin], included_applications: [:ex_syslogger] ] end @@ -57,6 +57,12 @@ defmodule Pleroma.Mixfile do # # Type `mix help deps` for examples and options. defp deps do + oauth_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "") + + oauth_deps = + for s <- oauth_strategies, + do: {String.to_atom("ueberauth_#{s}"), ">= 0.0.0"} + [ {:phoenix, "~> 1.4.1"}, {:plug_cowboy, "~> 2.0"}, @@ -94,14 +100,11 @@ defmodule Pleroma.Mixfile do {:floki, "~> 0.20.0"}, {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"}, {:timex, "~> 3.5"}, - {:oauth, github: "tim/erlang-oauth"}, - # {:oauth2, "~> 0.8", override: true}, {:ueberauth, "~> 0.4"}, - {:ueberauth_twitter, "~> 0.2"}, {:auto_linker, git: "https://git.pleroma.social/pleroma/auto_linker.git", ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"} - ] + ] ++ oauth_deps end # Aliases are shortcuts or tasks specific to the current project. -- cgit v1.2.3 From dfae0050af385786c5799ee886de315f69d36a78 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 28 Mar 2019 19:46:30 +0300 Subject: Move out of Gitlab Wiki I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just * Gets everything from gitlab wiki * Removes some specific gitlab hacks * Formats all documentation file names to be in snake case so they look the same way as our code does --- mix.exs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 99a262089..661430464 100644 --- a/mix.exs +++ b/mix.exs @@ -22,16 +22,12 @@ defmodule Pleroma.Mixfile do homepage_url: "https://pleroma.social/", docs: [ logo: "priv/static/static/logo.png", - extras: [ - "README.md", - "docs/Admin-API.md", - "docs/Clients.md", - "docs/config.md", - "docs/Custom-Emoji.md", - "docs/Differences-in-MastodonAPI-Responses.md", - "docs/Message-Rewrite-Facility-configuration.md", - "docs/Pleroma-API.md", - "docs/static_dir.md" + extras: ["README.md" | Path.wildcard("docs/**/*.md")], + groups_for_extras: [ + "Installation manuals": Path.wildcard("docs/installation/*.md"), + Configuration: Path.wildcard("docs/config/*.md"), + Administration: Path.wildcard("docs/admin/*.md"), + "Pleroma's APIs and Mastodon API extensions": Path.wildcard("docs/api/*.md") ], main: "readme", output: "priv/static/doc" -- cgit v1.2.3 From 9a39d1d84613bb11542a0628e8b762970bd18bd0 Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 29 Mar 2019 12:46:05 +0000 Subject: Replace Pleroma.Jobs with `pleroma_job_queue` --- mix.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 661430464..333f21a91 100644 --- a/mix.exs +++ b/mix.exs @@ -93,7 +93,8 @@ defmodule Pleroma.Mixfile do {:timex, "~> 3.5"}, {:auto_linker, git: "https://git.pleroma.social/pleroma/auto_linker.git", - ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"} + ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}, + {:pleroma_job_queue, "~> 0.2.0"} ] end -- cgit v1.2.3 From eadafc88b898879eb50545b700ea13c8596e908b Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Mon, 1 Apr 2019 09:28:56 +0300 Subject: [#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes. --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 34c17bd6b..2b0d25b55 100644 --- a/mix.exs +++ b/mix.exs @@ -76,7 +76,7 @@ defmodule Pleroma.Mixfile do {:phoenix_html, "~> 2.10"}, {:calendar, "~> 0.17.4"}, {:cachex, "~> 3.0.2"}, - {:httpoison, "~> 1.2.0", override: true}, + {:httpoison, "~> 1.2.0"}, {:poison, "~> 3.0", override: true}, {:tesla, "~> 1.2"}, {:jason, "~> 1.0"}, -- cgit v1.2.3 From d313a0c49c1c42bff60a34b088145e700eb5db53 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Wed, 3 Apr 2019 19:41:15 +0700 Subject: Update `auto_linker` dependency --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 333f21a91..88da6332a 100644 --- a/mix.exs +++ b/mix.exs @@ -93,7 +93,7 @@ defmodule Pleroma.Mixfile do {:timex, "~> 3.5"}, {:auto_linker, git: "https://git.pleroma.social/pleroma/auto_linker.git", - ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}, + ref: "479dd343f4e563ff91215c8275f3b5c67e032850"}, {:pleroma_job_queue, "~> 0.2.0"} ] end -- cgit v1.2.3 From b655a8ea839d19443f44ff5b300a069d88ec7d58 Mon Sep 17 00:00:00 2001 From: href Date: Wed, 6 Feb 2019 10:33:05 +0100 Subject: Add recon --- mix.exs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 88da6332a..8cb389248 100644 --- a/mix.exs +++ b/mix.exs @@ -94,7 +94,14 @@ defmodule Pleroma.Mixfile do {:auto_linker, git: "https://git.pleroma.social/pleroma/auto_linker.git", ref: "479dd343f4e563ff91215c8275f3b5c67e032850"}, - {:pleroma_job_queue, "~> 0.2.0"} + {:pleroma_job_queue, "~> 0.2.0"}, + {:telemetry, "~> 0.3"}, + {:prometheus_ex, "~> 3.0"}, + {:prometheus_plugs, "~> 1.1"}, + {:prometheus_phoenix, "~> 1.2"}, + {:prometheus_ecto, "~> 1.4"}, + {:prometheus_process_collector, "~> 1.4"}, + {:recon, github: "ferd/recon"} ] end -- cgit v1.2.3 From 3b12eeda192e739e8328ef4202059bb482d1cff2 Mon Sep 17 00:00:00 2001 From: feld Date: Thu, 4 Apr 2019 19:52:22 +0000 Subject: Add ability to ship logs to a Slack channel --- mix.exs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 88da6332a..3a04e0060 100644 --- a/mix.exs +++ b/mix.exs @@ -41,7 +41,7 @@ defmodule Pleroma.Mixfile do def application do [ mod: {Pleroma.Application, []}, - extra_applications: [:logger, :runtime_tools, :comeonin], + extra_applications: [:logger, :runtime_tools, :comeonin, :quack], included_applications: [:ex_syslogger] ] end @@ -94,7 +94,8 @@ defmodule Pleroma.Mixfile do {:auto_linker, git: "https://git.pleroma.social/pleroma/auto_linker.git", ref: "479dd343f4e563ff91215c8275f3b5c67e032850"}, - {:pleroma_job_queue, "~> 0.2.0"} + {:pleroma_job_queue, "~> 0.2.0"}, + {:quack, "~> 0.1.1"} ] end -- cgit v1.2.3 From b395aebf2489f44bdb1a9c4905a51f0f26bf5fab Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sat, 6 Apr 2019 09:30:36 -0500 Subject: Pin recon dependency to 2.4.0 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 6e7cff413..ec0865c4f 100644 --- a/mix.exs +++ b/mix.exs @@ -101,7 +101,7 @@ defmodule Pleroma.Mixfile do {:prometheus_phoenix, "~> 1.2"}, {:prometheus_ecto, "~> 1.4"}, {:prometheus_process_collector, "~> 1.4"}, - {:recon, github: "ferd/recon"}, + {:recon, github: "ferd/recon", tag: "2.4.0"}, {:quack, "~> 0.1.1"} ] end -- cgit v1.2.3