mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,406 Commits
67 Branches
15 Tags
342 MiB
Commit Graph

22406 Commits (main)

Author SHA1 Message Date
Claire 8af71d021b
Merge pull request #2797 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 887e64efd4
 2024-07-25 19:06:12 +02:00
Claire cf5d2c3fe4 Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
Claire 836719edf0
Merge pull request #2796 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4d374cf730
 2024-07-25 17:46:10 +02:00
Adam Niedzielski 887e64efd4
Allow @ at the end of an URL (#31124) 2024-07-25 15:02:58 +00:00
Matt Jankowski 5f5373397f
Remove duplicate `omniauth_only?` helper method (#31066) 2024-07-25 14:59:56 +00:00
Adam Niedzielski fbf95216c5
Fix LinkCrawlWorker NoMethodError: undefined method `[]' for nil (#31144) 2024-07-25 14:51:44 +00:00
Matt Jankowski bfaa53343a
Improve failure message on pagination matcher (#31146) 2024-07-25 14:28:08 +00:00
Adam Niedzielski 337a7fcf30
Fix ß bug in regexp for mentions and tags (#31122) 2024-07-25 14:24:19 +00:00
Matt Jankowski e881a59671
Add `User.unconfirmed` scope, reduce factories in `scheduler/user_cleanup` spec (#31063) 2024-07-25 14:18:24 +00:00
Claire c94c5da7b4 Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream 2024-07-25 12:43:25 +02:00
Matt Jankowski 34626b8291
Update schema to reflect full `db:migrate` run results (#31128) 2024-07-25 10:37:48 +00:00
renovate[bot] 4d374cf730
chore(deps): update dependency opentelemetry-exporter-otlp to v0.28.1 (#31139) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-25 10:00:06 +00:00
renovate[bot] efa7ad9d75
chore(deps): update dependency node to 20.16 (#31127) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-25 07:44:54 +00:00
github-actions[bot] ef0e3e447a
New Crowdin Translations (automated) (#31119) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-25 07:44:00 +00:00
renovate[bot] 9c39fb52f3
chore(deps): update opentelemetry-ruby (non-major) (#31138) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-25 07:21:01 +00:00
renovate[bot] 8117977c88
fix(deps): update dependency postcss to v8.4.40 (#31137) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-25 07:20:55 +00:00
Claire 6be21ae8ac
Fix double indent for post attachments and metadata in grouped notifications (#2793) 2024-07-24 22:35:39 +02:00
Claire 0adf31c007
Merge pull request #2794 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e507d17520
 2024-07-24 22:34:01 +02:00
renovate[bot] 9e04007020
chore(deps): update opentelemetry-ruby (non-major) (#31126) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-24 19:27:39 +00:00
Claire 3a49687ca0
Fix performance issue by using LATERAL in group notification CTE (#31123) 2024-07-24 18:59:15 +00:00
Michael Stanclift 2919d8b097 [Glitch] Recolor Preferences/Admin UI to better match main design 
Port 8b7f93cc7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-24 20:14:13 +02:00
Claire d999fc52ba Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
Claire 44caf314b8
Merge pull request #2791 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cd0ca4b994
 2024-07-24 20:07:23 +02:00
renovate[bot] 06f070d86d
fix(deps): update dependency fuzzysort to v3 (#30315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-24 08:13:09 +00:00
Claire e507d17520 [Glitch] Widen the clickable area for statuses in grouped notifications 
Port a8330be93e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-23 20:28:22 +02:00
Nick Schonning 977337f2d2 [Glitch] Update Prettier to 3.3.3 
Port 9a015a2a15 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-23 20:28:22 +02:00
Claire 838ea5f9cd [Glitch] Fix keyboard shortcuts and navigation in grouped notifications 
Port af06d74574 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-23 20:28:22 +02:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Michael Stanclift 8b7f93cc7f
Recolor Preferences/Admin UI to better match main design (#31034) 2024-07-23 15:30:45 +00:00
Adam Niedzielski cd0ca4b994
Select correct self link when parsing Webfinger response (#31110) 2024-07-23 14:42:31 +00:00
Claire a8330be93e
Widen the clickable area for statuses in grouped notifications (#31111) 2024-07-23 12:11:08 +00:00
Claire 2656381656
Merge pull request #2789 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 55705d8191
 2024-07-23 14:03:56 +02:00
renovate[bot] 871b6197df
chore(deps): update dependency public_suffix to v6.0.1 (#31109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-23 08:59:18 +00:00
Emelia Smith bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Matt Jankowski 1b839d2cba
Fix `mastodon:stats` decoration of stats rake task (#31104) 2024-07-23 06:51:57 +00:00
Nick Schonning 9a015a2a15
Update Prettier to 3.3.3 (#31106) 2024-07-23 06:46:09 +00:00
renovate[bot] 44bdfe1fed
chore(deps): update dependency opentelemetry-instrumentation-active_job to v0.7.3 (#31107) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-23 06:42:28 +00:00
Claire af06d74574
Fix keyboard shortcuts and navigation in grouped notifications (#31076) 2024-07-23 06:20:17 +00:00
Claire cbf25634a9 [Glitch] Fix reblogging after refactor 
Port 55705d8191 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire 643b1ef3e9 [Glitch] Refactor CW handling in an action 
Port 9cb9427133 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire f13a231b39 [Glitch] Refactor code for reblogging and favouriting 
Port 03dea64b79 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-22 22:03:10 +02:00
Claire dcfcfdcb14 Merge commit '55705d8191f31c1089095956fb4124f7505b4bd7' into glitch-soc/merge-upstream 2024-07-22 21:41:31 +02:00
Claire 55705d8191
Fix reblogging after refactor (#31105) 2024-07-22 19:30:06 +00:00
Claire ddc1f7ee44
Merge pull request #2788 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 80d9bff6df
 2024-07-22 19:38:53 +02:00
Claire 9cb9427133
Refactor CW handling in an action (#31103) 2024-07-22 16:03:58 +00:00
Claire 03dea64b79
Refactor code for reblogging and favouriting (#31102) 2024-07-22 15:45:07 +00:00
Claire 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
renovate[bot] 80d9bff6df
fix(deps): update dependency immutable to v4.3.7 (#31100) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 13:39:37 +00:00
Claire ced5e853c7
Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099) 2024-07-22 08:56:05 +00:00
Matt Jankowski 6e4305de69
Fix spec descriptions around configurable limit values (#31079) 2024-07-22 08:02:31 +00:00