From: rinpatch <rinpatch@sdf.org>
Date: Thu, 30 Jan 2020 19:24:04 +0000 (+0000)
Subject: Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=c27d1d65bfd60effdb45359697141c136e156177;hp=-c;p=akkoma

Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'

Disable rate limiter for socket/localhost

Closes #1380

See merge request pleroma/pleroma!2064
---

c27d1d65bfd60effdb45359697141c136e156177
diff --combined CHANGELOG.md
index 39fecc101,66f0b829e..6d0b3cecd
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -14,7 -14,6 +14,7 @@@ The format is based on [Keep a Changelo
  - **Breaking:** Pleroma won't start if it detects unapplied migrations
  - **Breaking:** attachments are removed along with statuses. Does not affect duplicate files and attachments without status.
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)
 +- **Breaking:** `Pleroma.Plugs.RemoteIp` and `:rate_limiter` enabled by default. Please ensure your reverse proxy forwards the real IP!
  - **Breaking:** attachment links (`config :pleroma, :instance, no_attachment_links` and `config :pleroma, Pleroma.Upload, link_name`) disabled by default
  - **Breaking:** OAuth: defaulted `[:auth, :enforce_oauth_admin_scope_usage]` setting to `true` which demands `admin` OAuth scope to perform admin actions (in addition to `is_admin` flag on User); make sure to use bundled or newer versions of AdminFE & PleromaFE to access admin / moderator features.
  - **Breaking:** Dynamic configuration has been rearchitected. The `:pleroma, :instance, dynamic_configuration` setting has been replaced with `config :pleroma, configurable_from_database`. Please backup your configuration to a file and run the migration task to ensure consistency with the new schema.
@@@ -28,6 -27,7 +28,7 @@@
  - Deprecated `User.Info` embedded schema (fields moved to `User`)
  - Store status data inside Flag activity
  - Deprecated (reorganized as `UserRelationship` entity) User fields with user AP IDs (`blocks`, `mutes`, `muted_reblogs`, `muted_notifications`, `subscribers`).
+ - Rate limiter is now disabled for localhost/socket (unless remoteip plug is enabled)
  - Logger: default log level changed from `warn` to `info`.
  - Config mix task `migrate_to_db` truncates `config` table before migrating the config file.
  <details>
@@@ -105,7 -105,6 +106,7 @@@
  - Mastodon API: Change emoji reaction reply format once more
  - Configuration: `feed.logo` option for tag feed.
  - Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
 +- Mastodon API: Add `reacted` property to `emoji_reactions`
  </details>
  
  ### Fixed