1d3f8af23a
Fix linting issue ( #26106 )
2023-07-21 14:21:10 +02:00
5664c5370f
Fix CSP headers being unintendedly wide ( #26105 )
2023-07-21 13:34:15 +02:00
f3127af389
Clean up unused application records ( #24871 )
2023-07-21 13:13:16 +02:00
58b52b7a33
Add stricter protocol fields validation for accounts ( #25937 )
2023-07-20 18:23:48 +02:00
20b9c1ca86
Fix `Lint/Void` cop ( #25922 )
2023-07-20 17:31:34 +02:00
0dd4a4a460
Move localized subject mailer shared example to separate file ( #25889 )
2023-07-20 15:50:50 +02:00
540cced981
Wrong count in response when removing favourite/reblog ( #24365 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-19 09:02:30 +02:00
4be315f0ae
Cleanup unused portions of statuses/status partial ( #26045 )
2023-07-19 08:44:16 +02:00
d315c684e4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
c05ff864cc
Migrate to request specs in `/api/v1/mutes` ( #25622 )
2023-07-18 13:05:19 +02:00
03eaa9746c
Migrate to request specs in `/api/v1/bookmarks` ( #25520 )
2023-07-18 09:15:50 +02:00
580d5831ec
Migrate to request specs in `/api/v1/timelines/public` ( #25746 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 09:15:18 +02:00
cb70bb8665
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
381baa978a
Migrate to request specs in `/api/v1/statuses/:status_id/favourite` ( #25626 )
2023-07-17 16:53:57 +02:00
b9694cb13e
Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` ( #25624 )
2023-07-17 16:51:49 +02:00
31b2765f6e
Migrate to request specs in `/api/v1/polls` ( #25596 )
2023-07-17 16:50:00 +02:00
32b7709183
Migrate to request specs in `/api/v1/statuses/:status_id/pin` ( #25635 )
2023-07-17 16:24:05 +02:00
07cb4e35f4
Migrate to request specs in `/api/v1/emails/confirmations` ( #25686 )
2023-07-17 16:22:33 +02:00
9c6f214c17
Migrate to request specs in `/api/v1/timelines/home` ( #25743 )
2023-07-17 16:20:11 +02:00
e8631f8e90
Remove unfollowed hashtag posts from home feed ( #26028 )
2023-07-17 13:56:28 +02:00
2d1ecbe1fe
Fix some incorrect tests ( #26035 )
2023-07-17 13:13:43 +02:00
efa6d4416c
Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
54b6b035a7
Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
2023-07-12 15:38:35 +02:00
63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
93cbe2a0e4
Fix `RSpec/StubbedMock` cop ( #25552 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:20:10 +02:00
b229fa7916
Fix `Lint/AmbiguousBlockAssociation` cop ( #25921 )
2023-07-12 10:02:41 +02:00
a887e8bbd7
Fix `RSpec/SubjectStub` cop ( #25550 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:02:19 +02:00
13a149dea6
Exclude `lib/linter` from simplecov report ( #25916 )
2023-07-12 09:51:59 +02:00
d9e56ef7ba
Fix `RSpec/SubjectDeclaration` cop ( #25312 )
2023-07-12 09:49:33 +02:00
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
c6ac835588
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
66693177ff
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
2023-07-10 18:26:56 +02:00
482071a976
Refactor `NotificationMailer` to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
b63d71fd48
Remove unused `NotificationMailer#digest` preview ( #25719 )
2023-07-08 20:04:21 +02:00
6555c33503
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
6894f5c114
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
9ba89aeeb5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
3445bdfa45
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
2b877ad937
Fix `/api/v2/search` not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
2f17abc686
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
2023-07-02 00:05:44 +02:00
843448c7d9
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
85dc0869a5
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
5d75bf9846
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-06-29 13:05:21 +02:00
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
92fbaae7b6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
011006c01b
Fix `RSpec/VerifiedDoubles` cop ( #25469 )
2023-06-22 14:55:22 +02:00
a62df37800
Reduce `Admin::Reports::Actions` spec db activity ( #25465 )
2023-06-22 14:53:13 +02:00
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
bb928d2f12
Speed-up on `StatusesController` spec ( #25549 )
2023-06-22 14:51:53 +02:00
397f0cd5e3
Speed-up on `BackupService` spec ( #25527 )
2023-06-22 11:53:28 +02:00
33f3a9c5f5
Migrate to request specs in `/api/v1/suggestions` ( #25540 )
2023-06-22 11:49:35 +02:00
4e0718dbf5
Add per-test timeouts to AutoStatusesCleanupScheduler tests ( #24841 )
2023-06-20 18:54:05 +02:00
5e5af7a0fe
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
88cdb02d89
Migrate to request specs in `/api/v1/admin/account_actions` ( #25514 )
2023-06-20 18:16:48 +02:00
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
4e861795a4
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
02ff7c5f3d
Re-allow title attribute in <abbr> ( #2254 )
...
* Re-allow title attribute in <abbr>
This was accidentally removed in a6363c3a2a
2023-06-19 18:01:35 +02:00
ecf17008e8
Fix user settings not getting validated ( #25508 )
2023-06-19 14:06:06 +01:00
d05a68a12e
Reduce `sleep` time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
ed134709aa
Add coverage for `UserMailer` methods ( #25484 )
2023-06-19 09:50:35 +02:00
72542ce967
Combine assertions in api/v1/notifications spec ( #25486 )
2023-06-19 09:05:42 +02:00
498e3231b6
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
2023-06-19 08:53:05 +02:00
a27a33ebde
Migrate to request specs in `/api/v1/tags` ( #25439 )
2023-06-19 08:51:40 +02:00
05adb637b7
Fix glitch-soc-only test being broken by refactor of the surrounding tests
2023-06-18 13:59:47 +02:00
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
2bd353cdf5
Remove Ruby GC config from spec helper ( #25455 )
2023-06-15 22:14:46 +01:00
dc9352a450
Migrate to request specs in `/api/v1/lists` ( #25443 )
2023-06-15 10:19:51 +02:00
eb1f69c2d4
Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop ( #24698 )
2023-06-14 16:44:37 +02:00
507a7e785a
Migrate to request specs in `/api/v1/domain_blocks` ( #25414 )
2023-06-14 16:08:53 +02:00
895e157b4d
Migrate to request specs in `/api/v1/follow_requests` ( #25411 )
2023-06-14 15:43:50 +02:00
4a994e5b50
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
2023-06-14 15:21:36 +02:00
b47741bb29
Reduce factory data created in spec/models/trends/statuses spec ( #25410 )
2023-06-14 09:57:06 +02:00
8c7da82c64
Speed improvement for `AccountsStatusesCleanupScheduler` spec ( #25406 )
2023-06-14 09:56:11 +02:00
943c99f780
Migrate to request specs in `/api/v1/apps/verify_credentials` ( #25404 )
2023-06-14 09:48:57 +02:00
51fdaefad4
Migrate to request specs in `/api/v1/apps` ( #25401 )
2023-06-14 09:48:48 +02:00
bc7346ab9c
Extract shared examples from api specs ( #25387 )
2023-06-14 09:34:01 +02:00
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
6273d4f5ee
Remove unused shared examples for scoped settings ( #25389 )
2023-06-13 14:59:04 +02:00
3fa5d7092e
Enable paperclip for account attachment examples ( #25381 )
2023-06-12 17:37:43 +02:00
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
a3c439de66
Reduce `RSpec/MultipleExpectations` cop max to 8 ( #25313 )
2023-06-10 18:38:22 +02:00
61a9504522
Add coverage for `CLI::Feeds` command ( #25319 )
2023-06-10 18:37:36 +02:00
4d21dbfa23
Add coverage for `CLI::Cache` command ( #25238 )
2023-06-10 18:36:09 +02:00
c31e2b3267
migrate test for `GET /api/v1/accounts/{account_id}` to request spec ( #25322 )
2023-06-10 18:33:24 +02:00
e2323fdcf6
Migrate to request specs in `/api/v1/admin/canonical_email_blocks` ( #25330 )
2023-06-10 18:33:02 +02:00
e359a19387
Migrate to request specs in `/api/v1/admin/ip_blocks` ( #25331 )
2023-06-10 18:32:46 +02:00
9c7f3acaf6
Migrate to request specs in `/api/v1/admin/domain_allows` ( #25333 )
2023-06-10 18:32:26 +02:00
70cc460c39
Migrate to request specs in `/api/v1/admin/domain_blocks` ( #25335 )
2023-06-10 18:32:07 +02:00
1a723c3425
Migrate to request specs in `/api/v1/admin/reports` ( #25355 )
2023-06-10 18:30:43 +02:00
23c3e09853
Use `build` where possible in fabricators ( #25360 )
2023-06-10 18:29:01 +02:00
Claire