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
d9caa6ed24
Migrate to request specs in `/api/v1/admin/accounts` ( #25563 )
2023-10-16 15:49:12 +02:00
f5bc1f20e2
Add coverage for `ExistingUsernameValidator` ( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-16 15:41:23 +02:00
f8afa0f614
Remove unused stub json ld context ( #25454 )
2023-10-16 15:38:27 +02:00
00e92b4038
Add coverage for `CLI::Statuses` command ( #25321 )
2023-10-16 15:37:22 +02:00
299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing ( #27423 )
2023-10-16 15:24:14 +02:00
82beeb2f7e
Migrate to request specs in `/api/v1/admin/trends/links` ( #25739 )
2023-10-13 16:23:16 +02:00
1b195ce115
Speed-up on `Rack::Attack` spec ( #25542 )
2023-10-13 16:14:23 +02:00
71cfdd7865
Fix duplicate tests ( #27395 )
2023-10-13 16:10:43 +02:00
cad8cc90ba
Speed-up on `MoveWorker` spec ( #25528 )
2023-10-13 15:50:46 +02:00
058f73a4f5
Add request specs for `/api/v1/reports` ( #25475 )
2023-10-13 15:30:40 +02:00
abf0e1fa39
Move `SignedReqestHelpers` rspec config to separate file ( #25453 )
2023-10-13 15:19:40 +02:00
bc6cd27d9e
Migrate to request specs in `/api/v1/followed_tags` ( #25472 )
2023-10-13 14:43:50 +02:00
fd9dea21d0
DB speedup in `API::` controller/request specs ( #25516 )
2023-10-13 14:42:09 +02:00
ecdb31d479
Migrate to request specs in `/api/v1/favourites` ( #25518 )
2023-10-13 14:19:12 +02:00
Claire