From e3f26920d0838a3ad0d76766f5c0f97df0890ad5 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sun, 15 Mar 2020 16:54:27 +0300 Subject: mix.exs: bump version to 2.0.1 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 89b56bc5d..90aeaf33a 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.0"), + version: version("2.0.1"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From 5f9fbd7d336d2ffed6cd8f2640d9399f78ed7c2f Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 13 Feb 2020 03:39:47 +0100 Subject: Formatting: Do not use \n and prefer
instead It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 90aeaf33a..b55a79a77 100644 --- a/mix.exs +++ b/mix.exs @@ -126,7 +126,7 @@ defmodule Pleroma.Mixfile do {:ex_aws_s3, "~> 2.0"}, {:sweet_xml, "~> 0.6.6"}, {:earmark, "~> 1.3"}, - {:bbcode, "~> 0.1.1"}, + {:bbcode_pleroma, "~> 0.2.0"}, {:ex_machina, "~> 2.3", only: :test}, {:credo, "~> 1.1.0", only: [:dev, :test], runtime: false}, {:mock, "~> 0.3.3", only: :test}, -- cgit v1.2.3 From 0c010c292e6115727465ecac5ea69696c108bbf6 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sun, 22 Mar 2020 14:32:40 +0000 Subject: Merge branch 'fix/ecto_ssl_option' into 'develop' Fix ssl option on Ecto config breaking release See merge request pleroma/pleroma!2307 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index b55a79a77..ca1655c60 100644 --- a/mix.exs +++ b/mix.exs @@ -63,7 +63,7 @@ defmodule Pleroma.Mixfile do def application do [ mod: {Pleroma.Application, []}, - extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize], + extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize, :ssl], included_applications: [:ex_syslogger] ] end -- cgit v1.2.3 From a674094ec657513758d184dfded2c26cf4ce17ec Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 31 Mar 2020 14:02:51 +0300 Subject: mix.exs bump version to 2.0.2 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index ca1655c60..42bcee67d 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.1"), + version: version("2.0.2"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From 0d74e38f5fcf4199a314cb4dff89bb1cfbc13995 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 19 Apr 2020 20:23:48 +0200 Subject: =?UTF-8?q?mix.exs:=20Do=20not=20bail=20out=20when=20.git=20doesn?= =?UTF-8?q?=E2=80=99t=20exists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mix.exs | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 42bcee67d..571adc802 100644 --- a/mix.exs +++ b/mix.exs @@ -203,19 +203,26 @@ defmodule Pleroma.Mixfile do identifier_filter = ~r/[^0-9a-z\-]+/i # Pre-release version, denoted from patch version with a hyphen + {tag, tag_err} = + System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true) + + {describe, describe_err} = System.cmd("git", ["describe", "--tags", "--abbrev=8"]) + {commit_hash, commit_hash_err} = System.cmd("git", ["rev-parse", "--short", "HEAD"]) + git_pre_release = - with {tag, 0} <- - System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true), - {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]) do - describe - |> String.trim() - |> String.replace(String.trim(tag), "") - |> String.trim_leading("-") - |> String.trim() - else - _ -> - {commit_hash, 0} = System.cmd("git", ["rev-parse", "--short", "HEAD"]) + cond do + tag_err == 0 and describe_err == 0 -> + describe + |> String.trim() + |> String.replace(String.trim(tag), "") + |> String.trim_leading("-") + |> String.trim() + + commit_hash_err == 0 -> "0-g" <> String.trim(commit_hash) + + true -> + "" end # Branch name as pre-release version component, denoted with a dot @@ -233,6 +240,8 @@ defmodule Pleroma.Mixfile do |> String.replace(identifier_filter, "-") branch_name + else + _ -> "stable" end build_name = -- cgit v1.2.3 From 04f23294d327f044a72ecd3f269846c2f6198cf1 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 1 May 2020 22:11:33 +0300 Subject: mix.exs: bump to 2.0.3 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 571adc802..3f3990ea2 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.2"), + version: version("2.0.3"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From a74c31ff639f4e3133ac5442125403454db88cee Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 9 May 2020 14:49:46 +0300 Subject: include eldap in OTP releases Closes #1313 --- mix.exs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 3f3990ea2..e6b9e1775 100644 --- a/mix.exs +++ b/mix.exs @@ -63,7 +63,15 @@ defmodule Pleroma.Mixfile do def application do [ mod: {Pleroma.Application, []}, - extra_applications: [:logger, :runtime_tools, :comeonin, :quack, :fast_sanitize, :ssl], + extra_applications: [ + :logger, + :runtime_tools, + :comeonin, + :quack, + :fast_sanitize, + :ssl, + :eldap + ], included_applications: [:ex_syslogger] ] end -- cgit v1.2.3 From 9c239558794ab3831fd7553171a80fd67d580746 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sun, 10 May 2020 02:37:36 +0300 Subject: mix.exs: bump version to 2.0.4 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index e6b9e1775..9f9679f62 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.3"), + version: version("2.0.4"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From b5b675fa14094ae13b78b3de137a9c6de83b3696 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 12 May 2020 23:03:21 +0300 Subject: fix eldap being required for non-OTP releases --- mix.exs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 9f9679f62..6e5d01e51 100644 --- a/mix.exs +++ b/mix.exs @@ -36,7 +36,7 @@ defmodule Pleroma.Mixfile do releases: [ pleroma: [ include_executables_for: [:unix], - applications: [ex_syslogger: :load, syslog: :load], + applications: [ex_syslogger: :load, syslog: :load, eldap: :transient], steps: [:assemble, ©_files/1, ©_nginx_config/1] ] ] @@ -69,8 +69,7 @@ defmodule Pleroma.Mixfile do :comeonin, :quack, :fast_sanitize, - :ssl, - :eldap + :ssl ], included_applications: [:ex_syslogger] ] -- cgit v1.2.3 From 2906cbbd40ea07c2ceb4d67e1c889cc7ab8b7662 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 13 May 2020 00:08:36 +0300 Subject: mix.exs: bump to 2.0.5 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 6e5d01e51..cc7a415ca 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.4"), + version: version("2.0.5"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From 0186f56d932a441f106e35c86bfefe57c9ead64d Mon Sep 17 00:00:00 2001 From: Roman Chvanikov Date: Tue, 19 May 2020 14:46:06 +0300 Subject: Update crypt library --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index cc7a415ca..d99b3ec1c 100644 --- a/mix.exs +++ b/mix.exs @@ -138,7 +138,7 @@ defmodule Pleroma.Mixfile do {:credo, "~> 1.1.0", only: [:dev, :test], runtime: false}, {:mock, "~> 0.3.3", only: :test}, {:crypt, - git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, + git: "https://github.com/msantos/crypt", ref: "f63a705f92c26955977ee62a313012e309a4d77a"}, {:cors_plug, "~> 1.5"}, {:ex_doc, "~> 0.21", only: :dev, runtime: false}, {:web_push_encryption, "~> 0.2.1"}, -- cgit v1.2.3 From fe8cf54829341ef0b8dc01d484b60ed909cf9709 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Mon, 8 Jun 2020 01:33:07 +0300 Subject: mix.exs: bump version to 2.0.6 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index d99b3ec1c..584df467b 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.5"), + version: version("2.0.6"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From 9046f85ced90e6cc1c857c33c04f259150c0e197 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 12 Jun 2020 21:09:28 +0300 Subject: mix.exs: bump to 2.0.7 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 584df467b..480497e9b 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.0.6"), + version: version("2.0.7"), elixir: "~> 1.8", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From 49a436ad3e174e1b0b6442f7a777498cc551449c Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 25 Aug 2020 16:07:07 +0200 Subject: Mix: Make rc version explicit. --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index d7c408972..77cf517cb 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.1.0"), + version: version("2.1.0-rc0"), elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From b141e35d641e733dffe7bd6a45a5bbcafe586c56 Mon Sep 17 00:00:00 2001 From: lain Date: Fri, 28 Aug 2020 11:34:48 +0200 Subject: Mix: Update version --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index 77cf517cb..d7c408972 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.1.0-rc0"), + version: version("2.1.0"), elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3 From ce387ce7306d944c11e63f0c86719afd5c2da2d2 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 28 Aug 2020 16:15:57 +0300 Subject: mix.exs: bump development version after 2.1.0 release --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mix.exs') diff --git a/mix.exs b/mix.exs index d7c408972..4de0c78db 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("2.1.0"), + version: version("2.1.50"), elixir: "~> 1.9", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), -- cgit v1.2.3