noellabo
d518f06eae
Add reject blurhash to Admin setting
2024-02-24 11:14:32 +01: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
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
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
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
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
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
