4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
11 months ago
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
11 months ago
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
11 months ago
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
11 months ago
db897eaa5a
Unwind `map` on single-item array in `spec/services/delete_account_service` spec ( #28358 )
11 months ago
ef9797a395
Un-nest contexts in `settings/2fa/webauthn` spec ( #28359 )
11 months ago
adbfd40a1b
Convert `api/v1/directories` controller spec to request spec ( #28356 )
11 months ago
28e1a7a394
Improve spec coverage for `models/announcement` class ( #28350 )
11 months ago
8a3d8c6c14
Remove the `stub_stdout` wrapper around CLI specs ( #28340 )
11 months ago
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
11 months ago
b5a1013ae3
Combine `CLI::...` spec example subjects ( #28285 )
11 months ago
0e4233de9d
Controller spec to request spec: `api/v2/suggestions` ( #28297 )
11 months ago
0c64092500
Controller spec to request spec: `api/v1/accounts/search` ( #28299 )
11 months ago
16ede59d0a
Controller spec to request spec: `api/v1/featured_tags/suggestions` ( #28298 )
11 months ago
809506bdd4
Controller spec to request spec: `api/v1/accounts/pins` ( #28300 )
11 months ago
94cc707ab3
Controller spec to request spec: `api/v1/accounts/notes` ( #28301 )
11 months ago
e544b6df42
Controller spec to request spec: `api/v1/accounts/lookup` ( #28302 )
11 months ago
a968898dc7
Controller spec to request spec: `api/v1/accounts/lists` ( #28303 )
11 months ago
8f94502e7d
Controller spec to request spec: `api/v1/accounts/identify_proofs` ( #28304 )
11 months ago
78347d2556
Controller spec to request spec: `api/v1/accounts/familiar_followers` ( #28305 )
11 months ago
11d2bd9716
Fix intermittent failure from unspecified order in `api/v1/accounts/relationships` spec ( #28306 )
11 months ago
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
11 months ago
a3cbb4b2f1
Add spec for `CLI::Search#deploy` command ( #28272 )
11 months ago
8de86eabbf
Add spec for `CLI::Domains#crawl` command ( #28271 )
11 months ago
7e514688b3
Convert `api/v2/search` controller spec to request spec ( #28269 )
11 months ago
8d8ae05a18
Add spec coverage for `CLI::Media#lookup` command ( #28266 )
11 months ago
ad34d33bfd
Formalize some patterns in cli specs ( #28255 )
11 months ago
0b4a3a0437
Remove remaining `without_partial_double_verification` usage ( #28127 )
11 months ago
658ad7a6ca
Fix flaky tests related to file creation ( #28248 )
11 months ago
0e8ba19113
Add spec coverage for `CLI::Emoji` class ( #28182 )
11 months ago
ed7b5c091b
Remove double subject call in `services/delete_account_service` spec ( #28212 )
11 months ago
be6bb1a10d
Remove double subject call in `services/suspend_account_service` spec ( #28213 )
11 months ago
5517df61de
Remove double subject call in `services/activitypub/process_account_service` spec ( #28214 )
11 months ago
faffd81976
Remove double subject call in `services/unsuspend_account_service` spec ( #28215 )
11 months ago
89a8e6e622
Remove 2x double subject call in `models/form/account_batch` spec ( #28209 )
11 months ago
71e5a16eba
Remove triple subject call in `api/v1/lists` spec ( #28210 )
11 months ago
cca19f5fbb
Use the `Admin::ActionLog` fabricator in admin/action_logs spec ( #28194 )
11 months ago
b3b009e6aa
Add spec coverage for `CLI::EmailDomainBlocks` commands ( #28181 )
11 months ago
9603198982
Add spec coverage for `CLI::Domains#purge` command ( #28179 )
11 months ago
1bf2230fd1
Add spec coverage for `CLI::Upgrade#storage_schema` command ( #28180 )
11 months ago
19ad51253d
Prevent triple-subject run in admin/domain_blocks spec ( #28195 )
11 months ago
d848d8d87c
Add helper methods for domains allow and export blocks files ( #28196 )
11 months ago
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
11 months ago
aa8563d43d
Fix `Style/SuperWithArgsParentheses` cop ( #28174 )
11 months ago
1564799952
Add spec coverage for media CLI `refresh` command ( #28166 )
11 months ago
7753e5f715
Add shared example for CLI command specs ( #28165 )
11 months ago
92fa9b109f
Add spec coverage for media CLI usage command ( #28167 )
11 months ago
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
11 months ago
b751078fcd
Eliminate double subject call in admin/ controller specs ( #28158 )
11 months ago
1f1c75bba5
File cleanup/organization in `controllers/concerns` ( #27846 )
12 months ago
0530ce5e95
Convert accounts controller spec to request spec ( #28126 )
12 months ago
e7c340a634
Spec coverage for missing `q` param and error conditions in `api/v2/search` controller ( #27842 )
12 months ago
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
12 months ago
bb0efe16e6
Remove `default_scope` from `MediaAttachment` class ( #28043 )
12 months ago
ce78a9c9ac
Clean up `two_factor_authentication/confirmations` controller spec ( #28128 )
12 months ago
e6fd9a59e6
Fix FamiliarFollowersController test response comparison ( #28121 )
...
Co-authored-by: Filippo Giunchedi <filippo@debian.org>
12 months ago
e48ecd2929
Remove `default_scope` from `Admin::ActionLog` ( #28026 )
12 months ago
291dc04e67
Remove un-needed `action` and `template` options to `render` in controllers ( #28022 )
12 months ago
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
12 months ago
6b46bf9953
Handle scenario when webfinger response `subject` is missing host value ( #28088 )
12 months ago
bcc0a24acd
Merge remote-tracking branch 'glitch/main' ( 660372d130)
12 months ago
78a9906dfe
Merge remote-tracking branch 'glitch/main' ( a21fe8687e)
12 months ago
660372d130
Revert recent CSP changes ( #2485 )
...
* Revert "Fix image and media loading when using external storage server"
This reverts commit 6cfa0245ca#2474 )"
This reverts commit d59196e170
12 months ago
19baf22683
Add missing email previews for `AdminMailer` ( #28044 )
12 months ago
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
12 months ago
973597c6f1
Consolidate configuration of `Sidekiq::Testing.fake!` setup ( #28046 )
12 months ago
9742bccbe7
Add coverage for `api/v2/media` endpoint ( #28027 )
12 months ago
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
67fd3187b3
Update rspec fixture path config to silence deprecation warning ( #28018 )
12 months ago
30ee4aaff4
Convert measurement `api/v1/admin/*` controller specs to request specs ( #28005 )
12 months ago
32e19e3af6
Reduce `.times` usage in request and controller specs ( #27949 )
12 months ago
f7cb64a184
Add coverage for `settings/privacy` controller ( #28000 )
12 months ago
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
12 months ago
b2e8af8889
Add coverage for `settings/verifications` controller ( #28001 )
12 months ago
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
12 months ago
a6d446e6a7
Add coverage for `remote_interaction_helper` ( #28002 )
12 months ago
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
12 months ago
876f5b1d12
Convert `/instances/*` controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
718c95e7af
Convert `api/v1/custom_emojis` controller spec to request spec ( #27985 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
c260a68f54
Clean up some `Mastodon::CLI::Accounts` tests ( #27473 )
12 months ago
17582d36d5
Convert `api/v1/preferences` controller spec to request spec ( #27987 )
12 months ago
9a01a260a0
Convert `api/v1/scheduled_statuses` controller spec to request spec ( #27986 )
12 months ago
b9fb47aeb1
Convert `api/v1/endorsements` controller spec to request spec ( #27984 )
12 months ago
371f355719
Reduce `.times` usage in `AccountStatusesCleanupPolicy` ( #27947 )
12 months ago
d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit ( #27946 )
12 months ago
00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator ( #27945 )
12 months ago
1fabf20a88
Reduce `.times` usage in `lib/mastodon/cli/accounts` spec ( #27944 )
12 months ago
09a2db3f6c
Move api/v2/filters spec to correct path location ( #27950 )
12 months ago
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
12 months ago
297839c10c
Rewrite `/api/v1/statuses` tests as request specs ( #27891 )
12 months ago
9257737675
Rewrite `/api/v1/accounts` tests as request specs ( #27888 )
12 months ago
549e8e7baf
Add `email_spec` and speedup/cleanup to `spec/mailers` ( #27902 )
12 months ago
1526e54ac6
Add spec coverage for `workers/redownload_*` worker classes ( #27892 )
12 months ago
cb1a4a8713
Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs ( #27881 )
12 months ago
155fb84141
Improve spec coverage for collection of `workers/` classes ( #27874 )
12 months ago
8a285413f7
Reduce expectations for `RSpec/MultipleExpectations` cop in `MoveWorker` spec ( #27880 )
12 months ago
3f0c1566c3
Reduce expectations for `RSpec/MultipleExpectations` cop in `api/v1/accounts/relationships` spec ( #27879 )
12 months ago
c1f93def40
Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec ( #27875 )
12 months ago
04121bd020
Disable simplecov `enable_coverage_for_eval` option, move to standalone file ( #27869 )
1 year ago
3de9145613
Move controller specs for `well-known` endpoints to request specs ( #27855 )
1 year ago
12a5b7391d
Add spec for well known change password endpoint ( #27856 )
1 year ago
fe58ac8d9f
Improve spec coverage for `api/web/push_subscriptions` controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
7c72944661
Use `Lcov` simplecov formatter on CI and `HTML` elsewhere ( #27859 )
1 year ago
36d7d1781f
Add CodeCov for Ruby coverage reports ( #23868 )
1 year ago
b2c5b20ef2
Fix `RSpec/AnyInstance` cop ( #27810 )
1 year ago
d562fb8459
Specs for minimal CSP policy in `Api::` controllers ( #27845 )
1 year ago
5e2ecc736d
Remove double `subject` in api/v1/accounts/relationships spec ( #27839 )
1 year ago
b7807f3d84
Use `normalizes` to prepare `Webhook#events` value ( #27605 )
1 year ago
49ba5a9f94
Use `hash_including` to check `AccountFilter` setup in `admin/accounts` controller spec ( #27838 )
1 year ago
a36b59be8a
Spec coverage for `api/v1/trends` controllers ( #27837 )
1 year ago
07a4059901
Add support for invite codes in the registration API ( #27805 )
1 year ago
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
1 year ago
9dc3ce878b
Speed-up in `Settings::` controllers specs ( #27808 )
1 year ago
e79bf1b1e7
Minor speed improvement on `controllers/accounts` spec ( #27679 )
1 year ago
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
1 year ago
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
1 year ago
63c9102f8a
Fix `RSpec/MessageChain` cop ( #27776 )
1 year ago
c9204b792c
Fix `Rails/I18nLocaleTexts` cop ( #27779 )
1 year ago
69d00e2721
Fix `RSpec/InstanceVariable` cop ( #27766 )
1 year ago
4329616c53
Ignore block result of `send` method and remove `rubocop:disable` in deepl spec ( #27741 )
1 year ago
b05575e242
Move RSpec config for streaming/search managers to be near classes ( #27761 )
1 year ago
ce91d14d48
Fix `Style/WordArray` cop ( #27770 )
1 year ago
c03bd2a238
Don't stub SUT in `FollowLimitValidator` spec ( #27760 )
1 year ago
9b7b4d748f
Simplify request cache spec shared examples ( #27673 )
1 year ago
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
1 year ago
e545978076
Use framework helpers instead of i-vars in controller specs ( #27767 )
1 year ago
ee57bb4b44
Account statuses filter spec speedup ( #27674 )
1 year ago
ae7c20b00c
Move search and streaming spec manager classes to separate support files ( #27727 )
1 year ago
370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command ( #25252 )
1 year ago
1d51e10510
Consolidate JSON parsing in serializers specs ( #27693 )
1 year ago
a688a9ed20
Use strings instead of numeric literals and remove `rubocop:disable` in cache spec ( #27742 )
1 year ago
dc0bf87090
Remove unused before block from settings/branding spec ( #27759 )
1 year ago
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
1 year ago
49e2772064
Fix `RSpec/MessageSpies` cop ( #27751 )
1 year ago
2862ad701f
Stub controller methods and remove `rubocop:disable` in captcha feature spec ( #27743 )
1 year ago
cfa14ec6d1
Fix `Lint/EmptyBlock` cop ( #27748 )
1 year ago
b06284c572
Fix `RSpec/HookArgument` cop ( #27747 )
1 year ago
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
1 year ago
fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )
1 year ago
949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )
1 year ago
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
1 year ago
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
1 year ago
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
1 year ago
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
1 year ago
beee9ea991
Fix `RSpec/LetSetup` cop in spec/controllers/admin area ( #27619 )
1 year ago
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
1 year ago
2e6bf60f15
Use `deliveries.size` in mailer-related examples in controller specs ( #27589 )
1 year ago
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
1 year ago
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
1 year ago
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
1 year ago
8f998cd96a
Handle featured collections without items ( #27581 )
1 year ago
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
1 year ago
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
1 year ago
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.
1 year ago
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
1 year ago
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.
1 year ago
e93a75f1a1
Rails 7.1 update ( #25963 )
1 year ago
26d2a2a0cc
Migrate to request specs in `/api/v1/media` ( #25543 )
1 year ago
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
1 year ago
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
1 year ago
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07)
1 year ago
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
1 year ago
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
1 year ago
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
1 year ago
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` ( #25284 )
1 year ago
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
1 year ago
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
1 year ago
091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` ( #25204 )
1 year ago
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
1 year ago
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
1 year ago
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
1 year ago
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`.
1 year ago
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.
1 year ago
5ef26d8fd5
Add RSpec GitHub annotations gem ( #24040 )
1 year ago
71447ab19f
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area ( #27445 )
1 year ago
2528a0721f
Update `rubocop-capybara` to version 2.19.0 ( #26982 )
1 year ago
b34a2b1b33
Fix errors in CLI specs ( #27399 )
1 year ago
c4bddc9855
Add spec for poll model ( #23399 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
12bb7be8b5
Spec speed ups on `AccountsController` spec ( #25391 )
1 year ago
d54fec24e5
Add coverage for `CLI::PreviewCards#remove` command ( #27441 )
1 year ago
19900f647e
Add coverage for `UnreservedUsernameValidator` ( #25590 )
1 year ago
fc9ab61448
Expand spec coverage of `CLI::Media` ( #27437 )
1 year ago
893b2f33fd
Extract shared example for cacheable response in specs ( #25388 )
1 year ago
708299bb0d
Misc coverage improvements for `Admin::` and `Settings::` controllers ( #25346 )
1 year ago
e0ed0f8c7c
Migrate to request specs in `/api/v1/notifications` ( #25553 )
1 year ago
cafdaec6cf
Migrate to request specs in `/api/v1/lists/:id/accounts` ( #25468 )
1 year ago
8e6116503d
Migrate to request specs in `/api/v1/blocks` ( #25517 )
1 year ago
d9caa6ed24
Migrate to request specs in `/api/v1/admin/accounts` ( #25563 )
1 year ago
f5bc1f20e2
Add coverage for `ExistingUsernameValidator` ( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
f8afa0f614
Remove unused stub json ld context ( #25454 )
1 year ago
00e92b4038
Add coverage for `CLI::Statuses` command ( #25321 )
1 year ago
299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing ( #27423 )
1 year ago
82beeb2f7e
Migrate to request specs in `/api/v1/admin/trends/links` ( #25739 )
1 year ago
1b195ce115
Speed-up on `Rack::Attack` spec ( #25542 )
1 year ago
71cfdd7865
Fix duplicate tests ( #27395 )
1 year ago
cad8cc90ba
Speed-up on `MoveWorker` spec ( #25528 )
1 year ago
058f73a4f5
Add request specs for `/api/v1/reports` ( #25475 )
1 year ago
abf0e1fa39
Move `SignedReqestHelpers` rspec config to separate file ( #25453 )
1 year ago
Claire
Matt Jankowski
Filippo Giunchedi
Emelia Smith
Kouhai
Kevin Bongart
Eugen Rochko
Nick Schonning
Renaud Chaput
Jeong Arm
Daniel M Brasil
kouhai
Victor Lee