From feaa152fcd8385602c9b78d73f4a7622c2f0eb12 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 28 Nov 2022 16:42:04 +0100
Subject: [PATCH 1/2] Fix expanded statuses not always being scrolled into view
 (#21797)

---
 app/javascript/mastodon/features/status/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index cb67944c94..8a63cced20 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -222,6 +222,10 @@ class Status extends ImmutablePureComponent {
       this.props.dispatch(fetchStatus(nextProps.params.statusId));
     }
 
+    if (nextProps.params.statusId && nextProps.ancestorsIds.size > this.props.ancestorsIds.size) {
+      this._scrolledIntoView = false;
+    }
+
     if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
       this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
     }

From 214029963847c4b6e562ed94520968845a5ae4ff Mon Sep 17 00:00:00 2001
From: mhkhung <mhkhung@gmail.com>
Date: Wed, 30 Nov 2022 03:56:27 -0500
Subject: [PATCH 2/2] 3.0.5 version of cimg/ruby:3.0-node upgraded to node 18
 (#21873)

Node 18 caused build to fail
---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a60ae6841..bddfd2d27a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,7 +68,9 @@ jobs:
           cache-version: v1
           pkg-manager: yarn
       - run:
-          command: ./bin/rails assets:precompile
+          command: |
+            export NODE_OPTIONS=--openssl-legacy-provider
+            ./bin/rails assets:precompile
           name: Precompile assets
       - persist_to_workspace:
           paths: