From 24ea6f851f0cc68c8b8bfdfed16dc2f723740f97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 09:59:13 +0200 Subject: [PATCH 1/6] Update dependency redis to v4.6.8 (#26630) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 403748ea9d..216e22f681 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1755,10 +1755,10 @@ resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71" integrity sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg== -"@redis/client@1.5.8": - version "1.5.8" - resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.8.tgz#a375ba7861825bd0d2dc512282b8bff7b98dbcb1" - integrity sha512-xzElwHIO6rBAqzPeVnCzgvrnBEcFL1P0w8P65VNLRkdVW8rOE58f52hdj0BDgmsdOm4f1EoXPZtH4Fh7M/qUpw== +"@redis/client@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.9.tgz#c4ee81bbfedb4f1d9c7c5e9859661b9388fb4021" + integrity sha512-SffgN+P1zdWJWSXBvJeynvEnmnZrYmtKSRW00xl8pOPFOMJjxRR9u0frSxJpPR6Y4V+k54blJjGW7FgxbTI7bQ== dependencies: cluster-key-slot "1.1.2" generic-pool "3.9.0" @@ -1779,10 +1779,10 @@ resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.3.tgz#b5a6837522ce9028267fe6f50762a8bcfd2e998b" integrity sha512-4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng== -"@redis/time-series@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.4.tgz#af85eb080f6934580e4d3b58046026b6c2b18717" - integrity sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng== +"@redis/time-series@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.5.tgz#a6d70ef7a0e71e083ea09b967df0a0ed742bc6ad" + integrity sha512-IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg== "@reduxjs/toolkit@^1.9.5": version "1.9.5" @@ -10202,16 +10202,16 @@ redent@^4.0.0: strip-indent "^4.0.0" redis@^4.6.5: - version "4.6.7" - resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.7.tgz#c73123ad0b572776223f172ec78185adb72a6b57" - integrity sha512-KrkuNJNpCwRm5vFJh0tteMxW8SaUzkm5fBH7eL5hd/D0fAkzvapxbfGPP/r+4JAXdQuX7nebsBkBqA2RHB7Usw== + version "4.6.8" + resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.8.tgz#54c5992e8a5ba512506fe9f53142cadc405547e7" + integrity sha512-S7qNkPUYrsofQ0ztWlTHSaK0Qqfl1y+WMIxrzeAGNG+9iUZB4HGeBgkHxE6uJJ6iXrkvLd1RVJ2nvu6H1sAzfQ== dependencies: "@redis/bloom" "1.2.0" - "@redis/client" "1.5.8" + "@redis/client" "1.5.9" "@redis/graph" "1.1.0" "@redis/json" "1.0.4" "@redis/search" "1.1.3" - "@redis/time-series" "1.0.4" + "@redis/time-series" "1.0.5" redux-immutable@^4.0.0: version "4.0.0" From 2dbbeedc94e14164e370e9be2c243bd6ff40e4a3 Mon Sep 17 00:00:00 2001 From: Jaehong Kang Date: Thu, 24 Aug 2023 20:07:27 +0900 Subject: [PATCH 2/6] Fix: Workaround to load MASTODON_VERSION_* in Docker. (#26591) Co-authored-by: Claire --- lib/mastodon/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index ee81eedaa5..e3347ca17c 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def flags - ENV.fetch('MASTODON_VERSION_FLAGS', '-beta2') + ENV['MASTODON_VERSION_FLAGS'].presence || '-beta2' end def suffix From b2ac93dd7379933dac63e60ea4260283a2f856f5 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 24 Aug 2023 14:06:27 +0200 Subject: [PATCH 3/6] Fix selecting domains to forward reports to not passing the information correctly (#26636) --- app/javascript/mastodon/features/ui/components/report_modal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx index 7ed5742588..fef1ced824 100644 --- a/app/javascript/mastodon/features/ui/components/report_modal.jsx +++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx @@ -62,7 +62,7 @@ class ReportModal extends ImmutablePureComponent { dispatch(submitReport({ account_id: accountId, status_ids: selectedStatusIds.toArray(), - selected_domains: selectedDomains.toArray(), + forward_to_domains: selectedDomains.toArray(), comment, forward: selectedDomains.size > 0, category, From e90649b0641910225e04e308e59297f8c91b96a8 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 24 Aug 2023 14:10:48 +0200 Subject: [PATCH 4/6] =?UTF-8?q?Fix=20clicking=20=E2=80=9CExplore=E2=80=9D?= =?UTF-8?q?=20or=20=E2=80=9CLive=20feeds=E2=80=9D=20column=20headers=20to?= =?UTF-8?q?=20scroll=20in=20advanced=20mode=20(#26633)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Plastikmensch --- app/javascript/mastodon/components/column.jsx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/components/column.jsx b/app/javascript/mastodon/components/column.jsx index 7e7eaa4115..d737bd347c 100644 --- a/app/javascript/mastodon/components/column.jsx +++ b/app/javascript/mastodon/components/column.jsx @@ -16,7 +16,19 @@ export default class Column extends PureComponent { }; scrollTop () { - const scrollable = this.props.bindToDocument ? document.scrollingElement : this.node.querySelector('.scrollable'); + let scrollable = null; + + if (this.props.bindToDocument) { + scrollable = document.scrollingElement; + } else { + scrollable = this.node.querySelector('.scrollable'); + + // Some columns have nested `.scrollable` containers, with the outer one + // being a wrapper while the actual scrollable content is deeper. + if (scrollable.classList.contains('scrollable--flex')) { + scrollable = scrollable?.querySelector('.scrollable') || scrollable; + } + } if (!scrollable) { return; From 163b004bb19343f02a6d901d0f5723aae82df57f Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 24 Aug 2023 14:43:00 +0200 Subject: [PATCH 5/6] Change admin e-mail notification settins to be their own settings group (#26596) --- .../preferences/notifications/show.html.haml | 13 +++++++++---- config/locales/en.yml | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml index cb1ad0886d..0913bda9ae 100644 --- a/app/views/settings/preferences/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@ -18,14 +18,19 @@ = ff.input :'notification_emails.reblog', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.reblog') = ff.input :'notification_emails.favourite', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.favourite') = ff.input :'notification_emails.mention', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.mention') - = ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports) - = ff.input :'notification_emails.appeal', as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.appeal') if current_user.can?(:manage_appeals) - = ff.input :'notification_emails.pending_account', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.pending_account') if current_user.can?(:manage_users) - = ff.input :'notification_emails.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_tag') if current_user.can?(:manage_taxonomies) .fields-group = ff.input :always_send_emails, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_always_send_emails'), hint: I18n.t('simple_form.hints.defaults.setting_always_send_emails') + - if current_user.can?(:manage_reports, :manage_appeals, :manage_users, :manage_taxonomies) + %h4= t 'notifications.administration_emails' + + .fields-group + = ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports) + = ff.input :'notification_emails.appeal', as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.appeal') if current_user.can?(:manage_appeals) + = ff.input :'notification_emails.pending_account', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.pending_account') if current_user.can?(:manage_users) + = ff.input :'notification_emails.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_tag') if current_user.can?(:manage_taxonomies) + %h4= t 'notifications.other_settings' .fields-group diff --git a/config/locales/en.yml b/config/locales/en.yml index 389b7aa661..71121bb2e2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1446,6 +1446,7 @@ en: update: subject: "%{name} edited a post" notifications: + administration_emails: Admin e-mail notifications email_events: Events for e-mail notifications email_events_hint: 'Select events that you want to receive notifications for:' other_settings: Other notifications settings From 96bcee66fba582666259d1d7785c3a7f2a72b8aa Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 24 Aug 2023 14:43:44 +0200 Subject: [PATCH 6/6] Change nightlies versioning from `v4.2.0+2023-08-23` to `v4.2.0-nightly.2023-08-23` (#26626) --- .github/workflows/build-nightly.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml index b700790d8a..5b34c1c3c6 100644 --- a/.github/workflows/build-nightly.yml +++ b/.github/workflows/build-nightly.yml @@ -16,7 +16,7 @@ jobs: env: TZ: Etc/UTC run: | - echo mastodon_version_suffix=nightly-$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT + echo mastodon_version_suffix=nightly.$(date +'%Y-%m-%d')>> $GITHUB_OUTPUT outputs: suffix: ${{ steps.version_vars.outputs.mastodon_version_suffix }} @@ -29,8 +29,8 @@ jobs: push_to_images: | tootsuite/mastodon ghcr.io/mastodon/mastodon - # The `+` is important here, result will be v4.1.2+nightly-2022-03-05 - version_suffix: +${{ needs.compute-suffix.outputs.suffix }} + # The `-` is important here, result will be v4.1.2-nightly.2022-03-05 + version_suffix: -${{ needs.compute-suffix.outputs.suffix }} labels: | org.opencontainers.image.description=Nightly build image used for testing purposes flavor: |