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
Matt Jankowski
50013b10a5
Add Status::Visibility concern to hold visibility logic ( #33578 )
2025-01-14 14:32:57 +00:00
Matt Jankowski
f9451c5614
Fix issue with trending order when user has chosen languages ( #33557 )
2025-01-13 14:27:30 +00:00
Daniel M Brasil
0db7558822
Fix HTTP 500 on POST /api/v1/admin/ip_blocks ( #29308 )
2025-01-13 13:50:58 +00:00
Matt Jankowski
22c1b6f3ee
Fix Invite#code changing value on every save ( #33550 )
2025-01-10 20:34:18 +00:00
Claire
155dc4bc4b
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
2025-01-10 20:41:36 +01:00
Matt Jankowski
4f6edc7596
Use in_order_of in trends/* classes ( #33531 )
2025-01-10 09:33:07 +00:00
Matt Jankowski
f98972e4eb
Use with_options for Account if: :local? validation group ( #33529 )
2025-01-10 09:00:31 +00:00
Matt Jankowski
54e2030146
Add AccountWarning#appeal_eligible? method ( #33526 )
2025-01-09 15:08:39 +00:00
Matt Jankowski
9b8d1fb6d1
Add Account#actor_type_application? query method ( #33525 )
2025-01-09 14:32:48 +00:00
Matt Jankowski
ce1501c3a7
Add "Account::Search" shared example for use in Account spec ( #33507 )
2025-01-09 08:12:48 +00:00
Matt Jankowski
f22a2aab40
Add Account#remote? query method ( #33508 )
2025-01-08 14:28:08 +00:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths ( #33207 )
2025-01-08 08:48:45 +00:00
Matt Jankowski
b3243ef41c
Refer to constant values from api/v1/apps request spec ( #33488 )
2025-01-07 16:28:54 +00:00
Matt Jankowski
efcd4ea5de
Reference value constants from specs ( #33479 )
2025-01-06 23:25:13 +00:00
Claire
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
Matt Jankowski
ef39398b82
Add urgent scope and by_version method to SoftwareUpdate ( #33470 )
2025-01-06 18:23:57 +00:00
Matt Jankowski
08dd11f8d4
Use in_order_of with filter: false in AccountSummary.localized ( #33446 )
2025-01-06 08:18:05 +00:00
zunda
f16fbc069a
Use configured limit for number of profile fields ( #33463 )
2025-01-06 04:47:10 +00:00
Tim Rogers
3bdfa3eb4c
Added validator for extra profile field values with empty name ( #33421 )
2025-01-04 19:42:27 +00:00
Claire
68106f250c
Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream
2025-01-03 12:34:47 +01:00
Matt Jankowski
7cbdcd7b3f
Add role-specific user fabricators ( #33437 )
2025-01-03 08:28:14 +00:00
Claire
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
Matt Jankowski
f35de1ed0d
Remove un-needed Poll.attached scope ( #33368 )
2024-12-20 15:15:11 +00:00
Matt Jankowski
28d309fd86
Add shared example for Expireable concern ( #33369 )
2024-12-20 08:21:34 +00:00
Matt Jankowski
22caddaa24
Update user role position range limit ( #33349 )
2024-12-19 08:10:39 +00:00
Matt Jankowski
aee64a465c
Remove unused Poll.unattached scope ( #33350 )
2024-12-19 08:10:06 +00:00
Matt Jankowski
ca2a7d66b8
Fix missing value limits for UserRole position ( #33172 )
2024-12-18 08:29:27 +00:00
Matt Jankowski
0085e8c427
Wrap assertions in change within AccountStatusesCleanupPolicy spec ( #33335 )
2024-12-17 16:25:02 +00:00
Claire
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
Matt Jankowski
1bd9306ced
Add coverage for Tag model validations on name/display_name ( #33291 )
2024-12-13 09:21:55 +00:00
Matt Jankowski
4bf6af3b61
Remove unused model_have_error_on_field matcher ( #33273 )
2024-12-12 10:28:05 +00:00
Matt Jankowski
b51e0bc3c7
Simplify model validation specs for Report ( #33267 )
2024-12-12 09:09:35 +00:00
Matt Jankowski
ad68686bec
Simplify model validation specs for CustomFilter ( #33248 )
2024-12-11 09:55:35 +00:00
Matt Jankowski
f6daf73286
Add non-matching cases to Report#history spec ( #33253 )
2024-12-11 08:24:50 +00:00
