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
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
