From: Claire Date: Fri, 8 Apr 2022 17:53:32 +0000 (+0200) Subject: Merge branch 'main' into glitch-soc/merge-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ff73d43b3596d50d071fd3e6ab6f49608b62c9d1;p=mastodon.git Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change. --- ff73d43b3596d50d071fd3e6ab6f49608b62c9d1 diff --cc Gemfile index 4c8cd2f5a,0e924b78d..09dd1c2e2 --- a/Gemfile +++ b/Gemfile @@@ -98,12 -98,10 +98,12 @@@ gem 'json-ld gem 'json-ld-preloaded', '~> 3.2' gem 'rdf-normalize', '~> 0.5' +gem 'redcarpet', '~> 3.5' + group :development, :test do - gem 'fabrication', '~> 2.27' + gem 'fabrication', '~> 2.28' gem 'fuubar', '~> 2.5' - gem 'i18n-tasks', '~> 0.9', require: false + gem 'i18n-tasks', '~> 1.0', require: false gem 'pry-byebug', '~> 3.9' gem 'pry-rails', '~> 0.3' gem 'rspec-rails', '~> 5.1' diff --cc Gemfile.lock index 04572ad75,e19bfde09..3d815cd7b --- a/Gemfile.lock +++ b/Gemfile.lock @@@ -278,9 -286,7 +286,9 @@@ GE hamlit (>= 1.2.0) railties (>= 4.0.1) hashdiff (1.0.1) - hashie (4.1.0) + hashie (5.0.0) + hcaptcha (7.1.0) + json highline (2.0.3) hiredis (0.6.3) hkdf (0.3.0) @@@ -760,9 -768,8 +771,9 @@@ DEPENDENCIE fog-core (<= 2.1.0) fog-openstack (~> 0.3) fuubar (~> 2.5) - gitlab-omniauth-openid-connect (~> 0.5.0) + gitlab-omniauth-openid-connect (~> 0.9.1) hamlit-rails (~> 0.2) + hcaptcha (~> 7.1) hiredis (~> 0.6) htmlentities (~> 4.3) http (~> 5.0) diff --cc app/controllers/settings/preferences_controller.rb index 1fddd087b,bfe651bc6..669ed00c6 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@@ -57,7 -54,8 +57,8 @@@ class Settings::PreferencesController :setting_use_pending_items, :setting_trends, :setting_crop_images, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status), + :setting_always_send_emails, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag appeal), ++ notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status appeal), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end diff --cc app/models/user.rb index 5dd93519c,9da7b2639..5c1f9504a --- a/app/models/user.rb +++ b/app/models/user.rb @@@ -126,11 -126,11 +126,11 @@@ class User < ApplicationRecor has_many :session_activations, dependent: :destroy - delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal, - :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, + delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal, + :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_followers_count, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images, - :disable_swiping, :default_content_type, :system_emoji_font, - :disable_swiping, :always_send_emails, ++ :disable_swiping, :always_send_emails, :default_content_type, :system_emoji_font, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code diff --cc app/views/settings/preferences/notifications/show.html.haml index e01cd077f,42754a852..38e8b171e --- a/app/views/settings/preferences/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@@ -24,9 -24,10 +24,12 @@@ = ff.input :appeal, as: :boolean, wrapper: :with_label = ff.input :pending_account, as: :boolean, wrapper: :with_label = ff.input :trending_tag, as: :boolean, wrapper: :with_label + = ff.input :trending_link, as: :boolean, wrapper: :with_label + = ff.input :trending_status, as: :boolean, wrapper: :with_label + .fields-group + = f.input :setting_always_send_emails, as: :boolean, wrapper: :with_label + .fields-group = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff| = ff.input :digest, as: :boolean, wrapper: :with_label diff --cc config/i18n-tasks.yml index f41b8dfff,42a7afb33..7139bcea7 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@@ -59,7 -59,7 +59,8 @@@ ignore_unused - 'errors.429' - 'admin.accounts.roles.*' - 'admin.action_logs.actions.*' + - 'themes.*' + - 'admin_mailer.new_appeal.actions.*' - 'statuses.attached.*' - 'move_handler.carry_{mutes,blocks}_over_text' - 'notification_mailer.*' diff --cc config/settings.yml index 51016d322,eaa05071e..bb2720ec2 --- a/config/settings.yml +++ b/config/settings.yml @@@ -40,21 -36,19 +40,22 @@@ defaults: &default use_pending_items: false trends: true trendable_by_default: false + trending_status_cw: true crop_images: true notification_emails: - follow: false + follow: true reblog: false favourite: false - mention: false + mention: true follow_request: true digest: true report: true pending_account: true trending_tag: true + trending_link: false + trending_status: false appeal: true + always_send_emails: false interactions: must_be_follower: false must_be_following: false