View MR for information: !425



Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>

syuilo authored 1 year ago and dakkar committed 1 year ago

Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>

(cherry picked from commit fb455e4f)

(cherry picked from commit 8c5818ac)

CVE: Fixed code injection from twitter import

See merge request !390

(cherry picked from commit 127f8556)

2a8e93e4 Fixed code injection from twitter import

Update docker-compose_example.yml

See merge request TransFem-org/Sharkey!389

This reverts commit acf3e346

This reverts merge request !386

build stable with stable tag

See merge request TransFem-org/Sharkey!386

(cherry picked from commit 3b2d47b1)

Merge branch 'gitlab-ci' into 'develop'

See merge request !383

Originally from PR #288

Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/287

`globSync` doesn't guarantee the order in which it returns the
matching paths, so without the `sort()`, the config files may be
merged differently each time the server is started

Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/284

Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/283

note length is now configurable through the config file

Closes #281

falls back to 3000 (misskey default) if not used/included in config