Merge remote-tracking branch 'parent/main' into upstream-20231204

2023-12-04 12:04:52 +09:00 · 2023-12-04 12:04:52 +09:00 · 94c2396a34
commit 94c2396a34
parent 780426db31 456597dae5
179 changed files with 1036 additions and 775 deletions
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@ -113,6 +113,15 @@ const initialState = ImmutableMap({
      body: '',
    }),
  }),
+
+  dismissed_banners: ImmutableMap({
+    'public_timeline': false,
+    'community_timeline': false,
+    'home.explore_prompt': false,
+    'explore/links': false,
+    'explore/statuses': false,
+    'explore/tags': false,
+  }),
 });

 const defaultColumns = fromJS([