anna
60d54db810
merge with catstodon/main
3 months ago
Jeremy Kescher
6d6a5561f8
Catstodon rev reset due to upstream version bump
3 months ago
Jeremy Kescher
ce878a78bb
Merge branch 'glitch-soc' into develop
3 months ago
Claire
d7d477047e
Bump version to v4.3.0-alpha.3 ( #29241 )
3 months ago
Jeremy Kescher
f044841a6e
Catstodon rev +1.0.18
3 months ago
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
3 months ago
Claire
40439399c6
Bump version to v4.3.0-alpha.2 ( #29200 )
3 months ago
Jeremy Kescher
924912bf9b
Catstodon rev +1.0.17
3 months ago
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
3 months ago
anna
1caf07f427
merge with catstodon/main
4 months ago
Jeremy Kescher
c7e37c256e
Merge branch 'glitch-soc' into develop
4 months ago
Claire
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
4 months ago
Jeremy Kescher
2609f2bcbd
Bump to +1.0.14
4 months ago
Jeremy Kescher
bf4d613731
Merge branch 'glitch-soc' into develop
4 months ago
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
4 months ago
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."
4 months ago
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.
4 months ago
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
4 months ago
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
4 months ago
Matt Jankowski
4cdf62e576
Extract `rebuild_index` method in maintenance CLI ( #28911 )
4 months ago
Matt Jankowski
274a48a9f4
Extract helper methods for db connection and table existence check in `CLI::Maintenance` task ( #28281 )
4 months ago
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.
4 months ago
Matt Jankowski
7a1f087659
Add `created_before` and `updated_before` scopes to `MediaAttachment` ( #28869 )
4 months ago
Matt Jankowski
d03fe2bdee
N+1 fixes for CLI maintenance command ( #28847 )
4 months ago
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
4 months ago
Claire
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
4 months ago
Jeremy Kescher
16be9e975b
Remove local account check in like and emoji_react inbound activity handling
4 months ago
Matt Jankowski
2115bc52e4
Order by sql in `CLI::Maintenance` task ( #28289 )
4 months ago
Matt Jankowski
81e4e65610
Update links to upstream migration helpers, remove unused methods ( #28781 )
4 months ago
Jeremy Kescher
d06ea73a04
Bump version
4 months ago
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
4 months ago
Claire
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
4 months ago
Claire
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
4 months ago
Jeremy Kescher
777be10810
Merge branch 'glitch-soc' into develop
4 months ago
Jeremy Kescher
2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8
4 months ago
Jeremy Kescher
bfda2d7bc4
v4.3.0-alpha.0+glitch+cat+1.0.7
4 months ago
Jeremy Kescher
3df2bc2caf
v4.3.0-alpha.0+glitch+cat+1.0.6
4 months ago
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
4 months ago
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
4 months ago
Claire
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
4 months ago
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`.
4 months ago
Matt Jankowski
ea1c0feb86
Remove `add_column_with_default` migration helper ( #28654 )
4 months ago
Matt Jankowski
202951e6d9
Use Arel `in_order_of` method to generate CASE for `DomainBlock.by_severity` ( #28617 )
4 months ago
Jeremy Kescher
adc45c99d7
v4.3.0+1.0.4
4 months ago
Jean Boussier
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
5 months ago
Jeremy Kescher
3b9a52aab6
Merge branch 'glitch-soc' into develop
5 months ago
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop
5 months ago
Matt Jankowski
1af5c37701
Use heredoc on federation CLI warning strings ( #28578 )
5 months ago
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
5 months ago
Jeremy Kescher
42520e72c5
Remove duplicate "Number of visible reactions" setting
5 months ago