2318 commits

Author	SHA1	Message	Date
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
Matt Jankowski	42ab855b23	Add specs for Instance model scopes and add with_domain_follows scope (#28767)	2024-01-25 15:28:27 +00:00
Matt Jankowski	6b6586f5d0	Add CustomFilterKeyword#to_regex method (#28893)	2024-01-25 13:00:34 +00:00
Claire	22cfab0ebf	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	2024-01-24 20:42:53 +01:00
Matt Jankowski	38f7f8b909	Tidy up association declaration in Instance model (#28880)	2024-01-24 17:30:28 +00:00
Matt Jankowski	7a1f087659	Add created_before and updated_before scopes to MediaAttachment (#28869)	2024-01-24 10:32:54 +00:00
Matt Jankowski	9d413cbaf8	Fix Rails/WhereExists cop in app/models (#28863)	2024-01-24 09:57:49 +00:00
Matt Jankowski	599bc69503	Simplify AccountSummary.filtered query generation (#28868)	2024-01-24 09:57:32 +00:00
Eugen Rochko	5b1eb09d54	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00:00
Matt Jankowski	c0e8e457ab	Eager loading fixes for api/ controllers (#28848)	2024-01-23 11:41:54 +00:00
Matt Jankowski	b0207d7757	Add coverage for Tag.recently_used scope (#28850)	2024-01-23 09:10:11 +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
Matt Jankowski	18004bf227	Add Account.matches_uri_prefix scope and use in activitypub/followers_synchronizations controller (#28820)	2024-01-22 13:55:37 +00:00
Matt Jankowski	5fc4ae7c5f	Move privacy policy into markdown file (#28699)	2024-01-19 11:22:23 +00:00
Matt Jankowski	1480573c83	Add Account.auditable scope, fix N+1 in admin/action_logs#index (#28812)	2024-01-19 01:39:30 +00:00
Claire	528a8fa495	Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream	2024-01-18 22:16:16 +01:00
Matt Jankowski	f866413e72	Extract shared tagged statuses method in FeaturedTag (#28805)	2024-01-18 16:14:15 +00:00
Matt Jankowski	d0b3bc23d7	Remove unused matches_domain scopes on Account, DomainAllow, DomainBlock (#28803)	2024-01-18 16:11:04 +00:00
Matt Jankowski	0b853678a4	Add coverage for api/v1/peers/search endpoint and extract controller query to Instance scope (#28796)	2024-01-18 15:57:10 +00:00
Matt Jankowski	9fb9ef418a	Fix Rails/WhereExists cop in User model (#28792)	2024-01-18 13:55:44 +00:00
Matt Jankowski	aaa6f2e930	Group common class_name options in associations (#28779)	2024-01-18 12:29:41 +00:00
Matt Jankowski	da31792ac7	Fix Rails/WhereExists cop in FeaturedTag model (#28791)	2024-01-18 12:22:12 +00:00
Matt Jankowski	89c9a4502d	Fix Rails/WhereExists cop in account/interactions concern (#28789)	2024-01-18 09:36:16 +00:00
Claire	c59fb65ddc	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.	2024-01-17 18:32:15 +01:00
Matt Jankowski	1b0cb3b54d	Announcement reactions query spec improvement and refactor (#28768)	2024-01-17 09:18:13 +00:00
Claire	278597c161	Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
Claire	2f521bc84a	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
Claire	464051c2d2	Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream	2024-01-15 20:06:31 +01:00
Claire	98b5f85f10	Rename and refactor User#confirm! to User#mark_email_as_confirmed! (#28735)	2024-01-15 18:04:58 +00:00
Claire	e621c1c44c	Fix registrations not checking MX records for email domain blocks requiring approval (#28608)	2024-01-15 17:10:57 +00:00
Matt Jankowski	a2f02a0775	Disable Rails/SkipsModelValidations cop (#28712)	2024-01-15 13:46:47 +00:00
Claire	8cb4825c8b	Fix sign-up restrictions based on email addresses not being enforced (#28732)	2024-01-15 11:06:48 +00:00
Matt Jankowski	a90c134850	Move followable by logic to suggestion class (#28710)	2024-01-12 13:09:33 +00:00
Claire	23d8bd8ce1	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +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	543d7890fd	Use normalizes to prepare User values (#28650) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-10 13:36:06 +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	cd4b4d4734	Replace unused by_recent_sign_in scope (#28616)	2024-01-08 15:31:13 +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
Matt Jankowski	9322396e58	Use normalizes to prepare Account#username value (#28646)	2024-01-08 13:48:31 +00:00
Matt Jankowski	cd58e37b25	Remove unused DomainBlock#affected_accounts_count method (#28642)	2024-01-08 13:38:52 +00:00
Matt Jankowski	4ccba94489	Remove unused *_silenced_accounts scopes on Status (#28644)	2024-01-08 13:35:53 +00:00
Matt Jankowski	c52a593a30	Remove unused scope User.emailable (#28647)	2024-01-08 13:33:45 +00:00
Matt Jankowski	e827c4692c	Use Arel matches method in CustomEmoji search (#28615)	2024-01-08 13:26:12 +00:00
Matt Jankowski	1bc5a52139	Extract SQL heredoc method for Announcement scopes (#28613)	2024-01-08 11:22:16 +00:00
Matt Jankowski	aa6d07dbd9	Use normalizes to prepare CustomEmoji domain value (#28624)	2024-01-08 11:20:59 +00:00
Matt Jankowski	202951e6d9	Use Arel in_order_of method to generate CASE for DomainBlock.by_severity (#28617)	2024-01-08 11:15:36 +00:00
Matt Jankowski	57f49c8191	Use Arel nulls_first method in ordering CustomEmojiFilter scope (#28614)	2024-01-08 11:09:50 +00:00
Jean Boussier	5a6d533c53	Enable Rails 7.1 Marshalling format (#28609)	2024-01-05 21:57:47 +00:00
Matt Jankowski	12bed81187	Add validation specs to CustomFilter model (#28600)	2024-01-05 15:13:59 +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
Michael Stanclift	195b89d336	Fix .opus file uploads being misidentified by Paperclip (#28580)	2024-01-03 19:02:53 +00:00
Claire	35b6583371	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
Claire	fcfdeadc04	Fix random NoMethodError errors on cached CustomFilter objects (#28521)	2023-12-29 16:23:07 +00:00
Matt Jankowski	ba5f659bb3	Use shorter attribute query methods in Announcement (#28474)	2023-12-29 10:55:50 +00:00
Matt Jankowski	128c5b7db3	Fix Performance/StringIdentifierArgument cop (#28508)	2023-12-29 10:23:30 +00:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Claire	ea6c187fca	Fix media attachment order of remote posts (#28469)	2023-12-22 18:45:36 +01:00
Claire	2bf84b93d4	Fix media attachment order of remote posts (#28469)	2023-12-22 15:10:39 +00: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	a60b9acf3c	Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream	2023-12-21 19:04:20 +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
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	b8209c3b96	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.	2023-12-20 20:10:45 +01:00
Claire	d29b1cca2e	Fix friends_of_friends sometimes suggesting already-followed accounts (#28433)	2023-12-20 14:35:59 +00:00
Claire	b135b6ba8f	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.	2023-12-19 21:24:01 +01:00
Claire	2e786e13cb	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.	2023-12-19 20:51:37 +01:00
Claire	8afd313807	Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming. - `yarn.lock`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming.	2023-12-19 20:06:32 +01:00
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-12-19 10:59:43 +00:00
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
Claire	7d9b209fe8	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
Matt Jankowski	1820bad646	Fix Performance/StringIdentifierArgument cop (#28399)	2023-12-18 10:26:09 +00:00
Matt Jankowski	0e5b8fc46b	Fix Style/RedundantReturn cop (#28391)	2023-12-18 09:50:51 +00:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	2023-12-17 23:04:16 +01:00
Claire	1474318691	Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.	2023-12-17 15:32:29 +01:00
Matt Jankowski	b1dec09d20	Fix Style/InverseMethods cop (#28377)	2023-12-15 15:52:00 +00:00
Claire	dcc24db793	Fix N+1s because of association preloaders not actually getting called (#28339)	2023-12-13 07:47:32 +00:00
Claire	9f92b05bd2	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	2023-12-10 18:05:02 +01:00
Matt Jankowski	3918dc68c7	Use composite primary key for PreviewCardsStatus model (#28208)	2023-12-07 14:49:05 +00:00
Matt Jankowski	5631f139c1	Fix Lint/SymbolConversion cop (#28175)	2023-12-01 15:53:35 +00:00
Matt Jankowski	d83d01eb1e	Fix Lint/RedundantSafeNavigation cop (#28172)	2023-12-01 15:52:56 +00:00
Matt Jankowski	f70f39dd04	Add explicit dependent: nil to associations (#28169)	2023-12-01 15:52:47 +00:00
Matt Jankowski	440b80b2e7	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
Claire	963354978a	Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053)	2023-11-30 15:43:26 +00:00
Matt Jankowski	bb0efe16e6	Remove default_scope from MediaAttachment class (#28043)	2023-11-30 13:30:35 +00:00
Matt Jankowski	e48ecd2929	Remove default_scope from Admin::ActionLog (#28026)	2023-11-29 10:39:59 +00:00
Matt Jankowski	186895fc88	Refactor, lint fix, and bug fix on admin/roles/form partial (#27558)	2023-11-29 10:00:52 +00:00
Claire	3a24754229	Change GIF max matrix size error to explicitly mention GIF files (#27927)	2023-11-24 09:31:28 +00:00
Matt Jankowski	4be12791e6	Remove default_scope from StatusEdit class (#28042)	2023-11-23 09:26:11 +00:00
Eugen Rochko	cdc57c74b7	Fix unsupported time zone or locale preventing sign-up (#28035) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-22 11:38:07 +00:00
Matt Jankowski	d2aacea8da	Reduce .times usage in AccountSearch spec, use constant for default limit (#27946)	2023-11-20 09:08:22 +00:00
ppnplus	2b038b4f89	Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE (#26576)	2023-11-14 15:33:59 +00:00
Matt Jankowski	b7807f3d84	Use normalizes to prepare Webhook#events value (#27605)	2023-11-13 22:47:44 +00:00
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
Matt Jankowski	45770c9306	Fix Performance/MapMethodChain cop (#27744)	2023-11-07 13:01:09 +00:00
Matt Jankowski	bbad5b6456	Remove false positive cop detection (#27457)	2023-11-07 10:44:15 +00:00
Claire	6c52f8286b	Fix posts from force-sensitized accounts being able to trend (#27620)	2023-10-30 22:32:25 +00:00
Claire	93e4cdc31b	Fix hashtag matching pattern matching some URLs (#27584)	2023-10-27 14:04:51 +00:00
Matt Jankowski	12550a6a28	Use Rails.env.local? shorthand method to check env (#27519)	2023-10-26 21:20:41 +00:00
Claire	4ef66d6538	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.	2023-10-24 20:31:20 +02:00
Claire	4b0fb764c3	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream ... Conflicts and ported changes: - updated `@rails/ujs` imports	2023-10-24 19:59:19 +02:00
Claire	57c0de949b	Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream changed how asset host CSP directives are used, and glitch-soc has a pretty different CSP file. It may be worth reconsidering the differences between upstream and glitch-soc but for now, just port the change.	2023-10-24 19:17:20 +02:00
Claire	787d5ad386	Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Caused by a glitch-soc-only dependency (`exif-js`). Kept it.	2023-10-24 19:05:18 +02:00
Claire	b0c76eaadd	Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change.	2023-10-24 18:41:20 +02:00
Matt Jankowski	714e3ae5b5	Use Rails 7.1 normalizes feature (#27521)	2023-10-24 10:06:10 +00:00
Matt Jankowski	e93a75f1a1	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00:00
Claire	8b770ce811	Add warnings to report action logs (#27425)	2023-10-23 14:30:46 +02:00
Claire	bcae744275	Fix some link anchors being recognized as hashtags (#27271)	2023-10-23 14:19:38 +02:00
Matt Jankowski	b0213472df	Validate allowed schemes on preview card URLs (#27485)	2023-10-23 09:50:02 +02:00
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
Matt Jankowski	63a2a4b074	Fix Performance/DeletePrefix cop (#27448)	2023-10-18 10:32:09 +02:00
Claire	c10a667ac2	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
Matt Jankowski	08a376cbcb	Fix Style/CombinableLoops cop (#27429)	2023-10-16 16:36:28 +02:00
Claire	53f5b27bd1	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	2023-10-08 17:30:48 +02:00
Claire	ac2370778a	Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.	2023-10-08 17:21:12 +02:00
Claire	d7fcd70023	Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.	2023-10-08 16:41:56 +02:00
Claire	19ebf7797e	Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00
Claire	340c390849	Fix crash when filtering for “dormant” relationships (#27306)	2023-10-06 12:58:16 +02:00
Matt Jankowski	c676bc91e9	Dont match mention in url query string (#25656) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-10-03 17:01:45 +02:00
Matt Jankowski	2016c5d912	Fix deprecation warning about rewhere: true being default behavior (Rails 7.1 prep) (#27190)	2023-09-28 16:52:23 +02:00
Matt Jankowski	3060bfa4bd	Extract filename and csv helper methods from Form::Import (#26129)	2023-09-28 16:22:05 +02:00
Claire	686406cc2d	Fix filtering audit log for entries about disabling 2FA (#27186)	2023-09-28 13:41:24 +02:00
Claire	abdb58840a	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
Essem	bd810391d6	Properly remove tIME chunk from PNG uploads (#27111)	2023-09-25 19:21:07 +02:00
Claire	1bd7455d81	Fix inefficient queries in “Follows and followers” as well as several admin pages (#27116)	2023-09-25 15:06:43 +02:00
Claire	39da3d86f8	Fix ActiveRecord using two connection pools when no replica is defined (#27061)	2023-09-22 16:01:59 +02:00
Claire	dfc05ec8df	Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream modified this file close to a line modified by glitch-soc to disable the ARMv64 builder (as glitch-soc doesn't have one). Ported upstream's changes. - `.github/workflows/build-releases.yml`: Upstream modified this file close to lines changed by glitch-soc to change the Docker image repositories used (only ghcr, and based on the organization's name). Ported upstream's changes.	2023-09-15 21:43:49 +02:00
Claire	5ed72f668f	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
Claire	08b495d95c	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
Claire	5d8c65f2a7	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
Claire	e4f5114aaf	Fix obsolete cache key in status cache invalidation logic (#26934)	2023-09-15 19:52:28 +02:00
Eugen Rochko	fc6825055b	Change score half-life for trending posts from 2 hours to 1 hour (#26915)	2023-09-14 09:20:14 +02:00
Robert R George	20666482ef	Added admin api for managing tags (#26872)	2023-09-13 11:22:53 +02:00
Claire	81caafbe84	Fix performances of profile directory (#26842)	2023-09-07 18:55:25 +02:00
Claire	355e3fb529	Simplify Account.by_recent_status and Account.by_recent_sign_in scopes (#26840)	2023-09-07 15:38:11 +02:00
Colette Kerr	8a9d7aeb1e	Change DCT method used for JPEG encoding to float (#26675)	2023-09-07 05:26:25 +02:00
Claire	b83e487502	Fix moderator rights inconsistencies (#26729)	2023-09-06 16:40:19 +02:00
Claire	77caba3789	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-05 20:34:17 +02:00
Claire	cab4cbfa5c	Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793)	2023-09-05 15:37:23 +02:00
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
Claire	4ed629cd7e	Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.	2023-09-02 14:44:47 +02:00
Claire	ac2dae0d11	Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-releases.yml`: Upstream changed comments close to a line we modified to account for different container image repositories. Updated the comments as upstream did.	2023-09-02 13:50:16 +02:00
Claire	ffb486648c	Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream	2023-09-02 13:34:54 +02:00
Claire	fbbe9f1c12	Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream	2023-09-02 12:20:33 +02:00
Claire	c8aa3d6d06	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00
Claire	3c7dbf3a16	Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `.github/workflows/build-push-pr.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream changed how the version string is built from environment variables. Adapted the logic to account for the `+glitch` in glitch-soc.	2023-09-02 11:56:09 +02:00
Claire	6b7c47311d	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
Eugen Rochko	05093266e6	Fix some video encoding failing due to uneven dimensions (#26766)	2023-09-02 09:02:44 +02:00
Claire	16681e0f20	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
Claire	9e26cd5503	Add authorized_fetch server setting in addition to env var (#25798)	2023-09-01 15:41:10 +02:00
Eugen Rochko	ecd76fa413	Fix videos not playing in some browsers due to unsupported color space (#26745)	2023-08-31 17:21:06 +02:00
Claire	9e77ab7db2	Change private statuses index to index without crutches (#26713)	2023-08-29 17:51:13 +02:00
Eugen Rochko	01b87a1632	Change video compression parameters (#26631)	2023-08-28 19:40:08 +02:00
Claire	0cce7fb617	Fix incorrect call to PublicStatusesIndex.import (#26697)	2023-08-28 15:04:57 +02:00
Eugen Rochko	5694e24bbf	Fix unnecessary condition causing seqscan when indexing (#26689)	2023-08-27 22:37:35 +02:00
Claire	32e67e78a3	Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream	2023-08-24 21:50:14 +02:00
Claire	88ff45a3b2	Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream	2023-08-24 21:03:56 +02:00
Claire	1b5d3fdc5e	Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream	2023-08-24 20:55:28 +02:00
jsgoldstein	30c191aaa0	Add new public status index (#26344) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-08-24 16:40:04 +02:00
Daniel M Brasil	f337008819	Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public (#26239)	2023-08-23 15:50:23 +02:00
Claire	452f15be78	Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab	2023-08-22 19:50:37 +02:00
Claire	10404aece8	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	2023-08-22 18:50:14 +02:00
Claire	2126812f65	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	2023-08-22 18:31:28 +02:00
Claire	9ed0c91a37	Add auto-refresh of accounts we get new messages/edits of (#26510)	2023-08-21 16:09:26 +02:00
Claire	ee702e36e5	Change follow recommendation materialized view to be faster in most cases (#26545) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-08-18 18:20:55 +02:00
Claire	60b9fa641d	Fix cached posts including stale stats (#26409)	2023-08-17 16:11:48 +02:00
Claire	cc4560d95b	Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach (#26508)	2023-08-17 09:13:26 +02:00
Claire	0446394465	Fix “legal” report category not showing up in moderation interface (#26509)	2023-08-16 16:38:33 +02:00
Claire	90ec88d58b	Add support for indexable attribute on remote actors (#26485) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-08-14 18:54:51 +02:00
Claire	fc5ab2dc83	Add privacy tab in profile settings (#26484) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-08-14 18:52:45 +02:00
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	2023-08-13 18:47:15 +02:00
Claire	44a5f1b64a	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README	2023-08-11 22:15:41 +02:00
Claire	2c204d904b	Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386)	2023-08-08 13:59:40 +02:00
Claire	d5bee37c57	Fix missing cached preview cards attributes (#26343)	2023-08-04 16:13:47 +02:00
Claire	9405e9af58	Fix incorrect model annotation for List#exclusive (#26313)	2023-08-04 09:00:31 +02:00
Claire	3105fef21a	Rename “read” database to “replica” for consistency (#26326)	2023-08-03 16:17:09 +02:00
Christian Schmidt	8da99ffb0d	Add alt text for preview card thumbnails (#26184)	2023-08-03 15:41:51 +02:00
Christian Schmidt	f2257069b2	Fix AVIF attachments (#26264)	2023-08-01 19:34:11 +02:00
Claire	92fa9d34b0	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.	2023-07-30 16:11:55 +02:00
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	2023-07-30 14:58:56 +02:00
Claire	7635c67450	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change.	2023-07-30 13:42:06 +02:00
Claire	993d0a9950	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.	2023-07-30 13:15:01 +02:00
Claire	b4e739ff0f	Change interaction modal in web UI (#26075) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-07-27 16:11:17 +02:00
Eugen Rochko	7bd8ef355c	Add published_at attribute to preview cards (#26153)	2023-07-25 13:40:35 +02:00
Vyr Cossont	394d1f19b1	Add report.updated webhook (#24211)	2023-07-24 17:37:38 +02:00
Eugen Rochko	4d01d1a1ee	Remove 16:9 cropping from web UI (#26132)	2023-07-24 13:46:55 +02:00
Claire	5cbc402687	Fix replica being used even if not explicitly defined (#26074)	2023-07-21 11:30:53 +02:00
Claire	1e3b19230a	Add stricter protocol fields validation for accounts (#25937)	2023-07-20 18:23:48 +02:00
Claire	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 12:52:15 +02:00
Eugen Rochko	26e522ac55	Fix not actually connecting to the configured replica (#25977)	2023-07-17 08:26:52 +02:00
Claire	d9adda1a99	Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream	2023-07-13 22:40:15 +02:00
Matt Jankowski	644c5fddd8	Refactor Status.tagged_with_all for brakeman SQL injection warning (#25941)	2023-07-13 15:52:37 +02:00
Claire	2d09653d50	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	2023-07-13 13:35:15 +02:00
Matt Jankowski	ce43ed144c	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	2023-07-12 16:03:05 +02:00
Claire	dd0002e1fe	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.	2023-07-12 15:38:35 +02:00
Matt Jankowski	1ef014802b	Refactor Trends::Query to avoid brakeman sql injection warnings (#25881)	2023-07-12 14:19:20 +02:00
Matt Jankowski	b8b2470cf8	Fix Style/SlicingWithRange cop (#25923)	2023-07-12 10:03:06 +02:00
Eugen Rochko	610cf6c371	Fix trend calculation working on too many items at a time (#25835)	2023-07-08 20:16:48 +02:00
Matt Jankowski	cf33028f35	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
Claire	b9aa228c54	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.	2023-07-07 19:59:43 +02:00
Claire	94fbac77e7	Fix processing of media files with unusual names (#25788)	2023-07-07 13:35:22 +02:00
Claire	ff7aae3037	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
Claire	dc8f1fbd97	Merge pull request from GHSA-9928-3cp5-93fm ... * Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged	2023-07-06 15:05:05 +02:00
Claire	44e98a2740	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-02 11:49:08 +02:00
Eugen Rochko	ba06a2f104	Revert "Rails 7 update" (#25667)	2023-07-02 11:14:22 +02:00
Matt Jankowski	50c2a03695	Rails 7 update (#24241)	2023-07-02 10:38:53 +02:00
Matt Jankowski	683ba5ecb1	Fix rails rewhere deprecation warning in directories api controller (#25625)	2023-07-01 21:48:16 +02:00
jsgoldstein	4581a528f7	Change account search to match by text when opted-in (#25599) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-06-29 13:05:21 +02:00
Claire	178e151019	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.	2023-06-25 14:27:38 +02:00
Claire	602c458ab6	Add finer permission requirements for managing webhooks (#25463)	2023-06-22 14:52:25 +02:00
Claire	ebfeaebedb	Fix /api/v1/conversations sometimes returning empty accounts (#25499)	2023-06-20 18:32:26 +02:00
Claire	ec91ea4457	Fix missing validation on default_privacy setting (#25513)	2023-06-20 18:32:14 +02:00
Claire	dd07393e75	Fix user settings not getting validated (#25508)	2023-06-19 14:06:06 +01:00
Claire	6c99479ef4	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.	2023-06-18 13:41:33 +02:00
Claire	65cbcce997	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +02:00
Daniel M Brasil	d9c6f70cc6	Fix ArgumentError in /api/v1/admin/accounts/:id/action (#25386)	2023-06-14 15:21:36 +02:00
Claire	ec59166844	Fix ArgumentError when loading newer Private Mentions (#25399)	2023-06-14 08:54:52 +02:00
Renaud Chaput	1cb4514d0e	Add missing report category translation (#25400)	2023-06-13 15:05:40 +02:00
Claire	42a0898f16	Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.	2023-06-10 18:42:29 +02:00
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	2023-06-10 16:48:01 +02:00
Claire	d8b0a732aa	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.	2023-06-10 16:22:14 +02:00
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	2023-06-10 15:17:08 +02:00
Claire	93c714417f	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream changed various script definitions in lines surrounding the one for `i18n:extract`, which had glitch-soc-specific changes. Updated the scripts as upstream did, while keeping our changes to `i18n:extract`.	2023-06-10 14:38:04 +02:00
Eugen Rochko	4c9406bdb0	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00
Eugen Rochko	67d17ce194	Add legal as report category (#23941)	2023-06-06 23:41:59 +02:00
Nick Schonning	c66250abf1	Autofix Rubocop Regex Style rules (#23690) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-06 14:50:51 +02:00
Eugen Rochko	4eda233e09	Add webhook templating (#23289) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-06 10:42:47 +02:00
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	2023-06-05 13:25:22 +02:00
Darius Kazemi	bacb674921	Add exclusive lists (#22048) ... Co-authored-by: Liam Cooke <liam@liamcooke.com> Co-authored-by: John Holdun <john@johnholdun.com> Co-authored-by: Effy Elden <effy@effy.space> Co-authored-by: Lina Reyne <git@lina.pizza> Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-05 09:37:02 +02:00
Claire	8884d1ece0	Add support for importing lists (#25203)	2023-06-01 14:47:31 +02:00
Claire	2b45fecde1	Fix multiple N+1s in ConversationsController (#25134)	2023-06-01 02:41:51 +02:00
Christian Schmidt	69057467cb	Translate CW, poll options and media descriptions (#24175) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-06-01 00:10:21 +02:00
Claire	b6519ab3f5	Fix inconsistent naming of Instance.by_domain_and_subdomain (#25159)	2023-05-31 09:57:24 +02:00
Claire	0669783da8	Merge branch 'main' into glitch-soc/merge-upstream	2023-05-28 17:01:25 +02:00
Claire	6dbd44faea	Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream	2023-05-28 15:01:53 +02:00
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2023-05-25 22:59:30 +02:00
Claire	ad1098970b	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. - `app/views/admin/settings/registrations/show.html.haml`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. Additional changes: - `Gemfile`: Upstream added hcaptcha dependency in another place in the file. - `config/settings.yml`: Upstream added the `captcha_enabled` setting in another place in the file.	2023-05-25 22:49:18 +02:00
Claire	b735954971	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	2023-05-25 20:43:25 +02:00
Claire	1d588d58f1	Improve various queries against account domains (#25126)	2023-05-25 09:27:16 +02:00
Claire	dfa5889fc0	Change Identity to not destroy associated User on destroy (#25098)	2023-05-23 15:00:36 +02:00