399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
420ffdfb62
Add delay to profile updates to debounce them ( #34137 )
2025-03-11 16:17:17 +00:00
6d5a1fbe1d
Assert on page contents while progressing through `new_statuses` system spec ( #34139 )
2025-03-11 14:00:51 +00:00
dc43699b77
Assert on page contents before reloading report for interface JS spec ( #34132 )
2025-03-11 09:14:16 +00:00
fb55d09f77
Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream
2025-03-10 19:48:45 +01:00
e1f278cdf2
Convert `admin/webhooks/secrets` spec controller->system ( #34109 )
2025-03-10 08:17:48 +00:00
7169b270ae
Convert `admin/site_uploads` spec controller->system ( #34108 )
2025-03-10 08:17:02 +00:00
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
2cabbae132
Add min. age to terms of service ( #34105 )
2025-03-07 11:50:52 +00:00
eaf1ea3155
Remove `admin_user` helper method from `SystemHelpers` module ( #34096 )
2025-03-07 08:31:47 +00:00
551339401d
Use methods from `SystemHelpers` more consistently ( #33973 )
2025-03-07 08:02:55 +00:00
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
5a100bf38f
Add ability to email announcements to all users ( #33928 )
2025-03-06 14:05:27 +00:00
b021cfc91e
Convert `settings/sessions` spec controller->system ( #34072 )
2025-03-06 08:21:05 +00:00
ce23342d72
Convert `admin/terms_of_service/*` spec controller->system ( #33975 )
2025-03-04 15:27:44 +00:00
b56e90d049
Convert `admin/relationships` spec controller->system ( #34002 )
2025-02-28 11:17:13 +00:00
3aaa388ce4
Convert `admin/trends/*` spec controller->system ( #34003 )
2025-02-28 10:55:37 +00:00
524e8992ad
Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream
2025-02-22 21:31:46 +01:00
2a15bf4ede
Convert `admin/roles` controller spec to request/sytem specs ( #33947 )
2025-02-21 11:47:47 +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
6b52227fcc
Fix Mastodon listing updates older or equal to current version ( #33906 )
2025-02-12 14:27:42 +00:00
b07cd11f4c
Convert `settings/migration/redirects` spec controller->system ( #33905 )
2025-02-12 14:06:35 +00:00
4c597d5e2c
Convert `settings/privacy` spec controller->system ( #33894 )
2025-02-12 08:13:01 +00:00
7d20c12913
Convert `settings/featured_tags` controller->request/system spec ( #33880 )
2025-02-11 06:45:34 +00:00
1dbeac2196
Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream
2025-02-04 18:38:41 +01: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
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
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
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
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
11786f1114
Change design of edit media modal in web UI ( #33516 )
2025-01-21 11:34:22 +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
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
Claire
Matt Jankowski
Eugen Rochko
Christian Schmidt