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.
2023-12-19 20:51:37 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
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.
2023-12-19 20:06:32 +01:00
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
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.
2023-12-18 18:40:58 +01:00
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
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.
2023-12-18 18:07:24 +01:00
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.
2023-12-17 23:04:16 +01:00
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.
2023-12-17 17:43:30 +01:00
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.
2023-12-17 15:32:29 +01:00
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`
2023-12-10 18:05:02 +01:00
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
2023-11-26 15:32:35 +01:00
973597c6f1
Consolidate configuration of `Sidekiq::Testing.fake!` setup ( #28046 )
2023-11-23 09:43:43 +00:00
9742bccbe7
Add coverage for `api/v2/media` endpoint ( #28027 )
2023-11-22 15:39:34 +00:00
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-22 11:38:07 +00:00
67fd3187b3
Update rspec fixture path config to silence deprecation warning ( #28018 )
2023-11-21 15:51:40 +00:00
30ee4aaff4
Convert measurement `api/v1/admin/*` controller specs to request specs ( #28005 )
2023-11-21 14:25:07 +00:00
32e19e3af6
Reduce `.times` usage in request and controller specs ( #27949 )
2023-11-21 13:05:59 +00:00
f7cb64a184
Add coverage for `settings/privacy` controller ( #28000 )
2023-11-21 13:02:37 +00:00
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
2023-11-21 13:45:29 +01:00
b2e8af8889
Add coverage for `settings/verifications` controller ( #28001 )
2023-11-21 11:00:22 +00:00
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
2023-11-21 10:52:20 +00:00
a6d446e6a7
Add coverage for `remote_interaction_helper` ( #28002 )
2023-11-21 10:28:55 +00:00
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
2023-11-20 13:02:49 +01:00
876f5b1d12
Convert `/instances/*` controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:28 +00:00
718c95e7af
Convert `api/v1/custom_emojis` controller spec to request spec ( #27985 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:24 +00:00
c260a68f54
Clean up some `Mastodon::CLI::Accounts` tests ( #27473 )
2023-11-20 10:46:02 +00:00
17582d36d5
Convert `api/v1/preferences` controller spec to request spec ( #27987 )
2023-11-20 09:39:45 +00:00
9a01a260a0
Convert `api/v1/scheduled_statuses` controller spec to request spec ( #27986 )
2023-11-20 09:36:49 +00:00
b9fb47aeb1
Convert `api/v1/endorsements` controller spec to request spec ( #27984 )
2023-11-20 09:32:28 +00:00
371f355719
Reduce `.times` usage in `AccountStatusesCleanupPolicy` ( #27947 )
2023-11-20 09:08:54 +00:00
d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit ( #27946 )
2023-11-20 09:08:22 +00:00
00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator ( #27945 )
2023-11-20 09:07:25 +00:00
1fabf20a88
Reduce `.times` usage in `lib/mastodon/cli/accounts` spec ( #27944 )
2023-11-20 09:04:46 +00:00
09a2db3f6c
Move api/v2/filters spec to correct path location ( #27950 )
2023-11-20 08:48:56 +00:00
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
2023-11-17 11:52:20 +00:00
297839c10c
Rewrite `/api/v1/statuses` tests as request specs ( #27891 )
2023-11-17 11:36:04 +00:00
9257737675
Rewrite `/api/v1/accounts` tests as request specs ( #27888 )
2023-11-17 11:34:49 +00:00
549e8e7baf
Add `email_spec` and speedup/cleanup to `spec/mailers` ( #27902 )
2023-11-17 09:50:19 +00:00
1526e54ac6
Add spec coverage for `workers/redownload_*` worker classes ( #27892 )
2023-11-17 09:03:46 +00:00
cb1a4a8713
Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs ( #27881 )
2023-11-16 14:37:52 +00:00
155fb84141
Improve spec coverage for collection of `workers/` classes ( #27874 )
2023-11-16 14:36:59 +00:00
8a285413f7
Reduce expectations for `RSpec/MultipleExpectations` cop in `MoveWorker` spec ( #27880 )
2023-11-16 10:03:51 +00:00
3f0c1566c3
Reduce expectations for `RSpec/MultipleExpectations` cop in `api/v1/accounts/relationships` spec ( #27879 )
2023-11-16 09:55:50 +00:00
c1f93def40
Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec ( #27875 )
2023-11-16 09:54:51 +00:00
04121bd020
Disable simplecov `enable_coverage_for_eval` option, move to standalone file ( #27869 )
2023-11-15 23:09:31 +00:00
3de9145613
Move controller specs for `well-known` endpoints to request specs ( #27855 )
2023-11-15 19:12:02 +00:00
Claire
Matt Jankowski
Eugen Rochko