monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,047 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

2808 Commits

Author SHA1 Message Date
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' 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 24319836de
Convert request-based setup into factory setup in push/subscriptions request spec (#29489) 2024-03-11 15:46:25 +00:00
Matt Jankowski a38e424185
Use unchanging github links in docs/comments (#29545) 2024-03-11 15:14:55 +00:00
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00
Jeong Arm 4a6ddbc9c0
Normalize idna domain before account unblock domain (#29530) 2024-03-11 09:28:08 +00:00
Matt Jankowski a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation (#29527) 2024-03-11 09:16:19 +00:00
Matt Jankowski 98ef38e34e
Ensure unique values in fabricators (#29515) 2024-03-11 08:53:24 +00:00
Eugen Rochko 50b17f7e10
Add notification policies and notification requests (#29366) 2024-03-07 14:53:37 +00:00
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
 2024-03-05 16:25:50 +01:00
Claire ee8d0b9447
Fix follow suggestions potentially including silenced or blocked accounts (#29306) 2024-03-04 06:35:20 +00:00
Claire 159e500749 Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream 2024-03-01 18:34:48 +01:00
Matt Jankowski 18945f62e0
Convert more API specs from controller->request style (#29004) 2024-03-01 16:24:45 +00:00
Daniel M Brasil a25014de8f
Improve `IpBlock` model test coverage (#29460) 2024-03-01 16:17:40 +00:00
Claire f01605c665 Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.tsx`:
  Changes applied to `app/javascript/core/admin.ts` instead.
 2024-03-01 13:02:59 +01:00
Matt Jankowski 3389c41b58
Move `nobody` position in `UserRole` magic number to constant (#29465) 2024-03-01 11:05:24 +00:00
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
Matt Jankowski eb1b8f69de
Allow pagination `Link` headers on API accounts/statuses when pinned true (#29442) 2024-02-29 14:21:56 +00:00
Matt Jankowski 6675bf574a
Extract `parsed_uri_query_values` helper in ap/replies controller spec (#29410) 2024-02-29 13:47:38 +00:00
Matt Jankowski 14c65180df
Use sequence in `software_update` fabricator to allow multiple (#29438) 2024-02-29 10:51:11 +00:00
Claire ccdf56085d Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream 2024-02-28 20:37:38 +01:00
Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' 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 8f3c91fc3c
Add `change` block expectation to `admin/invites#deactivate_all` spec (#29412) 2024-02-27 16:25:58 +00:00
Claire 6f7615ba86
Add basic end-to-end test for admin moderation interface (#29424) 2024-02-27 15:18:06 +00:00
Matt Jankowski 9e78129e6e
Use "cacheable response" shared example in more places (#29419) 2024-02-27 11:50:21 +00:00
Claire 67ca8bb56a Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.
 2024-02-26 17:43:16 +01:00
Matt Jankowski 8156113d58
Use `response_vary_headers` method in requests/cache_spec (#29411) 2024-02-26 16:27:07 +00:00
Damien Mathieu 1540f42522
Better tests for auth/registrations#update (#29303) 2024-02-26 16:09:56 +00:00
Wolfgang Fournès d51c3ac087
Add a missing spec to `SessionsController#webauthn_options` (#29277) 2024-02-26 16:09:40 +00:00
Claire 2dc244784c Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream 2024-02-24 15:43:15 +01:00
Claire 1ad91dece8 Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead.
 2024-02-24 15:35:56 +01:00
Claire 7901dc9e24 Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream 
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 15:33:36 +01:00
Claire d2cfc6e5e2 Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream 2024-02-24 15:02:28 +01:00
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' 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
Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 14:27:43 +01:00
Claire 5b9ddfcfcc Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
Claire dfd74f0dae Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream 2024-02-24 14:15:49 +01:00
Claire 73de36318e Move `api/v1/timelines/direct` to request spec 2024-02-24 14:10:05 +01:00
Claire 9903e6beab Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
  `spec/controllers/api/v1/timelines` has been renamed, but we had an extra
  spec here for a glitch-soc-only endpoint.
  Kept glitch-soc's file unchanged (will port to a request spec later).
 2024-02-24 14:05:26 +01:00
Claire c297d999ba Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream 2024-02-24 14:02:01 +01:00
Claire 20615a516d Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream 2024-02-24 13:53:59 +01:00
Matt Jankowski b0064ddda7
Add basic coverage for `MoveService` class (#29301) 2024-02-23 09:59:29 +00:00
Claire 9d8dfeb5fb
Fix processing of `Link` objects in `Image` objects (#29335) 2024-02-22 22:27:24 +01:00
Matt Jankowski a6ed148769
Use heredoc on the `HTML` blocks in verify link spec (#29365) 2024-02-22 21:26:48 +00:00
Claire 10a0d76bf0 Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different handling for
  the character limit.
  Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different limits for
  option length and number of options.
  Ported glitch-soc's changes to the new version.

Additional change:
- `app/javascript/styles/components.scss`:
  Change how the new image is looked up.
 2024-02-22 20:58:41 +01:00
Claire f25414014a Fix link verifications when page size exceeds 1MB (#29358) 2024-02-22 20:45:40 +01:00
Claire d23f445527 Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-22 20:45:40 +01:00
Claire 5152dd869e
Fix link verifications when page size exceeds 1MB (#29358) 2024-02-22 17:31:50 +00:00
Claire b71904816a
Change registrations to be disabled by default for new servers (#29280) 2024-02-22 13:28:19 +00:00
Matt Jankowski e9b0f0c314
Add basic coverage for `RemoveDomainsFromFollowersService` class (#29327) 2024-02-22 10:53:38 +00:00
Matt Jankowski 7c7dfe7de3
Add basic coverage for `RemoveFeaturedTagService` class (#29328) 2024-02-22 10:51:04 +00:00