From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Mon, 9 Mar 2020 07:56:33 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=d9f8941dac983d89709645831b41e02adc454740;hp=-c;p=akkoma

Merge branch 'develop' into gun
---

d9f8941dac983d89709645831b41e02adc454740
diff --combined CHANGELOG.md
index 95918ee60,59f7dfcdd..88850133b
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -3,7 -3,7 +3,7 @@@ All notable changes to this project wil
  
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  
- ## [Unreleased]
+ ## [2.0.0] - 2019-03-08
  ### Security
  - Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
  
@@@ -80,7 -80,6 +80,7 @@@
  - User settings: Add _This account is a_ option.
  - A new users admin digest email
  - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
 +- New HTTP adapter [gun](https://github.com/ninenines/gun). Gun adapter requires minimum OTP version of 22.2 otherwise Pleroma won’t start. For hackney OTP update is not required.
  - Add an option `authorized_fetch_mode` to require HTTP signatures for AP fetches.
  - ActivityPub: support for `replies` collection (output for outgoing federation & fetching on incoming federation).
  - Mix task to refresh counter cache (`mix pleroma.refresh_counter_cache`)
@@@ -151,6 -150,43 +151,43 @@@
  - Mastodon API: Marking a conversation as read (`POST /api/v1/conversations/:id/read`) now no longer brings it to the top in the user's direct conversation list
  </details>
  
+ ## [1.1.9] - 2020-02-10
+ ### Fixed
+ - OTP: Inability to set the upload limit (again)
+ - Not being able to pin polls
+ - Streaming API: incorrect handling of reblog mutes
+ - Rejecting the user when field length limit is exceeded
+ - OpenGraph provider: html entities in descriptions
+ 
+ ## [1.1.8] - 2020-01-10
+ ### Fixed
+ - Captcha generation issues
+ - Returned Kocaptcha endpoint to configuration
+ - Captcha validity is now 5 minutes
+ 
+ ## [1.1.7] - 2019-12-13
+ ### Fixed
+ - OTP: Inability to set the upload limit
+ - OTP: Inability to override node name/distribution type to run 2 Pleroma instances on the same machine
+ 
+ ### Added
+ - Integrated captcha provider
+ 
+ ### Changed
+ - Captcha enabled by default
+ - Default Captcha provider changed from `Pleroma.Captcha.Kocaptcha` to `Pleroma.Captcha.Native`
+ - Better `Cache-Control` header for static content
+ 
+ ### Bundled Pleroma-FE Changes
+ #### Added
+ - Icons in the navigation panel
+ 
+ #### Fixed
+ - Improved support unauthenticated view of private instances
+ 
+ #### Removed
+ - Whitespace hack on empty post content
+ 
  ## [1.1.6] - 2019-11-19
  ### Fixed
  - Not being able to log into to third party apps when the browser is logged into mastofe
diff --combined mix.exs
index 3b1bbbaf2,bb86c38d0..4404043d1
--- a/mix.exs
+++ b/mix.exs
@@@ -4,7 -4,7 +4,7 @@@ defmodule Pleroma.Mixfile d
    def project do
      [
        app: :pleroma,
-       version: version("1.1.50"),
+       version: version("2.0.50"),
        elixir: "~> 1.8",
        elixirc_paths: elixirc_paths(Mix.env()),
        compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@@ -119,15 -119,7 +119,15 @@@
        {:calendar, "~> 0.17.4"},
        {:cachex, "~> 3.2"},
        {:poison, "~> 3.0", override: true},
 -      {:tesla, "~> 1.3", override: true},
 +      # {:tesla, "~> 1.3", override: true},
 +      {:tesla,
 +       git: "https://git.pleroma.social/pleroma/elixir-libraries/tesla.git",
 +       ref: "61b7503cef33f00834f78ddfafe0d5d9dec2270b",
 +       override: true},
 +      {:castore, "~> 0.1"},
 +      {:cowlib, "~> 2.8", override: true},
 +      {:gun,
 +       github: "ninenines/gun", ref: "bd6425ab87428cf4c95f4d23e0a48fd065fbd714", override: true},
        {:jason, "~> 1.0"},
        {:mogrify, "~> 0.6.1"},
        {:ex_aws, "~> 2.1"},