akkoma
4 years agoMerge branch 'chore/credo-alias' into 'develop'
lain [Tue, 4 Aug 2020 14:09:23 +0000 (14:09 +0000)]
Merge branch 'chore/credo-alias' into 'develop'

Add a simple credo mix alias to run the same checks we use in CI

See merge request pleroma/pleroma!2846

4 years agoAdd analyze mix alias to run the same credo checks we use in CI
Mark Felder [Tue, 4 Aug 2020 13:55:40 +0000 (08:55 -0500)]
Add analyze mix alias to run the same credo checks we use in CI

4 years agoMerge branch 'email-blacklist' into 'develop'
lain [Tue, 4 Aug 2020 11:00:30 +0000 (11:00 +0000)]
Merge branch 'email-blacklist' into 'develop'

Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837

4 years agoChangelog: Add info about email blacklist
lain [Tue, 4 Aug 2020 10:49:56 +0000 (12:49 +0200)]
Changelog: Add info about email blacklist

4 years agoEmail blacklist: Update phrasing again
Alex Gleason [Tue, 4 Aug 2020 03:20:49 +0000 (22:20 -0500)]
Email blacklist: Update phrasing again

4 years agoEmail blacklist: Update response phrasing
Alex Gleason [Tue, 4 Aug 2020 00:57:53 +0000 (19:57 -0500)]
Email blacklist: Update response phrasing

4 years agoMerge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into...
lain [Mon, 3 Aug 2020 21:01:56 +0000 (21:01 +0000)]
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'

fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782

4 years agoImproved WelcomeChatMessageTest
Ilja [Mon, 3 Aug 2020 18:13:43 +0000 (20:13 +0200)]
Improved WelcomeChatMessageTest

* Checks if message is the same using ==/2 instead of =~/2

4 years agoApply 1 suggestion(s) to 1 file(s)
Ilja [Mon, 3 Aug 2020 16:44:56 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'follower-mrf-again' into 'develop'
lain [Mon, 3 Aug 2020 14:22:11 +0000 (14:22 +0000)]
Merge branch 'follower-mrf-again' into 'develop'

Follower mrf again

See merge request pleroma/pleroma!2833

4 years agoAccountControllerTest: Add test for message returned.
lain [Mon, 3 Aug 2020 13:00:14 +0000 (15:00 +0200)]
AccountControllerTest: Add test for message returned.

4 years agoMerge branch 'config/default_ok_oldage' into 'develop'
lain [Mon, 3 Aug 2020 12:50:29 +0000 (12:50 +0000)]
Merge branch 'config/default_ok_oldage' into 'develop'

config: :mrf, :policies default to ObjectAgePolicy

Closes #2000

See merge request pleroma/pleroma!2814

4 years agoMerge branch 'object-age-fix' into 'develop'
lain [Mon, 3 Aug 2020 12:50:10 +0000 (12:50 +0000)]
Merge branch 'object-age-fix' into 'develop'

MRF Object Age Policy: Don't break on messages without cc/to

See merge request pleroma/pleroma!2840

4 years agoMRF Object Age Policy: Don't break on messages without cc/to
lain [Mon, 3 Aug 2020 12:12:32 +0000 (14:12 +0200)]
MRF Object Age Policy: Don't break on messages without cc/to

4 years agoMerge branch 'indigenous-client' into 'develop'
lain [Mon, 3 Aug 2020 11:37:55 +0000 (11:37 +0000)]
Merge branch 'indigenous-client' into 'develop'

Add indigenous to clients

See merge request pleroma/pleroma!2835

4 years agoMerge branch 'reportnote-test' into 'develop'
lain [Mon, 3 Aug 2020 09:55:56 +0000 (09:55 +0000)]
Merge branch 'reportnote-test' into 'develop'

ReportNote test

Closes #2014

See merge request pleroma/pleroma!2839

4 years agoAdd ReportNote test
Alex Gleason [Sun, 2 Aug 2020 21:37:33 +0000 (16:37 -0500)]
Add ReportNote test

4 years agoFactory: Add report_activity_factory
Alex Gleason [Sun, 2 Aug 2020 21:36:55 +0000 (16:36 -0500)]
Factory: Add report_activity_factory

4 years agoAdd email blacklist, fixes #1404
Alex Gleason [Sun, 2 Aug 2020 19:53:42 +0000 (14:53 -0500)]
Add email blacklist, fixes #1404

4 years agoAdd indigenous to clients
swentel [Sun, 2 Aug 2020 17:33:22 +0000 (19:33 +0200)]
Add indigenous to clients

4 years agoAdd welcome chatmessages
Ilja [Sun, 2 Aug 2020 13:54:59 +0000 (15:54 +0200)]
Add welcome chatmessages

* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md

4 years agoSimpleMRF: Add missing :followers_only to config.exs
Alex Gleason [Sat, 1 Aug 2020 21:08:29 +0000 (16:08 -0500)]
SimpleMRF: Add missing :followers_only to config.exs

4 years agoMerge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
lain [Sat, 1 Aug 2020 15:58:17 +0000 (15:58 +0000)]
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'

[#1985] Prevented force login on registration if account approval and/or email confirmation needed

Closes #1985

See merge request pleroma/pleroma!2823

4 years agoMerge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'
rinpatch [Sat, 1 Aug 2020 15:17:41 +0000 (15:17 +0000)]
Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'

ConnectionPool: fix gun open errors being returned without an error tuple

Closes #2008

See merge request pleroma/pleroma!2832

4 years agoConnectionPool: fix gun open errors being returned without an error tuple
rinpatch [Sat, 1 Aug 2020 14:59:50 +0000 (17:59 +0300)]
ConnectionPool: fix gun open errors being returned without an error tuple

When gun shuts down due to the host being unreachable, the worker
process shuts down with the same shutdown reason since they are linked.
Gun doesn't have error tuples in it's shutdown reason though, so we need
to handle it in get_conn.

Closes #2008

4 years agoMerge branch 'fix/gun-limiter' into 'develop'
rinpatch [Sat, 1 Aug 2020 10:49:35 +0000 (10:49 +0000)]
Merge branch 'fix/gun-limiter' into 'develop'

Fix ConnecitonPool deadlocking after reaching the connection limit

Closes #1977

See merge request pleroma/pleroma!2830

4 years agoFix ConnecitonPool deadlocking after reaching the connection limit
rinpatch [Sat, 1 Aug 2020 09:16:06 +0000 (12:16 +0300)]
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

4 years agoMerge branch 'fix/user-agent-overriding' into 'develop'
rinpatch [Sat, 1 Aug 2020 07:25:32 +0000 (07:25 +0000)]
Merge branch 'fix/user-agent-overriding' into 'develop'

Don't override user-agent header if it's been set

Closes #1923

See merge request pleroma/pleroma!2829

4 years agoDon't override user-agent header if it's been set
Roman Chvanikov [Sat, 1 Aug 2020 07:04:25 +0000 (10:04 +0300)]
Don't override user-agent header if it's been set

4 years agoRevert "Merge branch 'revert-1ac0969c' into 'develop'"
lain [Fri, 31 Jul 2020 15:18:04 +0000 (15:18 +0000)]
Revert "Merge branch 'revert-1ac0969c' into 'develop'"

This reverts merge request !2825

4 years agoMerge branch 'revert-1ac0969c' into 'develop'
lain [Fri, 31 Jul 2020 15:17:33 +0000 (15:17 +0000)]
Merge branch 'revert-1ac0969c' into 'develop'

Revert "Merge branch 'mrf-silence-2' into 'develop'"

See merge request pleroma/pleroma!2825

4 years agoRevert "Merge branch 'mrf-silence-2' into 'develop'"
lain [Fri, 31 Jul 2020 15:17:09 +0000 (15:17 +0000)]
Revert "Merge branch 'mrf-silence-2' into 'develop'"

This reverts merge request !2820

4 years agoMerge branch 'mrf-silence-2' into 'develop'
lain [Fri, 31 Jul 2020 14:43:33 +0000 (14:43 +0000)]
Merge branch 'mrf-silence-2' into 'develop'

MRF silencing alternative solution

See merge request pleroma/pleroma!2820

4 years ago[#1985] Prevented force login on registration if account approval and/or email confir...
Ivan Tashkinov [Fri, 31 Jul 2020 11:13:38 +0000 (14:13 +0300)]
[#1985] Prevented force login on registration if account approval and/or email confirmation needed.
Refactored login code in OAuthController, reused in AccountController. Added tests.

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Fri, 31 Jul 2020 10:29:16 +0000 (10:29 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoDefault MRF to ObjectAgePolicy, 7 days threshold
Haelwenn (lanodan) Monnier [Thu, 30 Jul 2020 16:49:48 +0000 (18:49 +0200)]
Default MRF to ObjectAgePolicy, 7 days threshold

4 years agoMerge branch 'deactivate-gun-again' into 'develop'
lain [Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)]
Merge branch 'deactivate-gun-again' into 'develop'

Config: Default to Hackney again

See merge request pleroma/pleroma!2821

4 years agoConfig: Default to Hackney again
lain [Fri, 31 Jul 2020 08:50:45 +0000 (10:50 +0200)]
Config: Default to Hackney again

Gun is still acting up.

4 years agoSimplePolicy: Fix problem with DM leaks.
lain [Fri, 31 Jul 2020 07:57:30 +0000 (09:57 +0200)]
SimplePolicy: Fix problem with DM leaks.

4 years agoMerge branch 'chore/fix-docs-typo' into 'develop'
feld [Thu, 30 Jul 2020 21:25:30 +0000 (21:25 +0000)]
Merge branch 'chore/fix-docs-typo' into 'develop'

Fix example json response

See merge request pleroma/pleroma!2819

4 years agoFix example json response
Mark Felder [Thu, 30 Jul 2020 20:57:41 +0000 (15:57 -0500)]
Fix example json response

4 years agoMerge branch 'fix/configdb-otp-instructions' into 'develop'
feld [Thu, 30 Jul 2020 20:28:28 +0000 (20:28 +0000)]
Merge branch 'fix/configdb-otp-instructions' into 'develop'

OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.

See merge request pleroma/pleroma!2817

4 years agoMerge branch 'render-preview-cards-in-chats' into 'develop'
Haelwenn [Thu, 30 Jul 2020 20:08:03 +0000 (20:08 +0000)]
Merge branch 'render-preview-cards-in-chats' into 'develop'

Render preview cards in chats

See merge request pleroma/pleroma!2816

4 years agoMerge branch '1993-confirm-users-on-registration' into 'develop'
Haelwenn [Thu, 30 Jul 2020 20:01:04 +0000 (20:01 +0000)]
Merge branch '1993-confirm-users-on-registration' into 'develop'

AccountController: Don't explicitly ask to keep users unconfirmed.

Closes #1993

See merge request pleroma/pleroma!2809

4 years agoMerge branch 'develop' into fix/configdb-otp-instructions
Mark Felder [Thu, 30 Jul 2020 18:04:49 +0000 (13:04 -0500)]
Merge branch 'develop' into fix/configdb-otp-instructions

4 years agoChatMessage schema: Add preview cards.
lain [Thu, 30 Jul 2020 17:57:45 +0000 (19:57 +0200)]
ChatMessage schema: Add preview cards.

4 years agoChatMessageReferenceView: Display preview cards.
lain [Thu, 30 Jul 2020 17:57:26 +0000 (19:57 +0200)]
ChatMessageReferenceView: Display preview cards.

4 years agoOTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
Mark Felder [Thu, 30 Jul 2020 17:37:56 +0000 (12:37 -0500)]
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.

4 years agoMerge branch 'chore/fix-configdb-docs-formatting' into 'develop'
feld [Thu, 30 Jul 2020 17:29:31 +0000 (17:29 +0000)]
Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'

Attempt to fix markdown formatting

See merge request pleroma/pleroma!2815

4 years agoAttempt to fix markdown formatting
Mark Felder [Thu, 30 Jul 2020 17:01:46 +0000 (12:01 -0500)]
Attempt to fix markdown formatting

4 years agoMerge branch 'hide-reactions' into 'develop'
lain [Thu, 30 Jul 2020 12:41:47 +0000 (12:41 +0000)]
Merge branch 'hide-reactions' into 'develop'

Let favourites and emoji reactions optionally be hidden

See merge request pleroma/pleroma!2804

4 years agoSimplePolicyTest: Add test for leaking DMs.
lain [Thu, 30 Jul 2020 12:29:00 +0000 (14:29 +0200)]
SimplePolicyTest: Add test for leaking DMs.

4 years agoMerge branch 'feature/captcha-expose-timeout' into 'develop'
lain [Thu, 30 Jul 2020 08:41:46 +0000 (08:41 +0000)]
Merge branch 'feature/captcha-expose-timeout' into 'develop'

Expose seconds_valid in Pleroma Captcha API endpoint

Closes #1954

See merge request pleroma/pleroma!2812

4 years agoApply 1 suggestion(s) to 1 file(s)
lain [Thu, 30 Jul 2020 08:00:07 +0000 (08:00 +0000)]
Apply 1 suggestion(s) to 1 file(s)

4 years agoMerge branch 'issue/1933-update-dependency' into 'develop'
lain [Thu, 30 Jul 2020 07:57:26 +0000 (07:57 +0000)]
Merge branch 'issue/1933-update-dependency' into 'develop'

[#1933] update dependency

See merge request pleroma/pleroma!2813

4 years agoset versions
Maksim Pechnikov [Thu, 30 Jul 2020 06:23:35 +0000 (09:23 +0300)]
set versions

4 years agoupdated `cors_plug`
Maksim Pechnikov [Thu, 30 Jul 2020 06:12:42 +0000 (09:12 +0300)]
updated `cors_plug`

4 years agoset `postgrex` version
Maksim Pechnikov [Thu, 30 Jul 2020 06:08:50 +0000 (09:08 +0300)]
set `postgrex` version

4 years agoset `web_push_encryption` version
Maksim Pechnikov [Thu, 30 Jul 2020 06:08:03 +0000 (09:08 +0300)]
set `web_push_encryption` version

4 years agoupdated `calendar` package
Maksim Pechnikov [Thu, 30 Jul 2020 05:58:19 +0000 (08:58 +0300)]
updated `calendar` package

4 years agoMerge branch 'develop' into issue/1933-update-dependency
Maksim Pechnikov [Thu, 30 Jul 2020 05:52:13 +0000 (08:52 +0300)]
Merge branch 'develop' into issue/1933-update-dependency

4 years agoExpose seconds_valid in Pleroma Captcha API endpoint
Mark Felder [Wed, 29 Jul 2020 21:07:22 +0000 (16:07 -0500)]
Expose seconds_valid in Pleroma Captcha API endpoint

4 years agoMerge remote-tracking branch 'upstream/develop' into mrf-silence
Alex Gleason [Wed, 29 Jul 2020 18:01:16 +0000 (13:01 -0500)]
Merge remote-tracking branch 'upstream/develop' into mrf-silence

4 years agoSimpleMRF: :silence --> :followers_only
Alex Gleason [Wed, 29 Jul 2020 17:58:08 +0000 (12:58 -0500)]
SimpleMRF: :silence --> :followers_only

4 years ago:show_reactions, refactor the other test
Alex Gleason [Wed, 29 Jul 2020 17:50:11 +0000 (12:50 -0500)]
:show_reactions, refactor the other test

4 years ago:show_reactions, add CHANGELOG.md, refactor test
Alex Gleason [Wed, 29 Jul 2020 17:45:32 +0000 (12:45 -0500)]
:show_reactions, add CHANGELOG.md, refactor test

4 years agoMerge remote-tracking branch 'upstream/develop' into hide-reactions
Alex Gleason [Wed, 29 Jul 2020 17:43:39 +0000 (12:43 -0500)]
Merge remote-tracking branch 'upstream/develop' into hide-reactions

4 years agoMerge branch 'issue/1023' into 'develop'
lain [Wed, 29 Jul 2020 13:45:15 +0000 (13:45 +0000)]
Merge branch 'issue/1023' into 'develop'

[#1023] added generated  `pleroma.env`

See merge request pleroma/pleroma!2763

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users...
lain [Wed, 29 Jul 2020 12:42:09 +0000 (14:42 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration

4 years agoMerge branch '1996-dont-break-on-chatmessages' into 'develop'
Haelwenn [Wed, 29 Jul 2020 12:20:04 +0000 (12:20 +0000)]
Merge branch '1996-dont-break-on-chatmessages' into 'develop'

EnsureRePrepended: Don't break on chat messages.

Closes #1996

See merge request pleroma/pleroma!2808

4 years agoMerge branch 'bugfix/remote-user-atom' into 'develop'
lain [Wed, 29 Jul 2020 12:16:20 +0000 (12:16 +0000)]
Merge branch 'bugfix/remote-user-atom' into 'develop'

feed/user_controller: Return 404 when the user is remote

Closes #1911

See merge request pleroma/pleroma!2811

4 years agofeed/user_controller: Return 404 when the user is remote
Haelwenn (lanodan) Monnier [Wed, 29 Jul 2020 12:02:02 +0000 (14:02 +0200)]
feed/user_controller: Return 404 when the user is remote

4 years agoMerge branch 'by-approval' into 'develop'
lain [Wed, 29 Jul 2020 11:27:26 +0000 (11:27 +0000)]
Merge branch 'by-approval' into 'develop'

Registrations "by approval" mode

Closes #1931

See merge request pleroma/pleroma!2757

4 years agoAccountController: Don't explicitly ask to keep users unconfirmed.
lain [Wed, 29 Jul 2020 09:47:03 +0000 (11:47 +0200)]
AccountController: Don't explicitly ask to keep users unconfirmed.

Confirmation is set in User.register_changeset based on the config
settings.

4 years agoEnsureRePrepended: Don't break on chat messages.
lain [Wed, 29 Jul 2020 08:53:08 +0000 (10:53 +0200)]
EnsureRePrepended: Don't break on chat messages.

4 years agoupdate mogrify package
Maksim Pechnikov [Wed, 29 Jul 2020 06:22:49 +0000 (09:22 +0300)]
update mogrify package

4 years agoset http_signatures version
Maksim Pechnikov [Wed, 29 Jul 2020 04:23:06 +0000 (07:23 +0300)]
set http_signatures version

4 years agoset `jason` version
Maksim Pechnikov [Wed, 29 Jul 2020 04:13:59 +0000 (07:13 +0300)]
set `jason` version

4 years agoupdated `pot` package
Maksim Pechnikov [Wed, 29 Jul 2020 04:02:36 +0000 (07:02 +0300)]
updated `pot` package

4 years agoupdated the minor version packages
Maksim Pechnikov [Wed, 29 Jul 2020 03:55:44 +0000 (06:55 +0300)]
updated the minor version packages

4 years agoset swoosh version
Maksim Pechnikov [Wed, 29 Jul 2020 03:50:00 +0000 (06:50 +0300)]
set swoosh version

4 years agoupdated dev & test packages
Maksim Pechnikov [Wed, 29 Jul 2020 03:45:08 +0000 (06:45 +0300)]
updated dev & test packages

4 years agoSimpleMRF silence: optimize, work okay with nil values in addressing
Alex Gleason [Wed, 29 Jul 2020 01:17:18 +0000 (20:17 -0500)]
SimpleMRF silence: optimize, work okay with nil values in addressing

4 years agoSimpleMRF: Let instances be silenced
Alex Gleason [Tue, 28 Jul 2020 23:55:29 +0000 (18:55 -0500)]
SimpleMRF: Let instances be silenced

4 years agoMerge branch 'fix/gun-pool-missing-cast' into 'develop'
rinpatch [Tue, 28 Jul 2020 21:16:45 +0000 (21:16 +0000)]
Merge branch 'fix/gun-pool-missing-cast' into 'develop'

gun ConnectionPool: Re-add a missing cast for remove_client

See merge request pleroma/pleroma!2805

4 years agogun ConnectionPool: Re-add a missing cast for remove_client
rinpatch [Tue, 28 Jul 2020 20:48:41 +0000 (23:48 +0300)]
gun ConnectionPool: Re-add a missing cast for remove_client

4 years agoLet favourites and emoji reactions optionally be hidden
Alex Gleason [Tue, 28 Jul 2020 19:49:49 +0000 (14:49 -0500)]
Let favourites and emoji reactions optionally be hidden

4 years agoMerge branch 'gun-replace-cast-with-call' into 'develop'
rinpatch [Tue, 28 Jul 2020 19:13:54 +0000 (19:13 +0000)]
Merge branch 'gun-replace-cast-with-call' into 'develop'

gun ConnectionPool: replace casts with calls

See merge request pleroma/pleroma!2803

4 years agogun ConnectionPool: replace casts with calls
rinpatch [Tue, 28 Jul 2020 17:49:48 +0000 (20:49 +0300)]
gun ConnectionPool: replace casts with calls

The slowdown from this is most likely immesurable, however it eliminates
possible false positives when tracking dead clients.

4 years agoMerge branch 'chore/frontends-config-clarification' into 'develop'
lain [Tue, 28 Jul 2020 17:32:18 +0000 (17:32 +0000)]
Merge branch 'chore/frontends-config-clarification' into 'develop'

Clarify location of frontends directory

See merge request pleroma/pleroma!2802

4 years agoClarify location of frontends directory
Mark Felder [Tue, 28 Jul 2020 17:10:04 +0000 (12:10 -0500)]
Clarify location of frontends directory

4 years agoMerge branch 'frontend-bundles-redux' into 'develop'
lain [Tue, 28 Jul 2020 16:45:21 +0000 (16:45 +0000)]
Merge branch 'frontend-bundles-redux' into 'develop'

Changeable frontends MVP

See merge request pleroma/pleroma!2801

4 years agoCheatsheet: Add even more info.
lain [Tue, 28 Jul 2020 15:50:32 +0000 (17:50 +0200)]
Cheatsheet: Add even more info.

4 years agoCheatsheet: Add more info.
lain [Tue, 28 Jul 2020 15:48:35 +0000 (17:48 +0200)]
Cheatsheet: Add more info.

4 years agoDocs: Add frontend info to cheat sheet.
lain [Tue, 28 Jul 2020 15:46:37 +0000 (17:46 +0200)]
Docs: Add frontend info to cheat sheet.

4 years agoAdd description for configuration.
Roman Chvanikov [Tue, 28 Jul 2020 15:40:21 +0000 (17:40 +0200)]
Add description for configuration.

4 years agoFrontendStatic: Add plug to serve frontends based on configuration.
lain [Tue, 28 Jul 2020 15:35:16 +0000 (17:35 +0200)]
FrontendStatic: Add plug to serve frontends based on configuration.

4 years agoInstanceStatic: Refactor.
lain [Tue, 28 Jul 2020 13:44:47 +0000 (15:44 +0200)]
InstanceStatic: Refactor.

4 years agoMerge branch 'issue/1986-earmark' into 'develop'
lain [Tue, 28 Jul 2020 08:40:20 +0000 (08:40 +0000)]
Merge branch 'issue/1986-earmark' into 'develop'

[#1986] locked the earmark version

See merge request pleroma/pleroma!2800

4 years agoMerge branch 'cleanup/masto_fe-default_settings' into 'develop'
lain [Tue, 28 Jul 2020 07:41:44 +0000 (07:41 +0000)]
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'

masto_fe_view: Remove @default_settings

See merge request pleroma/pleroma!2799