akkoma
4 years agoBenchmark env uses test database so we should be able to use test.secret.exs
Mark Felder [Wed, 11 Dec 2019 18:52:57 +0000 (12:52 -0600)]
Benchmark env uses test database so we should be able to use test.secret.exs

4 years agoMerge branch 'chore/fast_sanitize_bump' into 'develop'
rinpatch [Wed, 11 Dec 2019 17:57:41 +0000 (17:57 +0000)]
Merge branch 'chore/fast_sanitize_bump' into 'develop'

mix.lock: update fast_sanitize

See merge request pleroma/pleroma!2056

4 years agomix.lock: update fast_sanitize
rinpatch [Wed, 11 Dec 2019 17:42:08 +0000 (20:42 +0300)]
mix.lock: update fast_sanitize

the new version uses html-spec compliant fragment parsing instead of
just wrapping the fragment in the <body> tag.

4 years agoMerge branch 'admin-scope-support-code' into 'develop'
rinpatch [Wed, 11 Dec 2019 17:38:16 +0000 (17:38 +0000)]
Merge branch 'admin-scope-support-code' into 'develop'

FE bundle updates: admin-fe and pleroma-fe

See merge request pleroma/pleroma!2055

4 years agoUpdated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
Ivan Tashkinov [Wed, 11 Dec 2019 16:48:00 +0000 (19:48 +0300)]
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.

4 years agoMerge branch 'domain-block-precedence' into 'develop'
rinpatch [Wed, 11 Dec 2019 09:57:00 +0000 (09:57 +0000)]
Merge branch 'domain-block-precedence' into 'develop'

make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019

4 years agoremove single-step pipe
Sadposter [Wed, 11 Dec 2019 09:08:20 +0000 (09:08 +0000)]
remove single-step pipe

4 years agoMerge branch '1427-oauth-admin-scopes' into 'develop'
lain [Wed, 11 Dec 2019 08:50:43 +0000 (08:50 +0000)]
Merge branch '1427-oauth-admin-scopes' into 'develop'

[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests

Closes #1427

See merge request pleroma/pleroma!2053

4 years ago[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
Ivan Tashkinov [Wed, 11 Dec 2019 08:42:02 +0000 (11:42 +0300)]
[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.

4 years agoApply suggestion to lib/pleroma/user.ex
Sadposter [Tue, 10 Dec 2019 18:49:41 +0000 (18:49 +0000)]
Apply suggestion to lib/pleroma/user.ex

4 years agoMerge branch 'fix/unsubscribe-route' into 'develop'
feld [Tue, 10 Dec 2019 17:25:56 +0000 (17:25 +0000)]
Merge branch 'fix/unsubscribe-route' into 'develop'

Do not apply http signature pipeline to the unsubscribe route

See merge request pleroma/pleroma!2052

4 years agoMerge branch 'develop' into 'domain-block-precedence'
Sadposter [Tue, 10 Dec 2019 16:54:25 +0000 (16:54 +0000)]
Merge branch 'develop' into 'domain-block-precedence'

# Conflicts:
#   lib/pleroma/user.ex

4 years agomake analysis happy
Sadposter [Tue, 10 Dec 2019 16:50:58 +0000 (16:50 +0000)]
make analysis happy

4 years agoformat activity_pub.ex
Sadposter [Tue, 10 Dec 2019 16:41:43 +0000 (16:41 +0000)]
format activity_pub.ex

4 years agomodify SQL to include followed-but-domain-blocked activities
Sadposter [Tue, 10 Dec 2019 16:40:12 +0000 (16:40 +0000)]
modify SQL to include followed-but-domain-blocked activities

4 years agoDo not apply http signature pipeline to the unsubscribe route
Egor Kislitsyn [Tue, 10 Dec 2019 14:46:02 +0000 (21:46 +0700)]
Do not apply http signature pipeline to the unsubscribe route

4 years agoMerge branch '1427-oauth-admin-scopes' into 'develop'
lain [Tue, 10 Dec 2019 13:44:06 +0000 (13:44 +0000)]
Merge branch '1427-oauth-admin-scopes' into 'develop'

[#1427] OAuth admin scopes

Closes #1427

See merge request pleroma/pleroma!2025

4 years agoMerge branch 'develop' into '1427-oauth-admin-scopes'
lain [Tue, 10 Dec 2019 13:34:54 +0000 (13:34 +0000)]
Merge branch 'develop' into '1427-oauth-admin-scopes'

# Conflicts:
#   CHANGELOG.md

4 years agoMerge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'
lain [Tue, 10 Dec 2019 13:19:26 +0000 (13:19 +0000)]
Merge branch 'activitypub/configurable-activitypub-actor-type' into 'develop'

[ActivityPub] Configurable ActivityPub actor type

See merge request pleroma/pleroma!2005

4 years ago[ActivityPub] Configurable ActivityPub actor type
Hakaba Hitoyo [Tue, 10 Dec 2019 13:19:26 +0000 (13:19 +0000)]
[ActivityPub] Configurable ActivityPub actor type

4 years agoMerge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
Ivan Tashkinov [Tue, 10 Dec 2019 05:55:14 +0000 (08:55 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes

# Conflicts:
# CHANGELOG.md

4 years agoMerge branch 'fix/load_config' into 'develop'
rinpatch [Mon, 9 Dec 2019 20:35:05 +0000 (20:35 +0000)]
Merge branch 'fix/load_config' into 'develop'

fixed loads a config variable with large value from db

See merge request pleroma/pleroma!2051

4 years agofix loads config variable with large value from db
Maksim Pechnikov [Mon, 9 Dec 2019 19:29:44 +0000 (22:29 +0300)]
fix loads config variable with large value from db

4 years agoMerge branch 'fix/prefer-url-over-search' into 'develop'
rinpatch [Mon, 9 Dec 2019 17:55:48 +0000 (17:55 +0000)]
Merge branch 'fix/prefer-url-over-search' into 'develop'

status search: prefer the status fetched by url over other results

See merge request pleroma/pleroma!2050

4 years agoMerge branch 'user-timelines-changelog' into 'develop'
rinpatch [Mon, 9 Dec 2019 17:50:00 +0000 (17:50 +0000)]
Merge branch 'user-timelines-changelog' into 'develop'

Changelog: Update with user timeline change info.

See merge request pleroma/pleroma!2049

4 years agostatus search: prefer the status fetched by url over other results
rinpatch [Mon, 9 Dec 2019 17:45:04 +0000 (20:45 +0300)]
status search: prefer the status fetched by url over other results

4 years agoMerge branch 'fix/otp-parsers' into 'develop'
lain [Mon, 9 Dec 2019 15:10:05 +0000 (15:10 +0000)]
Merge branch 'fix/otp-parsers' into 'develop'

OTP: Fix runtime upload limit config being ignored

Closes #1109

See merge request pleroma/pleroma!2045

4 years agoMerge branch 'exclude-visibilities-for-like-notifications' into 'develop'
lain [Mon, 9 Dec 2019 14:55:42 +0000 (14:55 +0000)]
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'

Fix exclude_visibilities filter for followers-only Like notifications

See merge request pleroma/pleroma!1957

4 years agoMerge branch 'fix/user-list-task' into 'develop'
lain [Mon, 9 Dec 2019 14:44:56 +0000 (14:44 +0000)]
Merge branch 'fix/user-list-task' into 'develop'

Fix `mix pleroma.user list` task

See merge request pleroma/pleroma!2029

4 years agoMerge branch 'issue/1342' into 'develop'
lain [Mon, 9 Dec 2019 14:30:35 +0000 (14:30 +0000)]
Merge branch 'issue/1342' into 'develop'

[#1342] Added privacy option to push notifications

See merge request pleroma/pleroma!1920

4 years agoUpdate pleroma_api.md
lain [Mon, 9 Dec 2019 14:15:59 +0000 (14:15 +0000)]
Update pleroma_api.md

4 years agoMerge branch 'fix/oauth-compile-time' into 'develop'
lain [Mon, 9 Dec 2019 13:59:35 +0000 (13:59 +0000)]
Merge branch 'fix/oauth-compile-time' into 'develop'

OAuth token cleanup: Get rid of compile-time configuration

See merge request pleroma/pleroma!2044

4 years agoMerge branch 'develop' into 'fix/oauth-compile-time'
lain [Mon, 9 Dec 2019 13:52:01 +0000 (13:52 +0000)]
Merge branch 'develop' into 'fix/oauth-compile-time'

# Conflicts:
#   CHANGELOG.md

4 years agoMerge branch 'feature/otp-configurable-scrubbers' into 'develop'
lain [Mon, 9 Dec 2019 13:51:09 +0000 (13:51 +0000)]
Merge branch 'feature/otp-configurable-scrubbers' into 'develop'

HTML: Compile Scrubbers on boot

See merge request pleroma/pleroma!2043

4 years agoChangelog: Update with user timeline change info.
lain [Mon, 9 Dec 2019 13:43:57 +0000 (14:43 +0100)]
Changelog: Update with user timeline change info.

4 years agoMerge branch 'feat/docs-otp-source-picker' into 'develop'
rinpatch [Mon, 9 Dec 2019 10:27:43 +0000 (10:27 +0000)]
Merge branch 'feat/docs-otp-source-picker' into 'develop'

docs: add OTP/From source tabs to CLI tasks

See merge request pleroma/pleroma!2046

4 years agoMerge branch 'move-api-docs' into 'develop'
rinpatch [Mon, 9 Dec 2019 10:16:26 +0000 (10:16 +0000)]
Merge branch 'move-api-docs' into 'develop'

Document `with_move` parameter of the notification API

See merge request pleroma/pleroma!2047

4 years agoDocument `with_move` parameter of the notification API
Egor Kislitsyn [Mon, 9 Dec 2019 07:46:06 +0000 (14:46 +0700)]
Document `with_move` parameter of the notification API

4 years agodocs: add OTP/From source tabs to CLI tasks
rinpatch [Mon, 9 Dec 2019 01:07:16 +0000 (04:07 +0300)]
docs: add OTP/From source tabs to CLI tasks

4 years agoupdate docs
Maksim Pechnikov [Sun, 8 Dec 2019 19:09:15 +0000 (22:09 +0300)]
update docs

4 years agoupdate changelog
Maksim Pechnikov [Sun, 8 Dec 2019 18:46:20 +0000 (21:46 +0300)]
update changelog

4 years agoMerge branch 'develop' into issue/1342
Maksim Pechnikov [Sun, 8 Dec 2019 18:25:26 +0000 (21:25 +0300)]
Merge branch 'develop' into issue/1342

4 years agoOTP: Fix runtime upload limit config being ignored
rinpatch [Sun, 8 Dec 2019 18:08:25 +0000 (21:08 +0300)]
OTP: Fix runtime upload limit config being ignored

Closes #1109

4 years agoHTML: Compile Scrubbers on boot
rinpatch [Sun, 8 Dec 2019 16:42:40 +0000 (19:42 +0300)]
HTML: Compile Scrubbers on boot

This makes it possible to configure their behavior on OTP releases.

4 years agoOAuth token cleanup: Get rid of compile-time configuration
rinpatch [Sun, 8 Dec 2019 14:36:44 +0000 (17:36 +0300)]
OAuth token cleanup: Get rid of compile-time configuration

4 years agoMerge branch 'fix/clause-never-matches' into 'develop'
rinpatch [Sun, 8 Dec 2019 13:50:57 +0000 (13:50 +0000)]
Merge branch 'fix/clause-never-matches' into 'develop'

Fix never matching clause

See merge request pleroma/pleroma!2042

4 years agoFix never matching clause
rinpatch [Sun, 8 Dec 2019 13:36:22 +0000 (16:36 +0300)]
Fix never matching clause

`length/1` is only used with lists.

4 years agoMerge branch 'improve-move-notificaions-api' into 'develop'
rinpatch [Sun, 8 Dec 2019 13:07:05 +0000 (13:07 +0000)]
Merge branch 'improve-move-notificaions-api' into 'develop'

Add `with_move` query param to the notifications API

See merge request pleroma/pleroma!2032

4 years agoMerge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
rinpatch [Sun, 8 Dec 2019 11:23:31 +0000 (11:23 +0000)]
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'

ActivityPub: For user timelines, respects blocks.

Closes #1463

See merge request pleroma/pleroma!2041

4 years ago[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
Ivan Tashkinov [Sat, 7 Dec 2019 14:49:53 +0000 (17:49 +0300)]
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.

4 years ago[#1427] Fixes / improvements of admin scopes support. Added tests.
Ivan Tashkinov [Fri, 6 Dec 2019 17:33:47 +0000 (20:33 +0300)]
[#1427] Fixes / improvements of admin scopes support. Added tests.

4 years agoMerge branch 'feature/1455-chat-character-limit' into 'develop'
rinpatch [Fri, 6 Dec 2019 15:36:30 +0000 (15:36 +0000)]
Merge branch 'feature/1455-chat-character-limit' into 'develop'

Feature/1455 chat character limit

Closes #1455

See merge request pleroma/pleroma!2034

4 years ago[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
Ivan Tashkinov [Fri, 6 Dec 2019 13:56:23 +0000 (16:56 +0300)]
[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.

4 years agoMerge branch 'fix/mrf-delete' into 'develop'
lain [Fri, 6 Dec 2019 13:48:37 +0000 (13:48 +0000)]
Merge branch 'fix/mrf-delete' into 'develop'

ActivityPub: Fix deletes being exempt from MRF

Closes #1461

See merge request pleroma/pleroma!2037

4 years agoActivityPub: For user timelines, respects blocks.
lain [Fri, 6 Dec 2019 13:25:13 +0000 (14:25 +0100)]
ActivityPub: For user timelines, respects blocks.

Unless the timeline belongs to a blocked user.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
Ivan Tashkinov [Thu, 5 Dec 2019 21:26:31 +0000 (00:26 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes

4 years ago[#1427] Reworked admin scopes support.
Ivan Tashkinov [Thu, 5 Dec 2019 21:25:44 +0000 (00:25 +0300)]
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).

4 years agoMerge branch 'develop' into fix/mrf-delete
rinpatch [Thu, 5 Dec 2019 21:12:21 +0000 (00:12 +0300)]
Merge branch 'develop' into fix/mrf-delete

4 years agoActivityPub: Fix deletes being exempt from MRF
rinpatch [Wed, 4 Dec 2019 23:50:38 +0000 (02:50 +0300)]
ActivityPub: Fix deletes being exempt from MRF

Closes #1461

4 years agoMerge branch '1335-user-api-id-fields-relations' into 'develop'
lain [Thu, 5 Dec 2019 17:16:23 +0000 (17:16 +0000)]
Merge branch '1335-user-api-id-fields-relations' into 'develop'

[#1335] User: refactoring of AP ID fields into relations

Closes #1335

See merge request pleroma/pleroma!1963

4 years agoMerge branch 'feature/admin-api-render-whole-status' into 'develop'
feld [Thu, 5 Dec 2019 13:34:34 +0000 (13:34 +0000)]
Merge branch 'feature/admin-api-render-whole-status' into 'develop'

Miscellaneous grouped reports fixes

Closes admin-fe#48 and admin-fe#51

See merge request pleroma/pleroma!2007

4 years agoMerge branch 'develop' into issue/1342
Maksim Pechnikov [Thu, 5 Dec 2019 12:46:27 +0000 (15:46 +0300)]
Merge branch 'develop' into issue/1342

4 years agoMerge branch 'develop' into improve-move-notificaions-api
Egor Kislitsyn [Thu, 5 Dec 2019 07:55:48 +0000 (14:55 +0700)]
Merge branch 'develop' into improve-move-notificaions-api

4 years ago[#1335] Merge issue fix.
Ivan Tashkinov [Wed, 4 Dec 2019 16:41:14 +0000 (19:41 +0300)]
[#1335] Merge issue fix.

4 years agoMerge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
Ivan Tashkinov [Wed, 4 Dec 2019 15:56:31 +0000 (18:56 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts:
# lib/pleroma/user.ex

4 years agoMerge branch 'fix_test' into 'develop'
lain [Wed, 4 Dec 2019 13:25:12 +0000 (13:25 +0000)]
Merge branch 'fix_test' into 'develop'

[#1457] fix test

See merge request pleroma/pleroma!2035

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat...
lain [Wed, 4 Dec 2019 13:25:00 +0000 (14:25 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit

4 years agofix test
Maksim Pechnikov [Wed, 4 Dec 2019 13:22:01 +0000 (16:22 +0300)]
fix test

4 years agoCheat Sheet: Addg chat_limit information.
lain [Wed, 4 Dec 2019 11:51:06 +0000 (12:51 +0100)]
Cheat Sheet: Addg chat_limit information.

4 years agoChangelog: Add information about chat limit.
lain [Wed, 4 Dec 2019 11:49:46 +0000 (12:49 +0100)]
Changelog: Add information about chat limit.

4 years agoChatChannel: Ignore messages that are too long.
lain [Wed, 4 Dec 2019 11:48:34 +0000 (12:48 +0100)]
ChatChannel: Ignore messages that are too long.

4 years agoFix Pleroma.FollowingRelationship.move_following/2
Egor Kislitsyn [Tue, 3 Dec 2019 15:31:12 +0000 (22:31 +0700)]
Fix Pleroma.FollowingRelationship.move_following/2

4 years agoAdd `with_move` query param to the notifications API
Egor Kislitsyn [Tue, 3 Dec 2019 15:13:38 +0000 (22:13 +0700)]
Add `with_move` query param to the notifications API

4 years agoMerge branch 'feature/move-activity' into 'develop'
lain [Mon, 2 Dec 2019 16:26:19 +0000 (16:26 +0000)]
Merge branch 'feature/move-activity' into 'develop'

Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883

4 years agoMerge branch 'update-floki' into 'develop'
rinpatch [Mon, 2 Dec 2019 11:18:58 +0000 (11:18 +0000)]
Merge branch 'update-floki' into 'develop'

Update Floki dependency

See merge request pleroma/pleroma!2028

4 years agoFix `mix pleroma.user list` task
Egor Kislitsyn [Mon, 2 Dec 2019 11:11:45 +0000 (18:11 +0700)]
Fix `mix pleroma.user list` task

4 years agoUpdate Floki dependency
Egor Kislitsyn [Mon, 2 Dec 2019 06:38:35 +0000 (13:38 +0700)]
Update Floki dependency

4 years agoMerge branch 'remove-info-from-users' into 'develop'
rinpatch [Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)]
Merge branch 'remove-info-from-users' into 'develop'

Removed users.info field

See merge request pleroma/pleroma!2006

4 years agoMerge branch 'hide-relation-for-friendica' into 'develop'
rinpatch [Sat, 30 Nov 2019 10:41:18 +0000 (10:41 +0000)]
Merge branch 'hide-relation-for-friendica' into 'develop'

Hide relation for friendica users

See merge request pleroma/pleroma!2026

4 years agoMerge branch 'benchmarks/favourites_timeline' into 'develop'
rinpatch [Sat, 30 Nov 2019 10:39:48 +0000 (10:39 +0000)]
Merge branch 'benchmarks/favourites_timeline' into 'develop'

Benchmarks: favourites timeline

See merge request pleroma/pleroma!2027

4 years agotest missing first field
kPherox [Sat, 30 Nov 2019 06:24:08 +0000 (15:24 +0900)]
test missing first field

4 years agohide follower/following for friendica
kPherox [Fri, 29 Nov 2019 19:26:45 +0000 (04:26 +0900)]
hide follower/following for friendica

4 years ago[#1427] Initial support for OAuth admin scopes.
Ivan Tashkinov [Fri, 29 Nov 2019 15:57:19 +0000 (18:57 +0300)]
[#1427] Initial support for OAuth admin scopes.

4 years agoMerge branch 'fix/extract_first_external_url' into 'develop'
lain [Fri, 29 Nov 2019 10:10:30 +0000 (10:10 +0000)]
Merge branch 'fix/extract_first_external_url' into 'develop'

Fix Pleroma.HTML.extract_first_external_url/2

Closes #1451

See merge request pleroma/pleroma!2024

4 years agoFix Pleroma.HTML.extract_first_external_url/2
Egor Kislitsyn [Fri, 29 Nov 2019 08:49:35 +0000 (15:49 +0700)]
Fix Pleroma.HTML.extract_first_external_url/2

4 years agoMerge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
Ivan Tashkinov [Fri, 29 Nov 2019 07:17:59 +0000 (10:17 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts:
# mix.lock

4 years agoMerge branch 'bugfix/1447-set-following' into 'develop'
rinpatch [Thu, 28 Nov 2019 19:13:42 +0000 (19:13 +0000)]
Merge branch 'bugfix/1447-set-following' into 'develop'

Migrations: Set users.following_count to NOT NULL

Closes #1447

See merge request pleroma/pleroma!2021

4 years agoadd mix task to set\unset privacy option of notification
Maksim Pechnikov [Wed, 30 Oct 2019 19:59:04 +0000 (22:59 +0300)]
add mix task to set\unset privacy option of notification

4 years agoadded privacy option to push notifications
Maksim Pechnikov [Tue, 29 Oct 2019 18:33:17 +0000 (21:33 +0300)]
added privacy option to push notifications

4 years agoadded User.NotificationSetting struct
Maksim Pechnikov [Mon, 28 Oct 2019 09:47:23 +0000 (12:47 +0300)]
added User.NotificationSetting struct

4 years agoMerge branch 'chore/manual-benchmark' into 'develop'
rinpatch [Thu, 28 Nov 2019 17:46:23 +0000 (17:46 +0000)]
Merge branch 'chore/manual-benchmark' into 'develop'

CI: Make benchmarks manually triggered.

See merge request pleroma/pleroma!2020

4 years agoMerge branch 'use-pg12-in-ci' into 'develop'
lain [Thu, 28 Nov 2019 16:58:41 +0000 (16:58 +0000)]
Merge branch 'use-pg12-in-ci' into 'develop'

Use PosgreSQL v12 in the federated tests

See merge request pleroma/pleroma!2022

4 years agoUse PosgreSQL v12 in the federated tests
Egor Kislitsyn [Thu, 28 Nov 2019 16:08:13 +0000 (23:08 +0700)]
Use PosgreSQL v12 in the federated tests

4 years agoMigrations: Set users.following_count to NOT NULL
lain [Thu, 28 Nov 2019 16:01:43 +0000 (17:01 +0100)]
Migrations: Set users.following_count to NOT NULL

Also set following_count for local users to the correct value and for remote
users to 0.

4 years agoMerge branch 'fed-testing-updates' into 'develop'
lain [Thu, 28 Nov 2019 14:34:07 +0000 (14:34 +0000)]
Merge branch 'fed-testing-updates' into 'develop'

Add federated test infrastructure

See merge request pleroma/pleroma!2014

4 years agoCI: Make benchmarks manually triggered.
lain [Thu, 28 Nov 2019 14:14:11 +0000 (15:14 +0100)]
CI: Make benchmarks manually triggered.

4 years agoMerge branch 'cleanup-tests-output' into 'develop'
lain [Thu, 28 Nov 2019 12:19:15 +0000 (12:19 +0000)]
Merge branch 'cleanup-tests-output' into 'develop'

Cleanup tests output

See merge request pleroma/pleroma!2018

4 years agoobligatory format commit
Sadposter [Thu, 28 Nov 2019 10:40:50 +0000 (10:40 +0000)]
obligatory format commit

4 years agomake follows take precedence over domain blocks
Sadposter [Thu, 28 Nov 2019 10:38:38 +0000 (10:38 +0000)]
make follows take precedence over domain blocks

4 years agoCleanup tests output
Egor Kislitsyn [Thu, 28 Nov 2019 09:44:48 +0000 (16:44 +0700)]
Cleanup tests output