Commit Graph

306 Commits

Author SHA1 Message Date
Mark Felder 9272cef500 Switch to a build of Majic that does not try to fix extensions by default 2021-01-28 14:03:29 -06:00
Mark Felder d2382ab5f4 Update Oban to 2.3.4 2021-01-15 15:01:48 -06:00
Mark Felder a1a58f0a53 Switch to local fork of crypt until upstream fixes ability to build on aarch64
https://github.com/msantos/crypt/pull/8
2020-12-28 17:52:18 -06:00
lain e4f1d8f48c Merge branch 'cachex-test' into 'develop'
Test framework overhaul (speed, reliability)

See merge request pleroma/pleroma!3209
2020-12-26 10:26:35 +00:00
Mark Felder 5b838accc0 Update Linkify to 0.4.1
Fixes false positive detection of IPv4 addresses
2020-12-23 09:07:01 -06:00
Alexander Strizhakov dedc575225
update for retired elixir_make package version 2020-12-22 17:42:23 +03:00
lain 713612c377 Cachex: Make caching provider switchable at runtime.
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
rinpatch f687befb93 Merge branch 'fix/hackney-follow-redirects' into 'develop'
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix

Closes #2342

See merge request pleroma/pleroma!3199
2020-12-13 12:16:41 +00:00
Mark Felder 7d78c00049 Majic: specify commit so source users do not get surprise updates 2020-12-12 13:04:16 -06:00
Mark Felder 3299fea9e3 Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix 2020-12-12 13:01:30 -06:00
Mark Felder 45949b5cd3 Update Linkify to 0.4.0 2020-12-01 17:26:25 -06:00
Mark Felder 60c8c5402c Update Linkify to 0.3.0
Added

- Support returning result as iodata and as safe iodata

Fixed

- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
2020-11-23 11:22:50 -06:00
rinpatch 83ec4aadd6 Merge branch 'chores/tesla_1.4.0' into 'develop'
mix.exs: Update tesla to 1.4.0

See merge request pleroma/pleroma!3152
2020-11-17 12:42:51 +00:00
Haelwenn (lanodan) Monnier 3f69680ed9
mix.exs: Update tesla to 1.4.0 2020-11-17 13:09:56 +01:00
Mark Felder eea962fc10 Fix S3 uploads with Elixir 1.11 2020-11-16 19:51:44 +00:00
Mark Felder 2f2281fdf1 Ensure URLs for git repos end in .git for older git clients like on CentOS 7 2020-11-02 17:09:56 -06:00
Ivan Tashkinov 14900164b8 [#3059] Used forked prometheus-phx to remove log spam. 2020-10-22 17:58:25 +03:00
Ivan Tashkinov 8a55de1d78 [#3059] Fixed Phoenix 1.5 telemetry processing. 2020-10-22 13:54:15 +03:00
Ivan Tashkinov 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 2020-10-17 17:53:47 +03:00
Egor Kislitsyn a859d9bc15
Update dependencies 2020-10-15 18:05:54 +04:00
Mark Felder c4fae2611f Switch Majic to a copy hosted in our GitLab 2020-10-12 12:25:45 -05:00
Mark Felder 04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Mark Felder f3bc076f09 Temporarily soft-fork prometheus_ex 2020-10-07 10:23:20 -05:00
Mark Felder 268f7f492a Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings 2020-10-07 09:50:51 -05:00
Mark Felder cee1883b35 Update Oban to 2.1.0 2020-09-30 07:53:19 -05:00
feld 6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy

See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
Steven Fuchs f2ef9735c5 Federate data through persistent websocket connections 2020-09-18 11:58:22 +00:00
Mark Felder 55562ca936 Merge branch 'develop' into feature/gen-magic 2020-09-10 16:05:22 -05:00
Mark Felder 4ee99dafcc Merge branch 'develop' into media-preview-proxy 2020-09-09 11:11:36 -05:00
rinpatch 0c1d243185 bump concurrent_limiter
Should fix gun deadlocks
2020-09-09 18:34:07 +03:00
rinpatch 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
rinpatch 8628e1b216 switch back to upstream tesla
The patch we required got merged upstream: 9f7261ca49
2020-09-07 15:21:20 +03:00
Mark Felder 563718cab9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy 2020-09-06 08:15:34 -05:00
rinpatch 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
Alexander Strizhakov 8bd2b6eb13
temp hackney fix 2020-09-04 14:24:15 +03:00
Haelwenn (lanodan) Monnier 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
Mark Felder 85446cc30c Merge branch 'develop' into media-preview-proxy 2020-09-03 10:34:06 -05:00
rinpatch 858e9a59ed mix.lock: bump fast_sanitize
The update brings a better error message for when cmake isn't installed
2020-08-31 09:54:16 +03:00
Mark Felder 2cfe2dc81b Merge branch 'develop' into feld-2168-media-preview-proxy 2020-08-26 16:37:57 -05:00
rinpatch 6da17f88d6 fix fast_html build errors with gcc 10 by bumping fast_sanitize
Closes #2058
2020-08-26 16:31:02 +03:00
Ivan Tashkinov da116d81fb [#2497] Added video preview proxy. Switched from exexec to Port. 2020-08-18 18:23:27 +03:00
Ivan Tashkinov 2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	config/config.exs
#	mix.lock
2020-08-11 15:13:29 +03:00
rinpatch c662b09eee mix.exs: update fast_sanitize to 0.2.0 2020-08-07 16:45:33 +03:00
Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	mix.lock
2020-08-07 09:38:05 +03:00
rinpatch 87180ff817 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
2020-08-01 12:18:56 +03:00
Maksim Pechnikov b261135683 updated `cors_plug` 2020-07-30 09:12:42 +03:00
Maksim Pechnikov 4f10ef5e46 set `web_push_encryption` version 2020-07-30 09:08:03 +03:00
Maksim Pechnikov df82839c30 updated `calendar` package 2020-07-30 08:58:19 +03:00
Maksim Pechnikov cd2423d7f5 update mogrify package 2020-07-29 09:22:49 +03:00
Maksim Pechnikov b4603a9c9c set http_signatures version 2020-07-29 07:23:06 +03:00