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

22335 Commits (c75fe09e2b1283c600591d76918921a71ceae989)

Author SHA1 Message Date
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Matt Jankowski 82344342c1
Add link to org-level contribution guidelines to contributing doc (#31043) 2024-07-18 15:45:40 +00:00
Matt Jankowski 848b59c8ae
Reduce factory creation in `MediaAttachment` model spec (#31058) 2024-07-18 15:23:46 +00:00
renovate[bot] 41b7281b56
fix(deps): update dependency use-debounce to v10.0.1 (#31060) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-18 15:23:43 +00:00
Claire 6e47637dd4
Fix grouping across hourly buckets happening in a 12 seconds window instead of 12 hours window (#31062) 2024-07-18 15:23:40 +00:00
Renaud Chaput f587ff643f
Grouped Notifications UI (#30440) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 14:36:09 +00:00
github-actions[bot] 7d090b2ab6
New Crowdin Translations (automated) (#31055) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-18 08:00:29 +00:00
Matt Jankowski 47ea83d246
Reduce factory creation in `AP::ProcessStatusUpdateService` spec (#31051) 2024-07-18 08:00:19 +00:00
renovate[bot] 64c7ffdc65
chore(deps): update dependency ruby-vips to v2.2.2 (#31050) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-18 07:53:36 +00:00
Matt Jankowski 2616fde9e6
Use change-requiring records in admin/reports controller spec (#31052) 2024-07-18 07:49:44 +00:00
Matt Jankowski c5f8256801
Reduce extra factories in `FanOutOnWriteService` spec (#31053) 2024-07-18 07:45:59 +00:00
Claire fb29f40a28
Merge pull request #2781 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream up to aa4d8987a0
 2024-07-17 22:42:32 +02:00
Claire 5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
renovate[bot] aa4d8987a0
chore(deps): update dependency faker to v3.4.2 (#31046) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-17 10:42:54 +00:00
Claire 4957771a8a
Update rexml to version 3.3.2 (#31048) 2024-07-17 09:18:25 +00:00
Matt Jankowski 76c2c5c748
Reduce extra round trips in `activitypub` controller specs (#31041) 2024-07-17 08:09:34 +00:00
Matt Jankowski f5e90f3de3
Reduce extra round trips in `AP::SynchronizeFollowersService` spec (#31044) 2024-07-17 07:33:08 +00:00
Matt Jankowski 81877e7950
Reduce extra round trips in `AP::FetchRemoteStatusService` spec (#31045) 2024-07-17 07:24:14 +00:00
github-actions[bot] 00c110ac7b
New Crowdin Translations (automated) (#31047) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-17 07:23:07 +00:00
Claire d6a2635a77
Merge pull request #2780 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 66430cb25c
 2024-07-16 18:51:02 +02:00
Claire c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
github-actions[bot] 66430cb25c
New Crowdin Translations (automated) (#31038) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-16 15:24:56 +00:00
Adam Niedzielski a609940ec9
Fix test description in hashtag_bar (#30827) 2024-07-16 13:23:26 +00:00
Emelia Smith aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Adam Niedzielski fa54b61216
Handle missing links in Webfinger response (#31030) 2024-07-16 13:21:16 +00:00
renovate[bot] c27d194eb2
fix(deps): update dependency pino to v9.3.1 (#31032) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-16 13:20:34 +00:00
renovate[bot] c3a2f9d993
chore(deps): update dependency json-schema to v4.3.1 (#31012) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-16 12:14:25 +00:00
Michael Stanclift 905921b2ef
Add missing "Update Report" string in audit log (#31033) 2024-07-16 07:06:19 +00:00
Claire b7b6f1c89a
Merge pull request #2777 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9d0bce4072
 2024-07-15 19:35:20 +02:00
David Roetzel 70969ac64c [Glitch] Move filtered notifications bar in scrollable area 
Port 9d0bce4072 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-15 18:57:38 +02:00
Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
David Roetzel 9d0bce4072
Move filtered notifications bar in scrollable area (#30996) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-15 13:42:47 +00:00
renovate[bot] 0b97ec3f7b
fix(deps): update dependency @babel/core to v7.24.9 (#31029) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-15 13:03:57 +00:00
Matt Jankowski 543b59fa14
Clean up `theme_helper` style builders (#30617) 2024-07-15 13:03:23 +00:00
Matt Jankowski 91ef4a6fc5
Add assertion about key columns to account key generate spec (#30635) 2024-07-15 10:42:18 +00:00
Claire 1dd8262071
Add optional `filtered` attribute to notification entities in REST API (#31011) 2024-07-15 09:29:57 +00:00
github-actions[bot] 17117109ad
New Crowdin Translations (automated) (#31018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-15 07:44:37 +00:00
mogaminsk d61b536df3
Add i18n strings for instance favicon and logo settings label (#31016) 2024-07-15 07:38:48 +00:00
Claire d329eda295
Merge pull request #2776 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 00cb4a0313
 2024-07-14 19:40:29 +02:00
Claire edec2e9fdf Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02:00
Claire 54642244ed
Merge pull request #2775 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c929b4cace
 2024-07-12 17:14:23 +02:00
Matt Jankowski 00cb4a0313
Avoid repeated factory creation in media_attachments_vacuum_spec (#31000) 2024-07-12 14:09:16 +00:00
Emelia Smith c953dca1de
Streaming: use pgPool.query instead of manually acquiring & releasing a connection (#30964) 2024-07-12 12:23:09 +00:00
renovate[bot] b87c41115e
chore(deps): update dependency rubocop-rspec to v3.0.3 (#31009) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 12:20:32 +00:00
David Roetzel 35a437a03f
Destroy `NotificationRequest`s that are dismissed (#31008) 2024-07-12 12:09:52 +00:00
Claire 8d2a93b0cb [Glitch] Add setting to disable hover cards 
Port ad52b04a1c to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-12 13:50:42 +02:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
renovate[bot] c929b4cace
chore(deps): update dependency pghero to v3.6.0 (#30994) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 09:29:43 +00:00
renovate[bot] 9cc0607358
chore(deps): update dependency database_cleaner-active_record to v2.2.0 (#31007) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 09:29:10 +00:00
Matt Jankowski 43e24dbb13
Use `include_pagination_headers` in more places (#30999) 2024-07-12 08:30:52 +00:00