Code

Merge upstream - 4.2.11#59

Code

Merged

sneakers-the-rat merged 85 commits intodevNeuromatchAcademy/mastodon:devfrom merge-upstreamNeuromatchAcademy/mastodon:merge-upstreamCopy head branch name to clipboardAug 18, 2024

+3,560-3,844

Commits

Commits on Aug 10, 2024

• Improve legibility of account/hashtag autosuggest (mastodon#31361)

  vmstan

  authored
  caf0164

• Use material symbol for responsive menu toggle (mastodon#31362)

  mjankowski

  authored
  7519ef2

• Use material symbol for modal layout sign out link (mastodon#31363)

  mjankowski

  authored
  885e67b

• Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (mastodon#31292)

  ThisIsMissEm

  authored
  d308901

• Change “e-mail” to “email” in en.yml (mastodon#31317)

  beanieyi

  authored
  c39a8e1

• Fix typos in localisation from mastodon#31342 (mastodon#31369)

  renchap

  authored
  19dbc74

Commits on Aug 11, 2024

• New Crowdin Translations (automated) (mastodon#31351)

  Show description for 634ab0b
  

  github-actions[bot]

  and

  web-flow

  authored
  634ab0b

• New Crowdin Translations (automated) (mastodon#31377)

  Show description for 85152af
  

  github-actions[bot]

  and

  web-flow

  authored
  85152af

• Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream

  ClearlyClaire

  committed
  f441b28

• [Glitch] Improve legibility of account/hashtag autosuggest

  Show description for d6e340b
  

  vmstan

  authored and

  ClearlyClaire

  committed
  d6e340b

• [Glitch] Use material symbol for responsive menu toggle

  Show description for f299f8b
  

  mjankowski

  authored and

  ClearlyClaire

  committed
  f299f8b

• [Glitch] Move Follow Recommendations to Trends menu, rename to Recommendations & Trends

  Show description for 4515bf9
  

  ThisIsMissEm

  authored and

  ClearlyClaire

  committed
  4515bf9

• [Glitch] Fix typos in localisation from mastodon#31342

  Show description for dff29c8
  

  renchap

  authored and

  ClearlyClaire

  committed
  dff29c8

• Merge pull request glitch-soc#2810 from ClearlyClaire/glitch-soc/merge-upstream

  Show description for 9edf98c
  ClearlyClaire

  authored
  9edf98c

• Fix extra slash on notification policy request (mastodon#31378)

  TheEssem

  authored
  2e03dc9

• Revert Safari scrollbar changes (mastodon#31372)

  vmstan

  authored
  7365a13

• Fix account header avatar border (mastodon#31373)

  vmstan

  authored
  fbdda9f

Commits on Aug 12, 2024

• New Crowdin Translations (automated) (mastodon#31382)

  Show description for 3abb5c0
  

  github-actions[bot]

  and

  web-flow

  authored
  3abb5c0

• Add support for incoming <s> tag (mastodon#31375)

  mediaformat

  authored
  709dcd0

• Fix all streamed notification types being stored without filtering (mastodon#31384)

  ClearlyClaire

  authored
  a7b718c

• Add support for PKCE Extension in OmniAuth OIDC (mastodon#31131)

  ThisIsMissEm

  authored
  a1f723a

• Add missing Appeals link under Moderation in navigiation (mastodon#31071)

  ThisIsMissEm

  authored
  b42661b

• Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream

  Show description for 83480df
  ClearlyClaire

  committed
  83480df

• [Glitch] Fix extra slash on notification policy request

  Show description for 939af85
  

  TheEssem

  authored and

  ClearlyClaire

  committed
  939af85

• [Glitch] Revert Safari scrollbar changes

  Show description for 47df10e
  

  vmstan

  authored and

  ClearlyClaire

  committed
  47df10e

• [Glitch] Fix account header avatar border

  Show description for 61b2139
  

  vmstan

  authored and

  ClearlyClaire

  committed
  61b2139

• [Glitch] Fix all streamed notification types being stored without filtering

  Show description for 8426c20
  ClearlyClaire

  committed
  8426c20

• Merge pull request glitch-soc#2811 from ClearlyClaire/glitch-soc/merge-upstream

  Show description for 115fb0a
  ClearlyClaire

  authored
  115fb0a

Commits on Aug 13, 2024

• Add a border above the timeline hint for statuses with replies (mastodon#31387)

  renchap

  authored
  7e501c5

• Change avatars border radius (mastodon#31390)

  renchap

  authored
  f6d090f

• Finish email allow/deny list naming migration (mastodon#30530)

  mjankowski

  authored
  02df1b4

• New Crowdin Translations (automated) (mastodon#31394)

  Show description for 862e793
  

  github-actions[bot]

  and

  web-flow

  authored
  862e793

• Fix what was intended as a comment being interpreted as strings (mastodon#31398)

  ClearlyClaire

  authored
  2ed1307

• Fix modal border and padding inconsistencies (mastodon#31399)

  ClearlyClaire

  authored
  2b1670d

• Fix log out from user menu not working on Safari (mastodon#31402)

  renchap

  authored
  c3e1d86

• Fix styling of notification browser permission denied banner (mastodon#31406)

  ClearlyClaire

  authored
  12582d0

• Update docker/build-push-action action to v6 (mastodon#31381)

  Show description for 3a787d7
  renovate[bot]

  authored
  3a787d7

• Only run PR rebase needed check on non-fork repos (mastodon#31401)

  mjankowski

  authored
  2e85167

• Update dependency axios to v1.7.4 [SECURITY] (mastodon#31409)

  Show description for d767439
  renovate[bot]

  authored
  d767439

• Fix collapsable column borders in Safari and improve Safari scrollbars (mastodon#31389)

  vmstan

  authored
  7d4b602

• Update crowdin/github-action action to v2 (mastodon#31380)

  Show description for 6bd7da7
  renovate[bot]

  authored
  6bd7da7

Commits on Aug 14, 2024

• Fix notification screen crashing in rare cases where the status no longer exists (mastodon#31403)

  renchap

  authored
  0d85a79

• Update renovate config to fix mastodon#31379 (mastodon#31408)

  renchap

  authored
  feaf2f2

• New Crowdin Translations (automated) (mastodon#31411)

  Show description for 202f43c
  

  github-actions[bot]

  and

  web-flow

  authored
  202f43c

• Update dependency concurrent-ruby to v1.3.4 (mastodon#31412)

  Show description for ee6d3a8
  renovate[bot]

  authored
  ee6d3a8

• Update dependency cssnano to v7.0.5 (mastodon#31413)

  Show description for 3e3450b
  renovate[bot]

  authored
  3e3450b

• Change notification request acceptance to immediately delete the request (mastodon#31256)

  ClearlyClaire

  authored
  7996a95

• Update dependency @types/webpack to v4.41.39 (mastodon#31379)

  Show description for 8d96907
  renovate[bot]

  authored
  8d96907

• Don't push to cache buster if attachment path is nil (mastodon#31414)

  tribela

  authored
  95c11d3

• Update dependency oj to v3.16.5 (mastodon#31417)

  Show description for 4fdaf45
  renovate[bot]

  authored
  4fdaf45

• Update dependency libvips to v8.15.3 (mastodon#31416)

  Show description for 5b2750e
  renovate[bot]

  authored
  5b2750e

• Update dependency propshaft to v0.9.1 (mastodon#31421)

  Show description for b5ad4aa
  renovate[bot]

  authored
  b5ad4aa

• Update dependency postcss to v8.4.41 (mastodon#31420)

  Show description for b5e799d
  renovate[bot]

  authored
  b5e799d

• Update dependency postcss-preset-env to v10.0.1 (mastodon#31422)

  Show description for 5c91610
  renovate[bot]

  authored
  5c91610

• Update dependency wicg-inert to v3.1.3 (mastodon#31423)

  Show description for 3cc2968
  renovate[bot]

  authored
  3cc2968

• Fix removal of border from account listing (mastodon#31432)

  vmstan

  authored
  a1ddaa9

• Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream

  ClearlyClaire

  committed
  169b358

• [Glitch] Add a border above the timeline hint for statuses with replies

  Show description for d3db2d0
  

  renchap

  authored and

  ClearlyClaire

  committed
  d3db2d0

• [Glitch] Change avatars border radius

  Show description for 072f560
  

  renchap

  authored and

  ClearlyClaire

  committed
  072f560

• [Glitch] Fix modal border and padding inconsistencies

  Show description for a190efc
  ClearlyClaire

  committed
  a190efc

• Modify profile directory page image borders (mastodon#31391)

  vmstan

  authored
  9194197

• [Glitch] Fix log out from user menu not working on Safari

  Show description for 09929a4
  

  renchap

  authored and

  ClearlyClaire

  committed
  09929a4

• [Glitch] Fix styling of notification browser permission denied banner

  Show description for bf01299
  ClearlyClaire

  committed
  bf01299

• [Glitch] Fix collapsable column borders in Safari and improve Safari scrollbars

  Show description for cf96857
  

  vmstan

  authored and

  ClearlyClaire

  committed
  cf96857

• [Glitch] Fix notification screen crashing in rare cases where the status no longer exists

  Show description for 524fc85
  

  renchap

  authored and

  ClearlyClaire

  committed
  524fc85

• [Glitch] Fix removal of border from account listing

  Show description for 0dbdf6a
  

  vmstan

  authored and

  ClearlyClaire

  committed
  0dbdf6a

Commits on Aug 15, 2024

• Add the ability to ignore specific browser errors for a spec (mastodon#31436)

  renchap

  authored
  4545b8d

• Disable Chrome's search engine selection screen when running system specs (mastodon#31437)

  renchap

  authored
  5d04e29

• Merge pull request glitch-soc#2813 from ClearlyClaire/glitch-soc/merge-upstream

  Show description for d844537
  ClearlyClaire

  authored
  d844537

• Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream

  ClearlyClaire

  committed
  9f27758

• [Glitch] Modify profile directory page image borders

  Show description for 104c378
  

  vmstan

  authored and

  ClearlyClaire

  committed
  104c378

• Merge pull request glitch-soc#2814 from ClearlyClaire/glitch-soc/merge-upstream

  Show description for d6c80f6
  ClearlyClaire

  authored
  d6c80f6

Commits on Aug 16, 2024

• New Crowdin Translations (automated) (mastodon#31440)

  Show description for 9a24552
  

  github-actions[bot]

  and

  web-flow

  authored
  9a24552

• Update opentelemetry-ruby (non-major) (mastodon#31446)

  Show description for 78d08da
  renovate[bot]

  authored
  78d08da

• Update dependency sanitize to v6.1.3 (mastodon#31434)

  Show description for a0afbba
  renovate[bot]

  authored
  a0afbba

• Update dependency rspec-rails to v6.1.4 (mastodon#31442)

  Show description for 622628a
  renovate[bot]

  authored
  622628a

• Add a follow button & follower count on follow notifications (mastodon#31433)

  renchap

  authored
  32a78e5

• Update dependency test-prof to v1.4.0 (mastodon#31431)

  Show description for a2dfe5a
  renovate[bot]

  authored
  a2dfe5a

• Update dependency aws-sdk-s3 to v1.158.0 (mastodon#31447)

  Show description for 367d384
  renovate[bot]

  authored
  367d384

• Update changelog for v4.2.11 (mastodon#31452)

  ClearlyClaire

  authored
  1acbb62

• Fix incorrect activity matching in notification unfiltering worker (mastodon#31456)

  ClearlyClaire

  authored
  2d589a5

• Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream

  ClearlyClaire

  committed
  3ea0050

• [Glitch] Add a follow button & follower count on follow notifications

  Show description for ceeabff
  

  renchap

  authored and

  ClearlyClaire

  committed
  ceeabff

• Merge pull request glitch-soc#2815 from ClearlyClaire/glitch-soc/merge-upstream

  Show description for ec1ee7a
  ClearlyClaire

  authored
  ec1ee7a

Commits on Aug 18, 2024

• Merge branch 'glitch-soc-main' into merge-upstream

  sneakers-the-rat

  committed
  c2252b4