Sean King
3da1b2548d
Actually fix with forward slashes being restricted inside nickname
2022-07-18 21:30:57 -06:00
Hélène
1a67a20364
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:24 +00:00
Hélène
f9fc3a153d
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:10 +00:00
Hélène
ce0a6737e7
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:02 +00:00
Hélène
97e8c8a10a
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:26 +00:00
Hélène
d24d74b1a7
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:21 +00:00
Hélène
db789acf1e
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:11 +00:00
Hélène
d622fe8d48
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:03 +00:00
Hélène
02b4b4da47
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:45 +00:00
Hélène
02947bafeb
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:30 +00:00
Hélène
ad730c2135
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:23 +00:00
Hélène
2baf3084a1
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:01 +00:00
Hélène
92da9c4a47
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:37:41 +00:00
Hélène
275c60208b
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:37:27 +00:00
Sean King
2c7eed122e
Don't accept forward slash character for nicknames
2022-07-17 12:50:01 -06:00
marcin mikołajczak
fb268c4378
Allow to unset birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 19:46:29 +02:00
Haelwenn
3193f18cf3
Merge branch 'shrink-ci' into 'develop'
...
Shrink CI
See merge request pleroma/pleroma!3691
2022-07-17 17:34:47 +00:00
Haelwenn
bb4860e222
Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop'
...
Translatable config descriptions
Closes pleroma-meta#65
See merge request pleroma/pleroma!3695
2022-07-17 17:34:21 +00:00
Sean King
64e16e6a4b
Document way to do notice compatibility routes with Nginx reverse-proxy instead
2022-07-16 23:44:37 -06:00
tusooa
8aba7c08d1
Merge branch 'notification_types' into 'develop'
...
MastoAPI: Use `types` for filtering notifications
See merge request pleroma/pleroma!3648
2022-07-17 03:17:43 +00:00
tusooa
eb4b7f6efa
Merge branch 'docs__setting_up_a_gitlab_runner' into 'develop'
...
DOCS: Add some small piece about setting up a Gitlab-runner
See merge request pleroma/pleroma!3694
2022-07-17 02:36:28 +00:00
marcin mikołajczak
597f56b4c4
Use :utc_datetime
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-16 16:28:22 +02:00
Tusooa Zhu
8113dd31ee
Add api docs for settings endpoint
2022-07-16 01:27:16 -04:00
Tusooa Zhu
8371fd8ca2
Implement settings api
2022-07-16 01:20:25 -04:00
Tusooa Zhu
1d7e8d6e01
Pass in msgctxt for config translation strings
2022-07-14 17:41:33 -04:00
floatingghost
28626eafc1
Allow higher amount of restarts for Pleroma.Repo during testing
...
This was done by floatingghost as part of a bigger commit in Akkoma.
See <37ae047e16/lib/pleroma/application.ex (L83)https://ihatebeinga.live/objects/860d23e1-dc64-4b07-8b4d-020b9c56cff6 >
> there are so many caches that clearing them all can nuke the supervisor, which by default will become an hero if it gets more than 3 restarts in <5 seconds
And further down the thread
> essentially we've got like 11 caches (37ae047e16/lib/pleroma/application.ex (L165)https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/test/support/data_case.ex#L50 ) and call clear on them
> so if this clear fails on any 3 of them, the pleroma supervisor itself will die
How it fails?
> idk maybe cachex dies, maybe :ets does a weird thing
> it doesn't log anything, it just consistently dies during cache clearing so i figured it had to be that
> honestly my best bet is locksmith and queuing
> https://github.com/whitfin/cachex/blob/master/lib/cachex/actions/clear.ex#L26
> clear is thrown into a locksmith transaction
> locksmith says
> >If the process is already in a transactional context, the provided function will be executed immediately. Otherwise the required keys will be locked until the provided function has finished executing.
> so if we get 2 clears too close together, maybe it locks, then doesn't like the next clear?
2022-07-14 13:50:44 +02:00
Ilja
c045a49909
Add privilege for announcements
2022-07-14 08:40:26 +02:00
Ilja
44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +02:00
tusooa
3fb9171694
Merge branch 'from/upstream-develop/tusooa/zh-translation' into 'develop'
...
Translate static_pages.po (Simplified Chinese)
See merge request pleroma/pleroma!3655
2022-07-13 23:39:46 +00:00
Tusooa Zhu
074a94e90d
Extract translatable strings
2022-07-13 18:57:57 -04:00
Tusooa Zhu
7473868880
Fix compile error
2022-07-13 18:46:21 -04:00
Tusooa Zhu
20588517fc
Make admin api use translated config descriptions
2022-07-13 18:31:35 -04:00
Tusooa Zhu
36f6d92d98
Add tests for translator compiler
2022-07-13 18:31:01 -04:00
Tusooa Zhu
b2a0718e83
Extract config descriptions for translation
2022-07-13 18:01:47 -04:00
marcin mikołajczak
9022d855cd
Check refute User.following?
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-13 22:57:42 +02:00
Ilja
8ddea16b0d
DOCS: Add some small piece about setting up a Gitlab-runner
...
This is based on me setting one up, but I kept it general with mostly linking to other documentation.
The idea is that to just provide some Pleroma-specific info, maybe give some pointers, and point to the right (external) docs.
2022-07-13 20:54:24 +02:00
tusooa
fdc71f6051
Merge branch 'short-description' into 'develop'
...
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
Tusooa Zhu
eb2a1652bf
Add tests for short_description
2022-07-13 00:40:46 -04:00
Tusooa Zhu
c1874bc8f9
Make mutes and blocks behave the same as other lists
2022-07-12 19:03:18 -04:00
Haelwenn (lanodan) Monnier
12d888e04e
CI: cycles: Use current stable elixir image
2022-07-12 13:13:24 +02:00
Haelwenn (lanodan) Monnier
6e158bba2c
CI: template for change policies based on build stage
2022-07-12 12:13:34 +02:00
Haelwenn (lanodan) Monnier
e574408b33
CI: Run stages when .gitlab-ci.yml changes
2022-07-11 10:15:18 +02:00
Haelwenn (lanodan) Monnier
702a41ce23
CI: Run lint and cycles in alpine
2022-07-11 10:12:18 +02:00
Haelwenn (lanodan) Monnier
08c8814ef0
CI: Run postgres services in alpine
2022-07-11 09:29:18 +02:00
tusooa
311fda32f3
Merge branch 'fix/case-sensitivity-restricted-nicknames-blacklisted-domains' into 'develop'
...
Make checking blacklisted domains and restricted nicknames case-insensitive
Closes #2894 and #2888
See merge request pleroma/pleroma!3687
2022-07-11 04:04:36 +00:00
Tusooa Zhu
8bb2e52d2e
Make lint happy
2022-07-10 23:43:49 -04:00
Haelwenn
420da14b61
Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop'
...
Pass remote follow avatar into media proxy
Closes #2830
See merge request pleroma/pleroma!3690
2022-07-10 16:19:16 +00:00
Sean King
3cf6c2b7ea
Use is_binary instead of is_bitstring for restricted nicknames tests
2022-07-09 23:39:35 -06:00
Tusooa Zhu
2efc0ffcf0
Pass remote follow avatar into media proxy
2022-07-10 00:12:53 -04:00
Tusooa Zhu
04ded94a50
Fix remote emoji in subject disappearing after edits
2022-07-09 18:00:42 -04:00
