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
c4eba4b0d9
Disable paperclip processing in specs ( #25359 )
2023-06-10 18:27:35 +02:00
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
Claire