6c6de8e5df
Merge branch 'temp-hackney-fix' into 'develop'
...
temp hackney fix
See merge request pleroma/pleroma!2951
2020-09-07 12:47:43 +00:00
b5f3694302
Merge branch 'chore/back-to-upstream-tesla' into 'develop'
...
switch back to upstream tesla
See merge request pleroma/pleroma!2966
2020-09-07 12:38:22 +00:00
8628e1b216
switch back to upstream tesla
...
The patch we required got merged upstream: 9f7261ca49
2020-09-07 15:21:20 +03:00
1984ff3103
Add a changelog entry for hackney downgrade
2020-09-07 15:16:04 +03:00
d5c286b802
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-07 11:12:30 +00:00
fdab01ab56
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-07 10:19:19 +00:00
000c315ee7
Merge branch 'fix/no-rich-media-error' into 'develop'
...
RichMedia: do not log webpages missing metadata as errors
See merge request pleroma/pleroma!2960
2020-09-07 08:18:59 +00:00
23932aaf38
Merge branch 'chore/add-cc-by-4' into 'develop'
...
Add a copy of CC-BY-4.0 to the repo
See merge request pleroma/pleroma!2962
2020-09-07 08:14:34 +00:00
08aef7dd4e
instance: Log catch favicon errors as warnings
2020-09-07 08:40:52 +02:00
0b4fa769f4
Add a copy of CC-BY-4.0 to the repo
...
We mentined it in COPYING, but didn't actually have a copy in the repo.
2020-09-06 11:38:38 +03:00
170599c390
RichMedia: do not log webpages missing metadata as errors
...
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
2020-09-05 22:05:35 +03:00
047a60c46e
Merge branch 'hotfix-the-hotfix' into 'develop'
...
ConnectionPool: fix the previous hotfix
See merge request pleroma/pleroma!2959
2020-09-05 19:04:19 +00:00
129a2f48df
ConnectionPool middleware: handle connection opening errors
2020-09-05 21:36:17 +03:00
9d6aca5bee
ConnectionPool: fix the previous hotfix
...
I rushed the hotfix and forgot how `pop_in` actually works,
I want to die. We need some integration tests for the HTTP client
2020-09-05 21:27:06 +03:00
b42869424f
Merge branch 'hotfix/tesla-env-no-access' into 'develop'
...
ConnectionPool middleware: fix a crash due to unimplemented behaviour
See merge request pleroma/pleroma!2958
2020-09-05 18:18:49 +00:00
5298de3be6
ConnectionPool middleware: fix a crash due to unimplemented behaviour
...
Structs don't implement Access behaviour, so this crashed. Tests didn't
catch it and I didn't test that part of the codepath. Very sorry
2020-09-05 21:17:03 +03:00
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
2020-09-05 20:53:46 +03:00
8c8fb84a38
Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'
...
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
See merge request pleroma/pleroma!2954
2020-09-05 17:47:12 +00:00
de7e2ae0b5
use override flag for hackney dependency
2020-09-05 11:15:27 +03:00
0d91f65284
Prevent AccountView and instance.get_or_update_favicon fails
2020-09-05 05:43:50 +02:00
da4660d2bf
Merge branch 'use-https-in-dockerfile' into 'develop'
...
Use TLS when adding Alpine community repository in Dockerfile
See merge request pleroma/pleroma!2955
2020-09-05 03:10:54 +00:00
9fd0e5e0dd
Use TLS when adding Alpine community repository in Dockerfile
2020-09-04 19:19:56 -07:00
10da13c713
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects
...
Requires a patched Tesla due to upstream not saving opts between
redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04 22:10:40 +03:00
2cd2a8fda3
Merge branch 'develop' into 'develop'
...
Added cmake
See merge request pleroma/pleroma!2953
2020-09-04 18:19:23 +00:00
173b04df48
Added cmake
2020-09-04 18:03:58 +00:00
473458b0fb
fix for ReverseProxy
2020-09-04 14:45:30 +03:00
8bd2b6eb13
temp hackney fix
2020-09-04 14:24:15 +03:00
2b04cdf407
Merge branch 'feat/simplify-pool-managment' into 'develop'
...
HTTP: radically simplify pool checkin/checkout
See merge request pleroma/pleroma!2948
2020-09-04 10:27:46 +00:00
5dde1fdae2
Merge branch 'chore/fast_html-bump' into 'develop'
...
mix.lock: Bump fast_html
See merge request pleroma/pleroma!2950
2020-09-04 07:17:10 +00:00
bce22937dc
mix.lock: Bump fast_html
...
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
2020-09-04 09:15:58 +02:00
d34fe2840d
HTTP: radically simplify pool checkin/checkout
...
Use a custom tesla middleware instead of adapter helper function +
custom redirect middleware.
This will also fix "Client died before releasing the connection"
messages when the request pool is overloaded. Since the checkout is
now done after passing ConcurrentLimiter.
This is technically less efficient, since the connection needs to be
checked in/out every time the middleware is left or entered respectively.
But I don't think the nanoseconds we might lose on redirects
to the same host are worth the complexity.
2020-09-03 23:44:13 +03:00
9433311923
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
...
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
2020-09-03 11:50:30 +00:00
1d743ca829
Merge branch 'fix_install_fe_bug' into 'develop'
...
Fix frontend install mix task bug
See merge request pleroma/pleroma!2942
2020-09-03 09:56:17 +00:00
5da3677607
Frontend mix task: Add tests.
2020-09-03 11:40:17 +02:00
f26b580e80
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
2020-09-03 11:29:39 +02:00
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-02 17:11:24 +00:00
0ab03e8564
Merge branch 'fix/1991-tzdata-update' into 'develop'
...
user agent if Endpoint is not started yet
Closes #1991
See merge request pleroma/pleroma!2945
2020-09-02 17:09:55 +00:00
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
2020-09-02 17:03:45 +00:00
581f382e71
ListController: DRY up stuff.
2020-09-02 18:32:00 +02:00
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
d6e979aebe
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-02 13:46:11 +00:00
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
2020-09-02 16:45:54 +03:00
a11f23c130
user agent if Endpoint is not started yet
2020-09-02 15:45:47 +03:00
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
46236d1d87
html.ex: optimize external url extraction
...
By using a :not() selector and only extracting attributes from the
first match.
2020-09-02 12:45:20 +03:00
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-02 09:36:56 +00:00
84fbf16161
timeout option moved to gun adapter helper
2020-09-02 10:50:51 +03:00
1c57ef4498
default pool for tz_data client
2020-09-02 10:33:43 +03:00
96de4bfbca
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-02 06:55:58 +00:00
rinpatch
lain
Haelwenn
Haelwenn (lanodan) Monnier
Alexander Strizhakov
James Alseth
Farhan Khan
feld
Mark Felder