6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
1ee1c329cc
Convert `admin/announcements` controller spec to system spec ( #31655 )
2024-08-30 07:15:28 +00:00
ad0a28a8bf
Add `grouped_types` parameter to allow clients to restrict which notifications types get grouped ( #31594 )
2024-08-29 12:39:07 +00:00
02585d8789
Convert `media` controller spec to request spec ( #31634 )
2024-08-29 08:46:00 +00:00
b9269c8d38
Convert `admin/reset` controller spec to system spec ( #31643 )
2024-08-29 08:38:17 +00:00
0ef636f72d
Convert `shares` controller spec to system spec ( #31619 )
2024-08-28 07:58:40 +00:00
00586d27cb
Convert `instance_actor` controller spec to request spec ( #31621 )
2024-08-28 07:56:07 +00:00
94d8cdc494
Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream
2024-08-27 20:00:07 +02:00
3959f36d19
Add checks about response body content to admin/dash spec ( #30716 )
2024-08-27 14:59:56 +00:00
48f4e5444d
Convert `media_proxy` controller spec to request spec ( #31600 )
2024-08-27 09:44:16 +00:00
a7f8417795
Convert "CSV export" settings controller specs to request specs ( #31601 )
2024-08-27 08:12:39 +00:00
38a3466741
Convert `api/oembed` controller spec to request spec ( #31605 )
2024-08-27 07:55:25 +00:00
c09d232ee3
Convert `api/web/settings` controller spec to request spec ( #31606 )
2024-08-27 07:42:35 +00:00
14d7fe05d0
Use `describe` instead of `context` in top-level spec declaration ( #31607 )
2024-08-27 07:40:18 +00:00
8f678a3cf4
Fix tests for glitch-soc
2024-08-26 19:08:42 +02:00
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
4c2534d12e
Convert "static page" controller specs to system specs ( #31599 )
2024-08-26 15:53:48 +00:00
dbe0ee8a81
Convert `emojis` controller spec to request spec ( #31597 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-26 15:00:05 +00:00
5172d84946
Convert `manifest` controller spec to request spec ( #31596 )
2024-08-26 14:37:23 +00:00
36ccdcc9e1
Convert "custom css" controller spec to request spec ( #31595 )
2024-08-26 14:36:31 +00:00
641ae6a2cf
Convert health check endpoint controller spec to request spec ( #31565 )
2024-08-26 12:17:35 +00:00
bcc4b1078c
Fix `Rails/RootPathnameMethods` cop ( #31582 )
2024-08-26 07:35:07 +00:00
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
0374918746
Add spec for doorkeeper behavior around issuing tokens ( #31545 )
2024-08-23 08:20:32 +00:00
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
4a968cb7a9
Add `icon` field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
0cec9077a4
Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Upstream added a test for a new attribute, next to a line we modified
in glitch-soc because of a different default value.
Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
19a1acb38b
Add `api_versions` to `/api/v2/instance` ( #31354 )
2024-08-21 14:54:59 +00:00
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +02:00
f91403ccaa
Remove unused `fa_icon` helper method ( #31511 )
2024-08-20 15:59:59 +00:00
711e1fce0a
Fix pagination parameters in `GET /api/v2_alpha/notificatins` ( #31509 )
2024-08-20 13:54:08 +00:00
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
1760f84349
Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream
2024-08-19 18:25:31 +02:00
53c183f899
Reload notifications when accepted notifications are merged (streaming only) ( #31419 )
2024-08-19 15:59:06 +00:00
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations ( #31474 )
...
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
d2e4be0456
Hopefully fix notifications pagination flaky test ( #31494 )
2024-08-19 14:53:54 +00:00
9f2775830c
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream
2024-08-15 21:58:04 +02:00
5d04e29775
Disable Chrome's search engine selection screen when running system specs ( #31437 )
2024-08-15 06:45:00 +00:00
4545b8d6cb
Add the ability to ignore specific browser errors for a spec ( #31436 )
2024-08-15 06:44:13 +00:00
169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
95c11d365d
Don't push to cache buster if attachment path is nil ( #31414 )
2024-08-14 08:57:42 +00:00
7996a9543d
Change notification request acceptance to immediately delete the request ( #31256 )
2024-08-14 07:34:30 +00:00
c3e1d86d58
Fix log out from user menu not working on Safari ( #31402 )
2024-08-13 17:49:23 +00:00
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
8a5b57f668
Revert "Support JSON-LD named graph ( #31288 )" ( #31355 )
2024-08-09 13:48:54 +00:00
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
994ef16b72
Bust CDN cache on media deletion ( #31353 )
2024-08-09 12:48:34 +00:00
dd2a991e24
Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
52a626f39b
Replace more `font-awesome` icons in `app/helpers` ( #30962 )
2024-08-07 22:53:15 +00:00
Claire
Matt Jankowski
David Roetzel
Renaud Chaput
Edward Moulsdale
Jeong Arm