monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,111 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

3730 Commits

Author SHA1 Message Date
Claire cabd7c21fc Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream 2024-06-19 19:37:37 +02:00
Claire 2cda1dd542
Fix compatibility with Redis < 6.2 again (#30412) 2024-06-19 16:59:37 +00:00
Claire 52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
github-actions[bot] 80743e0e7f
New Crowdin Translations (automated) (#30762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-19 08:45:40 +00:00
Matt Jankowski be19b94dea
Unpluralize mistakenly changed privacy template (#30759) 2024-06-18 21:34:17 +00:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
github-actions[bot] 50db95b9a1
New Crowdin Translations (automated) (#30746) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-18 12:39:36 +00:00
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Claire 8089fa6935 Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's different theming system.
  Ported upstream's change.
 2024-06-17 18:14:14 +02:00
github-actions[bot] 35d52d7914
New Crowdin Translations (automated) (#30723) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-17 12:13:23 +00:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Matt Jankowski 980034e2e1
Fix `Style/NilLambda` cop in paperclip initializer (#30695) 2024-06-14 09:50:50 +00:00
Matt Jankowski 222ab80557
Fix `Style/GlobalStdStream` cop in environments/* files (#30694) 2024-06-14 09:50:33 +00:00
github-actions[bot] a7264a2b42
New Crowdin Translations (automated) (#30704) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-14 09:08:17 +00:00
Emelia Smith 3d9f00ae16
Fix unsafe URLs in audit log resulting from domain blocks (#27139) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-14 07:54:09 +00:00
github-actions[bot] dd587d29b6
New Crowdin Translations (automated) (#30684) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-13 13:30:07 +00:00
github-actions[bot] ced463360e
New Crowdin Translations (automated) (#30666) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-12 10:48:31 +00:00
Claire 4daed855e5 Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
Matt Jankowski 665f6f09a0
Add expired/revoked scopes for doorkeeper models via extension modules (#29936) 2024-06-11 08:50:51 +00:00
Matt Jankowski 0e1110c947
Use `SECRET_KEY_BASE_DUMMY` feature as placeholder during asset compilation (#30505) 2024-06-10 20:08:04 +00:00
Claire be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
github-actions[bot] bb27321781
New Crowdin Translations (automated) (#30608) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-10 14:29:30 +00:00
Matt Jankowski 0cf91213c9
Opt in to remaining Rails 7.1 defaults (#30332) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-10 06:32:20 +00:00
Claire 905e9fab97
Merge pull request #2696 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2024-06-08 13:42:34 +02:00
Claire 01a9b37c20 Fix bogus translations 2024-06-08 13:28:41 +02:00
GitHub Actions aab5b10c38 New Crowdin translations 2024-06-08 04:29:18 +00:00
Claire 7277d2f130 Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream 2024-06-07 20:30:51 +02:00
Claire 80cd001e0a
Fix linting issue (#30595) 2024-06-07 14:32:29 +00:00
Isa S 773283ffb9
Make S3's retry limit a ENV variable (#23215) 2024-06-07 13:54:55 +00:00
Victor Dyotte 299ae9bf92
Add `S3_KEY_PREFIX` environment variable (#30181) 2024-06-07 12:29:30 +00:00
Matt Jankowski a5e3b814a2
Remove Status/ivar/shapes regression check from test env (#30580) 2024-06-07 10:00:51 +00:00
Matt Jankowski 3dfc7267e2
Rename deprecated config option to `enable_reloading` in dev env (#30577) 2024-06-07 10:00:27 +00:00
github-actions[bot] c1b0c1a5e4
New Crowdin Translations (automated) (#30586) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-07 09:59:30 +00:00
Claire 30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
github-actions[bot] a729104a41
New Crowdin Translations (automated) (#30575) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-06 08:53:28 +00:00
Eugen Rochko a2505e8611
Add timeline of public posts about a trending link to REST API (#30381) 2024-06-06 08:43:04 +00:00
Emelia Smith e02d23b549
Change `read:me` scope to `profile` scope (#30357) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-06 07:30:10 +00:00
Eugen Rochko 5f15a892fa
Add support for libvips in addition to ImageMagick (#30090) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-05 19:15:39 +00:00
github-actions[bot] e4e3875452
New Crowdin Translations (automated) (#30543) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-05 07:52:25 +00:00
Claire 974335e414
Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
github-actions[bot] aa9b80f57d
New Crowdin Translations (automated) (#30517) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-03 07:34:33 +00:00
Matt Jankowski 4d3748ac44
Fix rack attack `match_type` value typo in logging config (#30514) 2024-06-03 07:16:01 +00:00
Matt Jankowski a22865a352
Add `:email` to filter parameter logging config (#30492) 2024-05-31 09:35:56 +00:00
github-actions[bot] dac4eba46b
New Crowdin Translations (automated) (#30499) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-31 09:26:52 +00:00
github-actions[bot] a0b525e50b
New Crowdin Translations (automated) (#30477) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-30 14:54:51 +00:00
Claire b8271f20c5 Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream 2024-05-30 15:41:31 +02:00
Claire 73a78cc19d
Fix rate-limiting incorrectly triggering a session cookie on most endpoints (#30483) 2024-05-30 12:56:18 +00:00
Claire 3fa0dd0b88
Merge pull request from GHSA-c2r5-cfqr-c553 
* Add hardening monkey-patch to prevent IP spoofing on misconfigured installations

* Remove rack-attack safelist
 2024-05-30 14:24:29 +02:00
Claire 16249946ae
Merge pull request from GHSA-q3rg-xx5v-4mxh 2024-05-30 14:14:04 +02:00
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00