Commit graph

14978 commits

Author SHA1 Message Date
Mark Felder
80c32ae00b Document the changes for Varnish 7.0+ compatibility and RFC compliance 2022-08-12 15:06:45 -04:00
Alex Gleason
d639b69295 Merge branch 'odic' into 'develop'
OIDC

Closes #62

See merge request soapbox-pub/soapbox-be!151
2022-08-12 12:58:36 +00:00
Haelwenn
06f9324afe Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into 'develop'
Treat MRF rejects as success in Oban worker

Closes #2912

See merge request pleroma/pleroma!3720
2022-08-12 01:37:40 +00:00
Haelwenn
837d4dc87f Merge branch 'fix_flaky_tests_where_we_sometimes_loose_db_connections' into 'develop'
Fix flaky tests with DB connections; Allow higher amount of restarts for Pleroma.Repo during testing

See merge request pleroma/pleroma!3696
2022-08-12 01:36:11 +00:00
Haelwenn
93f12c0d0d Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
Synchronized settings for apps (frontends)

See merge request pleroma/pleroma!3698
2022-08-12 01:34:36 +00:00
Haelwenn
6ce3f76b5d Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'
Backport: bugfix/follow-state

Closes #2902

See merge request pleroma/pleroma!3718
2022-08-12 01:32:20 +00:00
Alex Gleason
f63b84e6dd
Include OAUTH_CONSUMER_STRATEGIES deps in mix.lock 2022-08-11 19:10:26 -05:00
Alex Gleason
f30d9d5cbc
Dockerfile: build with OAUTH_CONSUMER_STRATEGIES 2022-08-11 18:26:00 -05:00
Alex Gleason
2edb44789d
Merge remote-tracking branch 'origin/develop' into odic 2022-08-11 18:17:44 -05:00
Alex Gleason
a12441c9a5 Merge branch 'dokku' into 'develop'
Review apps with Dokku

See merge request soapbox-pub/soapbox-be!146
2022-08-11 23:15:23 +00:00
Alex Gleason
54838c959f
Expose oauth_consumer_strategies in instance API 2022-08-11 17:58:54 -05:00
feld
514caed573 Merge branch 'fix-varnish7-support' into 'develop'
Fix Varnish7 support

See merge request pleroma/pleroma!3722
2022-08-11 15:14:16 +00:00
Mark Felder
73b4d0d9a7 Fix the mocks to use uppercase as well 2022-08-10 21:46:56 +00:00
Mark Felder
243ed7d60f Update the recommended VCL configuration 2022-08-10 17:18:06 -04:00
Mark Felder
cbdc13b767 Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a capitalized HEAD verb 2022-08-10 17:09:58 -04:00
0412cdcb32 Merge remote-tracking branch 'soapbox/develop' into edits
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-08 17:01:48 +02:00
marcin mikołajczak
9ce43cf0cb Merge branch 'public-polls-' into 'develop'
Expose nonAnonymous field from Smithereen polls

See merge request soapbox-pub/soapbox-be!150
2022-08-08 14:41:24 +00:00
Tusooa Zhu
d487e0160c
Treat containment failure as cancel in ReceiverWorker 2022-08-08 08:41:33 -04:00
b4575815ed Add entry to @context, tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-08 10:45:43 +02:00
3d7d1870b5 Expose nonAnonymous field from Smithereen polls
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-07 23:56:52 +02:00
a665aaaad2 Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/edits' into edits 2022-08-06 14:41:12 +02:00
Tusooa Zhu
88e0e6acd5
Fix FederatorTest 2022-08-06 00:42:10 -04:00
Tusooa Zhu
a0166e92fa
Treat MRF rejects as success in Oban worker 2022-08-06 00:33:18 -04:00
Tusooa Zhu
5d900a5cd1
Use latest alpine version for docker image 2022-08-05 23:47:53 -04:00
Alex Gleason
d317e08b49
Add app.json for Dokku 2022-08-05 15:42:56 -05:00
Alex Gleason
5d31b5a9e9
Set GIT_DEPTH=0 for dokku deployment 2022-08-05 14:59:25 -05:00
Alex Gleason
9019550a27
Dokku: add missing dokku@ 2022-08-05 14:20:57 -05:00
Alex Gleason
9817db05f3
GitLab CI: remove before_script from review_app 2022-08-05 13:47:23 -05:00
Alex Gleason
c73a08869d
Deploy review app with Dokku 2022-08-05 13:21:18 -05:00
Alex Gleason
d0d1457680
Docker: respect PORT env, use 5000 by default 2022-08-05 09:32:42 -05:00
Alex Gleason
9832ab2573
docker-entrypoint: use $DATABASE_URL for pg_isready 2022-08-04 22:37:37 -05:00
Alex Gleason
97e141c5e3
docker.exs: simplify database config 2022-08-04 19:53:37 -05:00
Alex Gleason
132a65a87e
Remove .buildpacks 2022-08-04 19:17:30 -05:00
marcin mikołajczak
3b964ee555 Merge branch 'merge-pleroma' into 'develop'
merge-pleroma

See merge request soapbox-pub/soapbox-be!145
2022-08-03 22:04:39 +00:00
55c62d19a8 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-03 23:42:48 +02:00
floatingghost
f2a9285ff0
bugfix/follow-state (#104)
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/104
2022-08-03 01:07:53 -04:00
Alex Gleason
af622eaf03 Merge branch 'docker' into 'develop'
Fix the Dockerfile

See merge request soapbox-pub/soapbox-be!143
2022-08-02 20:55:09 +00:00
Tusooa Zhu
a4fa286d20
Use actor_types() to determine whether the Update is for user 2022-08-02 10:37:28 -04:00
marcin mikołajczak
fdea5d2df6 Merge branch 'stream_markers' into 'develop'
Stream marker updates

See merge request soapbox-pub/soapbox-be!144
2022-08-02 07:35:37 +00:00
Haelwenn
b2ba307f4d Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
local only fixes

Closes #2871

See merge request pleroma/pleroma!3660
2022-08-02 05:39:50 +00:00
Haelwenn
7299795eb4 Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'
Allow users to create backups without providing email address

See merge request pleroma/pleroma!3665
2022-08-02 05:23:49 +00:00
Haelwenn
f8540b0a9d Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!3716
2022-08-02 05:10:51 +00:00
fe0c02f2c8 Stream marker updates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-01 19:07:17 +02:00
Yating Zhan
99d4823ab1 Translated using Weblate (Chinese (Simplified))
Currently translated at 18.9% (189 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-31 22:00:56 +00:00
tusooa
cc533e6956 Translated using Weblate (Chinese (Simplified))
Currently translated at 18.9% (189 of 998 strings)

Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-31 22:00:56 +00:00
Haelwenn
7de21ec991 Merge branch 'from/develop/tusooa/emit-move' into 'develop'
Implement moving account

See merge request pleroma/pleroma!3524
2022-07-31 22:00:40 +00:00
Haelwenn
5ef2dc317d Change test case wording 2022-07-31 21:34:23 +00:00
tusooa
c80096522c Merge branch 'develop' into 'from/develop/tusooa/emit-move'
# Conflicts:
#   CHANGELOG.md
#   test/pleroma/user_test.exs
2022-07-31 21:32:49 +00:00
Haelwenn
b5266097a1 Merge branch 'mutes' into 'develop'
MastoAPI: Use `duration` param for mute expiration duration

See merge request pleroma/pleroma!3715
2022-07-31 19:41:25 +00:00
5d3d6a58f7 Use duration param for mute expiration duration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-31 17:22:34 +02:00