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
a3baae0b99
API for updating attribution domains ( #32730 )
2025-01-17 08:18:55 +00:00
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
998cf0dd53
Convert `auth/setup` spec controller->system/request ( #33604 )
2025-01-16 09:03:46 +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
a9a8b6b701
Expand coverage of admin/trends/* areas ( #33581 )
2025-01-14 10:27:21 +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
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
b6c2923cf7
Convert `settings/migration` spec controller->system ( #33496 )
2025-01-08 08:53:26 +00:00
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
82d2ce293d
Convert `admin/warning_presets` spec controller->system ( #33474 )
2025-01-06 18:24:54 +00:00
68106f250c
Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream
2025-01-03 12:34:47 +01:00
7cbdcd7b3f
Add role-specific user fabricators ( #33437 )
2025-01-03 08:28:14 +00:00
cef665788a
Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream
2025-01-02 21:14:14 +01:00
8e3fd1b823
Convert `disputes/appeals` spec controller->system ( #33434 )
2025-01-02 16:08:25 +00:00
1fbd106af9
Convert `admin/report_notes` spec controller->system ( #33433 )
2025-01-02 15:54:21 +00:00
00a8a5467c
Convert `admin/relays` spec controller->system ( #33430 )
2025-01-02 15:01:44 +00:00
2e936785b7
Convert `admin/rules` spec controller->system ( #33377 )
2025-01-02 12:57:55 +00:00
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
8770905186
Convert `admin/ip_blocks` spec controller->system ( #33376 )
2024-12-20 15:36:19 +00:00
87c892191a
Convert `admin/domain_allows` spec controller->system ( #33365 )
2024-12-20 08:04:22 +00:00
1acc54cfc7
Convert `admin/webhooks` spec controller->system ( #33364 )
2024-12-20 07:52:16 +00:00
03bf4cde55
Convert `statuses_cleanup` controller specs to system specs ( #33363 )
2024-12-19 13:34:54 +00:00
545a6b9eed
Convert `admin/account_moderation_notes` spec controller->system ( #33354 )
2024-12-19 08:02:08 +00:00
668ce14ff2
Convert `admin/custom_emojis` spec controller->system ( #33327 )
2024-12-18 08:34:15 +00:00
60bb51eef8
Convert `filters` spec controller->system ( #33326 )
2024-12-17 09:20:01 +00:00
efe4e72f93
Convert `settings/preferences/appearance` controller spec to system ( #33323 )
2024-12-16 17:08:19 +00:00
9067a7f696
Convert `settings/preferences/notifications` controller spec to system ( #33322 )
2024-12-16 16:24:05 +00:00
bfef66276a
Convert `settings/preferences/other` controller spec to system ( #33321 )
2024-12-16 16:23:26 +00:00
a596f3479b
Convert `settings/login_activities` controller spec to system spec ( #33306 )
2024-12-16 08:12:36 +00:00
3d00b95359
Convert `settings/profiles` controller spec to system spec ( #33305 )
2024-12-16 08:11:48 +00:00
4130bda12e
Convert `settings/verifications` controller spec to system spec ( #33285 )
2024-12-13 10:39:07 +00:00
094e2172ec
Add system spec for `Admin::TermsOfService` index view ( #33250 )
2024-12-10 23:08:14 +00:00
c72083ad68
Add system spec for TOS page ( #33243 )
2024-12-10 14:14:28 +00:00
796dd57e1b
Change ability to navigate of unconfirmed users ( #33209 )
2024-12-09 08:31:56 +00:00
4517e18b79
Update dependency doorkeeper to v5.8.0 ( #33000 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-21 13:48:30 +00:00
297ce9ef44
Move body class to shared partial for web app controller concern views ( #31797 )
2024-11-15 15:49:26 +00:00
5a4f4f3e83
Remove single-use `ProfileStories` method ( #31164 )
2024-10-23 13:31:03 +00:00
bfe3d49cca
Add `inline_jobs` to admin/reset spec ( #32517 )
2024-10-16 08:06:34 +00:00
c40cd79c4d
Convert `admin/invites` controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
06d6b35e88
Convert `admin/tags` controller specs to system specs ( #32447 )
2024-10-14 08:31:12 +00:00
f49161ab1d
Oauth system spec cleanup / helper method extraction ( #32287 )
2024-10-08 13:30:54 +00:00
463f9197d8
Add regression coverage for admin reports resolution button within form ( #32248 )
2024-10-04 12:21:55 +00:00
b7bb850efd
Enable hostname config for all system specs ( #32109 )
2024-10-02 13:56:26 +00:00
e6cda8388c
Move OTP secret length to configuration ( #32125 )
2024-10-01 09:38:42 +00:00
5dfdec6453
Convert `settings/applications` controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
5a8f2fe31d
Convert `settings/exports` controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
Claire
Christian Schmidt
Matt Jankowski
Eugen Rochko
Emelia Smith
David Roetzel