577520b637
Replace deprecated `Sidekiq::Testing` block style ( #29097 )
2024-02-06 12:49:48 +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
66dda7c762
Fix already-invalid reports failing to resolve ( #29027 )
2024-02-06 09:35:27 +00:00
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
f4416e6b3a
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 11:15:23 +01:00
8b7b0ee598
Configure selenium to use Chrome version 120 ( #29038 )
2024-02-01 09:46:31 +00:00
86fbde7b46
Fix `Style/NumericLiterals` cop in ProfileStories support module ( #28971 )
2024-01-30 15:38:33 +00:00
f91acba70a
Combine repeated requests in account controller concern spec ( #28957 )
2024-01-30 15:32:20 +00:00
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
ff8937aa2c
Move `api/v1/statuses/*` to request spec ( #28954 )
2024-01-26 17:45:54 +00:00
44f6d285af
Combine repeated subject in ap fetch remote actor service spec ( #28953 )
2024-01-26 17:44:12 +00:00
239244e2ed
Combine repeated subject in ap fetch remote account service spec ( #28952 )
2024-01-26 17:43:08 +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
e519f113e8
Combine repeated subject in `cacheable response` shared example ( #28945 )
2024-01-26 16:37:05 +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
5fbdb2055b
Combine repeated `subject` in `cli/accounts` spec shared example ( #28942 )
2024-01-26 16:35:19 +00:00
1a30a517d6
Combine repeated subjects in link details extractor spec ( #28941 )
2024-01-26 16:31:07 +00:00
685eaa04d4
Combine double subject in admin/statuses controller shared example ( #28940 )
2024-01-26 16:30:30 +00:00
beb74fd71c
Combine double subjects in instance actors controller shared example ( #28939 )
2024-01-26 16:28:50 +00:00
beaef4b672
Combine double subjects in application controller shared example ( #28938 )
2024-01-26 16:23:12 +00:00
6d35a77c92
Combine repeated subjects in `models/user` spec ( #28937 )
2024-01-26 16:22:44 +00:00
2f8656334d
Combine double subjects in `admin/accounts` controller spec ( #28936 )
2024-01-26 16:21:31 +00:00
9cc1817bb4
Fix intmermittent failure in `api/v1/accounts/statuses` controller spec ( #28931 )
2024-01-26 14:10:26 +00:00
0e0a94f483
Handle CLI failure exit status at the top-level script ( #28322 )
2024-01-26 08:53:44 +00:00
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
6936e5aa69
Change design of compose form in web UI ( #28119 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 15:41:31 +00:00
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
2024-01-25 15:28:27 +00:00
2866106ec1
Reduce factory creation in `spec/models/account_statuses_cleanup_policy` ( #28361 )
2024-01-25 13:37:25 +00:00
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
2024-01-25 13:00:34 +00:00
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
2024-01-25 11:13:36 +00:00
0471a78055
Add tests for redirect confirmations ( #28903 )
2024-01-25 11:13:33 +00:00
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
a11a2fb052
Add error classes to api/base errors coverage ( #28864 )
2024-01-24 10:31:31 +00:00
b0207d7757
Add coverage for `Tag.recently_used` scope ( #28850 )
2024-01-23 09:10:11 +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
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
2024-01-22 13:55:43 +00:00
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +00:00
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections ( #28816 )
2024-01-19 12:43:10 +00:00
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
2024-01-19 12:19:49 +00:00
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00: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
3d82040b26
Reduced repeated setup in `UnallowDomainService` spec ( #28785 )
2024-01-18 10:11:10 +00:00
6c5a2d51bc
Reduced repeated setup in `PurgeDomainService` spec ( #28786 )
2024-01-18 10:07:49 +00:00
07e10e3747
Combine assertions about same setup in `Account#suspend!` spec ( #28787 )
2024-01-18 09:36:59 +00:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs ( #28764 )
2024-01-17 13:38:37 +00:00
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
dee561604b
Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream
2024-01-15 22:37:21 +01:00
b4c332104a
Use top-level `warn` in JS errors check ( #28745 )
2024-01-15 21:26:11 +00:00
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
2024-01-15 18:04:58 +00:00
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
2024-01-15 13:46:47 +00:00
e72676e83a
Improve `api/v1/markers#create` performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author ( #18482 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-12 15:58:28 +00:00
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
2024-01-12 09:21:00 +00:00
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
df9e220364
Add JS console errors check ( #28682 )
2024-01-12 09:12:31 +00:00
cd37048439
Move followable_by coverage to suggestions ( #28697 )
2024-01-12 09:11:34 +00:00
32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) ( #28698 )
2024-01-12 09:10:37 +00:00
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
8b26614fa7
Combine results include check in spec/models/account ( #28471 )
2024-01-11 16:17:45 +00:00
185c806d69
Extract spec helper for verifing to/from public AP collection namespace ( #28472 )
2024-01-11 16:17:21 +00: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
63acdebc5d
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because of a code style fix, while some changed lines are
absent from glitch-soc.
Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
4e08a4892f
Move streaming `around` config into manager class ( #28684 )
2024-01-11 10:54:42 +00:00
87097a227c
Clean up `settings/featured_tags/index` view ( #28688 )
2024-01-11 10:45:26 +00:00
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
0a7cff53c2
Add coverage for `Account.followable_by` scope ( #28689 )
2024-01-11 09:30:29 +00:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
8422b8ded0
Extract capybara config and improve headless_chrome driver config ( #28681 )
2024-01-10 14:54:11 +00:00
543d7890fd
Use normalizes to prepare `User` values ( #28650 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )
2024-01-10 11:06:58 +00:00
742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command ( #28669 )
2024-01-10 09:36:12 +00:00
63d0b52cf3
Add a system spec for the `/share` endpoint ( #28672 )
2024-01-09 21:58:19 +00:00
10203bd57a
Clean up `Setting` model and remove dead code ( #28661 )
2024-01-09 14:01:53 +00:00
1781849884
Inline what remains of the rails-settings-cached gem ( #28618 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
5dc634796a
Misc coverage improvements re: sidekiq/inline ( #28651 )
2024-01-09 09:40:08 +00:00
e677eb164c
Remove unused `Announcement#time_range?` ( #28648 )
2024-01-08 15:26:30 +00:00
3e43cd095c
Remove unused scope `Announcement.without_muted` ( #28645 )
2024-01-08 15:26:14 +00:00
157fc69954
Make request_pool_spec tests more robust ( #28610 )
2024-01-08 12:29:05 +00:00
aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value ( #28624 )
2024-01-08 11:20:59 +00:00
832b92ac3e
Add attachment check to spec/service/suspend_account_service spec ( #28619 )
2024-01-08 11:05:10 +00:00
12bed81187
Add validation specs to `CustomFilter` model ( #28600 )
2024-01-05 15:13:59 +00:00
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
964a0ecf37
Add sleep statement to nudge thread scheduler in request pool spec ( #28596 )
2024-01-04 16:55:00 +00:00
f06c1f1552
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features ( #28576 )
2024-01-04 09:20:32 +00:00
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command ( #28267 )
2024-01-03 14:12:56 +00:00
74a0d81e90
Add coverage for CLI `self-destruct` command ( #28565 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-03 13:06:38 +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
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
2023-12-22 15:29:50 +00:00
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00:00
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
2023-12-22 12:57:29 +00:00
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
2023-12-22 08:32:27 +00:00
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
2023-12-22 08:03:59 +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
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
2023-12-21 14:23:53 +00:00
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
2023-12-21 11:20:12 +00:00
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
2023-12-21 11:19:56 +00:00
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
2023-12-21 10:10:18 +00:00
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
2023-12-21 09:28:41 +00:00
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
2023-12-21 09:18:38 +00:00
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
2023-12-21 08:51:03 +00: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
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.
2023-12-20 22:05:31 +01:00
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
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.
2023-12-20 20:10:45 +01:00
961d65aba6
Add coverage to CLI Maintenance for duplicate users on `confirmation_token` and `reset_password_token` values ( #28434 )
2023-12-20 08:54:04 +00: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
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
6fed0fcbaa
Remove unneeded settings cleanup from specs ( #28425 )
2023-12-19 15:17:22 +00:00
c7c727994a
Add spec for `CLI::Maintenance#fix_duplicates` ( #28326 )
2023-12-19 13:10:33 +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
476d1237d4
Typo fix in json ld helper spec ( #28417 )
2023-12-18 16:47:22 +00:00
7d9b209fe8
Fix call to inefficient `delete_matched` cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
af366f65ee
Add spec coverage for `models/form/custom_emoji_batch` class ( #28388 )
2023-12-18 12:41:37 +00: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
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
b1dec09d20
Fix `Style/InverseMethods` cop ( #28377 )
2023-12-15 15:52:00 +00:00
db897eaa5a
Unwind `map` on single-item array in `spec/services/delete_account_service` spec ( #28358 )
2023-12-14 14:07:54 +00:00
ef9797a395
Un-nest contexts in `settings/2fa/webauthn` spec ( #28359 )
2023-12-14 10:46:43 +00: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
8a3d8c6c14
Remove the `stub_stdout` wrapper around CLI specs ( #28340 )
2023-12-13 10:14:19 +00:00
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
2023-12-12 10:39:21 +00:00
b5a1013ae3
Combine `CLI::...` spec example subjects ( #28285 )
2023-12-11 10:23:45 +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
e544b6df42
Controller spec to request spec: `api/v1/accounts/lookup` ( #28302 )
2023-12-11 07:57:33 +00:00
a968898dc7
Controller spec to request spec: `api/v1/accounts/lists` ( #28303 )
2023-12-11 07:56:47 +00:00
8f94502e7d
Controller spec to request spec: `api/v1/accounts/identify_proofs` ( #28304 )
2023-12-11 07:56:13 +00:00
78347d2556
Controller spec to request spec: `api/v1/accounts/familiar_followers` ( #28305 )
2023-12-11 07:55:45 +00:00
11d2bd9716
Fix intermittent failure from unspecified order in `api/v1/accounts/relationships` spec ( #28306 )
2023-12-11 07:55:07 +00: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
a3cbb4b2f1
Add spec for `CLI::Search#deploy` command ( #28272 )
2023-12-08 13:54:20 +00:00
8de86eabbf
Add spec for `CLI::Domains#crawl` command ( #28271 )
2023-12-08 09:51:57 +00:00
7e514688b3
Convert `api/v2/search` controller spec to request spec ( #28269 )
2023-12-08 09:27:33 +00:00
8d8ae05a18
Add spec coverage for `CLI::Media#lookup` command ( #28266 )
2023-12-07 15:27:41 +00:00
ad34d33bfd
Formalize some patterns in cli specs ( #28255 )
2023-12-07 13:49:14 +00:00
0b4a3a0437
Remove remaining `without_partial_double_verification` usage ( #28127 )
2023-12-07 12:15:50 +00:00
658ad7a6ca
Fix flaky tests related to file creation ( #28248 )
2023-12-06 22:22:25 +00:00
0e8ba19113
Add spec coverage for `CLI::Emoji` class ( #28182 )
2023-12-06 08:52:30 +00:00
ed7b5c091b
Remove double subject call in `services/delete_account_service` spec ( #28212 )
2023-12-06 08:51:09 +00:00
be6bb1a10d
Remove double subject call in `services/suspend_account_service` spec ( #28213 )
2023-12-06 08:45:19 +00:00
5517df61de
Remove double subject call in `services/activitypub/process_account_service` spec ( #28214 )
2023-12-06 08:44:51 +00:00
faffd81976
Remove double subject call in `services/unsuspend_account_service` spec ( #28215 )
2023-12-06 08:44:07 +00:00
89a8e6e622
Remove 2x double subject call in `models/form/account_batch` spec ( #28209 )
2023-12-04 15:41:43 +00:00
71e5a16eba
Remove triple subject call in `api/v1/lists` spec ( #28210 )
2023-12-04 15:28:19 +00:00
cca19f5fbb
Use the `Admin::ActionLog` fabricator in admin/action_logs spec ( #28194 )
2023-12-04 12:56:28 +00:00
b3b009e6aa
Add spec coverage for `CLI::EmailDomainBlocks` commands ( #28181 )
2023-12-04 09:44:54 +00:00
9603198982
Add spec coverage for `CLI::Domains#purge` command ( #28179 )
2023-12-04 09:09:05 +00:00
1bf2230fd1
Add spec coverage for `CLI::Upgrade#storage_schema` command ( #28180 )
2023-12-04 09:08:47 +00:00
19ad51253d
Prevent triple-subject run in admin/domain_blocks spec ( #28195 )
2023-12-04 09:02:40 +00:00
d848d8d87c
Add helper methods for domains allow and export blocks files ( #28196 )
2023-12-04 08:52:21 +00:00
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
2023-12-01 15:53:35 +00:00
aa8563d43d
Fix `Style/SuperWithArgsParentheses` cop ( #28174 )
2023-12-01 15:53:15 +00:00
1564799952
Add spec coverage for media CLI `refresh` command ( #28166 )
2023-12-01 14:18:45 +00:00
7753e5f715
Add shared example for CLI command specs ( #28165 )
2023-12-01 12:00:34 +00:00
92fa9b109f
Add spec coverage for media CLI usage command ( #28167 )
2023-12-01 11:56:47 +00:00
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
b751078fcd
Eliminate double subject call in admin/ controller specs ( #28158 )
2023-12-01 10:38:15 +00:00
1f1c75bba5
File cleanup/organization in `controllers/concerns` ( #27846 )
2023-11-30 14:39:41 +00:00
0530ce5e95
Convert accounts controller spec to request spec ( #28126 )
2023-11-30 14:28:05 +00:00
e7c340a634
Spec coverage for missing `q` param and error conditions in `api/v2/search` controller ( #27842 )
2023-11-30 13:59:46 +00:00
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
2023-11-30 13:47:01 +00:00
bb0efe16e6
Remove `default_scope` from `MediaAttachment` class ( #28043 )
2023-11-30 13:30:35 +00:00
ce78a9c9ac
Clean up `two_factor_authentication/confirmations` controller spec ( #28128 )
2023-11-30 11:44:42 +00:00
e6fd9a59e6
Fix FamiliarFollowersController test response comparison ( #28121 )
...
Co-authored-by: Filippo Giunchedi <filippo@debian.org>
2023-11-30 10:58:40 +00:00
e48ecd2929
Remove `default_scope` from `Admin::ActionLog` ( #28026 )
2023-11-29 10:39:59 +00:00
291dc04e67
Remove un-needed `action` and `template` options to `render` in controllers ( #28022 )
2023-11-29 10:38:05 +00:00
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-29 08:34:36 +00:00
6b46bf9953
Handle scenario when webfinger response `subject` is missing host value ( #28088 )
2023-11-28 18:37:54 +00: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
19baf22683
Add missing email previews for `AdminMailer` ( #28044 )
2023-11-23 12:32:50 +00:00
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
2023-11-23 10:00:09 +00: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
12a5b7391d
Add spec for well known change password endpoint ( #27856 )
2023-11-15 13:21:18 +00:00
fe58ac8d9f
Improve spec coverage for `api/web/push_subscriptions` controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 13:14:51 +00:00
7c72944661
Use `Lcov` simplecov formatter on CI and `HTML` elsewhere ( #27859 )
2023-11-15 09:11:02 +00:00
36d7d1781f
Add CodeCov for Ruby coverage reports ( #23868 )
2023-11-14 16:53:38 +00:00
b2c5b20ef2
Fix `RSpec/AnyInstance` cop ( #27810 )
2023-11-14 14:52:59 +00:00
d562fb8459
Specs for minimal CSP policy in `Api::` controllers ( #27845 )
2023-11-14 14:34:30 +00:00
5e2ecc736d
Remove double `subject` in api/v1/accounts/relationships spec ( #27839 )
2023-11-14 10:29:33 +00:00
b7807f3d84
Use `normalizes` to prepare `Webhook#events` value ( #27605 )
2023-11-13 22:47:44 +00:00
49ba5a9f94
Use `hash_including` to check `AccountFilter` setup in `admin/accounts` controller spec ( #27838 )
2023-11-13 16:01:24 +00:00
a36b59be8a
Spec coverage for `api/v1/trends` controllers ( #27837 )
2023-11-13 14:32:36 +00:00
07a4059901
Add support for invite codes in the registration API ( #27805 )
2023-11-13 13:27:00 +00:00
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
9dc3ce878b
Speed-up in `Settings::` controllers specs ( #27808 )
2023-11-10 15:13:42 +00:00
e79bf1b1e7
Minor speed improvement on `controllers/accounts` spec ( #27679 )
2023-11-09 16:21:11 +00:00
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
2023-11-09 13:05:57 +00:00
63c9102f8a
Fix `RSpec/MessageChain` cop ( #27776 )
2023-11-09 12:57:23 +00:00
c9204b792c
Fix `Rails/I18nLocaleTexts` cop ( #27779 )
2023-11-09 09:46:39 +00:00
69d00e2721
Fix `RSpec/InstanceVariable` cop ( #27766 )
2023-11-08 15:42:30 +00:00
4329616c53
Ignore block result of `send` method and remove `rubocop:disable` in deepl spec ( #27741 )
2023-11-08 14:43:17 +00:00
b05575e242
Move RSpec config for streaming/search managers to be near classes ( #27761 )
2023-11-08 13:04:17 +00:00
ce91d14d48
Fix `Style/WordArray` cop ( #27770 )
2023-11-08 13:03:44 +00:00
c03bd2a238
Don't stub SUT in `FollowLimitValidator` spec ( #27760 )
2023-11-08 12:49:46 +00:00
9b7b4d748f
Simplify request cache spec shared examples ( #27673 )
2023-11-08 12:37:29 +00:00
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
2023-11-08 10:31:05 +00:00
e545978076
Use framework helpers instead of i-vars in controller specs ( #27767 )
2023-11-08 08:17:43 +00:00
ee57bb4b44
Account statuses filter spec speedup ( #27674 )
2023-11-07 15:47:01 +00:00
ae7c20b00c
Move search and streaming spec manager classes to separate support files ( #27727 )
2023-11-07 15:25:49 +00:00
370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command ( #25252 )
2023-11-07 15:21:58 +00:00
1d51e10510
Consolidate JSON parsing in serializers specs ( #27693 )
2023-11-07 15:20:24 +00:00
a688a9ed20
Use strings instead of numeric literals and remove `rubocop:disable` in cache spec ( #27742 )
2023-11-07 15:20:00 +00:00
dc0bf87090
Remove unused before block from settings/branding spec ( #27759 )
2023-11-07 15:19:17 +00:00
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
2023-11-07 13:01:09 +00:00
49e2772064
Fix `RSpec/MessageSpies` cop ( #27751 )
2023-11-07 09:46:28 +00:00
2862ad701f
Stub controller methods and remove `rubocop:disable` in captcha feature spec ( #27743 )
2023-11-07 09:15:30 +00:00
cfa14ec6d1
Fix `Lint/EmptyBlock` cop ( #27748 )
2023-11-07 09:11:04 +00:00
b06284c572
Fix `RSpec/HookArgument` cop ( #27747 )
2023-11-07 09:10:36 +00:00
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
2023-11-06 16:25:40 +00:00
fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )
2023-11-06 15:51:52 +00:00
949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )
2023-11-06 14:28:20 +00:00
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
2023-11-06 09:28:14 +00:00
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
2023-11-04 21:52:56 +00:00
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
2023-11-02 14:58:37 +00:00
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
2023-10-31 09:40:30 +00:00
beee9ea991
Fix `RSpec/LetSetup` cop in spec/controllers/admin area ( #27619 )
2023-10-31 08:22:19 +00:00
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
2e6bf60f15
Use `deliveries.size` in mailer-related examples in controller specs ( #27589 )
2023-10-27 15:33:52 +00:00
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
2023-10-27 14:04:51 +00:00
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
2023-10-27 09:57:16 +00:00
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
2023-10-27 08:35:21 +00:00
8f998cd96a
Handle featured collections without items ( #27581 )
2023-10-27 02:36:22 +00:00
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
2023-10-25 21:33:44 +00:00
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
2023-10-24 19:05:18 +02:00
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
26d2a2a0cc
Migrate to request specs in `/api/v1/media` ( #25543 )
2023-10-23 15:46:21 +00:00
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
2023-10-20 15:32:16 +02:00
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
2023-10-20 10:45:46 +02:00
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
2023-10-19 16:55:06 +02:00
7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` ( #25284 )
2023-10-19 16:11:15 +02:00
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
2023-10-18 14:26:22 +02:00
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` ( #25204 )
2023-10-18 10:20:50 +02:00
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
2023-10-18 10:18:34 +02:00
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
5ef26d8fd5
Add RSpec GitHub annotations gem ( #24040 )
2023-10-17 18:28:09 +02:00
71447ab19f
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area ( #27445 )
2023-10-17 16:57:19 +02:00
2528a0721f
Update `rubocop-capybara` to version 2.19.0 ( #26982 )
2023-10-17 16:10:50 +02:00
b34a2b1b33
Fix errors in CLI specs ( #27399 )
2023-10-17 15:30:12 +02:00
c4bddc9855
Add spec for poll model ( #23399 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-17 14:56:24 +02:00
12bb7be8b5
Spec speed ups on `AccountsController` spec ( #25391 )
2023-10-17 13:32:10 +02:00
d54fec24e5
Add coverage for `CLI::PreviewCards#remove` command ( #27441 )
2023-10-17 13:06:16 +02:00
19900f647e
Add coverage for `UnreservedUsernameValidator` ( #25590 )
2023-10-17 13:05:28 +02:00
fc9ab61448
Expand spec coverage of `CLI::Media` ( #27437 )
2023-10-16 18:20:58 +02:00
893b2f33fd
Extract shared example for cacheable response in specs ( #25388 )
2023-10-16 17:52:06 +02:00
708299bb0d
Misc coverage improvements for `Admin::` and `Settings::` controllers ( #25346 )
2023-10-16 17:20:28 +02:00
e0ed0f8c7c
Migrate to request specs in `/api/v1/notifications` ( #25553 )
2023-10-16 17:15:24 +02:00
cafdaec6cf
Migrate to request specs in `/api/v1/lists/:id/accounts` ( #25468 )
2023-10-16 16:03:48 +02:00
8e6116503d
Migrate to request specs in `/api/v1/blocks` ( #25517 )
2023-10-16 16:03:35 +02:00
Matt Jankowski
Emelia Smith
Claire
Eugen Rochko
MitarashiDango
Renaud Chaput
Jean Boussier
Filippo Giunchedi
Kevin Bongart
Nick Schonning
Jeong Arm
Daniel M Brasil
Victor Lee