Noa Himesaka
14adeacef4
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-12-29 23:59:36 +09: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
8770905186
Convert admin/ip_blocks spec controller->system ( #33376 )
2024-12-20 15:36:19 +00:00
Matt Jankowski
f35de1ed0d
Remove un-needed Poll.attached scope ( #33368 )
2024-12-20 15:15:11 +00:00
Matt Jankowski
d2fbf42b0e
Avoid validate: false save in expired poll create activity spec ( #33367 )
2024-12-20 13:34:05 +00:00
Claire
344e2903b3
Fix featured tags for remote accounts not being kept up to date ( #33372 )
2024-12-20 11:50:31 +00:00
Matt Jankowski
d31d988e24
Add coverage for UserMailer not delivering to memorialized users ( #33366 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-12-20 10:27:40 +00:00
Matt Jankowski
28d309fd86
Add shared example for Expireable concern ( #33369 )
2024-12-20 08:21:34 +00:00
Matt Jankowski
87c892191a
Convert admin/domain_allows spec controller->system ( #33365 )
2024-12-20 08:04:22 +00:00
Matt Jankowski
1acc54cfc7
Convert admin/webhooks spec controller->system ( #33364 )
2024-12-20 07:52:16 +00:00
Matt Jankowski
03bf4cde55
Convert statuses_cleanup controller specs to system specs ( #33363 )
2024-12-19 13:34:54 +00:00
Matt Jankowski
0ac43700d8
Add coverage for REST::AnnualReportEventSerializer and two ActivityPub::* serializers ( #33355 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-12-19 12:30:09 +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
545a6b9eed
Convert admin/account_moderation_notes spec controller->system ( #33354 )
2024-12-19 08:02:08 +00:00
Matt Jankowski
668ce14ff2
Convert admin/custom_emojis spec controller->system ( #33327 )
2024-12-18 08:34:15 +00:00
Matt Jankowski
ca2a7d66b8
Fix missing value limits for UserRole position ( #33172 )
2024-12-18 08:29:27 +00:00
Matt Jankowski
d65e246192
Convert statuses#activity action controller to request spec ( #33336 )
2024-12-17 16:37:30 +00:00
Matt Jankowski
0085e8c427
Wrap assertions in change within AccountStatusesCleanupPolicy spec ( #33335 )
2024-12-17 16:25:02 +00:00
Matt Jankowski
ce5c33c65d
Add API datetime/format matcher for serialization specs, reduce factories ( #33325 )
2024-12-17 13:38:57 +00:00
Claire
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
Matt Jankowski
60bb51eef8
Convert filters spec controller->system ( #33326 )
2024-12-17 09:20:01 +00:00
Matt Jankowski
a7673d361d
Fix application_id erroneous inclusion in ScheduledStatusSerializer ( #33159 )
2024-12-17 08:54:07 +00:00
Matt Jankowski
efe4e72f93
Convert settings/preferences/appearance controller spec to system ( #33323 )
2024-12-16 17:08:19 +00:00
Matt Jankowski
9067a7f696
Convert settings/preferences/notifications controller spec to system ( #33322 )
2024-12-16 16:24:05 +00:00
Matt Jankowski
bfef66276a
Convert settings/preferences/other controller spec to system ( #33321 )
2024-12-16 16:23:26 +00:00
Matt Jankowski
c68eb82ffa
Use explicit config loading from bin/rubocop ( #33256 )
2024-12-16 13:50:58 +00:00
Matt Jankowski
a596f3479b
Convert settings/login_activities controller spec to system spec ( #33306 )
2024-12-16 08:12:36 +00:00
Matt Jankowski
3d00b95359
Convert settings/profiles controller spec to system spec ( #33305 )
2024-12-16 08:11:48 +00:00
Nik Clayton
5cf37248cc
Ensure datetime/date are serialized to correct format ( #33086 )
2024-12-14 15:50:41 +00:00
Matt Jankowski
4130bda12e
Convert settings/verifications controller spec to system spec ( #33285 )
2024-12-13 10:39:07 +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
3c71ee9b90
Use touch_all for time column updates ( #33295 )
2024-12-13 08:41:42 +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
Claire
bcb3b627b9
Fix processing of mentions for post edits with an existing corresponding silent mention ( #33227 )
2024-12-11 12:59:29 +00:00
Noa Himesaka
a702c42a1f
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-12-11 18:57:02 +09:00
Matt Jankowski
ad68686bec
Simplify model validation specs for CustomFilter ( #33248 )
2024-12-11 09:55:35 +00:00
Matt Jankowski
f721e76d13
Avoid double request in admin/export_domain_allows controller spec ( #33255 )
2024-12-11 08:58:59 +00:00
Matt Jankowski
f6daf73286
Add non-matching cases to Report#history spec ( #33253 )
2024-12-11 08:24:50 +00:00
Christian Schmidt
a70ae28644
Support animated PNGs in media attachments ( #28516 )
2024-12-11 02:28:21 +00:00
Matt Jankowski
39364346bb
Add coverage for admin/terms/drafts#update and admin/terms/generates#create actions ( #33251 )
2024-12-10 23:09:36 +00:00
Matt Jankowski
094e2172ec
Add system spec for Admin::TermsOfService index view ( #33250 )
2024-12-10 23:08:14 +00:00
Matt Jankowski
e76aff7de5
Standardize uniqueness validation declaration on Mention ( #33247 )
2024-12-10 15:45:13 +00:00
Matt Jankowski
12eb6b0e6d
Add coverage for TermsOfServicePolicy class ( #33241 )
2024-12-10 15:09:44 +00:00
Matt Jankowski
66266ec6fc
Add coverage for UserMailer#terms_of_service_changed mailer ( #33242 )
2024-12-10 14:45:40 +00:00
Matt Jankowski
19c6cb82f6
Add coverage for Admin::DistributeTermsOfServiceNotificationWorker class ( #33245 )
2024-12-10 14:45:14 +00:00
Matt Jankowski
c72083ad68
Add system spec for TOS page ( #33243 )
2024-12-10 14:14:28 +00:00
Matt Jankowski
7d52b24569
Add coverage for AccountPin model ( #33231 )
2024-12-10 13:02:52 +00:00
FND
c8c916e657
Change URL truncation to account for ellipses ( #33229 )
2024-12-10 08:41:06 +00:00
