Mark Felder
66cb3294ed
Switch to PromEx for prometheus metrics
...
Recommending use of the separate HTTP server for exposing the metrics
and securing it externally on your firewall or reverse proxy. It will
listen on port 4021 by default.
2023-11-13 15:34:59 -05:00
marcin mikołajczak
fe776d8b33
Fix GenerateUnsetUserKeys migration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-13 14:18:22 +01:00
lain
752bc168f6
Merge branch 'quotes-count' into 'develop'
...
Count and display post quotes
See merge request pleroma/pleroma!3956
2023-11-12 13:38:09 +00:00
marcin mikołajczak
9a063deacc
Count and display post quotes
2023-11-12 13:38:08 +00:00
lain
5f19fbc5a9
Merge branch 'phoenix1.7' into 'develop'
...
Update to Phoenix 1.7
See merge request pleroma/pleroma!3900
2023-11-12 13:34:27 +00:00
lain
e902c7168d
Merge branch 'meilisearch' into 'develop'
...
Different search backends, in particular meilisearch as an additional one
See merge request pleroma/pleroma!3529
2023-11-12 13:29:27 +00:00
Lain Soykaf
3d62c71edf
Credo fixes.
2023-11-12 17:13:27 +04:00
Lain Soykaf
59018d73c3
B Meilisearch: Update to current API responses.
2023-11-12 16:43:50 +04:00
Lain Soykaf
a1a25029da
B DatabaseSearch: Fix local-only search.
2023-11-12 16:19:54 +04:00
Lain Soykaf
5996bef7cd
Fix most tests that call SearchIndexWorker.
2023-11-12 15:54:16 +04:00
Lain Soykaf
5208bd8a95
Add changelog.
2023-11-12 15:00:51 +04:00
Lain Soykaf
d3f8950588
B MeiliSearch, SearchIndexingWorker: Use Config.Getting, make tests async.
2023-11-12 14:49:50 +04:00
Lain Soykaf
c1402af293
B Getting: Add default implementation, delegate, prepare test support.
2023-11-12 14:49:15 +04:00
Lain Soykaf
0c5cc51983
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch
2023-11-12 13:53:18 +04:00
Henry Jameson
637926dcbb
Initial draft on frontends management
2023-11-10 13:58:25 +02:00
feld
a51f3937ee
Merge branch 'benchee' into 'develop'
...
Ensure benchee doesn't run unless we are executing benchmarks
See merge request pleroma/pleroma!3972
2023-11-08 18:27:08 +00:00
Mark Felder
e23672d82f
Ensure benchee doesn't run unless we are executing benchmarks
2023-11-08 12:44:57 -05:00
Mark Felder
ef6d3dddd4
Fix changelogd grep syntax error
2023-11-08 12:28:23 -05:00
feld
aef1a88dc6
Merge branch 'changelogd-fix' into 'develop'
...
Fix changelogd grep syntax error
See merge request pleroma/pleroma!3973
2023-11-08 17:28:14 +00:00
Mark Felder
addc5408ff
Fix changelogd grep syntax error
2023-11-08 12:27:46 -05:00
feld
17524865e5
Merge branch 'update_mr_template' into 'develop'
...
Update MR template to include the type 'change'
See merge request pleroma/pleroma!3971
2023-11-08 14:39:00 +00:00
Mark Felder
1810b2f477
Update MR template to include the type 'change'
2023-11-08 09:37:08 -05:00
Mark Felder
0ab853cab8
Merge branch 'develop' into phoenix1.7
2023-11-08 09:18:08 -05:00
feld
0f56304f09
Merge branch 'bare_uri_test' into 'develop'
...
Activate test for object validator that has not been running
See merge request pleroma/pleroma!3968
2023-11-08 14:13:37 +00:00
feld
cfc01a660a
Merge branch 'changelogd-change' into 'develop'
...
changelogd: Support a type called "change"
See merge request pleroma/pleroma!3970
2023-11-08 14:12:33 +00:00
Mark Felder
e1bc95ae6e
Support a type called "change"
2023-11-08 09:11:41 -05:00
Haelwenn (lanodan) Monnier
76c070fe86
ObjectValidators.BareUriTest: Replace calls of SafeText to BareUri
2023-11-08 02:17:50 +01:00
Mark Felder
9fa6531109
Phoenix is no longer required in extra_applications
2023-11-07 16:14:05 -05:00
Mark Felder
a0e08c6ec2
Merge branch 'develop' into phoenix1.7
2023-11-07 16:05:04 -05:00
Mark Felder
8076deeeb4
Activate test for object validator that has not been running
2023-11-07 16:00:13 -05:00
feld
11c520607f
Merge branch 'mailer-queue' into 'develop'
...
Fix digest email processing, consolidate Oban queues
See merge request pleroma/pleroma!3966
2023-11-07 20:45:48 +00:00
Mark Felder
bf426c53b4
Fix digest email processing, consolidate Oban queues
...
The email related jobs can all share a single Oban queue
2023-11-07 15:14:36 -05:00
tusooa
4c5b45ed73
Merge branch 'mergeback/2.6.0' into 'develop'
...
mergeback: 2.6.0
Closes #3135
See merge request pleroma/pleroma!3964
2023-11-01 03:19:05 +00:00
tusooa
aaf53d9d77
Bump package version for mergeback
2023-10-31 20:49:31 -04:00
tusooa
6f654d534a
Merge branch 'release/2.6.0' into 'stable'
...
Release/2.6.0
See merge request pleroma/pleroma!3924
2023-11-01 00:43:35 +00:00
tusooa
ad45b06b3f
Merge branch 'stable' into 'release/2.6.0'
...
# Conflicts:
# .gitlab-ci.yml
# lib/pleroma/web/common_api/utils.ex
# lib/pleroma/web/xml.ex
# mix.exs
# test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
# test/pleroma/web/common_api/utils_test.exs
# test/pleroma/web/mastodon_api/update_credentials_test.exs
# test/pleroma/web/xml_test.exs
2023-10-31 01:07:43 +00:00
tusooa
ab894d98f4
Bundle 2.6.0 frontend
2023-10-29 12:59:03 -04:00
tusooa
6a13c2d180
Add collect-changelog script
2023-10-25 20:45:23 -04:00
tusooa
a2a69709b5
Bump version to 2.6.0
2023-10-24 19:57:31 -04:00
Haelwenn
e3ea311cd5
Merge branch 'tusooa/2810-punycode-mention' into 'develop'
...
Fix mentioning punycode domains when using Markdown
Closes #2810
See merge request pleroma/pleroma!3925
2023-10-18 01:20:00 +00:00
tusooa
df0b56576a
Fix other quotation mark conversion tests
2023-10-16 21:35:37 -04:00
tusooa
b748efe66a
Fix mentioning punycode domains when using Markdown
2023-10-16 21:35:25 -04:00
tusooa
340c881296
Merge branch 'tusooa/3018-unified-stream' into 'develop'
...
Unified streaming endpoint
Closes #3018
See merge request pleroma/pleroma!3864
2023-10-15 21:35:30 +00:00
tusooa
eb33a03d0a
Explain the encode-decode roundtrip
2023-10-15 17:20:26 -04:00
tusooa
3e7d2e29b3
Add changelog
2023-10-15 17:20:26 -04:00
tusooa
840dd01035
Fix duplicated schema names
2023-10-15 17:20:26 -04:00
tusooa
32de0683c4
Fix unsubscribe event type in streaming doc
2023-10-15 17:20:26 -04:00
tusooa
c13f0a8460
Add meta-info and query strings to streaming doc
2023-10-15 17:20:26 -04:00
tusooa
f393a15dd1
Fix some specs about server-sent events in streaming
2023-10-15 17:20:26 -04:00
tusooa
8829dcaee4
Document client-sent events in streaming
2023-10-15 17:20:25 -04:00