Commit Graph

258 Commits

Author SHA1 Message Date
rinpatch 27c3973b78 Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix

See merge request pleroma/pleroma!2951
2020-09-08 19:45:44 +03:00
rinpatch 59f5e39f9b Merge branch 'chore/fast_html-bump' into 'develop'
mix.lock: Bump fast_html

See merge request pleroma/pleroma!2950
2020-09-08 13:56:09 +03:00
rinpatch 515116e2f0 Merge branch 'chore/fast-sanitize-bump' into 'develop'
mix.lock: bump fast_sanitize

See merge request pleroma/pleroma!2932
2020-09-08 13:53:32 +03:00
rinpatch 6da17f88d6 fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
2020-08-26 16:31:02 +03:00
rinpatch c662b09eee mix.exs: update fast_sanitize to 0.2.0 2020-08-07 16:45:33 +03:00
rinpatch 87180ff817 Fix ConnecitonPool deadlocking after reaching the connection limit
The issue was with ConcurrentLimiter not decrementing counters on
overload. It was fixed in the latest commit, but concurrentlimiter
version wasn't updated in Pleroma for some reason.

Closes #1977
2020-08-01 12:18:56 +03:00
Maksim Pechnikov b261135683 updated `cors_plug` 2020-07-30 09:12:42 +03:00
Maksim Pechnikov 4f10ef5e46 set `web_push_encryption` version 2020-07-30 09:08:03 +03:00
Maksim Pechnikov df82839c30 updated `calendar` package 2020-07-30 08:58:19 +03:00
Maksim Pechnikov cd2423d7f5 update mogrify package 2020-07-29 09:22:49 +03:00
Maksim Pechnikov b4603a9c9c set http_signatures version 2020-07-29 07:23:06 +03:00
Maksim Pechnikov 88f57418c8 updated `pot` package 2020-07-29 07:02:36 +03:00
Maksim Pechnikov 992a271196 updated the minor version packages 2020-07-29 07:00:27 +03:00
Maksim Pechnikov ed881247b7 set swoosh version 2020-07-29 06:50:00 +03:00
Maksim Pechnikov 15b8446cdb updated dev & test packages 2020-07-29 06:47:56 +03:00
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting

Closes #1973

See merge request pleroma/pleroma!2791
2020-07-23 12:52:02 +00:00
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
Alex Gleason 5d263dfdb3
Update linkify to latest release 2020-07-20 09:29:03 -05:00
Alex Gleason 5701840d30
Use updated Linkify from git 2020-07-16 15:01:13 -05:00
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify 2020-07-16 14:51:36 -05:00
href ebfa591689 Go back to upstream Tesla 2020-07-15 15:26:35 +03:00
href 6b1f6a1cf7 Bump gun 2020-07-15 15:26:35 +03:00
rinpatch 4128e3a84a HTTP: Implement max request limits 2020-07-15 15:26:35 +03:00
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban 2020-07-10 11:34:53 -05:00
Mark Felder d7a37fddd1 Switch to the official Oban 2.0.0 release 2020-07-10 11:33:08 -05:00
Alexander Strizhakov b6688030fa
prometheus update for OTP 23 2020-07-10 10:35:59 +03:00
Mark Felder 4d3d867f10 Update Oban to 2.0-rc3 2020-07-03 10:37:07 -05:00
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban 2020-07-03 10:36:41 -05:00
Alex Gleason 8daacc9114
AutoLinker --> Linkify, update to latest version
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
Maksim Pechnikov dc60b1ee58 updated swoosh 2020-06-29 16:27:01 +03:00
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
Maksim Pechnikov 71e233268a oban 2.0-rc2 2020-06-23 21:47:01 +03:00
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1 2020-06-23 15:09:01 +03:00
rinpatch d2a1975e56 mix.lock: update hackney to 1.16.0
Closes #1612
2020-05-30 00:18:17 +03:00
rinpatch 48bcb22146 Merge branch 'recipients-query-speedup' into 'develop'
Greatly speed up recipients query

See merge request pleroma/pleroma!2558
2020-05-19 14:32:27 +00:00
lain a985bd57b4 User.Query: Speed up recipients query. 2020-05-19 14:11:32 +02:00
Roman Chvanikov 512261c97d Update crypt library 2020-05-19 14:46:06 +03:00
Alex Gleason 9cbf17d59f
Handle bcrypt passwords for Mastodon migration 2020-05-13 10:53:56 -05:00
lain 1307d6ca3c Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController

See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
Alex Gleason b46811a074
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
Egor Kislitsyn 3bde0fa3f6
Add OpenAPI spec for TimelineController 2020-05-11 15:43:03 +04:00
rinpatch 9c3c142c32 Restore mix.lock after 2FA merge
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
2020-05-07 14:35:29 +03:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Alexander Strizhakov 4b00eb93fe
fix for syslog compile with updated rebar3 2020-05-06 18:04:16 +03:00
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
Egor Kislitsyn 247e6fcb90
Merge branch 'develop' into openapi/account 2020-04-14 19:45:22 +04:00