From 08e511cecb935962fd51e44b4f52093df8742699 Mon Sep 17 00:00:00 2001 From: Essem Date: Tue, 6 Feb 2024 13:22:42 -0600 Subject: [PATCH 01/13] Fix doodle modal icons (#2597) --- .../glitch/features/ui/components/doodle_modal.jsx | 12 ++++++++---- .../material-icons/400-24px/colors-fill.svg | 1 + app/javascript/material-icons/400-24px/colors.svg | 1 + app/javascript/material-icons/400-24px/undo-fill.svg | 1 + app/javascript/material-icons/400-24px/undo.svg | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 app/javascript/material-icons/400-24px/colors-fill.svg create mode 100644 app/javascript/material-icons/400-24px/colors.svg create mode 100644 app/javascript/material-icons/400-24px/undo-fill.svg create mode 100644 app/javascript/material-icons/400-24px/undo.svg diff --git a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx index d682ef161d..ba593fc9fc 100644 --- a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx @@ -9,6 +9,10 @@ import { connect } from 'react-redux'; import Atrament from 'atrament'; // the doodling library import { debounce, mapValues } from 'lodash'; +import ColorsIcon from '@/material-icons/400-24px/colors.svg?react'; +import DeleteIcon from '@/material-icons/400-24px/delete.svg?react'; +import EditIcon from '@/material-icons/400-24px/edit.svg?react'; +import UndoIcon from '@/material-icons/400-24px/undo.svg?react'; import { doodleSet, uploadCompose } from 'flavours/glitch/actions/compose'; import { Button } from 'flavours/glitch/components/button'; import { IconButton } from 'flavours/glitch/components/icon_button'; @@ -584,10 +588,10 @@ class DoodleModal extends ImmutablePureComponent {
- - - - + + + +
{ diff --git a/app/javascript/material-icons/400-24px/colors-fill.svg b/app/javascript/material-icons/400-24px/colors-fill.svg new file mode 100644 index 0000000000..5e4b534fe2 --- /dev/null +++ b/app/javascript/material-icons/400-24px/colors-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/colors.svg b/app/javascript/material-icons/400-24px/colors.svg new file mode 100644 index 0000000000..5e4b534fe2 --- /dev/null +++ b/app/javascript/material-icons/400-24px/colors.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/undo-fill.svg b/app/javascript/material-icons/400-24px/undo-fill.svg new file mode 100644 index 0000000000..c451e1adc7 --- /dev/null +++ b/app/javascript/material-icons/400-24px/undo-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/javascript/material-icons/400-24px/undo.svg b/app/javascript/material-icons/400-24px/undo.svg new file mode 100644 index 0000000000..c451e1adc7 --- /dev/null +++ b/app/javascript/material-icons/400-24px/undo.svg @@ -0,0 +1 @@ + \ No newline at end of file From 541cbdd96319ad968d7fe7c85f0cb43e8c757d99 Mon Sep 17 00:00:00 2001 From: JS Moore <39682+jakkarth@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:23:36 -0500 Subject: [PATCH 02/13] Add env variable support for number of followable hashtags in feed column (#2500) * Add env variable support for number of followable hashtags in feed column. * Add a note about performance concerns for higher values. See discussion in https://github.com/glitch-soc/mastodon/pull/2500 * Update .devcontainer/docker-compose.yml --------- Co-authored-by: Claire --- .env.production.sample | 5 +++++ .../hashtag_timeline/components/column_settings.jsx | 8 +++++--- app/javascript/flavours/glitch/initial_state.js | 2 ++ app/models/tag_feed.rb | 2 +- app/serializers/initial_state_serializer.rb | 6 +++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.env.production.sample b/.env.production.sample index 7bcce0f7e5..5939c12146 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -251,6 +251,11 @@ SMTP_FROM_ADDRESS=notifications@example.com # Maximum allowed character count MAX_TOOT_CHARS=500 +# Maximum allowed hashtags to follow in a feed column +# Note that setting this value higher may cause significant +# database load +MAX_FEED_HASHTAGS=4 + # Maximum number of pinned posts MAX_PINNED_TOOTS=5 diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx index c60de4c518..4488c5b2a0 100644 --- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx +++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx @@ -9,6 +9,8 @@ import { NonceProvider } from 'react-select'; import AsyncSelect from 'react-select/async'; import Toggle from 'react-toggle'; +import { maxFeedHashtags } from 'flavours/glitch/initial_state'; + import SettingToggle from '../../notifications/components/setting_toggle'; const messages = defineMessages({ @@ -46,9 +48,9 @@ class ColumnSettings extends PureComponent { onSelect = mode => value => { const oldValue = this.tags(mode); - // Prevent changes that add more than 4 tags, but allow removing - // tags that were already added before - if ((value.length > 4) && !(value < oldValue)) { + // Prevent changes that add more than the number of configured + // tags, but allow removing tags that were already added before + if ((value.length > maxFeedHashtags) && !(value < oldValue)) { return; } diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js index fabe0a72e1..a281dbaf31 100644 --- a/app/javascript/flavours/glitch/initial_state.js +++ b/app/javascript/flavours/glitch/initial_state.js @@ -67,6 +67,7 @@ export const hasMultiColumnPath = initialPath === '/' * @property {InitialStateMeta} meta * @property {object} local_settings * @property {number} max_toot_chars + * @property {number} max_feed_hashtags * @property {number} poll_limits */ @@ -130,6 +131,7 @@ export const sso_redirect = getMeta('sso_redirect'); // Glitch-soc-specific settings export const maxChars = (initialState && initialState.max_toot_chars) || 500; +export const maxFeedHashtags = (initialState && initialState.max_feed_hashtags) || 4; export const favouriteModal = getMeta('favourite_modal'); export const pollLimits = (initialState && initialState.poll_limits); export const defaultContentType = getMeta('default_content_type'); diff --git a/app/models/tag_feed.rb b/app/models/tag_feed.rb index fbbdbaae27..051b0d1306 100644 --- a/app/models/tag_feed.rb +++ b/app/models/tag_feed.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class TagFeed < PublicFeed - LIMIT_PER_MODE = 4 + LIMIT_PER_MODE = (ENV['MAX_FEED_HASHTAGS'] || 4).to_i # @param [Tag] tag # @param [Account] account diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index ee79c38195..4135d8ed39 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -5,7 +5,7 @@ class InitialStateSerializer < ActiveModel::Serializer attributes :meta, :compose, :accounts, :media_attachments, :settings, - :max_toot_chars, :poll_limits, + :max_toot_chars, :max_feed_hashtags, :poll_limits, :languages attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? } @@ -17,6 +17,10 @@ class InitialStateSerializer < ActiveModel::Serializer StatusLengthValidator::MAX_CHARS end + def max_feed_hashtags + TagFeed::LIMIT_PER_MODE + end + def poll_limits { max_options: PollValidator::MAX_OPTIONS, From a2611d782c115e7cb0bd95c636cc70413f5ffa1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:45:07 +0100 Subject: [PATCH 03/13] New Crowdin Translations (automated) (#2588) * New Crowdin translations * Fix bogus translation files --------- Co-authored-by: GitHub Actions Co-authored-by: Claire --- .../flavours/glitch/locales/id.json | 47 ++++++++++++++++++ .../flavours/glitch/locales/sv.json | 48 +++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/app/javascript/flavours/glitch/locales/id.json b/app/javascript/flavours/glitch/locales/id.json index d360fed722..f37788bc80 100644 --- a/app/javascript/flavours/glitch/locales/id.json +++ b/app/javascript/flavours/glitch/locales/id.json @@ -1,4 +1,51 @@ { + "about.fork_disclaimer": "Glitch-soc adalah perangkat lunak sumber terbuka yang merupakan fork dari Mastodon.", + "account.disclaimer_full": "Informasi di bawah ini mungkin tidak mencerminkan profil pengguna secara lengkap.", + "account.follows": "Mengikuti", + "account.joined": "Bergabung {date}", + "account.suspended_disclaimer_full": "Pengguna ini telah ditangguhkan oleh moderator.", + "account.view_full_profile": "Tampilkan profil lengkap", + "advanced_options.icon_title": "Opsi lanjutan", + "advanced_options.local-only.long": "Jangan mengunggah ke instance lain", + "advanced_options.local-only.short": "Hanya lokal", + "advanced_options.local-only.tooltip": "Postingan ini hanya untuk lokal", + "advanced_options.threaded_mode.long": "Secara otomatis membuka balasan pada postingan", + "advanced_options.threaded_mode.short": "Mode Utasan", + "advanced_options.threaded_mode.tooltip": "Mode utasan dinyalakan", + "boost_modal.missing_description": "Toot ini berisi beberapa media tanpa deskripsi", + "column.favourited_by": "Disukai oleh", + "column.heading": "Lainnya", + "column.reblogged_by": "Dibagikan oleh", + "column.subheading": "Opsi lain-lain", + "column_header.profile": "Profil", + "column_subheading.lists": "Daftar", + "column_subheading.navigation": "Penelusuran", + "community.column_settings.allow_local_only": "Tampilkan toot lokal saja", + "compose.attach": "Lampirkan...", + "compose.attach.doodle": "Gambar sesuatu", + "compose.attach.upload": "Unggah file", + "compose.content-type.html": "HTML", + "compose.content-type.markdown": "Bahasa Markdown", + "compose.content-type.plain": "Teks biasa", + "compose_form.poll.multiple_choices": "Izinkan beberapa pilihan", + "compose_form.poll.single_choice": "Izinkan hanya satu pilihan", + "compose_form.spoiler": "Sembunyikan teks di balik peringatan", + "confirmation_modal.do_not_ask_again": "Jangan minta konfirmasi lagi", + "confirmations.deprecated_settings.confirm": "Gunakan preferensi Mastodon", + "confirmations.deprecated_settings.message": "Beberapa {app_settings} khusus perangkat Glitch-soc yang Anda gunakan telah digantikan oleh {preferences} Mastodon dan akan diganti:", + "confirmations.missing_media_description.confirm": "Tetap kirim", + "confirmations.missing_media_description.edit": "Sunting media", + "confirmations.missing_media_description.message": "Setidaknya satu lampiran media tidak memiliki deskripsi. Pertimbangkan untuk mendeskripsikan semua lampiran media untuk pengguna tunanetra sebelum mengirim toot Anda.", + "confirmations.unfilter.author": "Penulis", + "confirmations.unfilter.confirm": "Tampilkan", + "confirmations.unfilter.edit_filter": "Ubah saringan", + "content-type.change": "Jenis konten", + "direct.group_by_conversations": "Grupkan berdasarkan percakapan", + "endorsed_accounts_editor.endorsed_accounts": "Akun pilihan", + "favourite_modal.combo": "Anda dapat menekan {combo} untuk melewati ini lain kali", + "firehose.column_settings.allow_local_only": "Tampilkan postingan khusus lokal di \"Semua\"", + "home.column_settings.advanced": "Lanjutan", + "home.column_settings.filter_regex": "Saring dengan ekspresi reguler", "settings.content_warnings": "Content warnings", "settings.preferences": "Preferences" } diff --git a/app/javascript/flavours/glitch/locales/sv.json b/app/javascript/flavours/glitch/locales/sv.json index d360fed722..3212f7ff88 100644 --- a/app/javascript/flavours/glitch/locales/sv.json +++ b/app/javascript/flavours/glitch/locales/sv.json @@ -1,4 +1,52 @@ { + "account.follows": "Följer", + "account.joined": "Gick med {date}", + "account.suspended_disclaimer_full": "Denna användare har stängts av av en moderator.", + "account.view_full_profile": "Visa full profil", + "advanced_options.icon_title": "Avancerade inställningar", + "advanced_options.local-only.long": "Lägg inte ut på andra instanser", + "advanced_options.local-only.short": "Endast lokalt", + "advanced_options.local-only.tooltip": "Detta inlägg är endast tillgängligt lokalt", + "advanced_options.threaded_mode.long": "Öppnar automatiskt ett svar vid publicering", + "advanced_options.threaded_mode.short": "Tråd-läge", + "advanced_options.threaded_mode.tooltip": "Tråd-läge på", + "boost_modal.missing_description": "Denna toot innehåller viss media utan beskrivning", + "column.favourited_by": "Favoritmarkerad av", + "column.heading": "Övrigt", + "column.reblogged_by": "Boostad av", + "column.subheading": "Övriga val", + "column_header.profile": "Profil", + "column_subheading.lists": "Listor", + "column_subheading.navigation": "Navigering", + "community.column_settings.allow_local_only": "Visa endast lokala toots", + "compose.attach": "Bifoga...", + "compose.attach.doodle": "Rita något", + "compose.attach.upload": "Ladda upp en fil", + "compose.content-type.html": "HTML", + "compose.content-type.markdown": "Markdown", + "compose.content-type.plain": "Klartext", + "compose_form.poll.multiple_choices": "Tillåt flera val", + "compose_form.poll.single_choice": "Tillåt ett val", + "compose_form.spoiler": "Göm text bakom varning", + "confirmation_modal.do_not_ask_again": "Fråga mig inte igen", + "confirmations.deprecated_settings.confirm": "Använd Mastodon-preferenser", + "confirmations.deprecated_settings.message": "Några av de glitch-soc-enhetsspecifika {app_settings} som du använder har ersatts av Mastodon-{preferences} och kommer att åsidosättas:", + "confirmations.missing_media_description.confirm": "Lägg ut ändå", + "confirmations.missing_media_description.edit": "Redigera media", + "confirmations.missing_media_description.message": "Minst en mediebilaga saknar beskrivning. Överväg att beskriva all media för synskadade innan du skickar din toot.", + "confirmations.unfilter.author": "Användare", + "confirmations.unfilter.confirm": "Visa", + "confirmations.unfilter.edit_filter": "Redigera filter", + "confirmations.unfilter.filters": "Matchande {count, plural, one {filter} other {filters}}", + "content-type.change": "Innehållstyp", + "direct.group_by_conversations": "Sortera efter konversation", + "endorsed_accounts_editor.endorsed_accounts": "Utvalda konton", + "favourite_modal.combo": "Du kan trycka på {combo} för att skippa detta nästa gång", + "firehose.column_settings.allow_local_only": "Visa endast lokala inlägg i \"Alla\"", + "home.column_settings.advanced": "Avancerat", + "home.column_settings.filter_regex": "Filtrera bort med reguljära uttryck", + "home.column_settings.show_direct": "Visa privata omnämningar", + "home.settings": "Kolumninställningar", "settings.content_warnings": "Content warnings", "settings.preferences": "Preferences" } From ac49514bd6db46891c455b3d20d7efc784eccf9f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 16:40:43 +0100 Subject: [PATCH 04/13] Update dependency chewy to v7.5.1 (#29018) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 57b2580722..3891139dce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,7 +180,7 @@ GEM activesupport cbor (0.5.9.6) charlock_holmes (0.7.7) - chewy (7.5.0) + chewy (7.5.1) activesupport (>= 5.2) elasticsearch (>= 7.12.0, < 7.14.0) elasticsearch-dsl From 868333c86f249421cf12cf166310f6610a049a93 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:55:15 +0100 Subject: [PATCH 05/13] Update dependency capybara to v3.40.0 (#28966) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3891139dce..01f5b45929 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,11 +167,11 @@ GEM bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) From 93aa783aa12f0511a3282265ca295612253b13af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:20:23 +0100 Subject: [PATCH 06/13] Update dependency nokogiri to v1.16.2 [SECURITY] (#29106) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 01f5b45929..7c10a419ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -465,7 +465,7 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.5.9) - nokogiri (1.16.0) + nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) oj (3.16.3) From c6f7e3a1fbabe92024ac2ee18b8d2c4fee519396 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:24:44 +0100 Subject: [PATCH 07/13] Update dependency haml_lint to v0.56.0 (#29082) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c10a419ad..960bd48de4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -319,7 +319,7 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) - haml_lint (0.55.0) + haml_lint (0.56.0) haml (>= 5.0) parallel (~> 1.10) rainbow From 4cd00c0dd91cc969c13aa69042c597eaeb7b9587 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 6 Feb 2024 04:33:11 -0500 Subject: [PATCH 08/13] Update `nsa` gem to version 0.3.0 (#29065) --- Gemfile | 2 +- Gemfile.lock | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index cd0ef255b1..0a1fd60da2 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ gem 'kaminari', '~> 1.2' gem 'link_header', '~> 0.0' gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar' gem 'nokogiri', '~> 1.15' -gem 'nsa', github: 'jhawthorn/nsa', ref: 'e020fcc3a54d993ab45b7194d89ab720296c111b' +gem 'nsa' gem 'oj', '~> 3.14' gem 'ox', '~> 2.14' gem 'parslet' diff --git a/Gemfile.lock b/Gemfile.lock index 960bd48de4..9de0af9a4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,17 +7,6 @@ GIT hkdf (~> 0.2) jwt (~> 2.0) -GIT - remote: https://github.com/jhawthorn/nsa.git - revision: e020fcc3a54d993ab45b7194d89ab720296c111b - ref: e020fcc3a54d993ab45b7194d89ab720296c111b - specs: - nsa (0.2.8) - activesupport (>= 4.2, < 7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - sidekiq (>= 3.5) - statsd-ruby (~> 1.4, >= 1.4.0) - GEM remote: https://rubygems.org/ specs: @@ -468,6 +457,11 @@ GEM nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nsa (0.3.0) + activesupport (>= 4.2, < 7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + sidekiq (>= 3.5) + statsd-ruby (~> 1.4, >= 1.4.0) oj (3.16.3) bigdecimal (>= 3.0) omniauth (2.1.1) @@ -886,7 +880,7 @@ DEPENDENCIES net-http (~> 0.4.0) net-ldap (~> 0.18) nokogiri (~> 1.15) - nsa! + nsa oj (~> 3.14) omniauth (~> 2.0) omniauth-cas (~> 3.0.0.beta.1) From 63f1f1465ad581fcd6ec612ce5041abf1992c175 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:33:41 +0100 Subject: [PATCH 09/13] Update dependency tzinfo-data to v1.2024.1 (#29052) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9de0af9a4b..d6a51e2f0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -765,7 +765,7 @@ GEM unf (~> 0.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.4) + tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext From b27cad27c2bea46bf6ffe37e85154e54b04c665e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:52:28 +0100 Subject: [PATCH 10/13] Update dependency bootsnap to '~> 1.18.0' (#29019) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0a1fd60da2..ad7f0b3d40 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1' gem 'active_model_serializers', '~> 0.10' gem 'addressable', '~> 2.8' -gem 'bootsnap', '~> 1.17.0', require: false +gem 'bootsnap', '~> 1.18.0', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.7' gem 'chewy', '~> 7.3' diff --git a/Gemfile.lock b/Gemfile.lock index d6a51e2f0a..57ad96437f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ GEM binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) blurhash (0.1.7) - bootsnap (1.17.1) + bootsnap (1.18.3) msgpack (~> 1.2) brakeman (6.1.1) racc @@ -823,7 +823,7 @@ DEPENDENCIES better_errors (~> 2.9) binding_of_caller (~> 1.0) blurhash (~> 0.1) - bootsnap (~> 1.17.0) + bootsnap (~> 1.18.0) brakeman (~> 6.0) browser bundler-audit (~> 0.9) From 5ea36a36066a1f990aff4422baf23067b5219e68 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:31:54 +0100 Subject: [PATCH 11/13] Update dependency brakeman to v6.1.2 (#29062) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 57ad96437f..b76f449b26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,7 +146,7 @@ GEM blurhash (0.1.7) bootsnap (1.18.3) msgpack (~> 1.2) - brakeman (6.1.1) + brakeman (6.1.2) racc browser (5.3.1) brpoplpush-redis_script (0.1.3) From 19f1ffe28770bf917b554a578a892f134e0d8319 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 6 Feb 2024 16:32:09 +0100 Subject: [PATCH 12/13] Fix self-destruct schedule not actually replacing initial schedule (#29049) --- config/initializers/sidekiq.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9a2743ed5b..53b02edc40 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -26,6 +26,7 @@ Sidekiq.configure_server do |config| 'queue' => 'scheduler', }, } + SidekiqScheduler::Scheduler.instance.reload_schedule! end end From 65eb943b9dd98de055a7998aef9011c345744c7b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 2 Feb 2024 16:51:26 +0100 Subject: [PATCH 13/13] Fix confirmation e-mails when signing up through an app (#29064) --- app/views/user_mailer/confirmation_instructions.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml index 74b2d49a47..13e68c722b 100644 --- a/app/views/user_mailer/confirmation_instructions.html.haml +++ b/app/views/user_mailer/confirmation_instructions.html.haml @@ -8,9 +8,7 @@ %td.email-inner-card-td.email-prose %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname - if @resource.created_by_application - = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url - = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do - %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name + = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name), url: confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') - else = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token) %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url