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

21760 Commits (93a617236e9b0c457703e1df60f2338aac77f900)

Author SHA1 Message Date
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
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
Emelia Smith f0d6dc4519
Fix: Mark redirect uris field in Development > Application form as required (#30311) 2024-05-16 07:59:46 +00:00
renovate[bot] 356bbbaa7f
fix(deps): update dependency @reduxjs/toolkit to v2.2.5 (#30320) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-16 07:57:19 +00:00
github-actions[bot] cdb042ae86
New Crowdin Translations (automated) (#30319) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-16 07:50:19 +00:00
Matt Jankowski c9ee1437c0
Use ruby language constants to build version string in software version dimension (#30309) 2024-05-16 07:43:35 +00:00
renovate[bot] 60b423b3f7
chore(deps): update dependency rspec-sidekiq to v5 (#30314) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-16 07:43:31 +00:00
David Lapshin 94493cff92
Fix incorrect element selector from #30221 (#30307) 2024-05-16 07:33:29 +00:00
Matt Jankowski ca560c1095
Disable `Style/RedundantFetchBlock` cop (#30207) 2024-05-15 13:57:13 +00:00
renovate[bot] d5d3a0fc57
fix(deps): update dependency pino to v9.1.0 (#30283) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 13:38:51 +00:00
Emelia Smith 5fd56512de
Improve Report Notes and Account Moderation Notes (#30288) 2024-05-15 13:38:36 +00:00
Claire c2ca3d152f
Fix off-by-one in `tootctl media` commands (#30306) 2024-05-15 13:11:13 +00:00
renovate[bot] 4e085dff52
chore(deps): update dependency aws-sdk-s3 to v1.151.0 (#30287) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 13:05:05 +00:00
Claire 19ed3d9441
Merge pull request #2709 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1bf661cddb
 2024-05-15 12:10:10 +02:00
Jason Punyon 85c625d319
Fix repetitive database queries from #30040 (#30259) 2024-05-15 09:38:16 +00:00
Matt Jankowski 6beead3867
Move `simplecov` config into `rails_helper` (#30302) 2024-05-15 09:33:36 +00:00
github-actions[bot] aad5e841b5
New Crowdin Translations (automated) (#30290) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-15 08:53:57 +00:00
renovate[bot] 78a8263f73
fix(deps): update dependency postcss-preset-env to v9.5.13 (#30286) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:34:58 +00:00
renovate[bot] 7f7eba8753
chore(deps): update dependency letter_opener_web to v3 (#30296) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:34:50 +00:00
Renaud Chaput 40639510f8
Retain unconfirmed users longer (1 week) (#30285) 2024-05-15 08:27:34 +00:00
renovate[bot] 44e855db78
chore(deps): update dependency nokogiri to v1.16.5 [security] (#30289) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:26:22 +00:00
renovate[bot] 508e93eb64
chore(deps): update dependency fog-openstack to v1.1.1 (#30295) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:25:50 +00:00
renovate[bot] 38a330f963
fix(deps): update dependency core-js to v3.37.1 (#30293) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-15 08:25:34 +00:00
Renaud Chaput 47ce5f4ca9 [Glitch] Fix missing prop warning for `<Account>` 
Port 1bf661cddb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-14 20:53:40 +02:00
David Lapshin 160823716a [Glitch] Add active animation to header settings button 
Port cb93c1edf0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-14 20:53:01 +02:00
Claire 666760f450 Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did.
 2024-05-14 20:47:14 +02:00
Renaud Chaput 1bf661cddb
Fix missing prop warning for `<Account>` (#30291) 2024-05-14 18:15:42 +00:00
Claire b5b84fad65
Fix OpenSearch compatibility issue (#30278) 2024-05-14 17:54:28 +00:00
github-actions[bot] 3a7aec2807
New Crowdin Translations (automated) (#30254) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-13 11:30:41 +00:00
Nick Schonning 13fb54920b
Enable Style/IfUnlessModifier RuboCop (#30260) 2024-05-13 09:54:15 +00:00
Nick Schonning 9ec7c1f892
Fix i18n:extract flags (#30261) 2024-05-13 09:42:47 +00:00
renovate[bot] 6e1b8b33f5
Update opentelemetry-ruby (non-major) (#30262) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-05-13 09:42:08 +00:00