summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-17Don't accept forward slash character for nicknamesSean King
2022-07-17Allow to unset birthdaymarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17Merge branch 'shrink-ci' into 'develop'Haelwenn
Shrink CI See merge request pleroma/pleroma!3691
2022-07-17Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop'Haelwenn
Translatable config descriptions Closes pleroma-meta#65 See merge request pleroma/pleroma!3695
2022-07-16Document way to do notice compatibility routes with Nginx reverse-proxy insteadSean King
2022-07-17Merge branch 'notification_types' into 'develop'tusooa
MastoAPI: Use `types` for filtering notifications See merge request pleroma/pleroma!3648
2022-07-17Merge branch 'docs__setting_up_a_gitlab_runner' into 'develop'tusooa
DOCS: Add some small piece about setting up a Gitlab-runner See merge request pleroma/pleroma!3694
2022-07-16Use :utc_datetimemarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-16Add api docs for settings endpointTusooa Zhu
2022-07-16Implement settings apiTusooa Zhu
2022-07-14Pass in msgctxt for config translation stringsTusooa Zhu
2022-07-14Allow higher amount of restarts for Pleroma.Repo during testingfloatingghost
This was done by floatingghost as part of a bigger commit in Akkoma. See <https://akkoma.dev/AkkomaGang/akkoma/src/commit/37ae047e1652c4089934434ec79f393c4c839122/lib/pleroma/application.ex#L83>. As explained in <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 (https://akkoma.dev/AkkomaGang/akkoma/src/commit/37ae047e1652c4089934434ec79f393c4c839122/lib/pleroma/application.ex#L165) > then in test we fetch them all (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-13Merge branch 'from/upstream-develop/tusooa/zh-translation' into 'develop'tusooa
Translate static_pages.po (Simplified Chinese) See merge request pleroma/pleroma!3655
2022-07-13Extract translatable stringsTusooa Zhu
2022-07-13Fix compile errorTusooa Zhu
2022-07-13Make admin api use translated config descriptionsTusooa Zhu
2022-07-13Add tests for translator compilerTusooa Zhu
2022-07-13Extract config descriptions for translationTusooa Zhu
2022-07-13DOCS: Add some small piece about setting up a Gitlab-runnerIlja
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-13Merge branch 'short-description' into 'develop'tusooa
Add short_description instance field Closes #2865 See merge request pleroma/pleroma!3651
2022-07-13Add tests for short_descriptionTusooa Zhu
2022-07-12Make mutes and blocks behave the same as other listsTusooa Zhu
2022-07-12CI: cycles: Use current stable elixir imageHaelwenn (lanodan) Monnier
2022-07-12CI: template for change policies based on build stageHaelwenn (lanodan) Monnier
2022-07-11CI: Run stages when .gitlab-ci.yml changesHaelwenn (lanodan) Monnier
2022-07-11CI: Run lint and cycles in alpineHaelwenn (lanodan) Monnier
2022-07-11CI: Run postgres services in alpineHaelwenn (lanodan) Monnier
2022-07-11Merge branch 'fix/case-sensitivity-restricted-nicknames-blacklisted-domains' ↵tusooa
into 'develop' Make checking blacklisted domains and restricted nicknames case-insensitive Closes #2894 and #2888 See merge request pleroma/pleroma!3687
2022-07-10Make lint happyTusooa Zhu
2022-07-10Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop'Haelwenn
Pass remote follow avatar into media proxy Closes #2830 See merge request pleroma/pleroma!3690
2022-07-09Use is_binary instead of is_bitstring for restricted nicknames testsSean King
2022-07-10Pass remote follow avatar into media proxyTusooa Zhu
2022-07-09Fix rate_limiter_test.exs test "it restricts based on config values"Ilja
It used a timer to sleep. But time also goes on when doing other things, so depending on hardware, the timings could be off. I slightly changed the tests so we still test what we functionally want. Instead of waiting until the cache expires I now have a function to expire the test and use that. That means we're not testing any more if the cache really expires after a certain amount of time, but that's the responsability of the dependency imo, so shouldn't be a problem. I also changed `Pleroma.Web.Endpoint, :http, :ip` to `127.0.0.1` because that's the setting people typically have, and I see no reason to do it differently. Especially since it's an exernal ip, which may come over as weird or suspicious to people.
2022-07-08Add test for rendering mute expiration datemarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-06Make validation functions for restricted nicknames and blacklisted domains; ↵Sean King
do restricted nickname validation in LDAP account registration
2022-07-05Make checking blacklisted domains and restricted nicknames case-insenstiveSean King
2022-07-04Merge branch 'from/upstream-develop/tusooa/report-too-long' into 'develop'Haelwenn
Fix long report notes giving errors on creation See merge request pleroma/pleroma!3679
2022-07-04EmojiReactValidator: apply lanodan's suggestionsHaelwenn
These changes make the encoding for the fully-qualified heart emoji very visible in editors.
2022-07-03Merge branch 'fix/eblurhash-binaries' into 'develop'Haelwenn
mix: update eblurhash to 1.2.2 See merge request pleroma/pleroma!3686
2022-07-03Merge branch 'indexing-hotspots' into 'develop'Haelwenn
Add index hotspots See merge request pleroma/pleroma!3664
2022-07-03Merge branch 'image_description_from_exif_data' into 'develop'Haelwenn
Use EXIF data of image for image description See merge request pleroma/pleroma!3535
2022-07-03Merge branch 'bugfix/mime-validation-no-list' into 'develop'Haelwenn
Bugfix: Validate mediaType only by it's format See merge request pleroma/pleroma!3597
2022-07-03Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'Haelwenn
Server announcements (1st pass) See merge request pleroma/pleroma!3643
2022-07-02mix: update eblurhash to 1.2.2Hélène
Previous eblurhash versions bundled precompiled binaries which caused issues on non-Darwin operating systems.
2022-07-01Descriptions from exif data with only whitespeces are considered emptyIlja
I noticed that pictures taken with Ubuntu-Touch have whitespace in one of the fields This should just be ignored imo
2022-07-01update moduledocIlja
2022-07-01Change test picturesIlja
The previous pictures were labeled as public domain, but are actually a collage of pictures under other licenses. I now replaced them with a jpeg of simply a white pixel.
2022-07-01Add option to docs about instance genIlja
2022-07-01Better way of getting keysIlja
I used keyword_list[:key], but if the key doesn't exist, it will return nil. I actually expect a list and further down the code I use that list. I believe the key should always be present, but in case it's not, it's better to return an empty list instead of nil. That way the code wont fail further down the line.
2022-07-01Migration failed when no value for Pleroma.Upload was setIlja