Essem
2d07a29632
Merge remote-tracking branch 'upstream/main'
2024-03-17 00:13:58 -05:00
Claire
2e49bc97b0
Merge commit ' 7720c684c5' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
Essem
fd1f0891d9
Merge remote-tracking branch 'upstream/main'
2024-03-14 20:36:26 -05:00
Matt Jankowski
d39d625561
Use inclusive range in ActivityTracker#get ( #29413 )
2024-03-14 21:21:01 +00:00
Claire
06881a8669
Merge commit ' 2c0441acd7' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
Matt Jankowski
2c0441acd7
Use rails built-in tag methods in TextFormatter.shortened_link ( #28976 )
2024-03-13 09:19:54 +00:00
Matt Jankowski
7e6eb64f1e
Use full snowflake range in admin/metrics classes ( #29416 )
2024-03-13 08:56:37 +00:00
Claire
a5127d0ef8
Merge commit ' 24319836de' 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
a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation ( #29527 )
2024-03-11 09:16:19 +00:00
Essem
c609845d47
Merge remote-tracking branch 'upstream/main'
2024-02-29 16:35:17 -06:00
Claire
4d7e7cc562
Merge commit ' 6dfe318f34' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
Matt Jankowski
e1fcb02867
Align TagServersMeasure to use WITH query style similar to others ( #29435 )
2024-02-29 11:00:58 +00:00
Essem
54a3fc3ac5
Merge remote-tracking branch 'upstream/main'
2024-02-28 22:36:41 -06:00
Claire
ccdf56085d
Merge commit ' 7f84bbfd92' into glitch-soc/merge-upstream
2024-02-28 20:37:38 +01:00
Claire
a482932649
Merge commit ' 6f7615ba86' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
Matt Jankowski
ea8e7f3e9d
Align TagServersMeasure query style with other classes ( #29414 )
2024-02-27 16:25:12 +00:00
Matt Jankowski
76d256138e
Wrap media attachment size calculation in COALESCE ( #29415 )
2024-02-27 11:52:37 +00:00
Essem
fd6bd9c87b
Merge remote-tracking branch 'upstream/main'
2024-02-25 12:15:38 -06:00
Claire
ef3d15554b
Merge commit ' c645490d55' 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
Essem
e9e0b1bf2f
Fix newline split
2024-02-18 12:10:02 -06:00
noellabo
3a483775bb
Add reject blurhash to Admin setting
2024-02-18 11:44:57 -06:00
Emelia Smith
de18f3069c
Enable rejection of Create Activities if the status includes unusable hashtags
2024-02-17 22:44:00 -06:00
noellabo
45279418c5
Add reject pattern to Admin setting (Ported to Glitch Soc)
...
# Conflicts:
# app/views/admin/settings/shared/_links.html.haml
# config/routes/admin.rb
2024-02-17 09:39:59 -06:00
Essem
c16136bfd9
Merge remote-tracking branch 'upstream/main'
2024-02-14 09:55:13 -06:00
Emelia Smith
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
Emelia Smith
68eaa804c9
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:15:34 +01:00
Essem
170b07d56b
Hydrate reactions on streaming API
2024-02-09 21:00:59 -06:00
Claire
eff447a455
Rewrite signature verification using regexps and StringScanner ( #29133 )
2024-02-07 17:24:42 +00:00
Claire
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
Essem
b1b5ab92a4
Merge remote-tracking branch 'upstream/main'
2024-02-01 09:33:51 -06: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
Essem
3add1ded91
Merge remote-tracking branch 'upstream/main'
2024-01-27 15:31:24 -06:00
Essem
dd7de07232
Merge remote-tracking branch 'upstream/main'
2024-01-26 21:57:28 -06:00
Claire
5fa2821853
Merge commit ' 3205a654ca' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
Claire
70de52c297
Merge commit ' 7a1f087659' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
KMY（雪あすか）
9a8293f58d
Fix process of receiving posts with bearcaps is not working ( #26527 )
2024-01-25 10:37:09 +00:00
Essem
69e4361a1d
Merge remote-tracking branch 'upstream/main'
2024-01-24 21:09:39 -06:00
Matt Jankowski
1290fede65
Fix Rails/WhereExists cop in app/lib ( #28862 )
2024-01-24 11:51:09 +00:00
Eugen Rochko
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 10:49:19 +00:00
Matt Jankowski
7a1f087659
Add created_before and updated_before scopes to MediaAttachment ( #28869 )
2024-01-24 10:32:54 +00:00
Eugen Rochko
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
Claire
0700eb58bc
Merge commit ' 163db814c2' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
Matt Jankowski
fd64817fbe
Fix Rails/WhereExists cop in app/lib/status_cache_hydrator ( #28808 )
2024-01-19 09:19:48 +00:00
Essem
d96fd9f28f
Merge remote-tracking branch 'upstream/main'
2024-01-16 13:04:33 -06:00
Claire
2f521bc84a
Merge commit ' a2f02a0775' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
Claire
464051c2d2
Merge commit ' 1070804a1a' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
Matt Jankowski
a2f02a0775
Disable Rails/SkipsModelValidations cop ( #28712 )
2024-01-15 13:46:47 +00:00
Essem
7374678aa7
Make name of like content parser function more general
2024-01-13 18:18:36 -06:00
Claire
1070804a1a
Fix RedownloadMediaWorker not being called on transient S3 failure ( #28714 )
2024-01-12 17:00:17 +00:00
