1cdd91d6f1
Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream
2025-02-27 15:52:20 +01:00
6b519cfefa
Merge commit from fork
...
* Fix domain blocks/rationales being visible to unapproved/unconfirmed users
* Fix domain blocks/rationales being visible to suspended users
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Allow moved users to view domain blocks
* Add authorization specs for `/api/v1/instance/domain_blocks` spec
* Fix tests
* Fix incorrect test setup
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-02-27 15:49:57 +01:00
06f879ce9b
Merge commit from fork
...
* Add rate-limit on `/auth/setup`
* Remove useless test
2025-02-27 15:44:35 +01:00
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
20531d1e07
Fix `GET /api/v2/notifications/:id` and `POST /api/v2/notifications/:id/dismiss` for ungrouped notifications ( #33990 )
2025-02-25 14:37:44 +00:00
298ca53593
Add choice of law to terms of service generator ( #33994 )
2025-02-25 10:58:11 +00:00
524e8992ad
Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream
2025-02-22 21:31:46 +01:00
db97197685
Remove `rails-controller-testing` gem ( #33955 )
2025-02-21 14:00:16 +00:00
2a15bf4ede
Convert `admin/roles` controller spec to request/sytem specs ( #33947 )
2025-02-21 11:47:47 +00:00
d065d02d88
Improve example wording in 2FA/confirmations controller spec ( #33944 )
2025-02-21 07:31:06 +00:00
f3bc50778b
Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream
2025-02-18 20:38:57 +01:00
fbea3a64cc
Convert `statuses` spec controller->system/request ( #33921 )
2025-02-18 11:43:49 +00:00
ea53faeb3f
Convert `admin/users/roles` spec controller->system/request ( #33930 )
2025-02-17 09:25:25 +00:00
8f1b41622b
Convert `settings/two_factor_authentication_methods` spec controller->system/request ( #33914 )
2025-02-13 10:50:04 +00:00
62dc303d3c
Convert `settings/two_factor_authentication/recovery_codes` spec controller->system/request ( #33912 )
2025-02-13 08:02:01 +00:00
28d85ede4c
Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream
2025-02-12 18:40:21 +01:00
1248c4d1f4
Fix handling of duplicate mentions in incoming status `Update` ( #33911 )
2025-02-12 15:34:56 +00:00
6b52227fcc
Fix Mastodon listing updates older or equal to current version ( #33906 )
2025-02-12 14:27:42 +00:00
fb0856458b
Verify page content in `ChallengableConcern` spec ( #33895 )
2025-02-12 14:24:17 +00:00
6df24b4bc2
Move signed out statuses controller spec examples to request spec ( #33907 )
2025-02-12 14:24:03 +00:00
b07cd11f4c
Convert `settings/migration/redirects` spec controller->system ( #33905 )
2025-02-12 14:06:35 +00:00
506a70d0d8
Convert "http signatures" portion of statuses controller spec to request spec ( #33890 )
2025-02-12 08:33:25 +00:00
aa10e8f399
Verify page content in 2FA portion of `auth/sessions` controller spec ( #33891 )
2025-02-12 08:14:35 +00:00
4c597d5e2c
Convert `settings/privacy` spec controller->system ( #33894 )
2025-02-12 08:13:01 +00:00
4e58570f73
Use common `before` and contexts in admin/base controller spec ( #33879 )
2025-02-11 06:49:51 +00:00
7d20c12913
Convert `settings/featured_tags` controller->request/system spec ( #33880 )
2025-02-11 06:45:34 +00:00
dd2cb77f1a
Remove unused "oversized" spec fixture PNG file ( #33881 )
2025-02-11 06:45:27 +00:00
8c240ef042
Remove final remaining `assigns` usage in controller specs ( #33866 )
2025-02-10 07:33:36 +00:00
a417d6f3fc
Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/precompute_feed_service.rb`:
Upstream added an option to skip half-generated timelines.
We have a conflict because we still maintain upstream's old chronological DM
timelines.
Update our code to apply the same logic to the DM timelines.
2025-02-07 21:21:28 +01:00
23a0d91126
Combine examples to reduce factories in specs ( #33841 )
2025-02-06 10:54:31 +00:00
6ab5b9c790
Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-releases.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-security.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
2025-02-05 18:21:36 +01:00
334d306ccc
Fix filtering for lists ( #33842 )
2025-02-05 15:08:12 +00:00
1dbeac2196
Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream
2025-02-04 18:38:41 +01:00
95caa8bc4e
Switch coverage generation default to false, allow opt in with `COVERAGE` env var ( #33824 )
2025-02-04 11:14:45 +00:00
cf820b2eca
Fix `/settings/applications` rejecting scopes parameter ( #33798 )
2025-02-02 21:11:32 +00:00
c85616ee3a
Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
2025-02-01 19:07:13 +01:00
77587913ce
Convert `admin/reports` spec controller->system ( #33789 )
2025-01-31 08:15:51 +00:00
c5cd9bda48
Convert `auth/passwords` spec controller->system/request ( #33790 )
2025-01-31 08:08:56 +00:00
a3d2849d15
Fix `tootctl feeds build` not building list timelines ( #33783 )
2025-01-30 09:18:46 +00:00
2d545c5fe5
Fix flaky test in `/api/v2/notifications` tests ( #33773 )
2025-01-29 12:49:03 +00:00
844ae90dad
Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream
2025-01-29 12:05:09 +01:00
2beab34ca4
Convert `admin/email_domain_blocks` controller -> system spec ( #33759 )
2025-01-29 10:54:20 +00:00
353e5f797c
Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
2025-01-28 18:29:46 +01:00
5b291fcbe4
Fix incorrect signature after HTTP redirect ( #33757 )
2025-01-28 14:44:27 +00:00
32aa83e9d7
Fix polls not being validated on edition ( #33755 )
2025-01-28 14:38:18 +00:00
8a2d764d34
Reduce factory creation across `controllers/admin` specs ( #33752 )
2025-01-28 08:08:16 +00:00
fcc5262f60
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
93f3c724ae
Use `expect` in remaining controller locations ( #33748 )
2025-01-27 16:32:06 +00:00
d3b637c757
Use `expect` in `Admin::ExportControllerConcern` import params ( #33745 )
2025-01-27 14:29:25 +00:00
65d9171c7d
Use `expect` for `admin/` controllers ( #33686 )
2025-01-27 14:05:16 +00:00
Claire
Jeremy Kescher
Eugen Rochko
Matt Jankowski