lain [Mon, 27 Jul 2020 12:34:36 +0000 (12:34 +0000)]
Merge branch 'issue/1934-welcome-email' into 'develop'
[#1934] welcome email
See merge request pleroma/pleroma!2786
lain [Mon, 27 Jul 2020 12:24:41 +0000 (12:24 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Haelwenn [Mon, 27 Jul 2020 08:20:46 +0000 (08:20 +0000)]
Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
ReverseProxy: Fix a gun connection leak when there is an error with no body
See merge request pleroma/pleroma!2798
Haelwenn [Mon, 27 Jul 2020 08:11:07 +0000 (08:11 +0000)]
Merge branch 'fix/update-types-in-link-formatter' into 'develop'
Update types in Pleroma.Formatter group in description.exs
See merge request pleroma/pleroma!2796
rinpatch [Sun, 26 Jul 2020 17:44:26 +0000 (20:44 +0300)]
ReverseProxy tesla client: remove handling of old_conn
This is no longer relevant because we use a custom
FollowRedirects middleware now
rinpatch [Sun, 26 Jul 2020 16:38:57 +0000 (16:38 +0000)]
Merge branch 'patch-3' into 'develop'
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
See merge request pleroma/pleroma!2797
rinpatch [Sun, 26 Jul 2020 16:18:21 +0000 (19:18 +0300)]
ReverseProxy: Fix a gun connection leak when there is an error with no
body
- Modify `close/1` function to do the same thing it does for hackney,
which is - close the client rather than the whole connection
- Release the connection when there is no body to chunk
Alibek Omarov [Sun, 26 Jul 2020 13:59:46 +0000 (13:59 +0000)]
OpenAPI: remove accidentally pasted buffer data
Alibek Omarov [Sun, 26 Jul 2020 13:54:56 +0000 (13:54 +0000)]
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
lain [Sun, 26 Jul 2020 11:47:18 +0000 (11:47 +0000)]
Merge branch 'fix/mix-tasks' into 'develop'
Fix/mix tasks
Closes #1972 and #1970
See merge request pleroma/pleroma!2795
Angelina Filippova [Sat, 25 Jul 2020 22:48:50 +0000 (01:48 +0300)]
Update types in Pleroma.Formatter group
Maksim Pechnikov [Sat, 25 Jul 2020 04:09:09 +0000 (07:09 +0300)]
added migrate old settings to new
Mark Felder [Fri, 24 Jul 2020 17:06:56 +0000 (12:06 -0500)]
Ensure Oban is available during mix tasks.
Fixes: mix pleroma.user rm username
Mark Felder [Fri, 24 Jul 2020 17:05:42 +0000 (12:05 -0500)]
Fix mix tasks that make HTTP calls by starting the Gun connection pool
Maksim Pechnikov [Fri, 24 Jul 2020 05:35:06 +0000 (08:35 +0300)]
remove duplicate module
feld [Thu, 23 Jul 2020 20:06:11 +0000 (20:06 +0000)]
Merge branch 'unblock-domain-via-query' into 'develop'
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
Mark Felder [Thu, 23 Jul 2020 17:59:40 +0000 (12:59 -0500)]
Support blocking via query parameters as well and document the change.
feld [Thu, 23 Jul 2020 17:23:18 +0000 (17:23 +0000)]
Merge branch 'feature/add-mrf-related-policies' into 'develop'
Add MRF related policies field to description.exs
See merge request pleroma/pleroma!2790
Haelwenn [Thu, 23 Jul 2020 16:58:36 +0000 (16:58 +0000)]
Merge branch '1976-status-view-fixes' into 'develop'
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
Maksim Pechnikov [Thu, 23 Jul 2020 13:36:27 +0000 (16:36 +0300)]
Merge branch 'develop' into issue/1934-welcome-email
lain [Thu, 23 Jul 2020 12:52:02 +0000 (12:52 +0000)]
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
Ivan Tashkinov [Thu, 23 Jul 2020 12:08:30 +0000 (15:08 +0300)]
[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
lain [Thu, 23 Jul 2020 11:08:29 +0000 (11:08 +0000)]
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
Fix #783: Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
lain [Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)]
Merge branch 'issue/1878' into 'develop'
[#1878] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
lain [Thu, 23 Jul 2020 10:28:52 +0000 (10:28 +0000)]
Merge branch 'linkify' into 'develop'
Fix Linkify
See merge request pleroma/pleroma!2792
Maksim Pechnikov [Thu, 23 Jul 2020 03:51:19 +0000 (06:51 +0300)]
added warning to use old keys
Alex Gleason [Wed, 22 Jul 2020 21:01:55 +0000 (16:01 -0500)]
Update linkify migration tests to use config from ConfigDB
Alex Gleason [Wed, 22 Jul 2020 19:18:09 +0000 (14:18 -0500)]
Migration to fix malformed Pleroma.Formatter config
Alex Gleason [Wed, 22 Jul 2020 18:45:15 +0000 (13:45 -0500)]
Refactor require_migration/1 into a test helper function
Alex Gleason [Wed, 22 Jul 2020 18:10:10 +0000 (13:10 -0500)]
Add AutolinkerToLinkify migration test
Alex Gleason [Wed, 22 Jul 2020 16:27:52 +0000 (11:27 -0500)]
Fix linkify ConfigDB migration
Ivan Tashkinov [Wed, 22 Jul 2020 16:06:00 +0000 (19:06 +0300)]
[#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.
Angelina Filippova [Wed, 22 Jul 2020 15:15:30 +0000 (18:15 +0300)]
Add related_policy field
lain [Wed, 22 Jul 2020 15:09:32 +0000 (15:09 +0000)]
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
Maksim Pechnikov [Wed, 22 Jul 2020 13:00:49 +0000 (16:00 +0300)]
added check user email for welcome email
Lain Soykaf [Wed, 22 Jul 2020 12:44:06 +0000 (14:44 +0200)]
StatusView: Handle badly formatted emoji reactions.
Maksim Pechnikov [Wed, 22 Jul 2020 12:34:47 +0000 (15:34 +0300)]
fix sender for welcome email
lain [Wed, 22 Jul 2020 11:22:34 +0000 (11:22 +0000)]
Merge branch 'bugfix/limiter_git_url' into 'develop'
mix.exs: Append .git to git repo URLs
Closes #1980
See merge request pleroma/pleroma!2787
Haelwenn (lanodan) Monnier [Wed, 22 Jul 2020 10:00:07 +0000 (12:00 +0200)]
mix.exs: Append .git to git repo URLs
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
Maksim Pechnikov [Wed, 22 Jul 2020 06:17:00 +0000 (09:17 +0300)]
update description
Maksim Pechnikov [Wed, 22 Jul 2020 05:58:06 +0000 (08:58 +0300)]
added tests
Mark Felder [Tue, 21 Jul 2020 22:29:11 +0000 (17:29 -0500)]
Document the emoji packs API fix
Mark Felder [Tue, 21 Jul 2020 22:27:13 +0000 (17:27 -0500)]
Test that Emoji Packs can be listed when instance is not public
Mark Felder [Tue, 21 Jul 2020 22:26:59 +0000 (17:26 -0500)]
Skip the correct plug
lain [Tue, 21 Jul 2020 22:18:17 +0000 (22:18 +0000)]
Revert "Merge branch 'revert-
2b5d9eb1' into 'develop'"
This reverts merge request !2784
lain [Tue, 21 Jul 2020 22:18:02 +0000 (22:18 +0000)]
Merge branch 'revert-
2b5d9eb1' into 'develop'
Revert "Merge branch 'linkify' into 'develop'"
See merge request pleroma/pleroma!2784
lain [Tue, 21 Jul 2020 22:17:34 +0000 (22:17 +0000)]
Revert "Merge branch 'linkify' into 'develop'"
This reverts merge request !2677
Mark Felder [Tue, 21 Jul 2020 21:25:45 +0000 (16:25 -0500)]
Merge branch 'develop' into fix/pleroma-api-emoji-packs
lain [Tue, 21 Jul 2020 19:35:43 +0000 (19:35 +0000)]
Merge branch 'linkify' into 'develop'
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
lain [Tue, 21 Jul 2020 19:31:03 +0000 (19:31 +0000)]
Merge branch 'gopher-fix' into 'develop'
Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775
Egor Kislitsyn [Tue, 21 Jul 2020 12:06:46 +0000 (16:06 +0400)]
Allow unblocking a domain via query params
Alexander Strizhakov [Tue, 21 Jul 2020 07:31:58 +0000 (10:31 +0300)]
copy tmp file if test depends on it
Maksim Pechnikov [Tue, 21 Jul 2020 06:25:53 +0000 (09:25 +0300)]
added welcome email
Alex Gleason [Mon, 20 Jul 2020 18:45:05 +0000 (13:45 -0500)]
Pleroma.Formatter can have partial updates
Alex Gleason [Mon, 20 Jul 2020 14:29:03 +0000 (09:29 -0500)]
Update linkify to latest release
Haelwenn [Mon, 20 Jul 2020 13:52:56 +0000 (13:52 +0000)]
Merge branch 'patch-1' into 'develop'
fix markdown rendering withing <details>; typo parent**s**_visible
See merge request pleroma/pleroma!2781
Dym Sohin [Mon, 20 Jul 2020 11:41:43 +0000 (11:41 +0000)]
fix markdown rendering withing <details>; typo parent**s**_visible
Alex Gleason [Sat, 18 Jul 2020 20:10:48 +0000 (15:10 -0500)]
Test angry face in formatter D:< #1968
feld [Sat, 18 Jul 2020 16:49:30 +0000 (16:49 +0000)]
Merge branch 'fix/followredirects-hackney' into 'develop'
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
Closes #1966 and #1961
See merge request pleroma/pleroma!2778
href [Sat, 18 Jul 2020 11:17:38 +0000 (13:17 +0200)]
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
KokaKiwi [Sat, 18 Jul 2020 10:55:04 +0000 (12:55 +0200)]
Fix /api/pleroma/emoji/packs index endpoint.
Haelwenn [Fri, 17 Jul 2020 18:54:30 +0000 (18:54 +0000)]
Merge branch 'fix-1958' into 'develop'
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
Alex Gleason [Fri, 17 Jul 2020 02:39:10 +0000 (21:39 -0500)]
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Haelwenn [Fri, 17 Jul 2020 16:52:59 +0000 (16:52 +0000)]
Merge branch 'feature/expose-post-formats' into 'develop'
Expose the post formats in /api/v1/instance
See merge request pleroma/pleroma!2776
Mark Felder [Fri, 17 Jul 2020 15:45:41 +0000 (10:45 -0500)]
Expose the post formats in /api/v1/instance
Alexander Strizhakov [Fri, 17 Jul 2020 15:06:05 +0000 (18:06 +0300)]
using atom keys in search params
feld [Fri, 17 Jul 2020 14:36:38 +0000 (14:36 +0000)]
Merge branch 'feature/totp-input-improvements' into 'develop'
Improve TOTP token and recovery input fields in OAuth login
See merge request pleroma/pleroma!2769
Mark Felder [Fri, 17 Jul 2020 13:19:49 +0000 (08:19 -0500)]
TOTP length is configurable, so we can't hardcode this here.
rinpatch [Fri, 17 Jul 2020 08:05:16 +0000 (08:05 +0000)]
Merge branch 'chore/issue-template-remove-tasks' into 'develop'
Bug issue template: remove choice in "Installation type"
See merge request pleroma/pleroma!2774
rinpatch [Fri, 17 Jul 2020 08:03:47 +0000 (11:03 +0300)]
Bug issue template: remove choice in "Installation type"
It made gitlab display "1 of 2 tasks completed" when one is chosen,
which is totally not what this was used for.
Alex Gleason [Thu, 16 Jul 2020 21:35:03 +0000 (16:35 -0500)]
Migrate :auto_linker --> Pleroma.Formatter in ConfigDB
Alex Gleason [Tue, 2 Jun 2020 00:51:41 +0000 (19:51 -0500)]
Formatter: Test link with local mention
Alex Gleason [Thu, 16 Jul 2020 19:54:20 +0000 (14:54 -0500)]
Use updated Linkify from git
Alex Gleason [Thu, 16 Jul 2020 19:52:48 +0000 (14:52 -0500)]
description.exs typofixes
Alex Gleason [Thu, 16 Jul 2020 19:51:36 +0000 (14:51 -0500)]
Merge remote-tracking branch 'upstream/develop' into linkify
Mark Felder [Thu, 16 Jul 2020 18:11:03 +0000 (13:11 -0500)]
Improve TOTP token and recovery input fields in OAuth login
feld [Wed, 15 Jul 2020 23:10:52 +0000 (23:10 +0000)]
Merge branch 'refactor/gun-pool-registry' into 'develop'
Refactor gun pooling and simplify adapter option insertion
Closes #1834, #1700, and #1680
See merge request pleroma/pleroma!2479
Mark Felder [Wed, 15 Jul 2020 18:34:27 +0000 (13:34 -0500)]
Merge branch 'develop' into refactor/gun-pool-registry
feld [Wed, 15 Jul 2020 15:22:39 +0000 (15:22 +0000)]
Merge branch 'refactor/notification_settings' into 'develop'
Refactor notification settings
See merge request pleroma/pleroma!2602
Mark Felder [Wed, 15 Jul 2020 14:38:56 +0000 (09:38 -0500)]
Update FE bundle
Mark Felder [Wed, 15 Jul 2020 14:30:23 +0000 (09:30 -0500)]
Merge branch 'develop' into refactor/notification_settings
rinpatch [Wed, 15 Jul 2020 14:00:22 +0000 (14:00 +0000)]
Merge branch 'features/mrf-reasons' into 'develop'
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
rinpatch [Wed, 15 Jul 2020 13:52:01 +0000 (13:52 +0000)]
Merge branch 'fix/oban-pruning' into 'develop'
Bring back oban job pruning
Closes #1945
See merge request pleroma/pleroma!2768
feld [Wed, 15 Jul 2020 13:44:52 +0000 (13:44 +0000)]
Merge branch 'issue/sign-authority' into 'develop'
Include port in host for signatures
See merge request pleroma/pleroma!2766
Haelwenn (lanodan) Monnier [Wed, 15 Jul 2020 13:25:33 +0000 (15:25 +0200)]
MastoAPI: fix & test giving MRF reject reasons
rinpatch [Wed, 15 Jul 2020 13:20:17 +0000 (16:20 +0300)]
Bring back oban job pruning
Closes #1945
rinpatch [Wed, 15 Jul 2020 12:58:08 +0000 (15:58 +0300)]
ConnectionPool.Worker: do not stop with an error when there is a timeout
This produced error log messages about GenServer termination
every time the connection was not open due to a timeout.
Instead we stop with `{:shutdown, <gun_error>}` since shutting down
when the connection can't be established is normal behavior.
Maksim Pechnikov [Wed, 15 Jul 2020 12:49:46 +0000 (15:49 +0300)]
Merge branch 'develop' into issue/sign-authority
href [Mon, 13 Jul 2020 08:44:36 +0000 (10:44 +0200)]
Set a default timeout for Gun adapter timeout
href [Wed, 8 Jul 2020 17:23:32 +0000 (19:23 +0200)]
Don't test tls_options in adapter helper test.
href [Wed, 8 Jul 2020 14:02:57 +0000 (16:02 +0200)]
host is now useless
href [Wed, 8 Jul 2020 13:12:09 +0000 (15:12 +0200)]
Simplify TLS opts
- `verify_fun` is not useful now
- use `customize_check_hostname` (OTP 20+ so OK)
- `partial_chain` is useless as of OTP 21.1 (wasn't there, but hackney/..
uses it)
href [Wed, 8 Jul 2020 13:02:56 +0000 (15:02 +0200)]
Go back to upstream Tesla
href [Wed, 8 Jul 2020 12:59:10 +0000 (14:59 +0200)]
Bump gun
href [Wed, 8 Jul 2020 11:58:38 +0000 (13:58 +0200)]
parentheses...
href [Wed, 8 Jul 2020 11:22:42 +0000 (13:22 +0200)]
Fix race in enforcer/reclaimer start
href [Wed, 8 Jul 2020 11:01:02 +0000 (13:01 +0200)]
Ensure connections error get known by the caller
href [Tue, 7 Jul 2020 16:56:17 +0000 (18:56 +0200)]
ConnectionPool.Worker: Open gun conn in continue instead of init
rinpatch [Mon, 6 Jul 2020 09:13:02 +0000 (12:13 +0300)]
config.exs: set gun retries to 0
The new pooling code just removes the connection when it's down,
there is no need to reconnect a connection that is just sitting idle,
better just open a new one next time it's needed
rinpatch [Wed, 1 Jul 2020 22:53:27 +0000 (01:53 +0300)]
Connection Pool: fix LRFU implementation to not actually be LRU
The numbers of the native time unit were so small the CRF was always 1,
making it an LRU. This commit switches the time to miliseconds and changes
the time delta multiplier to the one yielding mostly highest hit rates according
to the paper