mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,940 Commits
69 Branches
20 Tags
374 MiB
Commit Graph

21940 Commits (4c55a6ee739e5c7fad4914cd078219345023bec7)

Author SHA1 Message Date
David Lapshin cd0c547936
Fix announcements icon rotating like settings one (#30388) 2024-05-21 15:24:51 +00:00
Claire 32223863a5
Add coverage to `/admin/accounts/:id` (#30386) 2024-05-21 13:17:34 +00:00
Claire edf6ca56e3 Fix rubocop error and cleanup `Status.as_direct_timeline` a little 2024-05-21 13:12:46 +02:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
Claire 89f89d738f
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385) 2024-05-21 08:56:08 +00:00
github-actions[bot] eda2bdfc7a
New Crowdin Translations (automated) (#30383) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-21 08:48:36 +00:00
Claire e853355f24
Merge pull request #2714 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0a2110b9af
 2024-05-20 20:23:13 +02:00
renovate[bot] 0663c7d78d
fix(deps): update formatjs monorepo (#30359) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:14:10 +00:00
renovate[bot] 8c925dec79
chore(deps): update dependency rubocop-rails to v2.25.0 (#30341) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 17:04:21 +00:00
Claire 20fdf8e22c Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream 2024-05-20 17:47:48 +02:00
Claire 7b3eef4cb1
Merge pull request #2713 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to de4815afda
 2024-05-20 17:27:55 +02:00
Matt Jankowski 0a2110b9af
Add coverage for custom filters (#30347) 2024-05-20 15:00:09 +00:00
Claire 00cf8d3748
Change older Paperclip database migrations for consistency (#30204) 2024-05-20 14:59:27 +00:00
Claire 2bcbeed951
Add some error handling to OTP secret migration (#30344) 2024-05-20 14:59:23 +00:00
Renaud Chaput ca5955ed76 [Glitch] Use a modern React context for identity in the app 
Port a178ba7cd5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-20 12:53:52 +02:00
Claire e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
Claire de4815afda
Add more tests for self-destruct mode (#30374) 2024-05-20 10:06:51 +00:00
Matt Jankowski def6b686ff
Fix `Rails/WhereRange` cop (#30343) 2024-05-20 09:37:36 +00:00
Matt Jankowski 70608f824e
Add coverage for `AdminMailer#auto_close_registrations` (#30349) 2024-05-20 08:03:39 +00:00
Renaud Chaput 9658d3e580
Use the job class as span name for Sidekiq root spans (#30353) 2024-05-20 08:01:04 +00:00
renovate[bot] 0ce22859a5
fix(deps): update dependency @rails/ujs to v7.1.3 (#30356) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:56:28 +00:00
github-actions[bot] 8b75d18371
New Crowdin Translations (automated) (#30358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-20 07:41:38 +00:00
renovate[bot] 814d00cf4b
chore(deps): update dependency @formatjs/cli to v6.2.12 (#30370) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:40:37 +00:00
renovate[bot] 778bd96a52
chore(deps): update dependency @types/lodash to v4.17.4 (#30371) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-20 07:40:20 +00:00
Renaud Chaput 990a0c19a9
Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API (#30368) 2024-05-20 07:29:27 +00:00
Nick Schonning 0f07e1cd4c
Fix yarn.lock diff (#30366) 2024-05-19 19:37:49 +00:00
renovate[bot] 0a343b9a91
fix(deps): update react monorepo to v18.3.1 (#30074) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-19 17:15:06 +00:00
Renaud Chaput a178ba7cd5
Use a modern React context for identity in the app (#30098) 2024-05-19 17:07:32 +00:00
Joshua Byrd 6282b6da77
Fix og:image requests when html in a web page is over 1.megabyte (#30362) 2024-05-19 16:30:05 +00:00
Claire 93a617236e
Merge pull request #2712 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 12472e7f40
 2024-05-17 18:05:32 +02:00
Emelia Smith 2da2a1dae9
Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192) 2024-05-17 13:46:12 +00:00
Claire 57fb2cf948 Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream 2024-05-17 12:33:41 +02:00
Claire 9668ac5acd
Merge pull request #2711 from ClearlyClaire/glitch-soc/merge-upstream 
Port upstream changes up to b2388be71e
 2024-05-17 12:32:59 +02:00
Claire 12472e7f40
Add emphasis on ActiveRecord Encryption configuration values being secret (#30340) 2024-05-17 09:28:40 +00:00
Jeong Arm a627219b25
Fix moderation action logs (#30342) 2024-05-17 09:18:54 +00:00
github-actions[bot] bff7769f5f
New Crowdin Translations (automated) (#30336) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-17 08:41:35 +00:00
Matt Jankowski a6d12299f2
Remove duplicate method def `ApplicationHelper#instance_presenter` (#30331) 2024-05-17 08:29:13 +00:00
renovate[bot] fc166d07f0
chore(deps): update dependency rails to v7.1.3.3 (#30334) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:28:22 +00:00
renovate[bot] 3286ad5226
chore(deps): update dependency selenium-webdriver to v4.21.1 (#30335) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:28:01 +00:00
renovate[bot] f7f5b9dadd
fix(deps): update dependency @rails/ujs to v7.1.3-3 (#30337) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:27:45 +00:00
renovate[bot] 226d7a7bad
fix(deps): update dependency sass to v1.77.2 (#30338) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-17 08:27:03 +00:00
Claire 87b5cfc60e
Merge pull request #2710 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b2388be71e
 2024-05-16 21:30:31 +02:00
Claire 7b078b46a2 [Glitch] Fix Web UI trying to save user settings when logged out 
Port 66906a1bc1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-16 19:34:50 +02:00
David Lapshin 061464a563 [Glitch] Fix incorrect element selector from #30221 
Port 94493cff92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-16 19:34:17 +02:00
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
renovate[bot] b2388be71e
chore(deps): update dependency selenium-webdriver to v4.21.0 (#30325) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-16 13:45:17 +00:00
Claire 66906a1bc1
Fix Web UI trying to save user settings when logged out (#30324) 2024-05-16 13:01:01 +00:00
Matt Jankowski 1b6eb2c7f0
Enable YJIT when available (#30310) 2024-05-16 09:56:48 +00:00
Renaud Chaput 283a891e92
Allow to customise the OTEL service name prefix (#30322) 2024-05-16 09:28:10 +00:00
Matt Jankowski 65e82211cd
Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00