bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15085 commits 1 branch 0 tags 292 MiB
Commit graph

15085 commits

This branch
This branch
All branches
Author SHA1 Message Date
marcin mikołajczak
fa9106bb1b Merge remote-tracking branch 'soapbox/develop' into polls 2022-08-16 07:42:22 +02:00
marcin mikołajczak
95f18a7296 Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
 2022-08-15 21:22:06 +02:00
Alex Gleason
02caf99400 Merge branch 'instance-favicon-tests' into 'develop' 
Disable instance favicons in tests

See merge request soapbox-pub/soapbox-be!161
 2022-08-15 01:44:15 +00:00
Alex Gleason
93c237881f
Disable instance favicons in tests 2022-08-14 20:43:19 -05:00
Alex Gleason
f8a8523d29 Merge branch 'instance-favicons' into 'develop' 
Soapbox: enable instance favicons

See merge request soapbox-pub/soapbox-be!160
 2022-08-15 00:41:02 +00:00
Alex Gleason
899ac39d71
Soapbox: enable instance favicons 2022-08-14 19:40:14 -05:00
Hélène
88c1c76d3e
Migrations: delete contexts with BaseMigrator 
Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
 2022-08-15 01:47:09 +02:00
Hélène
bb02ee99f5
CommonFixes: more predictable context generation 
`context` fields for objects and activities can now be generated based
on the object/activity `inReplyTo` field or its ActivityPub ID, as a
fallback method in cases where `context` fields are missing for incoming
activities and objects.
 2022-08-15 01:46:55 +02:00
Alex Gleason
02ffc908f6 Merge branch 'keycloak-default-scope' into 'develop' 
Set better default scope for keycloak

See merge request soapbox-pub/soapbox-be!159
 2022-08-14 22:18:24 +00:00
Alex Gleason
91ba80466d
Set better default scope for keycloak 2022-08-14 16:16:20 -05:00
Alex Gleason
a9550ac88d Merge branch 'delete-pleroma-fe' into 'develop' 
Delete Pleroma FE

See merge request soapbox-pub/soapbox-be!155
 2022-08-13 22:04:59 +00:00
Alex Gleason
ce19607358
index.html: add server-generated-meta so tests pass 2022-08-13 14:33:12 -05:00
Alex Gleason
d4d09828bf
Merge remote-tracking branch 'origin/develop' into delete-pleroma-fe 2022-08-13 14:30:14 -05:00
Alex Gleason
f5d8063e43 Merge branch 'merge-pleroma' into 'develop' 
Merge Pleroma

See merge request soapbox-pub/soapbox-be!156
 2022-08-13 19:29:49 +00:00
Alex Gleason
91873fed45
GitLab CI: allow_failure in review_app 2022-08-13 14:29:13 -05:00
Alex Gleason
dae909ad34
Revert "Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'" 
This reverts commit 93f12c0d0d, reversing
changes made to 6ce3f76b5d.
 2022-08-13 14:06:21 -05:00
Alex Gleason
70c2eaf15b
Don't auto-retry erratic tests, wasting CI minutes 2022-08-13 14:05:41 -05:00
Alex Gleason
f5713ab575
Tag erratic test 2022-08-13 14:04:21 -05:00
Alex Gleason
55c15ea81e
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-08-13 13:42:11 -05:00
Alex Gleason
858f83c85a
Restore panel.html and terms-of-service.html so tests pass 2022-08-13 13:35:04 -05:00
Alex Gleason
e1689cb323
Merge remote-tracking branch 'origin/develop' into delete-pleroma-fe 2022-08-13 13:27:25 -05:00
Alex Gleason
a77a6c0b9d
GitLab CI: allow_failure for review_app 2022-08-13 13:27:11 -05:00
Alex Gleason
9069af3187
soapbox.exs: delete landing-fe 2022-08-13 13:26:39 -05:00
Alex Gleason
f3f269b523 Merge branch 'more-docker-fixes' into 'develop' 
docker.exs: don't call fetch_env! for DB_PASS

See merge request soapbox-pub/soapbox-be!154
 2022-08-13 18:07:15 +00:00
Alex Gleason
705ccabec4
Fix landing page image 2022-08-13 13:06:31 -05:00
Alex Gleason
e8cfd1da05
Delete Pleroma FE 2022-08-13 12:50:37 -05:00
Alex Gleason
7d478b6ba3
docker.exs: don't call fetch_env! for DB_PASS 2022-08-13 12:15:26 -05:00
Alex Gleason
366e66b9ee Merge branch 'docker-fixes' into 'develop' 
Docker fixes

See merge request soapbox-pub/soapbox-be!153
 2022-08-13 00:02:22 +00:00
Alex Gleason
362c650f49
Copy .gitignore into .dockerignore 2022-08-12 18:30:06 -05:00
Alex Gleason
547fb9bd24
Docker config: pleroma --> postgres, default config 2022-08-12 18:29:49 -05:00
Alex Gleason
f4b002d844
docker-entrypoint: fix DATABASE_URL building 2022-08-12 18:29:19 -05:00
Alex Gleason
c5649dbd27
Dockerfile: ENV --> ARG 2022-08-12 18:28:55 -05:00
marcin mikołajczak
9ffb4d055a Handle voters count correctly 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-12 23:49:20 +02:00
marcin mikołajczak
3482b5d3a3 wip events 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-12 23:11:34 +02:00
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
marcin mikołajczak
2833287bee wip 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-10 14:21:50 +02:00