f87959ab50
Fix `RSpec/LetSetup` cop in api/v1/timelines/public spec ( #28972 )
2024-04-02 14:05:02 +00:00
34489591ec
Add `max_pinned_statuses` to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
81a04ac25c
Improve specs for severed relationships ( #29688 )
2024-03-22 16:25:36 +00:00
34f293475e
Fix results/query in `api/v1/featured_tags/suggestions` ( #29597 )
2024-03-22 15:08:27 +00:00
814a48517f
Add some more tests for notification policies ( #29698 )
2024-03-21 16:46:38 +00:00
7434c9c276
Fix the relationships controller spec, since it requires an extra model now ( #29671 )
2024-03-21 08:28:37 +00:00
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
2e91a9bd34
Add `include_pagination_headers` matcher to check `Link` header in api specs ( #29596 )
2024-03-15 10:17:45 +00:00
08b10cce52
Merge commit 'b43eaa4517107326c7e73b949cec759f841b4a30' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/accounts/credentials_controller_spec.rb`
Conflict due to glitch-soc's different note length handling.
Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
2024-03-13 20:12:58 +01:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
46e902f1f3
Merge `api/v1/accounts/credentials` controller spec into existing request spec ( #29006 )
2024-03-13 09:22:43 +00:00
71eecbfa1f
Move `api/v2/filters/*` to request spec ( #28956 )
2024-03-13 08:47:09 +00:00
3eaac3af73
Use `before_all` block to setup `requests/cache_spec` data ( #29437 )
2024-03-13 08:38:57 +00:00
96013cd576
Reduce `RSpec/ExampleLength` in CSP request spec ( #29104 )
2024-03-13 08:22:32 +00:00
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
24319836de
Convert request-based setup into factory setup in push/subscriptions request spec ( #29489 )
2024-03-11 15:46:25 +00:00
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
18945f62e0
Convert more API specs from controller->request style ( #29004 )
2024-03-01 16:24:45 +00:00
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
8156113d58
Use `response_vary_headers` method in requests/cache_spec ( #29411 )
2024-02-26 16:27:07 +00:00
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
73de36318e
Move `api/v1/timelines/direct` to request spec
2024-02-24 14:10:05 +01:00
9903e6beab
Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
`spec/controllers/api/v1/timelines` has been renamed, but we had an extra
spec here for a glitch-soc-only endpoint.
Kept glitch-soc's file unchanged (will port to a request spec later).
2024-02-24 14:05:26 +01:00
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
64f9939e39
Use `capture_emails` helper to improve email assertions in specs ( #29245 )
2024-02-19 15:57:47 +00:00
86627ea2e4
Add a missing thread example to the statuses spec ( #29278 )
2024-02-19 13:35:58 +00:00
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 21:49:45 +00:00
486e4bc7d3
Fix OmniAuth tests ( #29201 )
2024-02-14 16:07:28 +01:00
bbbbf00084
Fix OmniAuth tests ( #29201 )
2024-02-14 14:57:49 +00:00
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:16:07 +01:00
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
46142cdbdd
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 18:11:47 +00:00
7ee93b7431
Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
df7acdcee5
Update markers API spec for error case ( #29096 )
2024-02-06 12:47:04 +00:00
4fb7f611de
Return domain block digests from admin domain blocks API ( #29092 )
2024-02-06 12:38:14 +00:00
4cf07ed78c
Add missing action logging to `api/v1/admin/reports#update` ( #29044 )
2024-02-06 11:34:11 +00:00
ff8937aa2c
Move `api/v1/statuses/*` to request spec ( #28954 )
2024-01-26 17:45:54 +00:00
5119fbc9b7
Move `api/v1/admin/trends/links/preview_card_providers` to request spec ( #28951 )
2024-01-26 17:41:39 +00:00
b6baab447d
Move `api/v2/admin/accounts` to request spec ( #28950 )
2024-01-26 17:41:13 +00:00
7adcc0aae3
Move `api/v1/trends/*` to request specs ( #28949 )
2024-01-26 17:40:39 +00:00
0b0ca6f3b8
Move `api/v1/timelines/list` to request spec ( #28948 )
2024-01-26 17:40:15 +00:00
d791bca11b
Combine double subject in `well_known/webfinger` shared example ( #28944 )
2024-01-26 16:36:21 +00:00
09a3493fca
Combine double subject in `api/v1/media` shared example ( #28943 )
2024-01-26 16:35:49 +00:00
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
0b853678a4
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope ( #28796 )
2024-01-18 15:57:10 +00:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
e72676e83a
Improve `api/v1/markers#create` performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
2954279e9c
Remove double subject call in `api/v1/admin/trends/links/links` spec ( #28695 )
2024-01-11 15:13:11 +00:00
95bd46d32a
Remove double subject call in `api/v1/admin/ip_blocks` spec ( #28696 )
2024-01-11 15:11:57 +00:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )
2024-01-10 11:06:58 +00:00
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
2024-01-03 10:23:58 +00:00
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
2023-12-27 09:54:05 +01:00
a2624ff739
Convert signature verification specs to request specs ( #28443 )
2023-12-22 18:56:22 +00:00
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
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.
2023-12-21 19:31:12 +01:00
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
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.
2023-12-21 18:17:17 +01:00
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.
2023-12-20 22:16:50 +01:00
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
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.
2023-12-19 21:24:01 +01:00
6c00d5b0c4
Fix test failure caused by glitch-soc changes
2023-12-19 21:14:39 +01:00
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
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
2023-12-19 15:17:22 +00:00
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
c28976d89e
Handle negative offset param in `api/v2/search` ( #28282 )
2023-12-19 10:55:39 +00: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
1820bad646
Fix `Performance/StringIdentifierArgument` cop ( #28399 )
2023-12-18 10:26:09 +00: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
adbfd40a1b
Convert `api/v1/directories` controller spec to request spec ( #28356 )
2023-12-14 10:38:06 +00:00
28e1a7a394
Improve spec coverage for `models/announcement` class ( #28350 )
2023-12-14 10:29:10 +00:00
0e4233de9d
Controller spec to request spec: `api/v2/suggestions` ( #28297 )
2023-12-11 08:13:57 +00:00
0c64092500
Controller spec to request spec: `api/v1/accounts/search` ( #28299 )
2023-12-11 08:13:28 +00:00
16ede59d0a
Controller spec to request spec: `api/v1/featured_tags/suggestions` ( #28298 )
2023-12-11 08:00:41 +00:00
809506bdd4
Controller spec to request spec: `api/v1/accounts/pins` ( #28300 )
2023-12-11 07:59:40 +00:00
94cc707ab3
Controller spec to request spec: `api/v1/accounts/notes` ( #28301 )
2023-12-11 07:58:48 +00:00
Matt Jankowski
Renaud Chaput
Claire
Eugen Rochko
Wolfgang Fournès
Emelia Smith