Merge branch 'develop' into feature/store-statuses-data-inside-flag

diff --cc CHANGELOG.md
index 4744567d11f51c1211c20a4abeb35a42614da99d,51e5424c6bfe861ff5fff70a431fb870536e9d87..00dd62e24039b1df8ce7903c293fa093f07558f8
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -30,16 -64,38 +64,39 @@@ The format is based on [Keep a Changelo
  - MRF (Simple Policy): Also use `:accept`/`:reject` on the actors rather than only their activities
  - OStatus: Extract RSS functionality
  - Mastodon API: Add `pleroma.direct_conversation_id` to the status endpoint (`GET /api/v1/statuses/:id`)
 -</details>
+ - Mastodon API: Mark the direct conversation as read for the author when they send a new direct message
+ - Deprecated `User.Info` embedded schema (fields moved to `User`)
 +- Store status data inside Flag activity
++</details>
  
  ### Fixed
+ - Report emails now include functional links to profiles of remote user accounts
+ <details>
+   <summary>API Changes</summary>
+ 
  - Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
  - Mastodon API: Inability to get some local users by nickname in `/api/v1/accounts/:id_or_nickname`
- - Added `:instance, extended_nickname_format` setting to the default config
- - Report emails now include functional links to profiles of remote user accounts
+ </details>
+ 
+ ## [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.0] - 2019-??-??
- **Breaking:** The stable branch has been changed from `master` to `stable`, `master` now points to `release/1.0`
+ ## [1.1.1] - 2019-10-18
+ ### 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:
+ ```
+ delete from users where ap_id = 'https://your.instance.hostname/relay';
+ ```
+ - Bad user search matches
+ 
+ ## [1.1.0] - 2019-10-14
+ **Breaking:** The stable branch has been changed from `master` to `stable`. If you want to keep using 1.0, the `release/1.0` branch will receive security updates for 6 months after 1.1 release.
+ 
+ **OTP Note:** `pleroma_ctl` in 1.0 defaults to `master` and doesn't support specifying arbitrary branches, making `./pleroma_ctl update` fail. To fix this, fetch a version of `pleroma_ctl` from 1.1 using the command below and proceed with the update normally:
+ ```
+ curl -Lo ./bin/pleroma_ctl 'https://git.pleroma.social/pleroma/pleroma/raw/develop/rel/files/bin/pleroma_ctl'
+ ```
  ### Security
  - Mastodon API: respect post privacy in `/api/v1/statuses/:id/{favourited,reblogged}_by`
  

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
index 82389b344543dfbed9a5e6f78d2a03b7393eb6d1,6f7e1da1f65fc9eea293dd307efba4e0df3bf970..1069ade02a0e8751ba11502b1c6a6fd696073265
--- 1/test/web/activity_pub/transmogrifier_test.exs
--- 2/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@@ -12,10 -11,7 +11,8 @@@ defmodule Pleroma.Web.ActivityPub.Trans
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Transmogrifier
 +  alias Pleroma.Web.AdminAPI.AccountView
    alias Pleroma.Web.CommonAPI
-   alias Pleroma.Web.OStatus
-   alias Pleroma.Web.Websub.WebsubClientSubscription
  
    import Mock
    import Pleroma.Factory

diff --cc test/web/activity_pub/utils_test.exs
Simple merge

diff --cc test/web/common_api/common_api_test.exs
Simple merge