1503 commits

Author	SHA1	Message	Date
Claire	5d7d23999c	Fix leaking Elasticsearch connections in Sidekiq processes (#30450)	2024-05-29 08:15:06 +00:00
Jeremy Kescher	c1054880a3	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.6	2024-05-22 23:58:09 +02:00
Jeremy Kescher	6703af29e3	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.5	2024-05-21 05:52:53 +02:00
Jeremy Kescher	c9fb54fd4c	Emergency fix for charlock_holmes after ICU 75	2024-05-21 03:37:40 +02:00
Jeremy Kescher	ec9b8d058a	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.3	2024-05-21 00:05:46 +02: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	16a89487fd	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.2	2024-05-17 15:35:29 +02: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
Claire	12472e7f40	Add emphasis on ActiveRecord Encryption configuration values being secret (#30340)	2024-05-17 09:28:40 +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
Claire	c2ca3d152f	Fix off-by-one in tootctl media commands (#30306)	2024-05-15 13:11:13 +00:00
Claire	666760f450	Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.	2024-05-14 20:47:14 +02:00
Claire	b5b84fad65	Fix OpenSearch compatibility issue (#30278)	2024-05-14 17:54:28 +00:00
Jeremy Kescher	40bfe6a99c	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.1	2024-05-14 18:56:58 +02:00
Jeremy Kescher	74ed5bf354	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-14 18:56:01 +02:00
Jeremy Kescher	360fa71778	v4.3.0-alpha.3+glitch+cat+1.2.0	2024-05-11 23:36:59 +02:00
Jeremy Kescher	e73c612cb1	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
Claire	f35ba6963d	Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
Matt Jankowski	0d397db5dd	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
Claire	f7dadc9f0b	Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream	2024-05-07 12:13:02 +02:00
Claire	996292cd55	Fix db:encryption:init requiring ActiveRecord encryption variables to be set (#30202)	2024-05-07 08:41:53 +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	33368e3e79	Change ActiveRecordEncryption variable to be more explicit (#30151)	2024-05-03 09:26:24 +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	b039e62194	Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +02:00
Claire	eeefb7cdbc	Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream	2024-05-01 19:42:34 +02: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	9ce82a35cb	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +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
Shlee	40d7a553d2	Minor phrasing on tootcli statuses remove (#30122)	2024-04-30 08:51:39 +00:00
Matt Jankowski	f1a4b4e228	Disable Style/SignalException cop (#30064)	2024-04-29 12:32:06 +00:00
Claire	c3e12a4dfa	Change how theme style packs are loaded ... Load the `common` style pack, and then charge the style pack for the current skin, independent from any selected JS pack.	2024-04-28 15:45:41 +02:00
Jeremy Kescher	ef30d71a55	Add changelog for v4.3.0-alpha.3+glitch+cat+1.1.3	2024-04-26 21:28:50 +02:00
renovate[bot]	483fabf48a	Update dependency http to '~> 5.2.0' (#30027) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-22 14:02:47 +00:00
Tim Rogers	1ca6ff8ca5	Fixed crash when supplying FFMPEG_BINARY environment variable (#30022)	2024-04-22 09:00:24 +00:00
Matt Jankowski	2ec9bff36e	Fix Rubocop Rails/UniqueValidationWithoutIndex cop (#27461) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-22 08:04:05 +00:00
Matt Jankowski	828299e71c	Enable AR Encryption (#29831)	2024-04-17 09:19:02 +00:00
Matt Jankowski	9ae2594726	Add reusable duplicate ID finder methods in maintenance CLI (#28910)	2024-04-17 09:00:08 +00:00
Matt Jankowski	0d9ad96d3f	Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy (#29934)	2024-04-15 09:16:59 +00:00
Matt Jankowski	bf5d948237	Fix Style/SingleArgumentDig cop in webpacker/manifest_extensions (#29929)	2024-04-15 09:15:32 +00:00
Jeremy Kescher	3e02b6063a	Bump Catstodon revision to 1.1.2	2024-04-11 21:52:10 +02: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	4565015615	Fix Style/MapIntoArray cop in cli progress helper (#29884)	2024-04-10 12:46:43 +00:00
Matt Jankowski	4948a063d2	Use tt extension for form scaffold template (#29676)	2024-04-10 09:20:21 +00:00
Jeremy Kescher	7953261a1f	Bump Catstodon revision to 1.1.1	2024-04-06 21:06:05 +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	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	edde54e991	Update stoplight to version 4.1.0 (#28366)	2024-04-02 15:47:40 +00:00
Claire	d71d26a3c9	Reattribute notification-related records if possible when merging accounts (#29694)	2024-03-22 16:21:53 +00:00
Claire	70a8fcf07d	Fix notification policy migration not preserving filter_private_mentions correctly (#29699)	2024-03-21 21:52:29 +00:00
Matt Jankowski	718ee72c80	Use db_table_exists? method in new cli/maintenance area (#29677)	2024-03-21 08:32:40 +00:00
Matt Jankowski	cdd168f5d3	Update enum away from deprecated (#29678)	2024-03-21 08:32:35 +00:00
Claire	44bf7b8128	Add notifications of severed relationships (#27511)	2024-03-20 15:37:21 +00:00
Jeremy Kescher	a53f2cf970	Merge branch 'glitch-soc' into develop	2024-03-19 18:31:27 +01:00
Claire	b8f476256e	Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
Matt Jankowski	4f4132f1a1	Add diagnostic message for failure during CLI search deploy (#29462)	2024-03-15 14:26:23 +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	df6086d402	Extract file size sql calc from media storage cli (#29577)	2024-03-14 15:22:52 +00:00
Matt Jankowski	14aa7f1e15	Use Account.activitypub generated scope (#28157)	2024-03-14 13:19:20 +00:00
Matt Jankowski	19cbadfbd6	Use enum-generated scope for IpBlock in CLI (#28144)	2024-03-14 09:31:15 +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
Jeremy Kescher	9a1c5188a8	Bump Catstodon version to 1.0.9	2024-03-03 03:15:51 +01:00
Jeremy Kescher	75b87c100a	Update changelog and bump version	2024-02-29 19:38:54 +01:00
Jeremy Kescher	ca9b83b5a3	Bump Catstodon version	2024-02-28 23:10:22 +01:00
Jeremy Kescher	9b59f9c652	Bump Catstodon rev to 1.0.6	2024-02-25 18:16:38 +01: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
Jeremy Kescher	8f8cb0fad3	Merge branch 'glitch-soc' into develop	2024-02-24 17:51:18 +01:00
Claire	2dc244784c	Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +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	5b9ddfcfcc	Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
Jeremy Kescher	78b0f1c6cb	Bump version	2024-02-24 14:06:52 +01:00
Claire	20615a516d	Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream	2024-02-24 13:53:59 +01:00
Jeremy Kescher	206de12616	Bump Catstodon version	2024-02-24 11:17:01 +01:00
noellabo	d518f06eae	Add reject blurhash to Admin setting	2024-02-24 11:14:32 +01:00
Claire	cfa71a4d16	Fix admin account created by mastodon:setup not being auto-approved (#29379)	2024-02-23 19:04:57 +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
Jeremy Kescher	c2721d5129	Bump Catstodon revision to 1.0.2	2024-02-17 18:56:19 +01:00
Jeremy Kescher	05a5c20681	Merge branch 'glitch-soc' into develop	2024-02-17 18:16:14 +01:00
Jeremy Kescher	6d6a5561f8	Catstodon rev reset due to upstream version bump	2024-02-16 14:49:21 +01:00
Jeremy Kescher	ce878a78bb	Merge branch 'glitch-soc' into develop	2024-02-16 14:48:08 +01:00
Claire	d7d477047e	Bump version to v4.3.0-alpha.3 (#29241)	2024-02-16 12:17:15 +01:00
Claire	5f21a1f5a3	Bump version to v4.3.0-alpha.3 (#29241)	2024-02-16 11:06:47 +00:00
Jeremy Kescher	f044841a6e	Catstodon rev +1.0.18	2024-02-14 18:03:42 +01: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	40439399c6	Bump version to v4.3.0-alpha.2 (#29200)	2024-02-14 15:26:18 +01:00
Claire	8e8e0f104f	Bump version to v4.3.0-alpha.2 (#29200)	2024-02-14 14:20:02 +00:00
Claire	3c3ef8b9d3	Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199)	2024-02-14 13:42:15 +01:00
Claire	554e2a019e	Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199)	2024-02-14 12:12:13 +00:00
Jeremy Kescher	924912bf9b	Catstodon rev +1.0.17	2024-02-11 17:26:45 +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
Jeremy Kescher	c7e37c256e	Merge branch 'glitch-soc' into develop	2024-02-01 18:18:19 +01:00
Claire	ff58ec0103	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:57:08 +01:00
Claire	1726085db5	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:56:46 +01:00
Matt Jankowski	adcd693b71	Use existing MediaAttachment.remote scope in media CLI (#28912)	2024-01-30 15:29:42 +00:00
Jeremy Kescher	2609f2bcbd	Bump to +1.0.14	2024-01-28 17:58:28 +01: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
Matt Jankowski	0e0a94f483	Handle CLI failure exit status at the top-level script (#28322)	2024-01-26 08:53:44 +00:00
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
Matt Jankowski	4cdf62e576	Extract rebuild_index method in maintenance CLI (#28911)	2024-01-25 15:26:51 +00:00
Matt Jankowski	274a48a9f4	Extract helper methods for db connection and table existence check in CLI::Maintenance task (#28281)	2024-01-25 13:49:33 +00:00
Matt Jankowski	ca7053f19c	Consolidate db test prep steps to rake task (#28886)	2024-01-25 13:10:39 +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	7a1f087659	Add created_before and updated_before scopes to MediaAttachment (#28869)	2024-01-24 10:32:54 +00:00
Matt Jankowski	d03fe2bdee	N+1 fixes for CLI maintenance command (#28847)	2024-01-23 09:31:59 +00:00
Matt Jankowski	defe5f4076	Fix Rails/WhereExists cop in lib/tasks (#28852)	2024-01-23 09:07:22 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Claire	93957daa50	Fix error when processing remote files with unusually long names (#28823)	2024-01-19 18:52:59 +00:00
Matt Jankowski	6a5d70e146	Update pre_migration_check postgres version requirement (#28800)	2024-01-19 11:20:20 +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
Jeremy Kescher	16be9e975b	Remove local account check in like and emoji_react inbound activity handling	2024-01-18 19:46:29 +01:00
Matt Jankowski	2115bc52e4	Order by sql in CLI::Maintenance task (#28289)	2024-01-18 14:53:29 +00:00
Matt Jankowski	81e4e65610	Update links to upstream migration helpers, remove unused methods (#28781)	2024-01-18 12:29:54 +00:00
Jeremy Kescher	d06ea73a04	Bump version	2024-01-17 22:41:16 +01: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
Matt Jankowski	127503eb2c	Fix Rails/RakeEnvironment cop (#28782)	2024-01-17 16:33:17 +00:00
Claire	e4d07c7bcc	Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream	2024-01-16 12:04:11 +01:00
Renaud Chaput	01b6c83c36	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
Claire	4fcb372776	Fix Ruby linting issue	2024-01-15 20:57:55 +01: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	1323dfac80	Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream	2024-01-15 19:19:04 +01:00
Claire	98b5f85f10	Rename and refactor User#confirm! to User#mark_email_as_confirmed! (#28735)	2024-01-15 18:04:58 +00:00
Jeremy Kescher	777be10810	Merge branch 'glitch-soc' into develop	2024-01-14 19:46:03 +01:00
Jeremy Kescher	2047683539	v4.3.0-alpha.0+glitch+cat+1.0.8	2024-01-14 17:48:42 +01:00
Jeremy Kescher	bfda2d7bc4	v4.3.0-alpha.0+glitch+cat+1.0.7	2024-01-14 03:58:49 +01:00
Jeremy Kescher	3df2bc2caf	v4.3.0-alpha.0+glitch+cat+1.0.6	2024-01-13 17:46:55 +01:00
Claire	a3b6a85521	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	2024-01-13 12:11:29 +01:00
Jeremy Kescher	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	2024-01-12 22:03:50 +01:00
Claire	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064)	2024-01-12 20:16:48 +00:00
Matt Jankowski	df9e220364	Add JS console errors check (#28682)	2024-01-12 09:12:31 +00:00
Essem	b6e353537b	Add new emojis from jdecked/twemoji 15.0 (#28404)	2024-01-11 16:15:08 +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