Commit graph

301 commits

Author SHA1 Message Date
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
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
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
Steven Fuchs aca6a7543a Upgrade to Elixir 1.9 2020-06-16 13:18:29 +00: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 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 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
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
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 d1379c4de8
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-13 16:07:17 +01:00
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
rinpatch 86e7709a4d mix.exs: bump version to development one 2020-03-08 23:24:30 +03:00
rinpatch 3508ae7039 version bump changelog and mix version 2020-03-05 22:35:23 +03:00
Alexander Strizhakov fe47bcde8c
updating tesla ref 2020-03-04 19:44:03 +03:00
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
Mark Felder 85d571fc23 Move Tesla repo to our GitLab 2020-03-02 12:52:41 -06:00
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun 2020-03-01 12:48:49 +03:00
rinpatch c026128325 deps: update cachex to 3.2.0 2020-02-29 20:40:23 +03:00
Alexander Strizhakov 3849bbb60d
temp using tesla from fork 2020-02-21 12:30:37 +03:00
Mark Felder cf94349287 Merge branch 'develop' into gun 2020-02-18 09:06:27 -06:00
Alexander Strizhakov 514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
rinpatch 472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00