Commit Graph

2633 Commits (46128f25b62ed20fa4cae6cecb3172c5e4eb3afd)

Author SHA1 Message Date
Claire 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
Matt Jankowski cd37048439
Move followable_by coverage to suggestions () 2024-01-12 09:11:34 +00:00
Matt Jankowski 32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) () 2024-01-12 09:10:37 +00:00
Claire 15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Matt Jankowski 8b26614fa7
Combine results include check in spec/models/account () 2024-01-11 16:17:45 +00:00
Matt Jankowski 185c806d69
Extract spec helper for verifing to/from public AP collection namespace () 2024-01-11 16:17:21 +00:00
Matt Jankowski 2954279e9c
Remove double subject call in `api/v1/admin/trends/links/links` spec () 2024-01-11 15:13:11 +00:00
Matt Jankowski 95bd46d32a
Remove double subject call in `api/v1/admin/ip_blocks` spec () 2024-01-11 15:11:57 +00:00
Claire 23d8bd8ce1 Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01:00
Claire 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
Claire 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
Matt Jankowski 4e08a4892f
Move streaming `around` config into manager class () 2024-01-11 10:54:42 +00:00
Matt Jankowski 87097a227c
Clean up `settings/featured_tags/index` view () 2024-01-11 10:45:26 +00:00
Matt Jankowski 55802242ce
Refactor login activity partial (remove inline ruby) () 2024-01-11 10:36:27 +00:00
Matt Jankowski 0a7cff53c2
Add coverage for `Account.followable_by` scope () 2024-01-11 09:30:29 +00:00
Claire 47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Claire 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
Claire d7e13e2483
Fix potential redirection loop of streaming endpoint () 2024-01-10 15:05:46 +00:00
Matt Jankowski 8422b8ded0
Extract capybara config and improve headless_chrome driver config () 2024-01-10 14:54:11 +00:00
Matt Jankowski 543d7890fd
Use normalizes to prepare `User` values ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
Matt Jankowski 00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs () 2024-01-10 11:06:58 +00:00
Matt Jankowski 742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command () 2024-01-10 09:36:12 +00:00
Renaud Chaput 63d0b52cf3
Add a system spec for the `/share` endpoint () 2024-01-09 21:58:19 +00:00
Claire 10203bd57a
Clean up `Setting` model and remove dead code () 2024-01-09 14:01:53 +00:00
Jean Boussier 1781849884
Inline what remains of the rails-settings-cached gem ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
Matt Jankowski 5dc634796a
Misc coverage improvements re: sidekiq/inline () 2024-01-09 09:40:08 +00:00
Matt Jankowski e677eb164c
Remove unused `Announcement#time_range?` () 2024-01-08 15:26:30 +00:00
Matt Jankowski 3e43cd095c
Remove unused scope `Announcement.without_muted` () 2024-01-08 15:26:14 +00:00
Claire 157fc69954
Make request_pool_spec tests more robust () 2024-01-08 12:29:05 +00:00
Matt Jankowski aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value () 2024-01-08 11:20:59 +00:00
Matt Jankowski 832b92ac3e
Add attachment check to spec/service/suspend_account_service spec () 2024-01-08 11:05:10 +00:00
Matt Jankowski 12bed81187
Add validation specs to `CustomFilter` model () 2024-01-05 15:13:59 +00:00
Claire 6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs () 2024-01-05 11:07:57 +00:00
Claire 5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used () 2024-01-05 10:45:36 +00:00
Matt Jankowski 964a0ecf37
Add sleep statement to nudge thread scheduler in request pool spec () 2024-01-04 16:55:00 +00:00
Matt Jankowski f06c1f1552
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features () 2024-01-04 09:20:32 +00:00
Claire dfdadb92e8
Add ability to require approval when users sign up using specific email domains () 2024-01-04 09:07:05 +00:00
Claire 0b5783f3f1 Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream 2024-01-03 20:52:19 +01:00
Matt Jankowski f92d8c654d
Standardize on Thor methods in CLI classes () 2024-01-03 15:08:08 +00:00
Matt Jankowski 5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command () 2024-01-03 14:12:56 +00:00
Matt Jankowski 74a0d81e90
Add coverage for CLI `self-destruct` command ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-03 13:06:38 +00:00
Claire 9d9008666b Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
Claire 092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings () 2024-01-03 11:29:26 +00:00
Claire bd415af9a1
Change streaming API host to not be overridden to localhost in development mode () 2024-01-03 10:23:58 +00:00
Claire c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
Claire 19e14654cc
Reduce CSP configuration changes with upstream () 2023-12-27 09:54:05 +01:00
Claire a2624ff739
Convert signature verification specs to request specs () 2023-12-22 18:56:22 +00:00
Claire ea6c187fca Fix media attachment order of remote posts () 2023-12-22 18:45:36 +01:00
Matt Jankowski bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy () 2023-12-22 15:29:50 +00:00
Claire 2bf84b93d4
Fix media attachment order of remote posts () 2023-12-22 15:10:39 +00:00