Matt Jankowski
5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command ( #28267 )
10 months ago
Matt Jankowski
74a0d81e90
Add coverage for CLI `self-destruct` command ( #28565 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
Claire
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
10 months ago
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
10 months ago
Claire
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
10 months ago
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
11 months ago
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
11 months ago
Claire
a2624ff739
Convert signature verification specs to request specs ( #28443 )
11 months ago
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
11 months ago
Matt Jankowski
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
11 months ago
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
11 months ago
Matt Jankowski
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
11 months ago
Matt Jankowski
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
11 months ago
Matt Jankowski
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
11 months ago
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
11 months ago
Claire
30ee7339d3
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream changed code style change, including on a line modified by glitch-soc.
Kept glitch-soc's line but with the code style change applied.
11 months ago
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
11 months ago
Claire
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
11 months ago
Matt Jankowski
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
11 months ago
Matt Jankowski
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
11 months ago
Matt Jankowski
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
11 months ago
Matt Jankowski
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
11 months ago
Matt Jankowski
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
11 months ago
Matt Jankowski
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
11 months ago
Matt Jankowski
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
11 months ago
Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
11 months ago
Claire
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
11 months ago
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
11 months ago
Claire
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
11 months ago
Matt Jankowski
961d65aba6
Add coverage to CLI Maintenance for duplicate users on `confirmation_token` and `reset_password_token` values ( #28434 )
11 months ago
Claire
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
11 months ago
Claire
6c00d5b0c4
Fix test failure caused by glitch-soc changes
11 months ago
Claire
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
11 months ago
Claire
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
11 months ago
Claire
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
11 months ago
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
11 months ago
Claire
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
11 months ago
Claire
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
11 months ago
Matt Jankowski
c7c727994a
Add spec for `CLI::Maintenance#fix_duplicates` ( #28326 )
11 months ago
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
11 months ago
Matt Jankowski
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
11 months ago
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 months ago
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
11 months ago
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
11 months ago
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
11 months ago
Matt Jankowski
476d1237d4
Typo fix in json ld helper spec ( #28417 )
11 months ago
Claire
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
11 months ago
Matt Jankowski
af366f65ee
Add spec coverage for `models/form/custom_emoji_batch` class ( #28388 )
11 months ago
Matt Jankowski
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
11 months ago
Claire
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
Claire
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
Claire
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
Matt Jankowski
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
11 months ago
Matt Jankowski
db897eaa5a
Unwind `map` on single-item array in `spec/services/delete_account_service` spec ( #28358 )
11 months ago
Matt Jankowski
ef9797a395
Un-nest contexts in `settings/2fa/webauthn` spec ( #28359 )
11 months ago
Matt Jankowski
adbfd40a1b
Convert `api/v1/directories` controller spec to request spec ( #28356 )
11 months ago
Matt Jankowski
28e1a7a394
Improve spec coverage for `models/announcement` class ( #28350 )
11 months ago
Matt Jankowski
8a3d8c6c14
Remove the `stub_stdout` wrapper around CLI specs ( #28340 )
11 months ago
Claire
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
11 months ago
Matt Jankowski
b5a1013ae3
Combine `CLI::...` spec example subjects ( #28285 )
11 months ago
Matt Jankowski
0e4233de9d
Controller spec to request spec: `api/v2/suggestions` ( #28297 )
11 months ago
Matt Jankowski
0c64092500
Controller spec to request spec: `api/v1/accounts/search` ( #28299 )
11 months ago
Matt Jankowski
16ede59d0a
Controller spec to request spec: `api/v1/featured_tags/suggestions` ( #28298 )
11 months ago
Matt Jankowski
809506bdd4
Controller spec to request spec: `api/v1/accounts/pins` ( #28300 )
11 months ago
Matt Jankowski
94cc707ab3
Controller spec to request spec: `api/v1/accounts/notes` ( #28301 )
11 months ago
Matt Jankowski
e544b6df42
Controller spec to request spec: `api/v1/accounts/lookup` ( #28302 )
11 months ago
Matt Jankowski
a968898dc7
Controller spec to request spec: `api/v1/accounts/lists` ( #28303 )
11 months ago
Matt Jankowski
8f94502e7d
Controller spec to request spec: `api/v1/accounts/identify_proofs` ( #28304 )
11 months ago
Matt Jankowski
78347d2556
Controller spec to request spec: `api/v1/accounts/familiar_followers` ( #28305 )
11 months ago
Matt Jankowski
11d2bd9716
Fix intermittent failure from unspecified order in `api/v1/accounts/relationships` spec ( #28306 )
11 months ago
Claire
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
Matt Jankowski
a3cbb4b2f1
Add spec for `CLI::Search#deploy` command ( #28272 )
11 months ago
Matt Jankowski
8de86eabbf
Add spec for `CLI::Domains#crawl` command ( #28271 )
11 months ago
Matt Jankowski
7e514688b3
Convert `api/v2/search` controller spec to request spec ( #28269 )
11 months ago
Matt Jankowski
8d8ae05a18
Add spec coverage for `CLI::Media#lookup` command ( #28266 )
11 months ago
Matt Jankowski
ad34d33bfd
Formalize some patterns in cli specs ( #28255 )
11 months ago
Matt Jankowski
0b4a3a0437
Remove remaining `without_partial_double_verification` usage ( #28127 )
11 months ago
Claire
658ad7a6ca
Fix flaky tests related to file creation ( #28248 )
11 months ago
Matt Jankowski
0e8ba19113
Add spec coverage for `CLI::Emoji` class ( #28182 )
11 months ago
Matt Jankowski
ed7b5c091b
Remove double subject call in `services/delete_account_service` spec ( #28212 )
11 months ago
Matt Jankowski
be6bb1a10d
Remove double subject call in `services/suspend_account_service` spec ( #28213 )
11 months ago
Matt Jankowski
5517df61de
Remove double subject call in `services/activitypub/process_account_service` spec ( #28214 )
11 months ago
Matt Jankowski
faffd81976
Remove double subject call in `services/unsuspend_account_service` spec ( #28215 )
11 months ago
Matt Jankowski
89a8e6e622
Remove 2x double subject call in `models/form/account_batch` spec ( #28209 )
11 months ago
Matt Jankowski
71e5a16eba
Remove triple subject call in `api/v1/lists` spec ( #28210 )
11 months ago
Matt Jankowski
cca19f5fbb
Use the `Admin::ActionLog` fabricator in admin/action_logs spec ( #28194 )
11 months ago
Matt Jankowski
b3b009e6aa
Add spec coverage for `CLI::EmailDomainBlocks` commands ( #28181 )
11 months ago
Matt Jankowski
9603198982
Add spec coverage for `CLI::Domains#purge` command ( #28179 )
11 months ago
Matt Jankowski
1bf2230fd1
Add spec coverage for `CLI::Upgrade#storage_schema` command ( #28180 )
11 months ago
Matt Jankowski
19ad51253d
Prevent triple-subject run in admin/domain_blocks spec ( #28195 )
11 months ago
Matt Jankowski
d848d8d87c
Add helper methods for domains allow and export blocks files ( #28196 )
11 months ago
Matt Jankowski
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
11 months ago
Matt Jankowski
aa8563d43d
Fix `Style/SuperWithArgsParentheses` cop ( #28174 )
11 months ago
Matt Jankowski
1564799952
Add spec coverage for media CLI `refresh` command ( #28166 )
11 months ago
Matt Jankowski
7753e5f715
Add shared example for CLI command specs ( #28165 )
11 months ago
Matt Jankowski
92fa9b109f
Add spec coverage for media CLI usage command ( #28167 )
11 months ago
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
11 months ago
Matt Jankowski
b751078fcd
Eliminate double subject call in admin/ controller specs ( #28158 )
11 months ago
Matt Jankowski
1f1c75bba5
File cleanup/organization in `controllers/concerns` ( #27846 )
12 months ago
Matt Jankowski
0530ce5e95
Convert accounts controller spec to request spec ( #28126 )
12 months ago
Matt Jankowski
e7c340a634
Spec coverage for missing `q` param and error conditions in `api/v2/search` controller ( #27842 )
12 months ago
Claire
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
12 months ago
Matt Jankowski
bb0efe16e6
Remove `default_scope` from `MediaAttachment` class ( #28043 )
12 months ago
Matt Jankowski
ce78a9c9ac
Clean up `two_factor_authentication/confirmations` controller spec ( #28128 )
12 months ago
Filippo Giunchedi
e6fd9a59e6
Fix FamiliarFollowersController test response comparison ( #28121 )
...
Co-authored-by: Filippo Giunchedi <filippo@debian.org>
12 months ago
Matt Jankowski
e48ecd2929
Remove `default_scope` from `Admin::ActionLog` ( #28026 )
12 months ago
Matt Jankowski
291dc04e67
Remove un-needed `action` and `template` options to `render` in controllers ( #28022 )
12 months ago
Emelia Smith
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
12 months ago
Matt Jankowski
6b46bf9953
Handle scenario when webfinger response `subject` is missing host value ( #28088 )
12 months ago
Kouhai
bcc0a24acd
Merge remote-tracking branch 'glitch/main' ( 660372d130
)
12 months ago
Kouhai
78a9906dfe
Merge remote-tracking branch 'glitch/main' ( a21fe8687e
)
12 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
.
12 months ago
Matt Jankowski
19baf22683
Add missing email previews for `AdminMailer` ( #28044 )
12 months ago
Kevin Bongart
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
12 months ago
Matt Jankowski
973597c6f1
Consolidate configuration of `Sidekiq::Testing.fake!` setup ( #28046 )
12 months ago
Matt Jankowski
9742bccbe7
Add coverage for `api/v2/media` endpoint ( #28027 )
12 months ago
Eugen Rochko
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Matt Jankowski
67fd3187b3
Update rspec fixture path config to silence deprecation warning ( #28018 )
12 months ago
Matt Jankowski
30ee4aaff4
Convert measurement `api/v1/admin/*` controller specs to request specs ( #28005 )
12 months ago
Matt Jankowski
32e19e3af6
Reduce `.times` usage in request and controller specs ( #27949 )
12 months ago
Matt Jankowski
f7cb64a184
Add coverage for `settings/privacy` controller ( #28000 )
12 months ago
Claire
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
12 months ago
Matt Jankowski
b2e8af8889
Add coverage for `settings/verifications` controller ( #28001 )
12 months ago
Matt Jankowski
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
12 months ago
Matt Jankowski
a6d446e6a7
Add coverage for `remote_interaction_helper` ( #28002 )
12 months ago
Claire
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
12 months ago
Matt Jankowski
876f5b1d12
Convert `/instances/*` controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 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>
12 months ago
Claire
c260a68f54
Clean up some `Mastodon::CLI::Accounts` tests ( #27473 )
12 months ago
Matt Jankowski
17582d36d5
Convert `api/v1/preferences` controller spec to request spec ( #27987 )
12 months ago
Matt Jankowski
9a01a260a0
Convert `api/v1/scheduled_statuses` controller spec to request spec ( #27986 )
12 months ago
Matt Jankowski
b9fb47aeb1
Convert `api/v1/endorsements` controller spec to request spec ( #27984 )
12 months ago
Matt Jankowski
371f355719
Reduce `.times` usage in `AccountStatusesCleanupPolicy` ( #27947 )
12 months ago
Matt Jankowski
d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit ( #27946 )
12 months ago
Matt Jankowski
00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator ( #27945 )
12 months ago
Matt Jankowski
1fabf20a88
Reduce `.times` usage in `lib/mastodon/cli/accounts` spec ( #27944 )
12 months ago
Matt Jankowski
09a2db3f6c
Move api/v2/filters spec to correct path location ( #27950 )
12 months ago
Matt Jankowski
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
12 months ago
Claire
297839c10c
Rewrite `/api/v1/statuses` tests as request specs ( #27891 )
12 months ago
Claire
9257737675
Rewrite `/api/v1/accounts` tests as request specs ( #27888 )
12 months ago
Matt Jankowski
549e8e7baf
Add `email_spec` and speedup/cleanup to `spec/mailers` ( #27902 )
12 months ago
Matt Jankowski
1526e54ac6
Add spec coverage for `workers/redownload_*` worker classes ( #27892 )
12 months ago
Matt Jankowski
cb1a4a8713
Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs ( #27881 )
12 months ago
Matt Jankowski
155fb84141
Improve spec coverage for collection of `workers/` classes ( #27874 )
12 months ago
Matt Jankowski
8a285413f7
Reduce expectations for `RSpec/MultipleExpectations` cop in `MoveWorker` spec ( #27880 )
12 months ago
Matt Jankowski
3f0c1566c3
Reduce expectations for `RSpec/MultipleExpectations` cop in `api/v1/accounts/relationships` spec ( #27879 )
12 months ago
Matt Jankowski
c1f93def40
Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec ( #27875 )
12 months ago
Matt Jankowski
04121bd020
Disable simplecov `enable_coverage_for_eval` option, move to standalone file ( #27869 )
1 year ago
Matt Jankowski
3de9145613
Move controller specs for `well-known` endpoints to request specs ( #27855 )
1 year ago