aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-09-17 20:09:26 +0000
committerrinpatch <rinpatch@sdf.org>2019-09-17 20:09:26 +0000
commitf758e663b233a4a773bd58479f2f2c2bc02c47ef (patch)
tree656c235fdb3dccc4e10c563dce582b613b7a621c
parent764931fc9f5eecc30c1ccb3b5bacf6338fcdf706 (diff)
parente686f9be818ebddfba1aedcd9ae328d26147dca8 (diff)
downloadpleroma-f758e663b233a4a773bd58479f2f2c2bc02c47ef.tar.gz
Merge branch 'feature/bump-elixir-verstion' into 'develop'
Bump elixir version to ~> 1.8 See merge request pleroma/pleroma!1686
-rw-r--r--CHANGELOG.md1
-rw-r--r--mix.exs2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 584386136..4426e3f70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Remove `Reply-To` header from report emails for admins.
### Changed
+- **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
- **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config
- **Breaking:** Configuration: `/media/` is now removed when `base_url` is configured, append `/media/` to your `base_url` config to keep the old behaviour if desired
- **Breaking:** `/api/pleroma/notifications/read` is moved to `/api/v1/pleroma/notifications/read` and now supports `max_id` and responds with Mastodon API entities.
diff --git a/mix.exs b/mix.exs
index 84e80129b..33a27470b 100644
--- a/mix.exs
+++ b/mix.exs
@@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do
[
app: :pleroma,
version: version("1.0.0"),
- elixir: "~> 1.7",
+ elixir: "~> 1.8",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
elixirc_options: [warnings_as_errors: true],