akkoma
5 years agoMerge branch 'chore/query-optimization' into 'develop'
kaniini [Fri, 6 Sep 2019 23:25:30 +0000 (23:25 +0000)]
Merge branch 'chore/query-optimization' into 'develop'

chore: query optimization

Closes #1224

See merge request pleroma/pleroma!1640

5 years agoactivity: when restricting deactivated users, precalculate the user list
Ariadne Conill [Fri, 6 Sep 2019 23:14:29 +0000 (23:14 +0000)]
activity: when restricting deactivated users, precalculate the user list

the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make.  while we plan to simplify these queries through
unification of activities and objects, we are not yet there.  it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.

accordingly, drop the subquery and precalc the user list instead.

5 years agoactivitypub: help ecto build a better query for thread mute filtering
Ariadne Conill [Fri, 6 Sep 2019 23:11:26 +0000 (23:11 +0000)]
activitypub: help ecto build a better query for thread mute filtering

using an indexed value in thread_mute table helps ecto build a better query.

5 years agoMerge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'
rinpatch [Fri, 6 Sep 2019 15:29:03 +0000 (15:29 +0000)]
Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop'

Prioritize the removal of TwitterAPI and :accept_blocks in the changelog

See merge request pleroma/pleroma!1638

5 years agoPrioritize the removal of TwitterAPI and :accept_blocks in the changelog
rinpatch [Fri, 6 Sep 2019 15:28:01 +0000 (18:28 +0300)]
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog

5 years agoMerge branch 'so-long-twitterapi' into 'develop'
rinpatch [Fri, 6 Sep 2019 08:43:38 +0000 (08:43 +0000)]
Merge branch 'so-long-twitterapi' into 'develop'

Removing TwitterAPI

See merge request pleroma/pleroma!1605

5 years agoMerge branch 'update-frontend-e75ac9dd' into 'develop'
rinpatch [Fri, 6 Sep 2019 08:41:30 +0000 (08:41 +0000)]
Merge branch 'update-frontend-e75ac9dd' into 'develop'

Update frontend bundle to e75ac9dd

See merge request pleroma/pleroma!1635

5 years agoUpdate frontend bundle to e75ac9dd
rinpatch [Fri, 6 Sep 2019 08:31:44 +0000 (11:31 +0300)]
Update frontend bundle to e75ac9dd

5 years agoMerge branch 'hotifx/emoji-trailing' into 'develop'
rinpatch [Thu, 5 Sep 2019 19:23:52 +0000 (19:23 +0000)]
Merge branch 'hotifx/emoji-trailing' into 'develop'

Call TrailingFormatPlug for /api/pleroma/emoji

See merge request pleroma/pleroma!1634

5 years agoCall TrailingFormatPlug for /api/pleroma/emoji
rinpatch [Thu, 5 Sep 2019 19:21:20 +0000 (22:21 +0300)]
Call TrailingFormatPlug for /api/pleroma/emoji

Apparently Pleroma-FE still calls it with trailing '.json'

5 years agoMerge branch 'feature/mastoapi-accounts-external' into 'develop'
Haelwenn [Thu, 5 Sep 2019 12:48:27 +0000 (12:48 +0000)]
Merge branch 'feature/mastoapi-accounts-external' into 'develop'

Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`

See merge request pleroma/pleroma!1622

5 years agoMove checking for restrict_local to User.get_cached_by_id_or_nickname
rinpatch [Thu, 5 Sep 2019 12:33:49 +0000 (15:33 +0300)]
Move checking for restrict_local to User.get_cached_by_id_or_nickname

5 years agoMerge branch 'fix/endless-poll-handling' into 'develop'
rinpatch [Thu, 5 Sep 2019 09:11:16 +0000 (09:11 +0000)]
Merge branch 'fix/endless-poll-handling' into 'develop'

Mastodon API Poll view: Fix handling of polls without an end date

See merge request pleroma/pleroma!1631

5 years agoMastodon API Poll view: Fix handling of polls without an end date
rinpatch [Thu, 5 Sep 2019 08:58:02 +0000 (11:58 +0300)]
Mastodon API Poll view: Fix handling of polls without an end date

5 years agoMerge branch 'fix/safe-render-notifications' into 'develop'
rinpatch [Thu, 5 Sep 2019 05:47:06 +0000 (05:47 +0000)]
Merge branch 'fix/safe-render-notifications' into 'develop'

Do not crash if one notification failed to render

See merge request pleroma/pleroma!1630

5 years agoDo not crash if one notification failed to render
rinpatch [Thu, 5 Sep 2019 05:32:49 +0000 (08:32 +0300)]
Do not crash if one notification failed to render

5 years agoMerge branch 'dockerfile-touchups' into 'develop'
rinpatch [Wed, 4 Sep 2019 20:22:41 +0000 (20:22 +0000)]
Merge branch 'dockerfile-touchups' into 'develop'

Update Dockerfile + some touchups to docker.exs

See merge request pleroma/pleroma!1624

5 years agoSwitch to alpine:3.9 to avoid dlsym errors
Ashlynn Anderson [Wed, 4 Sep 2019 18:56:26 +0000 (14:56 -0400)]
Switch to alpine:3.9 to avoid dlsym errors

5 years agoMerge branch 'feat/mastoapi-status-threadmuted' into 'develop'
Haelwenn [Wed, 4 Sep 2019 11:26:34 +0000 (11:26 +0000)]
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'

Mastodon API: Add `pleroma.thread_muted` to Status entity

See merge request pleroma/pleroma!1626

5 years agoMastodon API: Add `pleroma.thread_muted` to Status entity
rinpatch [Wed, 4 Sep 2019 11:16:56 +0000 (14:16 +0300)]
Mastodon API: Add `pleroma.thread_muted` to Status entity

Needed for pleroma-fe!941

5 years agoMerge branch 'feature/mastoapi-read-notifications' into 'develop'
Haelwenn [Wed, 4 Sep 2019 10:46:49 +0000 (10:46 +0000)]
Merge branch 'feature/mastoapi-read-notifications' into 'develop'

Extend `/api/pleroma/notifications/read` to mark multiple notifications as read and make it respond with Mastoapi entities

See merge request pleroma/pleroma!1625

5 years agoClarify that read notifications are returned
rinpatch [Wed, 4 Sep 2019 10:39:39 +0000 (13:39 +0300)]
Clarify that read notifications are returned

5 years agoApply suggestion to docs/api/pleroma_api.md
rinpatch [Wed, 4 Sep 2019 10:37:43 +0000 (10:37 +0000)]
Apply suggestion to docs/api/pleroma_api.md

5 years agoApply suggestion to lib/pleroma/notification.ex
rinpatch [Wed, 4 Sep 2019 10:14:15 +0000 (10:14 +0000)]
Apply suggestion to lib/pleroma/notification.ex

5 years agoExtend `/api/pleroma/notifications/read` to mark multiple notifications
rinpatch [Wed, 4 Sep 2019 08:33:08 +0000 (11:33 +0300)]
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities

5 years agoMastdon API: Add ability to get a remote account by nickname to
rinpatch [Tue, 3 Sep 2019 14:54:21 +0000 (17:54 +0300)]
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`

5 years agoSwitch to official elixir:1.9-alpine image for build
Ashlynn Anderson [Tue, 3 Sep 2019 15:44:57 +0000 (11:44 -0400)]
Switch to official elixir:1.9-alpine image for build

5 years agoRemove dynamic config as default, add healthcheck
Ashlynn Anderson [Mon, 5 Aug 2019 19:35:34 +0000 (15:35 -0400)]
Remove dynamic config as default, add healthcheck

5 years agoMerge branch 'feature/pagination-total' into 'develop'
rinpatch [Tue, 3 Sep 2019 13:03:06 +0000 (13:03 +0000)]
Merge branch 'feature/pagination-total' into 'develop'

Return total items count from pagination + tests

See merge request pleroma/pleroma!1620

5 years agoReturn "total" optionally
Maxim Filippov [Tue, 3 Sep 2019 10:58:27 +0000 (13:58 +0300)]
Return "total" optionally

5 years agoReturn total from pagination + tests
Maxim Filippov [Mon, 2 Sep 2019 19:48:52 +0000 (22:48 +0300)]
Return total from pagination + tests

5 years agocredo fixes
rinpatch [Sat, 31 Aug 2019 10:08:43 +0000 (13:08 +0300)]
credo fixes

5 years agoAdd back /api/qvitter/statuses/notifications/read.json
rinpatch [Sat, 31 Aug 2019 08:40:04 +0000 (11:40 +0300)]
Add back /api/qvitter/statuses/notifications/read.json

5 years agoRemove a useless import
rinpatch [Sat, 31 Aug 2019 07:57:35 +0000 (10:57 +0300)]
Remove a useless import

5 years agoAdd a changelog entry for twitterapi removal and fix credo issues
rinpatch [Sat, 31 Aug 2019 07:45:37 +0000 (10:45 +0300)]
Add a changelog entry for twitterapi removal and fix credo issues

5 years agoRemove TwitterAPI representers
rinpatch [Sat, 31 Aug 2019 07:41:15 +0000 (10:41 +0300)]
Remove TwitterAPI representers

5 years agoRemove Mention of TwitterAPI in readme
rinpatch [Sat, 31 Aug 2019 07:34:29 +0000 (10:34 +0300)]
Remove Mention of TwitterAPI in readme

5 years agoRemove Activity, User and Notification views from TwitterAPI
rinpatch [Sat, 31 Aug 2019 07:31:15 +0000 (10:31 +0300)]
Remove Activity, User and Notification views from TwitterAPI

5 years agoRemove most of Pleroma.Web.TwitterAPI.TwitterAPI
rinpatch [Sat, 31 Aug 2019 07:20:34 +0000 (10:20 +0300)]
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI

5 years agoMerge branch 'iss-930-media' into 'develop'
feld [Fri, 30 Aug 2019 15:23:15 +0000 (15:23 +0000)]
Merge branch 'iss-930-media' into 'develop'

Fix missing changes in pleroma/pleroma!1197

See merge request pleroma/pleroma!1613

5 years agoFix missing changes in pleroma/pleroma!1197
kPherox [Fri, 30 Aug 2019 12:00:50 +0000 (21:00 +0900)]
Fix missing changes in pleroma/pleroma!1197

5 years agoMerge branch 'fix/antifollowbot-and-relays' into 'develop'
kaniini [Fri, 30 Aug 2019 00:38:03 +0000 (00:38 +0000)]
Merge branch 'fix/antifollowbot-and-relays' into 'develop'

Fix AntiFollowbotPolicy when trying to follow a relay

Closes #1231

See merge request pleroma/pleroma!1610

5 years agoFix AntiFollowbotPolicy when trying to follow a relay
feld [Fri, 30 Aug 2019 00:38:03 +0000 (00:38 +0000)]
Fix AntiFollowbotPolicy when trying to follow a relay

5 years agoMerge branch 'fix-osada-follow' into 'develop'
Haelwenn [Wed, 28 Aug 2019 07:10:35 +0000 (07:10 +0000)]
Merge branch 'fix-osada-follow' into 'develop'

Transmogrifier: Fix follow handling when the actor is an object.

Closes #1211

See merge request pleroma/pleroma!1604

5 years agoMerge branch 'list-controller' into 'develop'
lain [Tue, 27 Aug 2019 21:15:54 +0000 (21:15 +0000)]
Merge branch 'list-controller' into 'develop'

Extract list actions from `MastodonAPIController` into `ListController`

See merge request pleroma/pleroma!1600

5 years agoMerge branch 'tests/activity_pub' into 'develop'
lain [Tue, 27 Aug 2019 20:59:09 +0000 (20:59 +0000)]
Merge branch 'tests/activity_pub' into 'develop'

added tests for ActivityPub.like\unlike

See merge request pleroma/pleroma!1606

5 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
Maksim [Tue, 27 Aug 2019 17:37:19 +0000 (17:37 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex

5 years agoTransmogrifier: Use Containment.get_actor to get actors.
lain [Tue, 27 Aug 2019 17:22:30 +0000 (12:22 -0500)]
Transmogrifier: Use Containment.get_actor to get actors.

5 years agoadded tests for ActivityPub.like\unlike
Maksim Pechnikov [Tue, 27 Aug 2019 13:21:03 +0000 (16:21 +0300)]
added tests for ActivityPub.like\unlike

5 years agoRemove most of TwitterAPIController
rinpatch [Tue, 27 Aug 2019 09:29:19 +0000 (12:29 +0300)]
Remove most of TwitterAPIController

5 years agoMerge branch 'fix-typo' into 'develop'
lain [Mon, 26 Aug 2019 19:37:24 +0000 (19:37 +0000)]
Merge branch 'fix-typo' into 'develop'

Fix typo

See merge request pleroma/pleroma!1603

5 years agoTransmogrifier: Fix follow handling when the actor is an object.
lain [Mon, 26 Aug 2019 19:34:52 +0000 (14:34 -0500)]
Transmogrifier: Fix follow handling when the actor is an object.

5 years agoFix typo
Egor Kislitsyn [Mon, 26 Aug 2019 19:24:14 +0000 (02:24 +0700)]
Fix typo

5 years agoMerge branch 'fix/sporadic-test' into 'develop'
rinpatch [Mon, 26 Aug 2019 14:44:11 +0000 (14:44 +0000)]
Merge branch 'fix/sporadic-test' into 'develop'

Fix sporadic test

Closes #1221

See merge request pleroma/pleroma!1602

5 years agoFix sporadic test
Maxim Filippov [Mon, 26 Aug 2019 14:24:22 +0000 (17:24 +0300)]
Fix sporadic test

5 years agoMerge branch 'disable-rate-limiter' into 'develop'
kaniini [Mon, 26 Aug 2019 14:01:51 +0000 (14:01 +0000)]
Merge branch 'disable-rate-limiter' into 'develop'

Disable rate limiter by default

Closes #1217

See merge request pleroma/pleroma!1601

5 years agoDisable rate limiter by default
Egor Kislitsyn [Mon, 26 Aug 2019 13:36:44 +0000 (20:36 +0700)]
Disable rate limiter by default

5 years agoMove test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test...
Egor Kislitsyn [Mon, 26 Aug 2019 12:34:43 +0000 (19:34 +0700)]
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views

5 years agoMove mastodon_api/*_controller.ex to mastodon_api/controllers/
Egor Kislitsyn [Mon, 26 Aug 2019 12:32:47 +0000 (19:32 +0700)]
Move mastodon_api/*_controller.ex to mastodon_api/controllers/

5 years agoExtract MastodonAPIController's list actions into MastodonAPI.ListController; Add...
Egor Kislitsyn [Mon, 26 Aug 2019 12:37:54 +0000 (19:37 +0700)]
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests

5 years agoExtract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
Egor Kislitsyn [Mon, 26 Aug 2019 12:16:40 +0000 (19:16 +0700)]
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController

5 years agoAdd validation in Pleroma.List.create/2
Egor Kislitsyn [Mon, 26 Aug 2019 11:59:57 +0000 (18:59 +0700)]
Add validation in Pleroma.List.create/2

5 years agoMerge branch 'issue/1177' into 'develop'
kaniini [Sun, 25 Aug 2019 19:43:27 +0000 (19:43 +0000)]
Merge branch 'issue/1177' into 'develop'

[#1177] fixed unfollow for relay actor

See merge request pleroma/pleroma!1589

5 years agoMerge branch 'feature/moderation-log' into 'develop'
kaniini [Sun, 25 Aug 2019 19:39:37 +0000 (19:39 +0000)]
Merge branch 'feature/moderation-log' into 'develop'

Log admin/moderator actions

See merge request pleroma/pleroma!1582

5 years agoLog admin/moderator actions
Maxim Filippov [Sun, 25 Aug 2019 19:39:37 +0000 (19:39 +0000)]
Log admin/moderator actions

5 years agoMerge branch 'fix-all-custom-fields-deleted' into 'develop'
kaniini [Sun, 25 Aug 2019 19:35:28 +0000 (19:35 +0000)]
Merge branch 'fix-all-custom-fields-deleted' into 'develop'

Fix not to use unupdated attachments when all fields are deleted

See merge request pleroma/pleroma!1596

5 years agoUpdate test for custom profile fields
kPherox [Sun, 25 Aug 2019 17:00:41 +0000 (02:00 +0900)]
Update test for custom profile fields

5 years agoMerge branch 'bugfix/rel_me_missing_mocks' into 'develop'
lain [Sun, 25 Aug 2019 16:12:13 +0000 (16:12 +0000)]
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'

Implement missing mocks for rel=me

See merge request pleroma/pleroma!1598

5 years agoMerge branch 'bugfix/log_non_implemented_mocks' into 'develop'
rinpatch [Sun, 25 Aug 2019 08:09:18 +0000 (08:09 +0000)]
Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'

HttpRequestMock: Log non-implemented mock responses

Closes #1088

See merge request pleroma/pleroma!1416

5 years agoHttpRequestMock: Remove useless `error = error`
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 06:55:29 +0000 (08:55 +0200)]
HttpRequestMock: Remove useless `error = error`

5 years agouser_test.exs: fix rel=me tests
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 06:48:38 +0000 (08:48 +0200)]
user_test.exs: fix rel=me tests

5 years agoImplement missing mocks for rel=me
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 06:03:25 +0000 (08:03 +0200)]
Implement missing mocks for rel=me

5 years agoHttpRequestMock: Improve non-implemented error message
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 05:33:46 +0000 (07:33 +0200)]
HttpRequestMock: Improve non-implemented error message

5 years agoHttpRequestMock: Log mock errors as warnings
Haelwenn (lanodan) Monnier [Sun, 25 Aug 2019 05:10:22 +0000 (07:10 +0200)]
HttpRequestMock: Log mock errors as warnings

5 years agoChange to use attachment only when fields do not exist
kPherox [Sat, 24 Aug 2019 16:28:38 +0000 (01:28 +0900)]
Change to use attachment only when fields do not exist

5 years agoMerge branch 'admin-create-users' into 'develop'
lain [Sat, 24 Aug 2019 16:04:19 +0000 (16:04 +0000)]
Merge branch 'admin-create-users' into 'develop'

user creation admin api will create multiple users

See merge request pleroma/pleroma!1170

5 years agoMerge branch 'activity-expiration' into 'develop'
kaniini [Sat, 24 Aug 2019 16:01:57 +0000 (16:01 +0000)]
Merge branch 'activity-expiration' into 'develop'

Activity expiration

See merge request pleroma/pleroma!1595

5 years agoUpdate CHANGELOG.md
lain [Sat, 24 Aug 2019 15:33:17 +0000 (15:33 +0000)]
Update CHANGELOG.md

5 years agoActivity expiration: Fix docs.
lain [Sat, 24 Aug 2019 15:28:19 +0000 (17:28 +0200)]
Activity expiration: Fix docs.

5 years agoActivity Expiration: Switch to 'expires_in' system.
lain [Sat, 24 Aug 2019 15:22:48 +0000 (17:22 +0200)]
Activity Expiration: Switch to 'expires_in' system.

5 years agoActivityExpirationWorker: Fix merge issues.
lain [Sat, 24 Aug 2019 15:22:26 +0000 (17:22 +0200)]
ActivityExpirationWorker: Fix merge issues.

5 years agoupdate tests
Maksim Pechnikov [Sat, 24 Aug 2019 14:41:53 +0000 (17:41 +0300)]
update tests

5 years ago put_resp_header("content-type", "application/activity+json") -> put_resp_content_typ...
Maksim Pechnikov [Sat, 24 Aug 2019 14:17:17 +0000 (17:17 +0300)]
 put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")

5 years agoMerge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
lain [Sat, 24 Aug 2019 13:48:33 +0000 (15:48 +0200)]
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration

5 years agoadd tests
Maksim Pechnikov [Fri, 23 Aug 2019 18:17:14 +0000 (21:17 +0300)]
add tests

5 years agoMerge branch 'fix-default-config-account_field' into 'develop'
kaniini [Fri, 23 Aug 2019 21:28:52 +0000 (21:28 +0000)]
Merge branch 'fix-default-config-account_field' into 'develop'

Fix default config of account fields length

See merge request pleroma/pleroma!1593

5 years agoFix default config of account fields length
aries [Fri, 23 Aug 2019 21:28:52 +0000 (21:28 +0000)]
Fix default config of account fields length

5 years agoMerge branch 'fix/add-likes-index-objects' into 'develop'
kaniini [Fri, 23 Aug 2019 01:41:18 +0000 (01:41 +0000)]
Merge branch 'fix/add-likes-index-objects' into 'develop'

Add an index on object likes

See merge request pleroma/pleroma!1592

5 years agoAdd an index on object likes
rinpatch [Fri, 23 Aug 2019 00:17:20 +0000 (03:17 +0300)]
Add an index on object likes

In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.

5 years agofix /inbox for Relay
Maksim Pechnikov [Thu, 22 Aug 2019 19:39:06 +0000 (22:39 +0300)]
fix /inbox for Relay

5 years agofix test
Maksim Pechnikov [Thu, 22 Aug 2019 18:32:40 +0000 (21:32 +0300)]
fix test

5 years agoMerge branch 'develop' into issue/1177
Maksim Pechnikov [Thu, 22 Aug 2019 18:13:03 +0000 (21:13 +0300)]
Merge branch 'develop' into issue/1177

5 years agoMerge branch 'support/tests' into 'develop'
feld [Thu, 22 Aug 2019 17:37:01 +0000 (17:37 +0000)]
Merge branch 'support/tests' into 'develop'

fixed clear config after test

See merge request pleroma/pleroma!1588

5 years agoMerge branch 'improve-ap-routes-rate-limit' into 'develop'
lain [Thu, 22 Aug 2019 10:20:50 +0000 (10:20 +0000)]
Merge branch 'improve-ap-routes-rate-limit' into 'develop'

Improve AP routes rate limit

See merge request pleroma/pleroma!1590

5 years agoImprove AP routes rate limit
Egor Kislitsyn [Thu, 22 Aug 2019 09:03:43 +0000 (16:03 +0700)]
Improve AP routes rate limit

5 years agofixed unfollow for relay actor
Maksim Pechnikov [Thu, 22 Aug 2019 03:57:55 +0000 (06:57 +0300)]
fixed unfollow for relay actor

5 years agoremove old user create and delete routes for admin
Sachin Joshi [Wed, 21 Aug 2019 18:30:00 +0000 (00:15 +0545)]
remove old user create and delete routes for admin

5 years agofixed clear config after test
Maksim Pechnikov [Wed, 21 Aug 2019 18:24:35 +0000 (21:24 +0300)]
fixed clear config after test

5 years agoMerge branch 'rate-limit-ap-routes' into 'develop'
lain [Wed, 21 Aug 2019 16:45:20 +0000 (16:45 +0000)]
Merge branch 'rate-limit-ap-routes' into 'develop'

[#1174] Rate limit AP routes

See merge request pleroma/pleroma!1586

5 years agoMerge branch 'chore/fix-flakey-aws-test' into 'develop'
kaniini [Tue, 20 Aug 2019 20:28:54 +0000 (20:28 +0000)]
Merge branch 'chore/fix-flakey-aws-test' into 'develop'

test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1

See merge request pleroma/pleroma!1587