Commit Graph

2429 Commits

Author SHA1 Message Date
Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
Claire e68b26c8df
Fix posts made in the future being allowed to trend (#32996) 2024-11-20 12:41:22 +00:00
Matt Jankowski 37f00fb018
Use hash arguments to `group` when possible (#32916) 2024-11-19 10:36:02 +00:00
Eugen Rochko 2b5faa2ba3
Change lists to reflect added and removed users retroactively (#32930) 2024-11-19 10:04:12 +00:00
Matt Jankowski f2976ec9a4
Extract `Notification::Groups` concern (#32968) 2024-11-19 10:02:01 +00:00
Matt Jankowski da826fe959
Use hash arguments to `order` when possible (Rails 7.2) (#32915) 2024-11-18 15:07:53 +00:00
Matt Jankowski 477412d62a
Use hash arguments to `select` when possible (Rails 7.2) (#32917) 2024-11-18 14:58:45 +00:00
Matt Jankowski 1c6f53e70f
Use `with_options` blocks in `Associations` concern (#32840) 2024-11-18 08:07:18 +00:00
Claire 4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
Matt Jankowski 319109029d
Fix logic in "last used at per application" oauth token list (#32912) 2024-11-15 15:52:37 +00:00
Shlee 34d7c9edae
Rails 7+: primary_abstract_class recommendation (#32909) 2024-11-15 15:37:30 +00:00
Matt Jankowski 766358e52b
Add coverage for malformed version cleanup in `SoftwareUpdateCheckService`, add helper query methods (#32876) 2024-11-14 14:03:57 +00:00
Matt Jankowski 62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize (#32864) 2024-11-14 13:47:29 +00:00
Claire 8f5cbf5370
Fix list creation limit check (#32869) 2024-11-13 10:22:11 +00:00
Matt Jankowski 5d9dde3ec0
Add age/expiry duration constants to `BulkImport` class (#32839) 2024-11-12 08:57:06 +00:00
Emelia Smith a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Matt Jankowski c099797700
Use `mastodon` config namespace to load software update default value via `config_for` (#30534) 2024-11-12 08:28:31 +00:00
Matt Jankowski c78dc23b49
Move account sensitize-related methods to concern (#28865) 2024-11-11 13:08:23 +00:00
Matt Jankowski d033920b7e
Move account silence-related methods to concern (#28866) 2024-11-11 08:29:55 +00:00
Claire f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Matt Jankowski 10c895dc84
Use existing arel scopes instead of string ordering (#32801) 2024-11-08 14:21:44 +00:00
Matt Jankowski bde0f1239a
Add `InetContainer` with scopes of `containing` and `contained` (#32802) 2024-11-08 10:08:36 +00:00
Matt Jankowski df54196a14
Use `touch_all` with batches (#32799) 2024-11-08 10:00:15 +00:00
Matt Jankowski 41227aeb95
Update Rails to version 7.2.2 (#30391) 2024-11-07 14:58:20 +00:00
Matt Jankowski 697947116e
Add `EmailDomainBlock.parents` scope (#31968) 2024-11-07 13:46:20 +00:00
Matt Jankowski 68b545ef33
Add `Status.not_direct_visibility` scope (#32065) 2024-11-07 10:32:33 +00:00
Matt Jankowski 73f66af6eb
Update location of unused `MIN_SCHEDULE_OFFSET` constant (#31217) 2024-11-07 10:28:59 +00:00
Claire 2bea74e69d
Avoid latest featured tag use on post removal unless necessary (#32787) 2024-11-06 10:51:54 +00:00
Eugen Rochko d6349c0e9a
Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
Eugen Rochko 90f4ffa31d
Fix performance of percentile calculation for annual reports (#32765) 2024-11-04 10:11:06 +00:00
Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Matt Jankowski b231c3c1bf
Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
Matt Jankowski a20ac20302
Add model spec for `Tombstone` (#32697) 2024-10-31 13:27:47 +00:00
Matt Jankowski babee06794
Add coverage for `StatusTrend` and `PreviewCardTrend` models, add `locales` class method to `RankedTrend` (#32688) 2024-10-29 15:46:32 +00:00
Matt Jankowski 1edb527072
Enhance coverage for `StatusPin` model (#32515) 2024-10-28 07:34:58 +00:00
Jonny Saunders 9074c1fac9
Use `likes` and `shares` totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +00:00
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
2024-10-26 13:38:07 +02:00
Matt Jankowski 66c0471515
Enrich coverage for `IpBlock` model (#32471) 2024-10-25 08:35:07 +00:00
Matt Jankowski 2f906ed55a
Constants for account refresh (#32420) 2024-10-23 13:29:01 +00:00
David Roetzel 05f23df3b7
Add endpoint to remove web push subscription (#32626) 2024-10-23 08:02:31 +00:00
Jeong Arm 18659f8163
Fix that blocking was not working on link timeline (#32625) 2024-10-22 12:46:32 +00:00
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-19 19:13:32 +02:00
Claire 2391937e11
Fix follow recommendation moderation page default language when using regional variant (#32580) 2024-10-18 10:21:25 +00:00
Claire 4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Matt Jankowski d8eab3d81f
Reinforce coverage for `DomainBlock` model (#32473) 2024-10-14 12:51:01 +00:00
Claire b0dd38433b
Fix follow recommendation suppressions not applying immediately (#32392) 2024-10-14 08:18:25 +00:00
Claire d9fbb071da
Fix notification requests from suspended accounts still being listed (#32354) 2024-10-09 17:29:02 +00:00
Matt Jankowski 258dce1256
Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307) 2024-10-08 14:59:51 +00:00
Matt Jankowski e8ec6667bd
Extract wrapper constant for `HTTP::*` error classes (#32285) 2024-10-08 13:53:35 +00:00
Claire 7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00