Commit Graph

18529 Commits (c1bd8248c4d3c1dad73773add1ee87f8c78e6499)

Author SHA1 Message Date
Claire f2dbbcdec5 Fix CSP headers when S3_ALIAS_HOST includes a path component (#25273) 2023-06-05 17:35:05 +02:00
Claire 21f904b344 Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279) 2023-06-05 17:32:24 +02:00
Matt Jankowski c74040abfa Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes (#25277) 2023-06-05 16:52:33 +02:00
Daniel M Brasil a274d79f58 Add test coverage for `Mastodon::CLI::Accounts#cull` (#25250) 2023-06-05 14:51:25 +02:00
S.H 94f9888d57 Fix not shown announcements in hometimeline. (#25251) 2023-06-05 14:49:51 +02:00
Nick Schonning 5846344977 Update kt-paperclip 7.2 from sha (#25274) 2023-06-05 14:40:35 +02:00
dependabot[bot] d6feba366b [Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
Port 9ba1135000 to glitch-soc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 13:31:45 +02:00
Claire cd107b054d [Glitch] Fix `null` signUp URL in various places
Port 75ebb60ef6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 13:28:22 +02:00
y.takahashi e7cb0dc83b [Glitch] Handle Surrogate Pairs in truncate()
Port 5c744a5d7d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 13:28:02 +02:00
Claire bda5be1406 Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire 4c2503d36c Fix design issues with recent react-intl upgrade (#25272) 2023-06-05 09:52:36 +02:00
Darius Kazemi 6debddcf89 Add exclusive lists (#22048)
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
Matt Jankowski a04157e69f Add `allow_other_host: true` to backups controller (#25266) 2023-06-05 08:22:03 +02:00
Matt Jankowski 9c86b994db Add coverage for CLI::CanonicalEmailBlocks command (#25239) 2023-06-05 08:20:18 +02:00
Daniel M Brasil 427661c9eb Add test coverage for `Mastodon::CLI::Accounts#merge` (#25199) 2023-06-05 08:16:12 +02:00
Matt Jankowski c671e23d28 Remove unmaintained `nsa` gem (#25265) 2023-06-05 01:57:05 +02:00
Eugen Rochko c4426198c3 Change "Follow 7 people" to "Find at least 7 people to follow" in web UI (#24954) 2023-06-05 01:42:17 +02:00
Claire 85e0bd73cf Fix closeModal invocation (#2239)
Fixes #2238

Some call sites where missed in 62f386d44e
2023-06-04 22:05:45 +02:00
Nick Schonning 749c9434d1 Cleanup old translationRunner (#25241) 2023-06-02 20:01:36 +02:00
Jed Fox e24a587f84 Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
Claire c7a8838bd7 Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
Claire 1c298d97c5 Change wording of “Content cache retention period” setting to highlight destructive implications (#23261) 2023-06-02 18:09:08 +02:00
Jed Fox 2d2750c6a9 Fix spacing of middle dots in the detailed status meta section (#25247) 2023-06-02 15:40:23 +02:00
Renaud Chaput 29851c83bd Fix `/share` and cleanup and reorganize frontend locale loading (#25240) 2023-06-02 15:00:27 +02:00
Claire a82f036309 Fix overflow behavior of account rows (#25131) 2023-06-01 14:47:55 +02:00
Claire 572086c8ad Add support for importing lists (#25203) 2023-06-01 14:47:31 +02:00
dependabot[bot] 821f68fcd8 Bump sidekiq-scheduler from 5.0.2 to 5.0.3 (#25228)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 14:39:43 +02:00
Matt Jankowski a32c2b694f Extract verify options method in search cli (#25121) 2023-06-01 14:35:05 +02:00
Nick Schonning f30caffb80 Update yarn.lock for audit issues (#25152) 2023-06-01 14:32:34 +02:00
Matt Jankowski 13dffb206b Add CLI area progress bar helper (#25208) 2023-06-01 14:31:24 +02:00
Daniel M Brasil 269812919e Add test coverage for `Mastodon::CLI::Accounts#rotate` (#25212) 2023-06-01 14:29:29 +02:00
dependabot[bot] 11fde72be9 Bump puma from 6.2.2 to 6.3.0 (#25229)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 14:27:58 +02:00
S.H 4e28b89f51 Fix using Date.now() instead of intl.now() (#25234) 2023-06-01 13:46:19 +02:00
Renaud Chaput f681f81cbf Allow carets in URL search params (#25216) 2023-06-01 12:14:49 +02:00
Claire bf3227b5dd Bump workbox from 6.6.1 to 7.0.0 (#25232) 2023-06-01 10:24:11 +02:00
dependabot[bot] 0b46611cf7 Bump rspec-rails from 6.0.2 to 6.0.3 (#25223)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 10:01:21 +02:00
Daniel M Brasil 6f0217d056 Add test coverage for `Mastodon::CLI::Accounts#refresh` (#25196) 2023-06-01 10:01:09 +02:00
Claire ac0ecfa421 Add missing primary keys to `accounts_tags` and `statuses_tags` (#25210) 2023-06-01 09:49:06 +02:00
Matt Jankowski a6f0456756 Remove unused #hash_to_object method in SettingsHelper (#25213) 2023-06-01 09:47:05 +02:00
dependabot[bot] 78d2db7a84 Bump aws-sdk-s3 from 1.122.0 to 1.123.0 (#25230)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 09:45:10 +02:00
dependabot[bot] dade894b82 Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 (#25222)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 09:41:44 +02:00
dependabot[bot] 083e8715ef Bump @types/jest from 29.5.1 to 29.5.2 (#25220)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 09:41:03 +02:00
Claire 8ee98cfd2b Add a confirmation screen when suspending a domain (#25144) 2023-06-01 09:37:38 +02:00
Claire 135bd452c7 Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-06-01 09:25:26 +02:00
Claire 52b4e33d7f Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component (#25018) 2023-06-01 09:23:28 +02:00
Claire 3d550b5712 Fix multiple N+1s in ConversationsController (#25134) 2023-06-01 02:41:51 +02:00
Renaud Chaput 40e756f291 Fix prev/next buttons color in media viewer (#25231) 2023-06-01 02:25:38 +02:00
Nick Schonning 3b664f9b19 Add fix/lint helper dev targets (#23561) 2023-06-01 02:25:13 +02:00
Christian Schmidt 971eafc709 Translate CW, poll options and media descriptions (#24175)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
Renaud Chaput 76960f128a Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00