2616 commits

Author	SHA1	Message	Date
Claire	63acdebc5d	Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.	2024-01-11 13:17:13 +01:00
Claire	630b245bb4	Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	2024-01-11 12:59:27 +01:00
Claire	47d213e701	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	2024-01-10 18:41:04 +01:00
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	2024-01-10 17:51:12 +01:00
Matt Jankowski	742d8d30e2	Add coverage for --days option to CLI media refresh command (#28669)	2024-01-10 09:36:12 +00:00
Renaud Chaput	63d0b52cf3	Add a system spec for the /share endpoint (#28672)	2024-01-09 21:58:19 +00:00
Claire	10203bd57a	Clean up Setting model and remove dead code (#28661)	2024-01-09 14:01:53 +00:00
Jean Boussier	1781849884	Inline what remains of the rails-settings-cached gem (#28618) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-09 11:50:21 +00:00
Matt Jankowski	5dc634796a	Misc coverage improvements re: sidekiq/inline (#28651)	2024-01-09 09:40:08 +00:00
Matt Jankowski	e677eb164c	Remove unused Announcement#time_range? (#28648)	2024-01-08 15:26:30 +00:00
Matt Jankowski	3e43cd095c	Remove unused scope Announcement.without_muted (#28645)	2024-01-08 15:26:14 +00:00
Claire	157fc69954	Make request_pool_spec tests more robust (#28610)	2024-01-08 12:29:05 +00:00
Matt Jankowski	aa6d07dbd9	Use normalizes to prepare CustomEmoji domain value (#28624)	2024-01-08 11:20:59 +00:00
Matt Jankowski	832b92ac3e	Add attachment check to spec/service/suspend_account_service spec (#28619)	2024-01-08 11:05:10 +00:00
Matt Jankowski	12bed81187	Add validation specs to CustomFilter model (#28600)	2024-01-05 15:13:59 +00:00
Claire	6ad0fb5a77	Fix NULL MX handling and tighten DNS resolving specs (#28607)	2024-01-05 11:07:57 +00:00
Claire	5f4643b895	Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used (#28561)	2024-01-05 10:45:36 +00:00
Matt Jankowski	964a0ecf37	Add sleep statement to nudge thread scheduler in request pool spec (#28596)	2024-01-04 16:55:00 +00:00
Matt Jankowski	f06c1f1552	Fix Capybara/ClickLinkOrButtonStyle cop in spec/features (#28576)	2024-01-04 09:20:32 +00:00
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468)	2024-01-04 09:07:05 +00:00
Claire	0b5783f3f1	Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream	2024-01-03 20:52:19 +01:00
Matt Jankowski	f92d8c654d	Standardize on Thor methods in CLI classes (#28566)	2024-01-03 15:08:08 +00:00
Matt Jankowski	5c769de096	Add spec coverage for CLI::Media#remove_orphans command (#28267)	2024-01-03 14:12:56 +00:00
Matt Jankowski	74a0d81e90	Add coverage for CLI self-destruct command (#28565) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-03 13:06:38 +00:00
Claire	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	2024-01-03 12:38:49 +01:00
Claire	092bb8a27a	Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476)	2024-01-03 11:29:26 +00:00
Claire	bd415af9a1	Change streaming API host to not be overridden to localhost in development mode (#28557)	2024-01-03 10:23:58 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	19e14654cc	Reduce CSP configuration changes with upstream (#2536)	2023-12-27 09:54:05 +01:00
Claire	a2624ff739	Convert signature verification specs to request specs (#28443)	2023-12-22 18:56:22 +00:00
Claire	ea6c187fca	Fix media attachment order of remote posts (#28469)	2023-12-22 18:45:36 +01:00
Matt Jankowski	bb8077e784	Fix RSpec/LetSetup cop in models/account_status_cleanup_policy (#28470)	2023-12-22 15:29:50 +00:00
Claire	2bf84b93d4	Fix media attachment order of remote posts (#28469)	2023-12-22 15:10:39 +00:00
Matt Jankowski	a4d49c236d	Fix RSpec/LetSetup cop in ap/fetch_featured_collection_service (#28461)	2023-12-22 12:57:29 +00:00
Matt Jankowski	e6e217fedd	Clean up tagged_with_* Status specs, fix RSpec/LetSetup cop (#28462)	2023-12-22 08:32:27 +00:00
Matt Jankowski	513d35969e	Fix RSpec/LetSetup cop in auth controller specs (#28464)	2023-12-22 08:03:59 +00:00
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01:00
Claire	30ee7339d3	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.	2023-12-21 19:31:12 +01:00
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	2023-12-21 19:24:10 +01:00
Claire	6e56f95285	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.	2023-12-21 18:17:17 +01:00
Matt Jankowski	9251779d75	Fix RSpec/LetSetup cop in spec/services (#28459)	2023-12-21 14:23:53 +00:00
Matt Jankowski	efd16f3c2c	Clean up of RSpec/LetSetup within spec/services/activitypub (#28445)	2023-12-21 11:20:12 +00:00
Matt Jankowski	c99f88e1a8	Clean up of RSpec/LetSetup within spec/lib (#28447)	2023-12-21 11:19:56 +00:00
Matt Jankowski	cd64a5b2ec	Clean up of RSpec/LetSetup within api/ (#28448)	2023-12-21 10:10:18 +00:00
Matt Jankowski	f32d672d2f	Clean up of RSpec/LetSetup within spec/controllers (#28446)	2023-12-21 09:28:41 +00:00
Matt Jankowski	c753b1ad35	Clean up of RSpec/LetSetup within spec/models (#28444)	2023-12-21 09:18:38 +00:00
Matt Jankowski	2463b53363	More duplicates in cli maintenance spec, misc bug fixes (#28449)	2023-12-21 08:51:03 +00:00
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	2023-12-20 22:16:50 +01:00
Claire	75580360cd	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings.	2023-12-20 22:05:31 +01:00
Claire	8a5f2442cc	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01:00