Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 00:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,545 Commits 74 Branches 58 Tags
e4618a6ba57e5a413a601dcfd4443fbcf7cf369d
Commit Graph

1039 Commits

Author SHA1 Message Date
Claire
c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
 2025-06-25 19:29:09 +02:00
Emelia Smith
72f2f35bfb Implement Instance Moderation Notes (#31529) 2025-06-25 08:15:44 +00:00
Matt Jankowski
377289c961 Add coverage for doorkeeper model extensions (#35161) 2025-06-25 07:50:20 +00:00
Matt Jankowski
f852da50f6 Add User#email_domain method to extract domain from email address (#35159) 2025-06-25 07:22:19 +00:00
Claire
93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream 
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.
 2025-06-24 22:43:43 +02:00
Matt Jankowski
0338733531 Add model coverage and scopes to RuleTranslation class (#35098) 2025-06-24 07:44:50 +00:00
Matt Jankowski
0d7f1584bc Move remaining _map method specs from account to mappings spec (#35142) 2025-06-24 07:40:24 +00:00
Matt Jankowski
36f01af6c4 Add Status#only_reblogs scope for annual report classes (#35141) 2025-06-24 06:54:55 +00:00
Matt Jankowski
b08ccaa5b3 Extract Account::Mappings concern from "interactions" (#35119) 2025-06-23 12:02:14 +00:00
Claire
9cb5a77c3e Merge commit 'ac039d5f1323c46062d004896996f50549bfa38b' into glitch-soc/merge-upstream 2025-06-21 22:59:04 +02:00
David Roetzel
adf812efb3 Fix missing terms of services link (#35115) 2025-06-21 08:59:47 +00:00
Matt Jankowski
54f9a1b43b Extract secret size constants in Webhook model (#35104) 2025-06-20 10:05:24 +00:00
Matt Jankowski
e9b1c1edfe Simplify WebauthnCredential constant limit math (#35107) 2025-06-20 10:04:14 +00:00
Claire
2c751a6a19 Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream 2025-06-16 20:08:52 +02:00
Matt Jankowski
ca3cc36549 Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests (#35040) 2025-06-16 13:12:23 +00:00
Claire
7da6b07c75 Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream 2025-06-13 18:07:59 +02:00
Matt Jankowski
ab7f50ce4e Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025) 2025-06-13 07:58:22 +00:00
David Roetzel
319fbbbfac Experimental Async Refreshes API (#34918) 2025-06-12 14:54:00 +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
6ab96ba647 Use more generic locale as fallback for rules (#34756) 2025-05-21 16:22:54 +00:00
Matt Jankowski
f1a6f4333a Remove redis-namespace gem (#34742) 2025-05-21 15:20:17 +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
Claire
c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
David Roetzel
a5a2c6dc7e Add support for FASP data sharing (#34415) 2025-05-16 12:24:02 +00:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02: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
Matt Jankowski
6463415e06 Update rubocop-rspec to version 3.6.0 (#34497) 2025-04-24 14:56:13 +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
f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
David Roetzel
97b9994743 Basic FASP support (#34031) 2025-03-28 12:16:40 +00:00
Claire
e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Upstream removed some code that somehow had been modified in glitch-soc.
  Removed it as upstream did.
 2025-03-24 20:06:25 +01:00
Claire
ef870007e9 Fix CacheBuster being queued for missing media attachments (#34253) 2025-03-24 08:58:15 +00:00
Claire
d2c4f69148 Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream 2025-03-17 20:25:32 +01:00
Claire
e30001bc80 Fix incorrect URL being used when cache busting (#34189) 2025-03-17 16:40:28 +00:00
Claire
b330cc21c4 Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream 2025-03-12 19:48:51 +01:00
Claire
9db26db495 Refactor reply-fetching code and disable it by default (#34147) 2025-03-12 10:28:06 +00:00
Jonny Saunders
46e13dd81c Add Fetch All Replies Part 1: Backend (#32615) 
Signed-off-by: sneakers-the-rat <sneakers-the-rat@protonmail.com>
Co-authored-by: jonny <j@nny.fyi>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Kouhai <66407198+kouhaidev@users.noreply.github.com>
 2025-03-12 09:03:01 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Christian Schmidt
a3baae0b99 API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Claire
ad71a8d1f7 Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream 2025-01-15 19:32:04 +01:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Matt Jankowski
68c9f91ccb Treat non-null but blank account domain as local (#33576) 2025-01-14 17:40:55 +00:00