Kouhai
3644101a79
th: Merge remote-tracking branch 'glitch/main'
9 months ago
Kouhai
ecc917008e
th: maybe deal with spam
9 months ago
Claire
d7d477047e
Bump version to v4.3.0-alpha.3 ( #29241 )
9 months ago
Kouhai
a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3
)
9 months ago
Claire
40439399c6
Bump version to v4.3.0-alpha.2 ( #29200 )
9 months ago
Claire
3c3ef8b9d3
Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default ( #29199 )
9 months ago
Kouhai
f50b12fe6e
th: streaming builds again?
9 months ago
Kouhai
43e58d1558
th: Merge remote-tracking branch 'glitch/main'
9 months ago
Claire
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
9 months ago
Kouhai
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
9 months ago
Kouhai
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1
)
9 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.
10 months ago
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
10 months ago
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
10 months ago
Matt Jankowski
4cdf62e576
Extract `rebuild_index` method in maintenance CLI ( #28911 )
10 months ago
Matt Jankowski
274a48a9f4
Extract helper methods for db connection and table existence check in `CLI::Maintenance` task ( #28281 )
10 months ago
Matt Jankowski
ca7053f19c
Consolidate db test prep steps to rake task ( #28886 )
10 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.
10 months ago
Matt Jankowski
7a1f087659
Add `created_before` and `updated_before` scopes to `MediaAttachment` ( #28869 )
10 months ago
Matt Jankowski
d03fe2bdee
N+1 fixes for CLI maintenance command ( #28847 )
10 months ago
Matt Jankowski
defe5f4076
Fix `Rails/WhereExists` cop in lib/tasks ( #28852 )
10 months ago
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
10 months ago
Claire
93957daa50
Fix error when processing remote files with unusually long names ( #28823 )
10 months ago
Matt Jankowski
6a5d70e146
Update pre_migration_check postgres version requirement ( #28800 )
10 months ago
Claire
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
10 months ago
Matt Jankowski
2115bc52e4
Order by sql in `CLI::Maintenance` task ( #28289 )
10 months ago
Matt Jankowski
81e4e65610
Update links to upstream migration helpers, remove unused methods ( #28781 )
10 months ago
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.
10 months ago
Matt Jankowski
127503eb2c
Fix `Rails/RakeEnvironment` cop ( #28782 )
10 months ago
Claire
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
10 months ago
Renaud Chaput
01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )
10 months ago
Claire
4fcb372776
Fix Ruby linting issue
10 months ago
Claire
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
10 months ago
Claire
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
10 months ago
Claire
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
10 months ago
Claire
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
10 months ago
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.
10 months ago
Claire
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
10 months ago
Matt Jankowski
df9e220364
Add JS console errors check ( #28682 )
10 months ago
Essem
b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )
10 months ago
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
10 months ago
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.
10 months ago
Claire
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
10 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`.
10 months ago
Matt Jankowski
ea1c0feb86
Remove `add_column_with_default` migration helper ( #28654 )
10 months ago
gunchleoc
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Matt Jankowski
202951e6d9
Use Arel `in_order_of` method to generate CASE for `DomainBlock.by_severity` ( #28617 )
10 months ago
Jean Boussier
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
10 months ago
Matt Jankowski
1af5c37701
Use heredoc on federation CLI warning strings ( #28578 )
10 months ago
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
10 months ago