2515 commits

Author	SHA1	Message	Date
Claire	9e9613b286	Fix mentions.account_id and mentions.status_id not having NOT NULL database constraints (#30591)	2024-06-07 13:45:11 +00:00
Claire	1408733386	Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS (#30590)	2024-06-07 09:27:59 +00:00
Claire	30b00ca2b5	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
Eugen Rochko	a2505e8611	Add timeline of public posts about a trending link to REST API (#30381)	2024-06-06 08:43:04 +00:00
Emelia Smith	4655be0da6	Fix add validation to webpush subscription keys (#30542)	2024-06-05 19:16:47 +00:00
Eugen Rochko	5f15a892fa	Add support for libvips in addition to ImageMagick (#30090) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-06-05 19:15:39 +00:00
Emelia Smith	eef2cc054f	Add url validation to Web::PushSubscription endpoints (#30540)	2024-06-05 08:06:06 +00:00
Claire	974335e414	Add experimental server-side notification grouping (#29889)	2024-06-03 08:35:59 +00:00
Jeremy Kescher	cb080ca3ef	Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0	2024-05-30 18:51:42 +02:00
Claire	c827a98f19	Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did.	2024-05-29 17:03:24 +02:00
Jeremy Kescher	6d448d46ff	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/actions/interactions.js # app/javascript/flavours/glitch/reducers/statuses.js	2024-05-29 14:23:08 +02:00
Eugen Rochko	128987eded	Add support for fediverse:creator OpenGraph tag (#30398)	2024-05-29 01:34:33 +02:00
Matt Jankowski	4a77e477ee	Consolidate account scopes for LOWER (index using) username/domain queries (#30451)	2024-05-28 14:11:31 +00:00
Matt Jankowski	c61e356475	Add Status::MEDIA_ATTACHMENTS_LIMIT configuration constant (#30433)	2024-05-27 09:49:44 +00:00
Claire	d76106da12	Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream	2024-05-24 17:08:21 +02:00
Matt Jankowski	9b5055d34d	Fix Style/SuperArguments cop (#30406)	2024-05-24 08:36:21 +00:00
Jeremy Kescher	d1856ea48d	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/initial_state.js	2024-05-22 23:56:46 +02:00
Claire	edf6ca56e3	Fix rubocop error and cleanup Status.as_direct_timeline a little	2024-05-21 13:12:46 +02:00
Claire	d3136e6d58	Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream	2024-05-21 12:06:38 +02:00
Claire	89f89d738f	Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385)	2024-05-21 08:56:08 +00:00
Jeremy Kescher	fae98d1deb	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js	2024-05-20 23:57:04 +02:00
Claire	e46321e63d	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
Matt Jankowski	def6b686ff	Fix Rails/WhereRange cop (#30343)	2024-05-20 09:37:36 +00:00
Jeremy Kescher	70c76a1f30	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-17 15:33:30 +02:00
Claire	57fb2cf948	Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream	2024-05-17 12:33:41 +02:00
Jeong Arm	a627219b25	Fix moderation action logs (#30342)	2024-05-17 09:18:54 +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
Emelia Smith	5fd56512de	Improve Report Notes and Account Moderation Notes (#30288)	2024-05-15 13:38:36 +00:00
Jeremy Kescher	e73c612cb1	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
Claire	21c904b0f6	Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream	2024-05-07 20:30:17 +02:00
Claire	d8c4284723	Ensure custom favicon is converted to PNG and ICO (#30208)	2024-05-07 18:15:17 +00:00
Claire	016d194274	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.	2024-05-06 17:53:51 +02:00
Claire	2fe1b8d169	Add API to get multiple accounts and statuses (#27871) ... Co-authored-by: noellabo <noel.yoshiba@gmail.com>	2024-05-06 15:19:15 +00:00
Fawaz Farid	bc24c4792d	Allow admins to configure instance favicon and logo (#30040)	2024-05-06 15:06:52 +00:00
Claire	30ef9fccf0	Fix hashtag matching pattern matching some link anchors (#30190)	2024-05-06 12:47:19 +00:00
Claire	e5062b7135	Fix post deletion not being deferred when those are part of an account warning (#30163)	2024-05-06 09:52:34 +00:00
Claire	3789d9f825	Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream ... Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.	2024-05-04 16:28:30 +02:00
Claire	f09f5b35f2	Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`	2024-05-04 16:12:51 +02:00
Claire	a76980a229	Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream	2024-05-04 15:40:07 +02:00
Claire	d6f9c97ae4	Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
Claire	bac4026d80	Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream	2024-05-04 15:10:54 +02:00
Râu Cao	9aa31be8d3	Fix local account search on LDAP login being case-sensitive (#30113) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-05-03 09:22:48 +00:00
Matt Jankowski	88882fbbee	Move Rails/HABTM cop out of todo (#30118)	2024-05-02 09:40:05 +00:00
Matt Jankowski	1e7d5d2957	Update devise-two-factor to version 5.0.0 (#28325) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-05-02 09:31:41 +00:00
Claire	6204d13a2e	Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.	2024-05-01 19:38:34 +02:00
Claire	360590ecd8	Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.	2024-05-01 19:30:41 +02:00
Claire	946bd2e7e1	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
Claire	6f342a6d4c	Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.	2024-05-01 18:56:48 +02:00
Claire	9ce82a35cb	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
Claire	0fb469e2f3	Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream	2024-05-01 17:30:52 +02:00
Claire	15f6d2d038	Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name.	2024-05-01 17:22:02 +02:00
Claire	3f61981f5d	Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
Claire	7b46517c38	Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream	2024-05-01 14:31:14 +02:00
Matt Jankowski	924af400da	Remove unused memoization in CustomFilter#expires_in method (#30117)	2024-04-29 12:49:31 +00:00
Matt Jankowski	ac7f4d57bb	Use composable query in Status.without_replies scope (#30086)	2024-04-29 09:55:37 +00:00
Claire	95e9de5777	Prevent accidental serialization of Account and User records (#30079)	2024-04-29 09:45:58 +00:00
Matt Jankowski	bbf1b603e0	Remove unused Account.popular scope (#30068)	2024-04-29 09:04:35 +00:00
Matt Jankowski	2123281f7c	Move Account limits to constants (#30087)	2024-04-29 09:02:47 +00:00
Matt Jankowski	f0c9cbaf3b	Use EXPIRATION_DURATIONS constant in CustomFilter class (#30088)	2024-04-29 09:01:46 +00:00
Claire	e845594878	Fix moderator account being exposed in account moderation notification (#30082)	2024-04-26 12:42:06 +00:00
Claire	4ef0b48b95	Add in-app notifications for moderation actions/warnings (#30065)	2024-04-25 17:26:05 +00:00
Matt Jankowski	f4a53f3fb4	Extract constants for column size length validation limits (#30045)	2024-04-24 08:56:28 +00:00
Matt Jankowski	11e0049b08	Use enum-generated scopes/queries for BulkImport (#29975)	2024-04-18 10:13:35 +00:00
Matt Jankowski	650c548c31	Add not_featured_by scope to Tag (#28815)	2024-04-17 10:05:38 +00:00
Claire	fc89ecc6ca	Change /api/v1/announcements to return regular Status entities (#26736)	2024-04-17 09:06:23 +00:00
Matt Jankowski	6fed108703	Use Rails upsert to generate update_count! query in Counters concern (#28738) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-17 08:16:51 +00:00
Matt Jankowski	caad1e2628	Add scope Status.distributable_visibility (#29950)	2024-04-16 13:16:54 +00:00
Matt Jankowski	6b33d3f81b	Add CustomFilter.unexpired scope (#29896)	2024-04-16 09:29:34 +00:00
Matt Jankowski	3159c0a547	Add scope Status.list_eligible_visibility (#29951)	2024-04-16 09:17:03 +00:00
Matt Jankowski	13bbde2246	Use existing DEFAULT_FIELDS_SIZE constant to limit Account#fields (#29911)	2024-04-12 09:04:23 +00:00
Jeremy Kescher	2df3b9f803	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb	2024-04-11 21:50:48 +02:00
Matt Jankowski	285f63c02e	Use composable query in User.active scope (#29775)	2024-04-08 13:53:49 +00:00
Claire	babbf6017d	Remove caching in cache_collection (#29862)	2024-04-08 13:46:13 +00:00
Claire	1d1c3a808a	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.	2024-04-06 21:01:40 +02:00
Claire	777984faeb	Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
Claire	903dc53522	Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream	2024-04-06 20:01:25 +02:00
Claire	67842ffb22	Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream	2024-04-06 19:54:11 +02:00
Claire	f2b23aa5f3	Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Upstream added a navigation item while glitch-soc had an additional one. Ported upstream changes.	2024-04-06 19:35:21 +02:00
Matt Jankowski	c0fe8a9f13	Extract shared callback behaviour to CustomFilterCache concern (#29695)	2024-04-05 09:17:58 +00:00
Claire	38b9d31f63	Improve email address validation (#29838)	2024-04-05 07:48:45 +00:00
Matt Jankowski	f56309f5f0	Add by_latest_used scope, move admin area recent IPs to partial (#29497)	2024-04-02 13:51:34 +00:00
Matt Jankowski	b016f03637	Pull out constant from AccountWarning.recent scope (#29767)	2024-03-27 14:08:04 +00:00
Matt Jankowski	1d0a43f6a3	Use composable query in Status.not_domain_blocked_by_account scope (#29766)	2024-03-27 09:59:45 +00:00
Matt Jankowski	32938dadd7	Add not_allowed scope for PreviewCardTrend (#29599)	2024-03-26 13:21:20 +00:00
Matt Jankowski	cf76380c91	Add AccountStat.by_recent_status, use in Account (#29704)	2024-03-26 13:12:09 +00:00
Emelia Smith	eb926b7e60	Ensure case-insensitive fields are converted to lowercase in user imports (#29740)	2024-03-26 09:30:10 +00:00
Emelia Smith	a3e8b78250	Ensure case-insensitive fields are converted to lowercase in Admin Imports (#29739)	2024-03-26 09:30:07 +00:00
Claire	37ca59815c	Remove setting for unfollow confirmation modal, and make it unconditional (#29373)	2024-03-22 16:24:04 +00:00
Claire	58376eedda	Remove obsolete admin and moderator columns from users table (#29718)	2024-03-22 16:22:36 +00:00
Claire	d71d26a3c9	Reattribute notification-related records if possible when merging accounts (#29694)	2024-03-22 16:21:53 +00:00
Claire	dfa43707eb	Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
Matt Jankowski	8c1d29df7e	Use has_many through instead of delegate for ARSE<>SR (#29672)	2024-03-22 14:43:35 +00:00
Matt Jankowski	77897cd24c	Use existing SeveredRelationship.about_local_account scope in more places (#29673)	2024-03-21 08:36:49 +00:00
Matt Jankowski	cdd168f5d3	Update enum away from deprecated (#29678)	2024-03-21 08:32:35 +00:00
Jeremy Kescher	0353a3d759	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx # app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/features/ui/components/navigation_panel.jsx	2024-03-20 22:59:13 +01:00
Claire	821fc53583	Fix error when attempting to delete posts that triggered a notification request (#29666)	2024-03-20 19:53:20 +01:00
Claire	c0aade79b0	Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream	2024-03-20 18:31:09 +01:00
Claire	f4d753aedf	Fix error in severed relationship event serializer (#29670)	2024-03-20 17:14:53 +00:00
Claire	98a2bb8be2	Fix issue with severed relationships notifications (#29668)	2024-03-20 17:02:09 +00:00
Claire	954b470fbc	Fix error when attempting to delete posts that triggered a notification request (#29666)	2024-03-20 16:48:24 +00:00
Claire	d4449cc682	Fix account_relationship_severance_events unique indexes (#29665)	2024-03-20 16:08:34 +00:00
Claire	44bf7b8128	Add notifications of severed relationships (#27511)	2024-03-20 15:37:21 +00:00
Claire	8a1423a474	Allow unblocking email addresses from any matching account (#29305)	2024-03-20 14:38:00 +00:00
Claire	876aa35350	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-19 19:21:12 +01:00
Jeremy Kescher	a53f2cf970	Merge branch 'glitch-soc' into develop	2024-03-19 18:31:27 +01:00
Matt Jankowski	62e266fbd6	Add BrowserDetection model concern (#29513)	2024-03-19 15:39:14 +00:00
Claire	d5063072c3	Revert friends-of-friends follow recommendation query to using a CTE (#29619)	2024-03-18 12:57:21 +00:00
Claire	2e49bc97b0	Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream	2024-03-15 12:20:32 +01:00
Matt Jankowski	838b0bdf2d	Remove unused Account::Interactions#endorsed? method (#29463)	2024-03-15 09:00:26 +00:00
Jeremy Kescher	21a23b58ab	Merge branch 'glitch-soc' into develop	2024-03-14 21:46:57 +01:00
Jeremy Kescher	caccc2e0f4	Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb	2024-03-14 20:01:30 +01:00
Claire	e91ede5be6	Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Matt Jankowski	6c3e718b86	Remove setting of sensitive value (default false, not null) in Status model (#29589)	2024-03-14 13:56:59 +00:00
Matt Jankowski	14aa7f1e15	Use Account.activitypub generated scope (#28157)	2024-03-14 13:19:20 +00:00
Matt Jankowski	0bc17a3d48	Use enum-generated public_visibility scope on Status (#28156)	2024-03-14 09:31:57 +00:00
Matt Jankowski	19cbadfbd6	Use enum-generated scope for IpBlock in CLI (#28144)	2024-03-14 09:31:15 +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
Claire	c6dbb33944	Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream	2024-03-13 18:58:47 +01:00
Claire	27ffc09847	Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream	2024-03-13 18:56:40 +01:00
Matt Jankowski	c09b8a7164	Add Account.without_internal scope (#29559) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-03-13 14:11:23 +00:00
Claire	b43eaa4517	Refactor notification filtering behavior definition (#29567)	2024-03-13 10:35:49 +00:00
Matt Jankowski	01b624c4a0	Use normalizes on CustomFilter#context value (#27602)	2024-03-13 08:50:21 +00:00
Matt Jankowski	d4ed7e466c	Extract by_domain_length scope in DomainNormalizable concern (#29517)	2024-03-12 13:09:11 +00:00
Matt Jankowski	216cea1e27	Fix incorrect frequency value in FriendsOfFriendsSource data (#29550)	2024-03-12 08:38:32 +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
Eugen Rochko	c10bbf5fe3	Add notification policies and notification requests in web UI (#29433)	2024-03-11 15:02:21 +00:00
Jeong Arm	4a6ddbc9c0	Normalize idna domain before account unblock domain (#29530)	2024-03-11 09:28:08 +00:00
Eugen Rochko	5b3a8737d6	Add hints for rules (#29539)	2024-03-11 08:57:07 +00:00
Claire	d09ab957d4	Remove duplicate captcha_enabled key in app/models/form/admin_settings.rb	2024-03-08 11:38:01 +01:00
Eugen Rochko	50b17f7e10	Add notification policies and notification requests (#29366)	2024-03-07 14:53:37 +00:00
Claire	45e56db8e4	Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our version.	2024-03-05 16:25:50 +01:00
Claire	ee8d0b9447	Fix follow suggestions potentially including silenced or blocked accounts (#29306)	2024-03-04 06:35:20 +00:00
Jeremy Kescher	6aa17a7c1b	Merge branch 'glitch-soc' into develop	2024-03-03 03:12:37 +01:00
Claire	159e500749	Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
HTeuMeuLeu	934cab7508	New welcome email (#28883) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-03-01 12:16:53 +00:00
Claire	f01605c665	Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead.	2024-03-01 13:02:59 +01:00
Matt Jankowski	3389c41b58	Move nobody position in UserRole magic number to constant (#29465)	2024-03-01 11:05:24 +00:00
Jeremy Kescher	de1e89f42c	Merge branch 'glitch-soc' into develop	2024-02-28 23:01:31 +01: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
Matt Jankowski	8429d07454	Add RankedTrend concern for trends classes (#29388)	2024-02-26 13:45:39 +00:00
Jeremy Kescher	009251a17d	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml	2024-02-24 19:11:05 +01: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
noellabo	d518f06eae	Add reject blurhash to Admin setting	2024-02-24 11:14:32 +01:00
Matt Jankowski	0ef44ee720	Move AccountSuggestions::Source subclasses default limit value to constant (#29282)	2024-02-20 09:21:49 +00:00
Matt Jankowski	785e2f9399	Add scope providing_styles to UserRole (#29286)	2024-02-20 09:18:05 +00:00
Matt Jankowski	245064bb98	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	2024-02-19 11:09:43 +00:00
noellabo	5255bd08e0	Add reject pattern to Admin setting (Ported to Glitch Soc) ... # Conflicts: # app/views/admin/settings/shared/_links.html.haml # config/routes/admin.rb	2024-02-17 18:55:57 +01:00
Wolfgang Fournès	cfadb87077	Update enum syntax to use the new Rails 7.0 style (#29217)	2024-02-16 14:54:23 +00:00
Jeremy Kescher	1c9291adcd	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/styles/components/accounts.scss # app/javascript/flavours/glitch/styles/components/status.scss	2024-02-14 18:02:38 +01:00
Claire	53b73ed6a2	Merge pull request from GHSA-vm39-j3vx-pch3 ... * Prevent different identities from a same SSO provider from accessing a same account * Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true` * Rename methods to avoid confusion between OAuth and OmniAuth	2024-02-14 15:25:15 +01:00
Emelia Smith	436419cc2f	Merge pull request from GHSA-7w3c-p9j8-mq3x ... * Ensure destruction of OAuth Applications notifies streaming Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens. * Ensure password resets revoke access to Streaming API * Improve performance of deleting OAuth tokens --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-14 15:25:15 +01:00
Claire	b31af34c97	Merge pull request from GHSA-vm39-j3vx-pch3 ... * Prevent different identities from a same SSO provider from accessing a same account * Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true` * Rename methods to avoid confusion between OAuth and OmniAuth	2024-02-14 15:16:07 +01:00
Emelia Smith	68eaa804c9	Merge pull request from GHSA-7w3c-p9j8-mq3x ... * Ensure destruction of OAuth Applications notifies streaming Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens. * Ensure password resets revoke access to Streaming API * Improve performance of deleting OAuth tokens --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-14 15:15:34 +01:00
Emelia Smith	b83076647e	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 20:03:00 +01:00
Emelia Smith	e8b66a0525	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 17:14:49 +00:00
Essem	4cbaf46950	Hydrate reactions on streaming API	2024-02-11 17:25:53 +01:00
Jeremy Kescher	40ef7b3849	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/serializers/initial_state_serializer.rb	2024-02-06 22:58:23 +01:00
JS Moore	541cbdd963	Add env variable support for number of followable hashtags in feed column (#2500) ... * Add env variable support for number of followable hashtags in feed column. * Add a note about performance concerns for higher values. See discussion in https://github.com/glitch-soc/mastodon/pull/2500 * Update .devcontainer/docker-compose.yml --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-06 20:23:36 +01:00
Claire	7ee93b7431	Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)	2024-02-06 17:10:17 +00:00
Claire	66dda7c762	Fix already-invalid reports failing to resolve (#29027)	2024-02-06 09:35:27 +00:00
Matt Jankowski	86500e3312	Extract scenic view model common methods to concern (#28111)	2024-02-06 09:08:07 +00:00
Eugen Rochko	fa0ba67753	Change materialized views to be refreshed concurrently to avoid locks (#29015)	2024-01-30 18:21:30 +00:00
Eugen Rochko	c4af668e5c	Fix follow recommendations for less used languages (#29017)	2024-01-30 17:24:40 +00:00
Jeremy Kescher	bf4d613731	Merge branch 'glitch-soc' into develop	2024-01-28 17:56:47 +01:00
Jeremy Kescher	c2c2afc294	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
Essem	ae854b8027	Port three new emoji reaction PR commits to Catstodon: ... "Update reaction emails Reaction icon made by @t3rminus@calamity.world" "Simplify reactions API controller" "Refactor status reactions query This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too."	2024-01-28 02:22:43 +01:00
Claire	bf153b384b	Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.	2024-01-27 19:06:41 +01:00
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
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
Jeremy Kescher	93ae46fa14	Merge branch 'glitch-soc' into develop	2024-01-18 22:59:27 +01: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
Jeremy Kescher	5d4cfe4cd8	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01: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