221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
5a8f2fe31d
Convert `settings/exports` controller spec to system/request specs ( #31965 )
2024-09-19 13:43:40 +00:00
bf8eaaa9a5
Convert controller spec for security_key_options endpoint to request spec ( #31938 )
2024-09-18 09:42:36 +00:00
5405bdd344
Remove unused E2EE messaging code ( #31193 )
2024-09-18 09:27:43 +00:00
943738671c
Remove unneeded `to_s` on `Link` header comparison in statuses controller spec ( #31941 )
2024-09-18 08:21:31 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
207c073bf8
Remove debug output in migration controller spec ( #31886 )
2024-09-12 14:04:46 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
c88ba523ee
Fix sort order of moderation notes on Reports and Accounts ( #31528 )
2024-09-06 14:58:36 +00:00
6b6a80b407
Remove `body_as_json` in favor of built-in `response.parsed_body` for JSON response specs ( #31749 )
2024-09-06 09:58:46 +00:00
7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings ( #31010 )
2024-09-05 20:05:38 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
e820cc30b8
Convert invites controller spec to system/request specs ( #31755 )
2024-09-05 11:54:27 +00:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
e1b5f3fc6f
Use `response.parsed_body` for html response checks ( #31750 )
2024-09-04 17:29:05 +00:00
f1003b2560
Enable "zero monkey patching" mode in RSpec ( #31614 )
2024-09-04 05:12:25 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
e1fa456c7c
Add `have_cacheable_headers` matcher for responses ( #31727 )
2024-09-03 15:35:19 +00:00
928390c2ba
Convert `admin/settings` controller specs to system specs ( #31548 )
2024-09-03 15:29:32 +00:00
5b595b8a5a
Remove usage of `assigns` in controller specs ( #30195 )
2024-09-03 15:23:16 +00:00
219458d7d4
Convert `tags` controller spec to system and request specs ( #31708 )
2024-09-03 13:18:53 +00:00
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
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
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
654187a995
Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream
2024-07-29 19:16:58 +02:00
c40e481169
Implement UI for Admin Search of Hashtags ( #30880 )
2024-07-29 15:49:44 +00:00
fb411b6d0f
Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream
2024-07-27 13:19:38 +02:00
dd53792714
Move UI tests from controller to system spec ( #31158 )
2024-07-26 14:53:49 +00:00
693d9b03ed
Enable OAuth PKCE Extension ( #31129 )
2024-07-26 08:53:10 +00:00
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
bb2e5a4b58
Add audit logs to Admin::InstancesController ( #27386 )
2024-07-23 08:12:30 +00:00
c75fe09e2b
Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream
2024-07-18 17:56:25 +02:00
2616fde9e6
Use change-requiring records in admin/reports controller spec ( #31052 )
2024-07-18 07:49:44 +00:00
5e7720d11b
Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream
2024-07-17 22:20:12 +02:00
76c2c5c748
Reduce extra round trips in `activitypub` controller specs ( #31041 )
2024-07-17 08:09:34 +00:00
55cf5e0188
Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream
2024-07-12 13:41:54 +02:00
73d53827ea
Add change assertion to invites destroy spec ( #31004 )
2024-07-12 08:19:15 +00:00
6a55232988
Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream
2024-07-08 19:41:14 +02:00
f1300ad284
Rename jobs/attachments rspec tag names ( #29762 )
2024-07-08 16:01:08 +00:00
e61a7794f8
Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict because glitch-soc has a different list of allowed tags.
Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
Conflict because of glitch-soc's default settings.
Updated accordingly.
2024-07-04 17:12:14 +02:00
395f17ca17
Merge pull request from GHSA-vp5r-5pgw-jwqx
...
* Fix streaming sessions not being closed when revoking access to an app
* Add tests for GHSA-7w3c-p9j8-mq3x
2024-07-04 16:11:28 +02:00
6f2771cb32
Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream
2024-06-25 17:57:39 +02:00
30ae5952d2
Fix: Ensure "With Media" is highlighted from Admin Accounts page ( #30812 )
2024-06-25 07:46:53 +00:00
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
8827cd597e
Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments ( #30819 )
2024-06-24 13:11:10 +00:00
f214813919
Adapt settings spec to glitch-soc
2024-06-11 19:54:27 +02:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
edf6d64eeb
Use correct params in `settings/preferences/appearance` spec ( #30379 )
2024-06-11 07:36:46 +00:00
5ab111554e
Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream
2024-05-21 17:45:21 +02:00
32223863a5
Add coverage to `/admin/accounts/:id` ( #30386 )
2024-05-21 13:17:34 +00:00
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
65e82211cd
Rename `cache_*` methods to `preload_*` in controller concern ( #30209 )
2024-05-16 08:03:46 +00:00
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
babbf6017d
Remove caching in `cache_collection` ( #29862 )
2024-04-08 13:46:13 +00:00
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
f9100743ec
Add `Api::ErrorHandling` concern for api/base controller ( #29574 )
2024-03-14 09:09:47 +00:00
65ca37bbaa
Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Conflict due to glitch-soc having factored the file differently.
Ported upstream's changes.
2024-03-13 20:14:18 +01:00
08b10cce52
Merge commit 'b43eaa4517107326c7e73b949cec759f841b4a30' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/accounts/credentials_controller_spec.rb`
Conflict due to glitch-soc's different note length handling.
Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
2024-03-13 20:12:58 +01:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
71e5f0f48c
Add coverage for suspended instance actor scenario ( #29571 )
2024-03-13 15:43:40 +00:00
46e902f1f3
Merge `api/v1/accounts/credentials` controller spec into existing request spec ( #29006 )
2024-03-13 09:22:43 +00:00
71eecbfa1f
Move `api/v2/filters/*` to request spec ( #28956 )
2024-03-13 08:47:09 +00:00
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
a38e424185
Use unchanging github links in docs/comments ( #29545 )
2024-03-11 15:14:55 +00:00
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
18945f62e0
Convert more API specs from controller->request style ( #29004 )
2024-03-01 16:24:45 +00:00
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
eb1b8f69de
Allow pagination `Link` headers on API accounts/statuses when pinned true ( #29442 )
2024-02-29 14:21:56 +00:00
6675bf574a
Extract `parsed_uri_query_values` helper in ap/replies controller spec ( #29410 )
2024-02-29 13:47:38 +00:00
ccdf56085d
Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream
2024-02-28 20:37:38 +01:00
a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
8f3c91fc3c
Add `change` block expectation to `admin/invites#deactivate_all` spec ( #29412 )
2024-02-27 16:25:58 +00:00
9e78129e6e
Use "cacheable response" shared example in more places ( #29419 )
2024-02-27 11:50:21 +00:00
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
1540f42522
Better tests for auth/registrations#update ( #29303 )
2024-02-26 16:09:56 +00:00
d51c3ac087
Add a missing spec to `SessionsController#webauthn_options` ( #29277 )
2024-02-26 16:09:40 +00:00
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Claire