monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,453 Commits 1 Branch 0 Tags 290 MiB
Commit Graph

904 Commits

Author SHA1 Message Date
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
Matt Jankowski 27f05e9016
Expand coverage for `User#token_for_app` (#32434) 2024-10-15 13:43:08 +00:00
Matt Jankowski bfb41e61a3
Expand coverage for `Block` model (#32480) 2024-10-15 13:30:17 +00:00
Matt Jankowski 92bb19773a
Use `context` for repeated scenarios in `AccountStatusCleanupPolicy` spec (#32489) 2024-10-15 13:12:58 +00:00
Matt Jankowski d1d2278e70
Reduce factory creation (73 -> 64) in `PublicFeed` spec (#32491) 2024-10-15 13:10:29 +00:00
Matt Jankowski d74c2c583a
Extend spec coverage for `Poll` model (#32500) 2024-10-15 12:48:10 +00:00
Claire 4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Matt Jankowski cc70acc11c
Augment coverage for `Status` model (#32468) 2024-10-14 12:52:47 +00:00
Matt Jankowski d8eab3d81f
Reinforce coverage for `DomainBlock` model (#32473) 2024-10-14 12:51:01 +00:00
Claire d9fbb071da
Fix notification requests from suspended accounts still being listed (#32354) 2024-10-09 17:29:02 +00:00
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
Matt Jankowski d95f6f4410
Extract `ExportSummary` class for account object counts (#32227) 2024-10-03 13:09:58 +00:00
Matt Jankowski 2151dfb8d6
Add `relevant_params` to ReportFilter (matches account filter) (#32136) 2024-10-02 13:24:40 +00:00
Matt Jankowski ebab3b80c7
Expand coverage for `Export` utility class (#32212) 2024-10-02 09:43:04 +00:00
Claire c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Matt Jankowski bbf7752256
Combine assertions in `Notification` model spec (#32015) 2024-09-23 10:45:34 +00:00
Matt Jankowski cd7b670cd8
Reduce factory creation in `User#reset_password!` spec (#32021) 2024-09-23 09:18:04 +00:00
Claire 221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Matt Jankowski 04a939d640
Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern (#31988) 2024-09-20 08:51:37 +00:00
renovate[bot] 6801afa12f
Update dependency devise-two-factor to v6 [SECURITY] (#31957) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-09-19 10:56:09 +00:00
Matt Jankowski e3baa1cdda
Add coverage for `AccountDeletionRequest` class (#31937) 2024-09-18 13:29:57 +00:00
Matt Jankowski 5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Matt Jankowski c54cbf7943
Remove `follow` creation from `ListAccount` fabricator (#31902) 2024-09-16 08:56:40 +00:00
Matt Jankowski abd2f5654a
Add validation coverage for `CustomEmoji` shortcode value (#31906) 2024-09-16 07:53:03 +00:00
Matt Jankowski 822e918a56
Add coverage for `Bookmark` validation and reblog/status check callback (#31907) 2024-09-16 07:52:22 +00:00
Claire 4b40d13cb3
Increase preview card image size limit from 2MB to 8MB when using libvips (#31904) 2024-09-14 00:16:02 +00:00
Claire 117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
David Roetzel c1b2c4fd9a
Strip protocol from attribution domains (#31900) 2024-09-13 11:37:15 +00:00
Claire ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899) 2024-09-13 09:11:10 +00:00
Matt Jankowski a2c4f5f5c0
Add coverage for `ListAccount` follow/follow_request set up (#31896) 2024-09-13 08:49:03 +00:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Matt Jankowski 17c57c46e7
Add coverage for title/limit validations in `List` model (#31869) 2024-09-12 13:25:23 +00:00
Claire 10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Claire b240bad61a Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream 2024-09-11 20:58:35 +02:00
Eugen Rochko e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Matt Jankowski d0ab94c4d2
Add `FeaturedTag` coverage, use `pick` in model (#31828) 2024-09-09 19:57:19 +00:00
Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 2024-09-06 19:25:31 +02:00
Emelia Smith c88ba523ee
Fix sort order of moderation notes on Reports and Accounts (#31528) 2024-09-06 14:58:36 +00:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski 5acec087ca
Simplify basic presence validations (#29664) 2024-09-05 15:36:05 +00:00
Matt Jankowski ba9fd1c32e
Add coverage for `Account#prepare_contents` callback (#31748) 2024-09-05 09:48:33 +00:00
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Matt Jankowski 14af5b47ac
Add coverage for model normalizations (#31734) 2024-09-04 05:12:40 +00:00
Matt Jankowski f1003b2560
Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00
Matt Jankowski 7c26e5e4a1
Add `Reviewable` model concern (#31152) 2024-09-03 15:37:45 +00:00
Matt Jankowski 67faaf5557
Simplify account model username presence validation spec (#31013) 2024-09-03 15:30:57 +00:00
Matt Jankowski fcb83be8b2
Improve coverage specificity for Webhook enable/disable/secret specs (#31194) 2024-09-03 15:30:13 +00:00
Claire 1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00