monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,609 Commits 1 Branch 0 Tags 296 MiB
Commit Graph

3603 Commits

Author SHA1 Message Date
Claire 6b52227fcc
Fix Mastodon listing updates older or equal to current version (#33906) 2025-02-12 14:27:42 +00:00
Matt Jankowski fb0856458b
Verify page content in `ChallengableConcern` spec (#33895) 2025-02-12 14:24:17 +00:00
Matt Jankowski 6df24b4bc2
Move signed out statuses controller spec examples to request spec (#33907) 2025-02-12 14:24:03 +00:00
Matt Jankowski b07cd11f4c
Convert `settings/migration/redirects` spec controller->system (#33905) 2025-02-12 14:06:35 +00:00
Matt Jankowski 506a70d0d8
Convert "http signatures" portion of statuses controller spec to request spec (#33890) 2025-02-12 08:33:25 +00:00
Matt Jankowski aa10e8f399
Verify page content in 2FA portion of `auth/sessions` controller spec (#33891) 2025-02-12 08:14:35 +00:00
Matt Jankowski 4c597d5e2c
Convert `settings/privacy` spec controller->system (#33894) 2025-02-12 08:13:01 +00:00
Matt Jankowski 4e58570f73
Use common `before` and contexts in admin/base controller spec (#33879) 2025-02-11 06:49:51 +00:00
Matt Jankowski 7d20c12913
Convert `settings/featured_tags` controller->request/system spec (#33880) 2025-02-11 06:45:34 +00:00
Matt Jankowski dd2cb77f1a
Remove unused "oversized" spec fixture PNG file (#33881) 2025-02-11 06:45:27 +00:00
Matt Jankowski 8c240ef042
Remove final remaining `assigns` usage in controller specs (#33866) 2025-02-10 07:33:36 +00:00
Claire a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
 2025-02-07 21:21:28 +01:00
Matt Jankowski 23a0d91126
Combine examples to reduce factories in specs (#33841) 2025-02-06 10:54:31 +00:00
Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 2025-02-05 18:21:36 +01:00
Claire 334d306ccc
Fix filtering for lists (#33842) 2025-02-05 15:08:12 +00:00
Claire 1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
Matt Jankowski 95caa8bc4e
Switch coverage generation default to false, allow opt in with `COVERAGE` env var (#33824) 2025-02-04 11:14:45 +00:00
Claire cf820b2eca
Fix `/settings/applications` rejecting scopes parameter (#33798) 2025-02-02 21:11:32 +00:00
Claire c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
Matt Jankowski 77587913ce
Convert `admin/reports` spec controller->system (#33789) 2025-01-31 08:15:51 +00:00
Matt Jankowski c5cd9bda48
Convert `auth/passwords` spec controller->system/request (#33790) 2025-01-31 08:08:56 +00:00
Claire a3d2849d15
Fix `tootctl feeds build` not building list timelines (#33783) 2025-01-30 09:18:46 +00:00
Claire 2d545c5fe5
Fix flaky test in `/api/v2/notifications` tests (#33773) 2025-01-29 12:49:03 +00:00
Claire 844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
Matt Jankowski 2beab34ca4
Convert `admin/email_domain_blocks` controller -> system spec (#33759) 2025-01-29 10:54:20 +00:00
Claire 353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
Claire 5b291fcbe4
Fix incorrect signature after HTTP redirect (#33757) 2025-01-28 14:44:27 +00:00
Claire 32aa83e9d7
Fix polls not being validated on edition (#33755) 2025-01-28 14:38:18 +00:00
Matt Jankowski 8a2d764d34
Reduce factory creation across `controllers/admin` specs (#33752) 2025-01-28 08:08:16 +00:00
Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Matt Jankowski 93f3c724ae
Use `expect` in remaining controller locations (#33748) 2025-01-27 16:32:06 +00:00
Matt Jankowski d3b637c757
Use `expect` in `Admin::ExportControllerConcern` import params (#33745) 2025-01-27 14:29:25 +00:00
Matt Jankowski 65d9171c7d
Use `expect` for `admin/` controllers (#33686) 2025-01-27 14:05:16 +00:00
Matt Jankowski a1d9c3fb99
Use `expect` params wrapper for more "auth" and "2FA" "controllers" (#33717) 2025-01-24 14:40:20 +00:00
Claire 7261951791
Fix LDSignature tests (#33705) 2025-01-23 17:56:33 +00:00
Matt Jankowski 51ecc7326f
Fix intermittent services/ap/process_status_update tags failure (#33695) 2025-01-23 13:35:19 +00:00
Claire 19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Matt Jankowski 8eee7ae4c3
Fix issue with saving empty fields values on filter keyword updates (#33691) 2025-01-23 09:04:12 +00:00
Matt Jankowski 4a9c49ee43
Fix issue with saving empty fields values on profile update (#33689) 2025-01-22 18:50:15 +00:00
Matt Jankowski 607f65a0a5
Use `expect` for api/v1 and api/web push subs controllers (#33682) 2025-01-22 14:55:44 +00:00
Jonathan de Jong b18caff5b6
Change `first_of_value` to `first_of_hash`, and add more test cases (#33647) 2025-01-22 14:02:05 +00:00
Matt Jankowski e155aab39e
Use `expect` for nested params in `settings/*` controllers (#33673) 2025-01-22 08:49:52 +00:00
Matt Jankowski d2cc28813f
Use `expect` for nested params in more controllers (#33675) 2025-01-22 08:35:34 +00:00
Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
 2025-01-21 19:23:25 +01:00
Claire 3dcf5e12b1
Change notifications from moderators to not be filtered (#33654) 2025-01-21 11:39:53 +00:00
Eugen Rochko 11786f1114
Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire ce7fb94306 Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream 2025-01-21 12:06:49 +01:00
Matt Jankowski 45149cd5e1
Use `expect` for nested params in `auth/setup#update` (#33657) 2025-01-21 08:16:40 +00:00
Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Matt Jankowski 5be938e661
Migrate visibility interaction checks on statuses to request spec (#33622) 2025-01-17 10:06:52 +00:00
Christian Schmidt a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Matt Jankowski 3af6739f21
Add coverage for `AnnualReport.prepare` method (#33618) 2025-01-16 15:45:48 +00:00
Claire f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Claire da4e55eb17
Merge commit from fork 2025-01-16 11:10:08 +01:00
Matt Jankowski 998cf0dd53
Convert `auth/setup` spec controller->system/request (#33604) 2025-01-16 09:03:46 +00:00
Matt Jankowski 72abf05269
Add "needs refresh" scenario to `api/v1/polls` request spec (#33608) 2025-01-16 09:00:04 +00:00
Claire ad71a8d1f7 Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream 2025-01-15 19:32:04 +01:00
Matt Jankowski 9f03e5b53a
Expand coverage of `admin/*blocks` areas (#33594) 2025-01-15 07:47:34 +00:00
Claire ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Matt Jankowski 68c9f91ccb
Treat non-null but blank account domain as local (#33576) 2025-01-14 17:40:55 +00:00
Matt Jankowski 50013b10a5
Add `Status::Visibility` concern to hold visibility logic (#33578) 2025-01-14 14:32:57 +00:00
Matt Jankowski 7c56517c7c
Move mastodon version config to `config_for` yml (#33577) 2025-01-14 14:32:29 +00:00
Matt Jankowski a9a8b6b701
Expand coverage of admin/trends/* areas (#33581) 2025-01-14 10:27:21 +00:00
S1m 4a2813158d
Add support for standard webpush (#33528) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-14 09:14:00 +00:00
Jeong Arm 74da9e9281
Fix custom css cache miss (#33583) 2025-01-14 08:24:00 +00:00
Wolfgang 77a44e61a8
Add enum validation to `DomainBlock#severity` (#29158) 2025-01-13 16:05:24 +00:00
Matt Jankowski f9451c5614
Fix issue with trending order when user has chosen languages (#33557) 2025-01-13 14:27:30 +00:00
Daniel M Brasil 0db7558822
Fix HTTP 500 on `POST /api/v1/admin/ip_blocks` (#29308) 2025-01-13 13:50:58 +00:00
Matt Jankowski 3c4a83fc62
Remove unused `LanguagePresenter#native_name` (#33551) 2025-01-13 12:58:53 +00:00
Claire 68d818121d
Switch `webpush` dependency to latest version of Mastodon-maintained fork (#33572) 2025-01-13 12:46:32 +00:00
Claire d517fa5ab7
Change ActivityPub path generation to all happen in `ActivityPub::TagManager` (#33527) 2025-01-13 09:39:05 +00:00
Matt Jankowski 22c1b6f3ee
Fix `Invite#code` changing value on every save (#33550) 2025-01-10 20:34:18 +00:00
Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski 2cfc2a777a
Add `build_object` method for defaults in `AP::Activity::Create` spec (#33537) 2025-01-10 11:59:19 +00:00
Matt Jankowski 4f6edc7596
Use `in_order_of` in `trends/*` classes (#33531) 2025-01-10 09:33:07 +00:00
Matt Jankowski a8b0152bc5
Convert `admin/terms_of_service/histories` spec controller->system (#33534) 2025-01-10 09:11:57 +00:00
Matt Jankowski 8d4ca95163
Convert `admin/follow_recommendations` spec controller->system (#33533) 2025-01-10 09:10:21 +00:00
Matt Jankowski 2499cd01db
Add `duplicate_record` helper to maintenance CLI spec (#33536) 2025-01-10 09:04:23 +00:00
Matt Jankowski f98972e4eb
Use `with_options` for Account `if: :local?` validation group (#33529) 2025-01-10 09:00:31 +00:00
Matt Jankowski 54e2030146
Add `AccountWarning#appeal_eligible?` method (#33526) 2025-01-09 15:08:39 +00:00
Matt Jankowski 9b8d1fb6d1
Add `Account#actor_type_application?` query method (#33525) 2025-01-09 14:32:48 +00:00
Claire c6c8e7e6ab
Fix last paginated notification group only including data on a single notification (#33271) 2025-01-09 13:47:12 +00:00
Claire 91c75a6361
Re-introduce `application_id` in `ScheduledStatusSerializer` (#33505) 2025-01-09 13:38:23 +00:00
Christian Schmidt 8e2c642d44
Do now swallow response body on persistent connection (#32729) 2025-01-09 08:35:35 +00:00
Matt Jankowski cbae00ad23
Remove `render_template` from accounts request spec (#33519) 2025-01-09 08:17:11 +00:00
Matt Jankowski 4148b68430
Remove `render_template` from remote interaction helper request spec (#33518) 2025-01-09 08:17:06 +00:00
Matt Jankowski f4b463ecb1
Use `response.parsed_body` for error view application controller spec (#33515) 2025-01-09 08:17:00 +00:00
Matt Jankowski ce1501c3a7
Add "Account::Search" shared example for use in `Account` spec (#33507) 2025-01-09 08:12:48 +00:00
Matt Jankowski f22a2aab40
Add `Account#remote?` query method (#33508) 2025-01-08 14:28:08 +00:00
Matt Jankowski 0c690511c2
Convert `auth/challenges` spec controller->request (#33495) 2025-01-08 08:54:08 +00:00
Matt Jankowski b6c2923cf7
Convert `settings/migration` spec controller->system (#33496) 2025-01-08 08:53:26 +00:00
Matt Jankowski c0264c8013
Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
Matt Jankowski b3243ef41c
Refer to constant values from `api/v1/apps` request spec (#33488) 2025-01-07 16:28:54 +00:00
Matt Jankowski 7ad44e22ed
Remove role color highlighting from custom css (#33493) 2025-01-07 16:28:35 +00:00
Matt Jankowski efcd4ea5de
Reference value constants from specs (#33479) 2025-01-06 23:25:13 +00:00
Claire 126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
Matt Jankowski 82d2ce293d
Convert `admin/warning_presets` spec controller->system (#33474) 2025-01-06 18:24:54 +00:00
Matt Jankowski ef39398b82
Add `urgent` scope and `by_version` method to `SoftwareUpdate` (#33470) 2025-01-06 18:23:57 +00:00
Claire dbbf450ef5
Fix `fediverse:creator` metadata not showing up in REST API (#33466) 2025-01-06 10:04:25 +00:00
Matt Jankowski 08dd11f8d4
Use `in_order_of` with `filter: false` in `AccountSummary.localized` (#33446) 2025-01-06 08:18:05 +00:00