19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
8eee7ae4c3
Fix issue with saving empty fields values on filter keyword updates ( #33691 )
2025-01-23 09:04:12 +00:00
4a9c49ee43
Fix issue with saving empty fields values on profile update ( #33689 )
2025-01-22 18:50:15 +00:00
607f65a0a5
Use `expect` for api/v1 and api/web push subs controllers ( #33682 )
2025-01-22 14:55:44 +00:00
b18caff5b6
Change `first_of_value` to `first_of_hash`, and add more test cases ( #33647 )
2025-01-22 14:02:05 +00:00
e155aab39e
Use `expect` for nested params in `settings/*` controllers ( #33673 )
2025-01-22 08:49:52 +00:00
d2cc28813f
Use `expect` for nested params in more controllers ( #33675 )
2025-01-22 08:35:34 +00:00
05e5db91c7
Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict because one of the removed lines was modified to accomodate for
glitch-soc's slightly different build system.
Removed the lines as upstream did.
2025-01-21 19:23:25 +01:00
3dcf5e12b1
Change notifications from moderators to not be filtered ( #33654 )
2025-01-21 11:39:53 +00:00
11786f1114
Change design of edit media modal in web UI ( #33516 )
2025-01-21 11:34:22 +00:00
ce7fb94306
Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream
2025-01-21 12:06:49 +01:00
45149cd5e1
Use `expect` for nested params in `auth/setup#update` ( #33657 )
2025-01-21 08:16:40 +00:00
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
5be938e661
Migrate visibility interaction checks on statuses to request spec ( #33622 )
2025-01-17 10:06:52 +00:00
a3baae0b99
API for updating attribution domains ( #32730 )
2025-01-17 08:18:55 +00:00
3af6739f21
Add coverage for `AnnualReport.prepare` method ( #33618 )
2025-01-16 15:45:48 +00:00
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
da4e55eb17
Merge commit from fork
2025-01-16 11:10:08 +01:00
998cf0dd53
Convert `auth/setup` spec controller->system/request ( #33604 )
2025-01-16 09:03:46 +00:00
72abf05269
Add "needs refresh" scenario to `api/v1/polls` request spec ( #33608 )
2025-01-16 09:00:04 +00:00
ad71a8d1f7
Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream
2025-01-15 19:32:04 +01:00
9f03e5b53a
Expand coverage of `admin/*blocks` areas ( #33594 )
2025-01-15 07:47:34 +00:00
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
68c9f91ccb
Treat non-null but blank account domain as local ( #33576 )
2025-01-14 17:40:55 +00:00
50013b10a5
Add `Status::Visibility` concern to hold visibility logic ( #33578 )
2025-01-14 14:32:57 +00:00
7c56517c7c
Move mastodon version config to `config_for` yml ( #33577 )
2025-01-14 14:32:29 +00:00
a9a8b6b701
Expand coverage of admin/trends/* areas ( #33581 )
2025-01-14 10:27:21 +00:00
4a2813158d
Add support for standard webpush ( #33528 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
74da9e9281
Fix custom css cache miss ( #33583 )
2025-01-14 08:24:00 +00:00
77a44e61a8
Add enum validation to `DomainBlock#severity` ( #29158 )
2025-01-13 16:05:24 +00:00
f9451c5614
Fix issue with trending order when user has chosen languages ( #33557 )
2025-01-13 14:27:30 +00:00
0db7558822
Fix HTTP 500 on `POST /api/v1/admin/ip_blocks` ( #29308 )
2025-01-13 13:50:58 +00:00
3c4a83fc62
Remove unused `LanguagePresenter#native_name` ( #33551 )
2025-01-13 12:58:53 +00:00
68d818121d
Switch `webpush` dependency to latest version of Mastodon-maintained fork ( #33572 )
2025-01-13 12:46:32 +00:00
d517fa5ab7
Change ActivityPub path generation to all happen in `ActivityPub::TagManager` ( #33527 )
2025-01-13 09:39:05 +00:00
22c1b6f3ee
Fix `Invite#code` changing value on every save ( #33550 )
2025-01-10 20:34:18 +00:00
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
2cfc2a777a
Add `build_object` method for defaults in `AP::Activity::Create` spec ( #33537 )
2025-01-10 11:59:19 +00:00
4f6edc7596
Use `in_order_of` in `trends/*` classes ( #33531 )
2025-01-10 09:33:07 +00:00
a8b0152bc5
Convert `admin/terms_of_service/histories` spec controller->system ( #33534 )
2025-01-10 09:11:57 +00:00
8d4ca95163
Convert `admin/follow_recommendations` spec controller->system ( #33533 )
2025-01-10 09:10:21 +00:00
2499cd01db
Add `duplicate_record` helper to maintenance CLI spec ( #33536 )
2025-01-10 09:04:23 +00:00
f98972e4eb
Use `with_options` for Account `if: :local?` validation group ( #33529 )
2025-01-10 09:00:31 +00:00
54e2030146
Add `AccountWarning#appeal_eligible?` method ( #33526 )
2025-01-09 15:08:39 +00:00
9b8d1fb6d1
Add `Account#actor_type_application?` query method ( #33525 )
2025-01-09 14:32:48 +00:00
c6c8e7e6ab
Fix last paginated notification group only including data on a single notification ( #33271 )
2025-01-09 13:47:12 +00:00
91c75a6361
Re-introduce `application_id` in `ScheduledStatusSerializer` ( #33505 )
2025-01-09 13:38:23 +00:00
8e2c642d44
Do now swallow response body on persistent connection ( #32729 )
2025-01-09 08:35:35 +00:00
cbae00ad23
Remove `render_template` from accounts request spec ( #33519 )
2025-01-09 08:17:11 +00:00
4148b68430
Remove `render_template` from remote interaction helper request spec ( #33518 )
2025-01-09 08:17:06 +00:00
Claire
Matt Jankowski
Jonathan de Jong
Eugen Rochko
Christian Schmidt
S1m
Jeong Arm
Wolfgang
Daniel M Brasil