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
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
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -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
Alexander Strizhakov
de7e2ae0b5
use override flag for hackney dependency
2020-09-05 11:15:27 +03: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
rinpatch
ce387ce730
mix.exs: bump development version after 2.1.0 release
2020-08-28 16:15:57 +03:00
lain
b141e35d64
Mix: Update version
2020-08-28 11:34:48 +02:00
lain
49a436ad3e
Mix: Make rc version explicit.
2020-08-25 16:07:07 +02:00
lain
ea2b5c07e3
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
2020-08-25 15:38:12 +02:00
rinpatch
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
2020-08-07 16:45:33 +03:00
Roman Chvanikov
4672b61106
Merge branch 'develop' into command-available-check
2020-08-05 19:16:48 +03:00
Mark Felder
697e3db01c
Add analyze mix alias to run the same credo checks we use in CI
2020-08-04 08:55:40 -05: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
56171cbde6
set versions
2020-07-30 09:23:35 +03:00
Maksim Pechnikov
b261135683
updated `cors_plug`
2020-07-30 09:12:42 +03:00
Maksim Pechnikov
aac7e0314e
set `postgrex` version
2020-07-30 09:08:50 +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
Maksim Pechnikov
d6e36aaf06
set `jason` version
2020-07-29 07:13:59 +03:00
Maksim Pechnikov
88f57418c8
updated `pot` package
2020-07-29 07:02:36 +03:00
Maksim Pechnikov
992a271196
updated the minor version packages
2020-07-29 07:00:27 +03:00
Maksim Pechnikov
ed881247b7
set swoosh version
2020-07-29 06:50:00 +03:00
Maksim Pechnikov
15b8446cdb
updated dev & test packages
2020-07-29 06:47:56 +03:00
Maksim Pechnikov
3e5fb90eaa
locked earmark version
2020-07-28 07:00:02 +03:00
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
Haelwenn (lanodan) Monnier
c8fe0321b0
mix.exs: Append .git to git repo URLs
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
2020-07-22 12:00:07 +02:00
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
Alex Gleason
5d263dfdb3
Update linkify to latest release
2020-07-20 09:29:03 -05:00
Alex Gleason
5701840d30
Use updated Linkify from git
2020-07-16 15:01:13 -05:00
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
href
ebfa591689
Go back to upstream Tesla
2020-07-15 15:26:35 +03:00
href
6b1f6a1cf7
Bump gun
2020-07-15 15:26:35 +03:00
rinpatch
4128e3a84a
HTTP: Implement max request limits
2020-07-15 15:26:35 +03:00
rinpatch
e6ccc25565
Fix in-db configuration in dev environment
...
Previously, in-db configuration only worked when `warnings_as_errors`
was disabled because re-compiling scrubbers on application restart
created a warning about module conflicts. This patch fixes that
by enabling `ignore_module_conflict` option of the compiler at runtime,
and enables `warnings_as_errors` in prod since there is no reason
to keep it disabled anymore.
2020-07-14 13:16:54 +03:00
Roman Chvanikov
05187d497d
One can not simply call application modules from mix.exs
2020-07-11 16:09:46 +03:00
Roman Chvanikov
aedbbec88a
Add Pleroma.Utils.command_available?/1 and use where appropriate
2020-07-11 15:48:45 +03:00
Mark Felder
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
2020-07-10 11:34:53 -05:00
Mark Felder
d7a37fddd1
Switch to the official Oban 2.0.0 release
2020-07-10 11:33:08 -05:00
Alexander Strizhakov
b6688030fa
prometheus update for OTP 23
2020-07-10 10:35:59 +03:00
Mark Felder
4d3d867f10
Update Oban to 2.0-rc3
2020-07-03 10:37:07 -05:00
Mark Felder
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
2020-07-03 10:36:41 -05:00
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
Maksim Pechnikov
dc60b1ee58
updated swoosh
2020-06-29 16:27:01 +03:00
Maksim Pechnikov
721fc7c554
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
2020-06-24 09:12:32 +03:00
Maksim Pechnikov
71e233268a
oban 2.0-rc2
2020-06-23 21:47:01 +03:00
Maksim Pechnikov
a8d967762e
migrate to oban 2.0-rc1
2020-06-23 15:09:01 +03:00
lain
6efd3730c3
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
...
mix.exs: version git-less (part 2, MacOS-compat)
See merge request pleroma/pleroma!2420
2020-06-20 16:22:01 +00:00
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
2020-06-16 15:27:27 +02:00
Steven Fuchs
aca6a7543a
Upgrade to Elixir 1.9
2020-06-16 13:18:29 +00:00
href
ec1452fd1c
Pleroma.MIME: use gen_magic
2020-06-16 15:15:50 +02:00
rinpatch
9046f85ced
mix.exs: bump to 2.0.7
2020-06-12 21:09:28 +03:00
rinpatch
fe8cf54829
mix.exs: bump version to 2.0.6
2020-06-08 01:33:07 +03:00
Roman Chvanikov
0186f56d93
Update crypt library
2020-06-08 00:58:31 +03:00
Roman Chvanikov
512261c97d
Update crypt library
2020-05-19 14:46:06 +03:00
Alex Gleason
9cbf17d59f
Handle bcrypt passwords for Mastodon migration
2020-05-13 10:53:56 -05:00
lain
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
2020-05-13 09:33:37 +00:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
rinpatch
2906cbbd40
mix.exs: bump to 2.0.5
2020-05-13 00:33:38 +03:00
rinpatch
b5b675fa14
fix eldap being required for non-OTP releases
2020-05-12 23:05:31 +03:00
rinpatch
da2fe8920d
fix eldap being required for non-OTP releases
2020-05-12 23:03:21 +03:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
rinpatch
9c23955879
mix.exs: bump version to 2.0.4
2020-05-10 18:03:33 +03:00
rinpatch
a74c31ff63
include eldap in OTP releases
...
Closes #1313
2020-05-10 01:09:20 +03:00
rinpatch
b6d1bcc55d
include eldap in OTP releases
...
Closes #1313
2020-05-09 15:17:12 +03:00
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
rinpatch
04f23294d3
mix.exs: bump to 2.0.3
2020-05-02 19:16:27 +03:00
Haelwenn (lanodan) Monnier
0d74e38f5f
mix.exs: Do not bail out when .git doesn’t exists
2020-05-01 00:55:37 +03:00
Haelwenn (lanodan) Monnier
053c461530
mix.exs: proper check on 0, remove else in git_pre_release
2020-04-24 00:45:12 +02:00
Haelwenn (lanodan) Monnier
c63d6ba0b2
mix.exs: branch_name fallbacks to ""
2020-04-23 23:44:30 +02:00
Haelwenn (lanodan) Monnier
b429a49504
mix.exs: Fix for MacOS
2020-04-23 23:44:03 +02:00
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
Haelwenn (lanodan) Monnier
c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists
2020-04-19 20:24:32 +02:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
Maksim Pechnikov
648cc699e5
Merge branch 'develop' into support/update_oban
2020-04-10 07:09:28 +03:00
kPherox
c2aad36aa8
Rename function
2020-04-09 23:19:41 +00:00
kPherox
0e8f6d24b8
Create OTP_VERSION file by `mix release`
2020-04-10 00:22:50 +09:00
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
Maksim Pechnikov
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
Egor Kislitsyn
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
rinpatch
a674094ec6
mix.exs bump version to 2.0.2
2020-03-31 14:02:51 +03:00
rinpatch
0c010c292e
Merge branch 'fix/ecto_ssl_option' into 'develop'
...
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
2020-03-31 13:42:19 +03:00
Alexander Strizhakov
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Cevado
4705590f76
Fix ssl option on Ecto config breaking release
...
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
2020-03-16 22:02:01 -03:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier
5f9fbd7d33
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15 16:59:52 +03:00