tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,310 Commits 5 Branches 0 Tags
Commit Graph

2577 Commits

Author SHA1 Message Date
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Claire
3d474807bf
Change “legacy” non-fast-tracked quote posts to not be displayed as such (#34945) 2025-06-05 13:53:57 +00:00
Matt Jankowski
1297ad759e
Update rubocop to version 1.76.0 (#34926) 2025-06-05 12:09:05 +00:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Claire
d4bbe8b719
Fix blocked accounts not being automatically removed from trending statuses (#34891) 2025-06-02 13:38:47 +00:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
Claire
00b56932de
Fix handling of featured tag removal (#34887) 2025-06-02 08:09:30 +00:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski
c025824f98
Use config_for for cache buster values (#34851) 2025-05-30 11:54:25 +00:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
David Roetzel
b195956ecb
Encapsulate redis key usage (#34840) 2025-05-28 12:34:37 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Matt Jankowski
8d4ae81ab4
Remove OTP_SECRET env configuration (#34748) 2025-05-22 09:33:21 +00:00
Claire
6ab96ba647
Use more generic locale as fallback for rules (#34756) 2025-05-21 16:22:54 +00:00
Claire
8c51a8ba94
Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
Matt Jankowski
4709121f72
Remove Legacy OTP Secret code (#34743) 2025-05-20 14:51:19 +00:00
Claire
d7cb6068b1
Add ability to reorder server rules from admin interface (#34737) 2025-05-20 12:49:11 +00:00
Echo
dbf14784bf
Add setting to control the referrer origin (#34731) 2025-05-19 13:13:22 +00:00
Claire
90f7b90223
Change passthrough video processing to emit moov atom at start of video (#34726) 2025-05-19 08:29:31 +00:00
Claire
c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
Claire
8cc5084ca1
Add interstitial for Terms of Service updates (#34527) 2025-05-16 14:03:05 +00:00
David Roetzel
a5a2c6dc7e
Add support for FASP data sharing (#34415) 2025-05-16 12:24:02 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Claire
5305e939c4
Add (currently unused) setting for default quote policy (#34623) 2025-05-13 11:47:38 +00:00
Marcel Hellkamp
c9a554bdca
fix: OIDC account creation fails for long display names (#34639) 2025-05-12 15:51:53 +00:00
Claire
4e2aa78a56
Fix tootctl accounts create failing because of date-of-birth check (#34663) 2025-05-12 09:28:12 +00:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Claire
9ed6a14d45
Add support for ingesting quote policies (#34479) 2025-04-28 08:48:27 +00:00
Claire
dae6f19490 Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream 2025-04-25 17:22:10 +02:00
Eugen Rochko
a97647158c
Add REST API for featuring and unfeaturing a hashtag (#34489) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-25 15:12:05 +00:00
Claire
7bc301e184
Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional (#34498) 
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
 2025-04-23 08:12:31 +00:00
Claire
ace0a3d61f Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream 2025-04-21 15:22:22 +02:00
Claire
8cbd99e645 Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream 2025-04-21 14:32:47 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts (#34370) 2025-04-17 07:45:23 +00:00
Matt Jankowski
2eaef09166
Use enum validation instead of ArgumentError rescue for List replies policy check (#34452) 2025-04-14 21:11:10 +00:00
Matt Jankowski
aadff24099
Enable validate: true on CustomFilter#action (#34434) 2025-04-14 07:28:11 +00:00
Claire
4e6c7fba78 Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream 2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model (#34371) 2025-04-10 12:49:24 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
Matt Jankowski
6e607f97a3
Extract constant for Poll last fetch duration check (#34341) 2025-04-02 06:43:46 +00:00
Claire
aebb6c8ab7 Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream 2025-03-31 17:12:44 +02:00
Matt Jankowski
b4e56822c7
Fix Style/MapToHash cop (#34327) 2025-03-31 14:08:02 +00:00
Claire
8efc381063 Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream 2025-03-29 19:19:58 +01:00
Claire
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire
ee65f77a7e
Add server-side support for grouping account sign-up notifications (#34298) 2025-03-28 12:35:25 +00:00
David Roetzel
97b9994743
Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Claire
166514d252 Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream 2025-03-27 19:40:04 +01:00
Matt Jankowski
0e3ff680d3
Update rubocop to version 1.75.0 (#34283) 2025-03-27 07:48:19 +00:00