1222 commits

Author	SHA1	Message	Date
Claire	94d8cdc494	Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream	2024-08-27 20:00:07 +02:00
Matt Jankowski	3959f36d19	Add checks about response body content to admin/dash spec (#30716)	2024-08-27 14:59:56 +00:00
Matt Jankowski	48f4e5444d	Convert media_proxy controller spec to request spec (#31600)	2024-08-27 09:44:16 +00:00
Matt Jankowski	a7f8417795	Convert "CSV export" settings controller specs to request specs (#31601)	2024-08-27 08:12:39 +00:00
Matt Jankowski	38a3466741	Convert api/oembed controller spec to request spec (#31605)	2024-08-27 07:55:25 +00:00
Matt Jankowski	c09d232ee3	Convert api/web/settings controller spec to request spec (#31606)	2024-08-27 07:42:35 +00:00
Claire	11b8017b45	Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream	2024-08-26 18:52:33 +02:00
Matt Jankowski	4c2534d12e	Convert "static page" controller specs to system specs (#31599)	2024-08-26 15:53:48 +00:00
Matt Jankowski	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
Matt Jankowski	5172d84946	Convert manifest controller spec to request spec (#31596)	2024-08-26 14:37:23 +00:00
Matt Jankowski	36ccdcc9e1	Convert "custom css" controller spec to request spec (#31595)	2024-08-26 14:36:31 +00:00
Matt Jankowski	641ae6a2cf	Convert health check endpoint controller spec to request spec (#31565)	2024-08-26 12:17:35 +00:00
Claire	654187a995	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
Emelia Smith	c40e481169	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00:00
Claire	fb411b6d0f	Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream	2024-07-27 13:19:38 +02:00
David Roetzel	dd53792714	Move UI tests from controller to system spec (#31158)	2024-07-26 14:53:49 +00:00
Emelia Smith	693d9b03ed	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
Claire	68000956f4	Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
Emelia Smith	bb2e5a4b58	Add audit logs to Admin::InstancesController (#27386)	2024-07-23 08:12:30 +00:00
Claire	c75fe09e2b	Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream	2024-07-18 17:56:25 +02:00
Matt Jankowski	2616fde9e6	Use change-requiring records in admin/reports controller spec (#31052)	2024-07-18 07:49:44 +00:00
Claire	5e7720d11b	Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream	2024-07-17 22:20:12 +02:00
Matt Jankowski	76c2c5c748	Reduce extra round trips in activitypub controller specs (#31041)	2024-07-17 08:09:34 +00:00
Claire	55cf5e0188	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
Matt Jankowski	73d53827ea	Add change assertion to invites destroy spec (#31004)	2024-07-12 08:19:15 +00:00
Claire	6a55232988	Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream	2024-07-08 19:41:14 +02:00
Matt Jankowski	f1300ad284	Rename jobs/attachments rspec tag names (#29762)	2024-07-08 16:01:08 +00:00
Claire	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
Claire	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
Claire	6f2771cb32	Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream	2024-06-25 17:57:39 +02:00
Emelia Smith	30ae5952d2	Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812)	2024-06-25 07:46:53 +00:00
Claire	21ca03581a	Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream	2024-06-24 19:39:42 +02:00
Claire	8827cd597e	Fix /admin/accounts/:account_id/statuses/:id for edited posts with media attachments (#30819)	2024-06-24 13:11:10 +00:00
Claire	f214813919	Adapt settings spec to glitch-soc	2024-06-11 19:54:27 +02:00
Claire	4daed855e5	Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Matt Jankowski	edf6d64eeb	Use correct params in settings/preferences/appearance spec (#30379)	2024-06-11 07:36:46 +00:00
Claire	5ab111554e	Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream	2024-05-21 17:45:21 +02:00
Claire	32223863a5	Add coverage to /admin/accounts/:id (#30386)	2024-05-21 13:17:34 +00:00
Claire	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
Matt Jankowski	65e82211cd	Rename cache_* methods to preload_* in controller concern (#30209)	2024-05-16 08:03:46 +00:00
Emelia Smith	5fd56512de	Improve Report Notes and Account Moderation Notes (#30288)	2024-05-15 13:38:36 +00:00
Claire	9ce82a35cb	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
Claire	babbf6017d	Remove caching in cache_collection (#29862)	2024-04-08 13:46:13 +00:00
Claire	e91ede5be6	Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Matt Jankowski	f9100743ec	Add Api::ErrorHandling concern for api/base controller (#29574)	2024-03-14 09:09:47 +00:00
Claire	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
Claire	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
Claire	06881a8669	Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream	2024-03-13 19:16:47 +01:00
Matt Jankowski	71e5f0f48c	Add coverage for suspended instance actor scenario (#29571)	2024-03-13 15:43:40 +00:00
Matt Jankowski	46e902f1f3	Merge api/v1/accounts/credentials controller spec into existing request spec (#29006)	2024-03-13 09:22:43 +00:00
Matt Jankowski	71eecbfa1f	Move api/v2/filters/* to request spec (#28956)	2024-03-13 08:47:09 +00:00
Claire	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
Matt Jankowski	a38e424185	Use unchanging github links in docs/comments (#29545)	2024-03-11 15:14:55 +00:00
Eugen Rochko	50b17f7e10	Add notification policies and notification requests (#29366)	2024-03-07 14:53:37 +00:00
Claire	159e500749	Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
Matt Jankowski	18945f62e0	Convert more API specs from controller->request style (#29004)	2024-03-01 16:24:45 +00:00
Claire	4d7e7cc562	Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream	2024-02-29 18:24:47 +01:00
Matt Jankowski	eb1b8f69de	Allow pagination Link headers on API accounts/statuses when pinned true (#29442)	2024-02-29 14:21:56 +00:00
Matt Jankowski	6675bf574a	Extract parsed_uri_query_values helper in ap/replies controller spec (#29410)	2024-02-29 13:47:38 +00:00
Claire	ccdf56085d	Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream	2024-02-28 20:37:38 +01:00
Claire	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
Matt Jankowski	8f3c91fc3c	Add change block expectation to admin/invites#deactivate_all spec (#29412)	2024-02-27 16:25:58 +00:00
Matt Jankowski	9e78129e6e	Use "cacheable response" shared example in more places (#29419)	2024-02-27 11:50:21 +00:00
Claire	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
Damien Mathieu	1540f42522	Better tests for auth/registrations#update (#29303)	2024-02-26 16:09:56 +00:00
Wolfgang Fournès	d51c3ac087	Add a missing spec to SessionsController#webauthn_options (#29277)	2024-02-26 16:09:40 +00:00
Claire	d2cfc6e5e2	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
Claire	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
Claire	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	5b9ddfcfcc	Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
Claire	dfd74f0dae	Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream	2024-02-24 14:15:49 +01:00
Claire	73de36318e	Move api/v1/timelines/direct to request spec	2024-02-24 14:10:05 +01:00
Claire	9903e6beab	Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/direct_controller_spec.rb`: `spec/controllers/api/v1/timelines` has been renamed, but we had an extra spec here for a glitch-soc-only endpoint. Kept glitch-soc's file unchanged (will port to a request spec later).	2024-02-24 14:05:26 +01:00
Claire	c297d999ba	Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream	2024-02-24 14:02:01 +01:00
Matt Jankowski	64f9939e39	Use capture_emails helper to improve email assertions in specs (#29245)	2024-02-19 15:57:47 +00:00
Matt Jankowski	1946e171e6	Reduce round trips in admin/disputes/appeals spec (#29234)	2024-02-16 13:46:28 +00:00
Matt Jankowski	3454fcbd71	Reduce round trips in auth/sessions spec (#29233)	2024-02-16 13:38:49 +00:00
Matt Jankowski	a316c0e38d	Reduce round trips in disputes/appeals spec (#29232)	2024-02-16 13:01:15 +00:00
Matt Jankowski	1690fb39e6	Reduce RSpec/MultipleExpectations in instance_actors_controller spec (#29229)	2024-02-16 13:00:11 +00:00
Matt Jankowski	da50217b88	Combine repeated requests in admin/accounts controller spec (#29119)	2024-02-07 10:59:32 +00:00
Matt Jankowski	2d6ab44556	Reduce request/response round-trips in ap/collections controller spec (#29102)	2024-02-06 13:10:00 +00:00
Matt Jankowski	4cf07ed78c	Add missing action logging to api/v1/admin/reports#update (#29044)	2024-02-06 11:34:11 +00:00
Matt Jankowski	f91acba70a	Combine repeated requests in account controller concern spec (#28957)	2024-01-30 15:32:20 +00:00
Matt Jankowski	ff8937aa2c	Move api/v1/statuses/* to request spec (#28954)	2024-01-26 17:45:54 +00:00
Matt Jankowski	5119fbc9b7	Move api/v1/admin/trends/links/preview_card_providers to request spec (#28951)	2024-01-26 17:41:39 +00:00
Matt Jankowski	b6baab447d	Move api/v2/admin/accounts to request spec (#28950)	2024-01-26 17:41:13 +00:00
Matt Jankowski	7adcc0aae3	Move api/v1/trends/* to request specs (#28949)	2024-01-26 17:40:39 +00:00
Matt Jankowski	0b0ca6f3b8	Move api/v1/timelines/list to request spec (#28948)	2024-01-26 17:40:15 +00:00
Matt Jankowski	685eaa04d4	Combine double subject in admin/statuses controller shared example (#28940)	2024-01-26 16:30:30 +00:00
Matt Jankowski	beb74fd71c	Combine double subjects in instance actors controller shared example (#28939)	2024-01-26 16:28:50 +00:00
Matt Jankowski	beaef4b672	Combine double subjects in application controller shared example (#28938)	2024-01-26 16:23:12 +00:00
Matt Jankowski	2f8656334d	Combine double subjects in admin/accounts controller spec (#28936)	2024-01-26 16:21:31 +00:00
Matt Jankowski	9cc1817bb4	Fix intmermittent failure in api/v1/accounts/statuses controller spec (#28931)	2024-01-26 14:10:26 +00:00
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
Matt Jankowski	a11a2fb052	Add error classes to api/base errors coverage (#28864)	2024-01-24 10:31:31 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Claire	0700eb58bc	Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream	2024-01-22 19:12:05 +01:00
Claire	e2d9635074	Add notification email on invalid second authenticator (#28822)	2024-01-22 13:55:43 +00:00
Matt Jankowski	7ecf7f5403	Move controller->request specs for api/v1/statuses/* (#28818)	2024-01-22 11:58:54 +00:00
Claire	3593ee2e36	Add rate-limit of TOTP authentication attempts at controller level (#28801)	2024-01-19 12:19:49 +00:00