Commit 9b26d160 authored by rinpatch's avatar rinpatch

Merge branch 'release/1.1.2' into 'stable'

1.1.2 Release

See merge request pleroma/pleroma!1863
parents bb73f100 59d447d5
...@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. ...@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [1.1.2] - 2019-10-18
### Fixed
- `pleroma_ctl` trying to connect to a running instance when generating the config, which of course doesn't exist.
## [1.1.1] - 2019-10-18 ## [1.1.1] - 2019-10-18
### Fixed ### Fixed
- One of the migrations between 1.0.0 and 1.1.0 wiping user info of the relay user because of unexpected behavior of postgresql's `jsonb_set`, resulting in inability to post in the default configuration. If you were affected, please run the following query in postgres console, the relay user will be recreated automatically: - One of the migrations between 1.0.0 and 1.1.0 wiping user info of the relay user because of unexpected behavior of postgresql's `jsonb_set`, resulting in inability to post in the default configuration. If you were affected, please run the following query in postgres console, the relay user will be recreated automatically:
......
...@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do ...@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do def project do
[ [
app: :pleroma, app: :pleroma,
version: version("1.1.1"), version: version("1.1.2"),
elixir: "~> 1.7", elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()), elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(), compilers: [:phoenix, :gettext] ++ Mix.compilers(),
......
...@@ -141,8 +141,8 @@ else ...@@ -141,8 +141,8 @@ else
ACTION="$1" ACTION="$1"
shift shift
echo "$1" | grep "^-" >/dev/null
if [ "$(echo \"$1\" | grep \"^-\" >/dev/null)" = false ]; then if [ $? -eq 1 ]; then
SUBACTION="$1" SUBACTION="$1"
shift shift
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment