Commit Graph

2730 Commits (main)

Author SHA1 Message Date
Matt Jankowski 92fa9b109f
Add spec coverage for media CLI usage command (#28167) 6 months ago
Matt Jankowski 440b80b2e7
Model concerns organization into module namespaces (#28149) 6 months ago
Matt Jankowski b751078fcd
Eliminate double subject call in admin/ controller specs (#28158) 6 months ago
Matt Jankowski 1f1c75bba5
File cleanup/organization in `controllers/concerns` (#27846) 6 months ago
Matt Jankowski 0530ce5e95
Convert accounts controller spec to request spec (#28126) 6 months ago
Matt Jankowski e7c340a634
Spec coverage for missing `q` param and error conditions in `api/v2/search` controller (#27842) 6 months ago
Claire 85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` (#28025) 6 months ago
Matt Jankowski bb0efe16e6
Remove `default_scope` from `MediaAttachment` class (#28043) 6 months ago
Matt Jankowski ce78a9c9ac
Clean up `two_factor_authentication/confirmations` controller spec (#28128) 6 months ago
Filippo Giunchedi e6fd9a59e6
Fix FamiliarFollowersController test response comparison (#28121)
Co-authored-by: Filippo Giunchedi <filippo@debian.org>
6 months ago
Matt Jankowski e48ecd2929
Remove `default_scope` from `Admin::ActionLog` (#28026) 6 months ago
Matt Jankowski 291dc04e67
Remove un-needed `action` and `template` options to `render` in controllers (#28022) 6 months ago
Emelia Smith 603b245cc6
Add VAPID public key to instance serializer (#28006)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
6 months ago
Matt Jankowski 6b46bf9953
Handle scenario when webfinger response `subject` is missing host value (#28088) 6 months ago
Claire 660372d130
Revert recent CSP changes (#2485)
* Revert "Fix image and media loading when using external storage server"

This reverts commit 6cfa0245ca.

* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)"

This reverts commit d59196e170.
6 months ago
Matt Jankowski 19baf22683
Add missing email previews for `AdminMailer` (#28044) 6 months ago
Kevin Bongart 7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs (#27982) 6 months ago
Matt Jankowski 973597c6f1
Consolidate configuration of `Sidekiq::Testing.fake!` setup (#28046) 6 months ago
Matt Jankowski 9742bccbe7
Add coverage for `api/v2/media` endpoint (#28027) 6 months ago
Eugen Rochko cdc57c74b7
Fix unsupported time zone or locale preventing sign-up (#28035)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6 months ago
Matt Jankowski 67fd3187b3
Update rspec fixture path config to silence deprecation warning (#28018) 6 months ago
Matt Jankowski 30ee4aaff4
Convert measurement `api/v1/admin/*` controller specs to request specs (#28005) 6 months ago
Matt Jankowski 32e19e3af6
Reduce `.times` usage in request and controller specs (#27949) 6 months ago
Matt Jankowski f7cb64a184
Add coverage for `settings/privacy` controller (#28000) 6 months ago
Claire 6cfa0245ca Fix image and media loading when using external storage server
Fixes #2479
6 months ago
Matt Jankowski b2e8af8889
Add coverage for `settings/verifications` controller (#28001) 6 months ago
Matt Jankowski 6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer (#28011) 6 months ago
Matt Jankowski a6d446e6a7
Add coverage for `remote_interaction_helper` (#28002) 6 months ago
Claire d59196e170
Change glitch-soc's CSP config to match upstream's closer (#2474) 6 months ago
Matt Jankowski 876f5b1d12
Convert `/instances/*` controller specs to request specs (#27988)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6 months ago
Matt Jankowski 718c95e7af
Convert `api/v1/custom_emojis` controller spec to request spec (#27985)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6 months ago
Claire c260a68f54
Clean up some `Mastodon::CLI::Accounts` tests (#27473) 6 months ago
Matt Jankowski 17582d36d5
Convert `api/v1/preferences` controller spec to request spec (#27987) 6 months ago
Matt Jankowski 9a01a260a0
Convert `api/v1/scheduled_statuses` controller spec to request spec (#27986) 6 months ago
Matt Jankowski b9fb47aeb1
Convert `api/v1/endorsements` controller spec to request spec (#27984) 6 months ago
Matt Jankowski 371f355719
Reduce `.times` usage in `AccountStatusesCleanupPolicy` (#27947) 6 months ago
Matt Jankowski d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit (#27946) 6 months ago
Matt Jankowski 00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator (#27945) 6 months ago
Matt Jankowski 1fabf20a88
Reduce `.times` usage in `lib/mastodon/cli/accounts` spec (#27944) 6 months ago
Matt Jankowski 09a2db3f6c
Move api/v2/filters spec to correct path location (#27950) 6 months ago
Matt Jankowski e892efbc40
Configure elastic search integration with rspec tag (#27882) 6 months ago
Claire 297839c10c
Rewrite `/api/v1/statuses` tests as request specs (#27891) 6 months ago
Claire 9257737675
Rewrite `/api/v1/accounts` tests as request specs (#27888) 6 months ago
Matt Jankowski 549e8e7baf
Add `email_spec` and speedup/cleanup to `spec/mailers` (#27902) 6 months ago
Matt Jankowski 1526e54ac6
Add spec coverage for `workers/redownload_*` worker classes (#27892) 6 months ago
Matt Jankowski cb1a4a8713
Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs (#27881) 6 months ago
Matt Jankowski 155fb84141
Improve spec coverage for collection of `workers/` classes (#27874) 6 months ago
Matt Jankowski 8a285413f7
Reduce expectations for `RSpec/MultipleExpectations` cop in `MoveWorker` spec (#27880) 6 months ago
Matt Jankowski 3f0c1566c3
Reduce expectations for `RSpec/MultipleExpectations` cop in `api/v1/accounts/relationships` spec (#27879) 6 months ago
Matt Jankowski c1f93def40
Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec (#27875) 6 months ago
Matt Jankowski 04121bd020
Disable simplecov `enable_coverage_for_eval` option, move to standalone file (#27869) 6 months ago
Matt Jankowski 3de9145613
Move controller specs for `well-known` endpoints to request specs (#27855) 6 months ago
Matt Jankowski 12a5b7391d
Add spec for well known change password endpoint (#27856) 6 months ago
Matt Jankowski fe58ac8d9f
Improve spec coverage for `api/web/push_subscriptions` controller (#27858)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6 months ago
Matt Jankowski 7c72944661
Use `Lcov` simplecov formatter on CI and `HTML` elsewhere (#27859) 6 months ago
Nick Schonning 36d7d1781f
Add CodeCov for Ruby coverage reports (#23868) 6 months ago
Matt Jankowski b2c5b20ef2
Fix `RSpec/AnyInstance` cop (#27810) 6 months ago
Matt Jankowski d562fb8459
Specs for minimal CSP policy in `Api::` controllers (#27845) 6 months ago
Matt Jankowski 5e2ecc736d
Remove double `subject` in api/v1/accounts/relationships spec (#27839) 6 months ago
Matt Jankowski b7807f3d84
Use `normalizes` to prepare `Webhook#events` value (#27605) 6 months ago
Matt Jankowski 49ba5a9f94
Use `hash_including` to check `AccountFilter` setup in `admin/accounts` controller spec (#27838) 6 months ago
Matt Jankowski a36b59be8a
Spec coverage for `api/v1/trends` controllers (#27837) 6 months ago
Claire 07a4059901
Add support for invite codes in the registration API (#27805) 6 months ago
Eugen Rochko 0d14fcebae
Change link previews to keep original URL from the status (#27312) 6 months ago
Matt Jankowski 9dc3ce878b
Speed-up in `Settings::` controllers specs (#27808) 6 months ago
Matt Jankowski e79bf1b1e7
Minor speed improvement on `controllers/accounts` spec (#27679) 6 months ago
Claire c451bbe249
Allow viewing and severing relationships with suspended accounts (#27667) 6 months ago
Matt Jankowski 548bb30b2a
Consolidate html page title output logic into helper (#27563) 6 months ago
Matt Jankowski 63c9102f8a
Fix `RSpec/MessageChain` cop (#27776) 6 months ago
Matt Jankowski c9204b792c
Fix `Rails/I18nLocaleTexts` cop (#27779) 6 months ago
Matt Jankowski 69d00e2721
Fix `RSpec/InstanceVariable` cop (#27766) 6 months ago
Matt Jankowski 4329616c53
Ignore block result of `send` method and remove `rubocop:disable` in deepl spec (#27741) 6 months ago
Matt Jankowski b05575e242
Move RSpec config for streaming/search managers to be near classes (#27761) 6 months ago
Matt Jankowski ce91d14d48
Fix `Style/WordArray` cop (#27770) 6 months ago
Matt Jankowski c03bd2a238
Don't stub SUT in `FollowLimitValidator` spec (#27760) 6 months ago
Matt Jankowski 9b7b4d748f
Simplify request cache spec shared examples (#27673) 6 months ago
Claire 23e32a4b30
Fix format-dependent redirects being cached regardless of requested format (#27632) 6 months ago
Matt Jankowski e545978076
Use framework helpers instead of i-vars in controller specs (#27767) 6 months ago
Matt Jankowski ee57bb4b44
Account statuses filter spec speedup (#27674) 6 months ago
Matt Jankowski ae7c20b00c
Move search and streaming spec manager classes to separate support files (#27727) 6 months ago
Matt Jankowski 370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command (#25252) 6 months ago
Matt Jankowski 1d51e10510
Consolidate JSON parsing in serializers specs (#27693) 6 months ago
Matt Jankowski a688a9ed20
Use strings instead of numeric literals and remove `rubocop:disable` in cache spec (#27742) 6 months ago
Matt Jankowski dc0bf87090
Remove unused before block from settings/branding spec (#27759) 6 months ago
Matt Jankowski 45770c9306
Fix `Performance/MapMethodChain` cop (#27744) 6 months ago
Matt Jankowski 49e2772064
Fix `RSpec/MessageSpies` cop (#27751) 6 months ago
Matt Jankowski 2862ad701f
Stub controller methods and remove `rubocop:disable` in captcha feature spec (#27743) 6 months ago
Matt Jankowski cfa14ec6d1
Fix `Lint/EmptyBlock` cop (#27748) 6 months ago
Matt Jankowski b06284c572
Fix `RSpec/HookArgument` cop (#27747) 6 months ago
Matt Jankowski d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops (#27730) 6 months ago
Matt Jankowski fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop (#26885) 6 months ago
Matt Jankowski 949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ (#27729) 6 months ago
Claire c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 (#27655) 6 months ago
Renaud Chaput 6712bf86cd
Fixes website not loading for unlogged users (#27698) 7 months ago
Claire 0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines (#27653) 7 months ago
Claire d649bbf28f
Add some more tests and clean up domain block controller (#27469) 7 months ago
Matt Jankowski beee9ea991
Fix `RSpec/LetSetup` cop in spec/controllers/admin area (#27619) 7 months ago
Matt Jankowski eae5c7334a
Extract class from CSP configuration/initialization (#26905) 7 months ago
Matt Jankowski 2e6bf60f15
Use `deliveries.size` in mailer-related examples in controller specs (#27589) 7 months ago
Claire 93e4cdc31b
Fix hashtag matching pattern matching some URLs (#27584) 7 months ago
Matt Jankowski 1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec (#27486) 7 months ago
Claire bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts (#27459) 7 months ago
Jeong Arm 8f998cd96a
Handle featured collections without items (#27581) 7 months ago
Claire 49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368) 7 months ago
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
Conflicts and ported changes:
- updated `@rails/ujs` imports
7 months ago
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
7 months ago
Claire 787d5ad386 Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
7 months ago
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
7 months ago
Matt Jankowski e93a75f1a1
Rails 7.1 update (#25963) 7 months ago
Daniel M Brasil 26d2a2a0cc
Migrate to request specs in `/api/v1/media` (#25543) 7 months ago
Claire bcae744275
Fix some link anchors being recognized as hashtags (#27271) 7 months ago
Matt Jankowski b0213472df
Validate allowed schemes on preview card URLs (#27485) 7 months ago
Matt Jankowski ab0fb81479
Configure brakeman to ignore url safe preview card urls (#25883) 7 months ago
Claire 13688539bc
Fix processing LDSigned activities from actors with unknown public keys (#27474) 7 months ago
Claire 74fd46d3ab Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream 7 months ago
Matt Jankowski 9f218c9924
Refactor appeal partial to avoid brakeman XSS warning (#25880) 7 months ago
Matt Jankowski bcd0171e5e
Fix `Lint/UselessAssignment` cop (#27472) 7 months ago
Daniel M Brasil 7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` (#25284) 7 months ago
Matt Jankowski a1b27d8b61
Fix `Naming/VariableNumber` cop (#27447) 7 months ago
Emelia Smith 7c3fea7275
Feature: Allow token introspection without read scope (#27142) 7 months ago
Daniel M Brasil 091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` (#25204) 7 months ago
Claire e9dc30cdba
Fix duplicate github annotations for rspec failures (#27450) 7 months ago
Claire 63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 7 months ago
Claire c10a667ac2 Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream 7 months ago
Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
7 months ago
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
7 months ago
Nick Schonning 5ef26d8fd5
Add RSpec GitHub annotations gem (#24040) 7 months ago
Matt Jankowski 71447ab19f
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area (#27445) 7 months ago
Matt Jankowski 2528a0721f
Update `rubocop-capybara` to version 2.19.0 (#26982) 7 months ago
Claire b34a2b1b33
Fix errors in CLI specs (#27399) 7 months ago
Victor Lee c4bddc9855
Add spec for poll model (#23399)
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
7 months ago
Matt Jankowski 12bb7be8b5
Spec speed ups on `AccountsController` spec (#25391) 7 months ago
Matt Jankowski d54fec24e5
Add coverage for `CLI::PreviewCards#remove` command (#27441) 7 months ago
Matt Jankowski 19900f647e
Add coverage for `UnreservedUsernameValidator` (#25590) 7 months ago
Matt Jankowski fc9ab61448
Expand spec coverage of `CLI::Media` (#27437) 7 months ago
Matt Jankowski 893b2f33fd
Extract shared example for cacheable response in specs (#25388) 7 months ago
Matt Jankowski 708299bb0d
Misc coverage improvements for `Admin::` and `Settings::` controllers (#25346) 7 months ago
Daniel M Brasil e0ed0f8c7c
Migrate to request specs in `/api/v1/notifications` (#25553) 7 months ago
Daniel M Brasil cafdaec6cf
Migrate to request specs in `/api/v1/lists/:id/accounts` (#25468) 7 months ago
Daniel M Brasil 8e6116503d
Migrate to request specs in `/api/v1/blocks` (#25517) 7 months ago
Daniel M Brasil d9caa6ed24
Migrate to request specs in `/api/v1/admin/accounts` (#25563) 7 months ago
Matt Jankowski f5bc1f20e2
Add coverage for `ExistingUsernameValidator` (#25592)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
7 months ago
Matt Jankowski f8afa0f614
Remove unused stub json ld context (#25454) 7 months ago
Matt Jankowski 00e92b4038
Add coverage for `CLI::Statuses` command (#25321) 7 months ago
Claire 299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing (#27423) 7 months ago
Daniel M Brasil 82beeb2f7e
Migrate to request specs in `/api/v1/admin/trends/links` (#25739) 7 months ago
Matt Jankowski 1b195ce115
Speed-up on `Rack::Attack` spec (#25542) 7 months ago
Claire 71cfdd7865
Fix duplicate tests (#27395) 7 months ago
Matt Jankowski cad8cc90ba
Speed-up on `MoveWorker` spec (#25528) 7 months ago
Daniel M Brasil 058f73a4f5
Add request specs for `/api/v1/reports` (#25475) 7 months ago
Matt Jankowski abf0e1fa39
Move `SignedReqestHelpers` rspec config to separate file (#25453) 7 months ago
Daniel M Brasil bc6cd27d9e
Migrate to request specs in `/api/v1/followed_tags` (#25472) 7 months ago
Matt Jankowski fd9dea21d0
DB speedup in `API::` controller/request specs (#25516) 7 months ago
Daniel M Brasil ecdb31d479
Migrate to request specs in `/api/v1/favourites` (#25518) 7 months ago
Daniel M Brasil 7664e3b692
Migrate to request specs in `/api/v1/statuses/:status_id/source` (#25634) 7 months ago
Daniel M Brasil 4230d1ee0a
Migrate to request specs in `/api/v1/timelines/tag/:hashtag` (#25797) 7 months ago
KMY(雪あすか) 45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline (#27391) 7 months ago
Matt Jankowski 133f218a4d
Add system specs for admin area `batch` actions (#25027) 7 months ago
Claire 3735e6f79d Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream 7 months ago
Claire 27e84c0691
Fix duplicate reports being sent when reporting some remote posts (#27355) 7 months ago
Claire 53f5b27bd1 Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 7 months ago
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
7 months ago
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
7 months ago
Claire 74c27e33e3 Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream 7 months ago
Claire 3262d1f1b6
Fix incorrect serialization of regional languages in `contentMap` (#27207) 8 months ago
Claire 340c390849
Fix crash when filtering for “dormant” relationships (#27306) 8 months ago
Claire 40ba6e119b
Fix Vary headers not being set on some redirects (#27272) 8 months ago
Matt Jankowski 72cec47c13
Silence deprecation warning in CacheBuster spec (#27264) 8 months ago
gunchleoc 68ec1d180a
Fix language sorting in settings (#27158) 8 months ago
Matt Jankowski c676bc91e9
Dont match mention in url query string (#25656)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
8 months ago
Claire ceb365c419
Fix boosts of local users being filtered in account timelines (#27204) 8 months ago
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
8 months ago
Claire 828eebad48
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API (#26998) 8 months ago
Claire f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 8 months ago
Claire 94893cf24f
Merge pull request from GHSA-hcqf-fw2r-52g4
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285)"

This reverts commit 8891d8945d.

* Revert "Do not normalize URL before fetching it (#26219)"

This reverts commit fd284311e7.
8 months ago
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
8 months ago
Claire 5ed72f668f Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 8 months ago
Claire 08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 8 months ago
Claire 5d8c65f2a7 Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 8 months ago
Claire 6273416292
Fix post edits not being forwarded as expected (#26936) 8 months ago
Robert R George 20666482ef
Added admin api for managing tags (#26872) 8 months ago
jsgoldstein 4d9186a48c
Add search tests (#26703) 8 months ago
Eugen Rochko 3a679844e4
Fix `account_id`, `max_id` and `min_id` params not working in search (#26847) 8 months ago
Claire 81caafbe84
Fix performances of profile directory (#26842) 8 months ago
Claire 355e3fb529
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes (#26840) 8 months ago
Claire 1f99d86287
Fix blocked domain appears from account feed (#26823)
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
9 months ago
Claire b83e487502
Fix moderator rights inconsistencies (#26729) 9 months ago
Claire e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 9 months ago
Eugen Rochko ece1ff77d6
Add `in:library` syntax to search (#26760)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
Christian Schmidt ea31929776
Fix invalid Content-Type header for WebP images (#26773) 9 months ago
Claire c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 9 months ago
Claire 4adb12ca91 Fix test failures due to different default settings in glitch-soc 9 months ago
Claire ac2dae0d11 Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
9 months ago
Claire c8aa3d6d06 Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream 9 months ago
Claire 6b7c47311d Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 9 months ago
Claire 16681e0f20
Add admin notifications for new Mastodon versions (#26582) 9 months ago
Eugen Rochko e754083e8a
Fix unmatched quotes and prefixes causing search to fail (#26701) 9 months ago
Daniel M Brasil ccca542db1
Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled (#26237) 9 months ago
Tyler Deitz 336ec503c2
Add avatar image to webfinger responses (#26558) 9 months ago
Eugen Rochko 2304cc6456
Fix bad search type heuristic (#26673) 9 months ago
Claire e3825a13c1
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard (#26650) 9 months ago
Claire 32e67e78a3 Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream 9 months ago
Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
9 months ago
Claire 88ff45a3b2 Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream 9 months ago
Claire fbfc4145fd Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
9 months ago
jsgoldstein 30c191aaa0
Add new public status index (#26344)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
Daniel M Brasil f337008819
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` (#26239) 9 months ago
Claire 10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 9 months ago
Nick Schonning b970ed6098
Update rubocop and rubocop-rspec (#26329) 9 months ago
Claire ac0eb0533e
Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448) 9 months ago
Claire 191d302b7f
Refactor `Api::V1::ProfilesController` into two separate controllers (#26573) 9 months ago
Daniel M Brasil d24a87ce4f
Add ability to delete avatar or header picture via the API (#25124)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9 months ago
Renaud Chaput b95867ad1f
Allow setting a custom HTTP method in CacheBuster (#26528)
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
9 months ago
Claire 60b9fa641d
Fix cached posts including stale stats (#26409) 9 months ago
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
9 months ago
Claire ea8802a05a Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 9 months ago
Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
9 months ago
Matt Jankowski d9a9323968
Avoid connecting to a running ES instance in ES search check spec (#26413) 9 months ago
Matt Jankowski 2c88364222
Restore console behavior in `test` env (#26401) 9 months ago
Claire b12d75ef4f
Fix blocking subdomains of an already-blocked domain (#26392) 9 months ago
Claire 30c64bf616
Fix list import concurrently creating lists of the same name (#26372) 10 months ago
Matt Jankowski c363978782
Spec media attachment speedups (#25416) 10 months ago
Christian Schmidt 8da99ffb0d
Add alt text for preview card thumbnails (#26184) 10 months ago
Daniel M Brasil 3a4d3e9d4b
Add `GET /api/v1/instance/languages` to REST API (#24443)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Emelia Smith e258b4cb64
Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 10 months ago
Christian Schmidt 8891d8945d
Fix request URL normalisation for bare domain and 8-bit characters (#26285) 10 months ago
Christian Schmidt ca342d4838
Add List-Unsubscribe email header (#26085) 10 months ago
Christian Schmidt f2257069b2
Fix AVIF attachments (#26264) 10 months ago
Christian Schmidt fd284311e7
Do not normalize URL before fetching it (#26219) 10 months ago
Claire 73a3228e0f Fix CSP tests in glitch-soc 10 months ago
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
10 months ago
Claire 454d8567d4 Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream 10 months ago
Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
10 months ago
Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
10 months ago
Claire 7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
10 months ago
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
10 months ago
Matt Jankowski 7581b1ff96
Profiling tools configuration improvement (#25383) 10 months ago
Matt Jankowski 6f1fa1364f
Fix `RSpec/EmptyExampleGroup` cop (#24735) 10 months ago
Matt Jankowski 660993b415
Add coverage for `URLValidator` (#25591) 10 months ago
Matt Jankowski 6602edf064
Add coverage for `LanguageValidator` (#25593) 10 months ago
Renaud Chaput 4d1b67f664
Add end-to-end (system) tests (#25461) 10 months ago
Christian Schmidt f96e4b3047
Use original URL in preview if it redirects to 4xx page (#26200) 10 months ago
Claire 6c3c5bbbc3
Fix crash when processing Flag activity with no status (#26189) 10 months ago
Claire b4e739ff0f
Change interaction modal in web UI (#26075)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
10 months ago
Daniel M Brasil 812a84ff5f
Migrate to request specs in `/api/v2/filters` (#25721) 10 months ago
Matt Jankowski f48d345de1
Use correct naming on controller concern specs (#26197) 10 months ago
Matt Jankowski 2d9808f648
Reformat large key values in service specs (#26181) 10 months ago
Matt Jankowski 7d62e3b198
Reformat large text arg in `FetchLinkCardService` spec (#26183) 10 months ago
Matt Jankowski 50ff3d3342
Coverage for `Auth::OmniauthCallbacks` controller (#26147) 10 months ago
Claire 5b457961fc
Fix linting issue (#26106) 10 months ago