Merge branch 'master' into glitch-soc/merge-upstream

diff --cc app/controllers/admin/dashboard_controller.rb
index faa2df1b51838d1c2fa5013af1dbf4bc2592b194,70afdedd7663968835d6b1035717c00bd31eda20..4f4341918bb329196aea7c19a873bc1b06572445
--- 1/app/controllers/admin/dashboard_controller.rb
--- 2/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@@ -27,10 -27,9 +27,10 @@@ module Admi
        @saml_enabled          = ENV['SAML_ENABLED'] == 'true'
        @pam_enabled           = ENV['PAM_ENABLED'] == 'true'
        @hidden_service        = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
-       @trending_hashtags     = TrendingTags.get(7)
+       @trending_hashtags     = TrendingTags.get(10, filtered: false)
        @profile_directory     = Setting.profile_directory
        @timeline_preview      = Setting.timeline_preview
 +      @keybase_integration   = Setting.enable_keybase
        @spam_check_enabled    = Setting.spam_check_enabled
      end
  

diff --cc app/controllers/settings/preferences_controller.rb
index ab6b5c0b07e9a5be5e01de5dd16637d58bb31c2f,d548072a8014885b5cbc1521b7b62cca64173851..ea4491d1e2d3d3e475833805e53c90d5120caab9
--- 1/app/controllers/settings/preferences_controller.rb
--- 2/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@@ -55,10 -54,9 +55,10 @@@ class Settings::PreferencesController 
        :setting_aggregate_reblogs,
        :setting_show_application,
        :setting_advanced_layout,
 +      :setting_default_content_type,
        :setting_use_blurhash,
        :setting_use_pending_items,
-       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
+       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
        interactions: %i(must_be_follower must_be_following must_be_following_dm)
      )
    end

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/admin/dashboard/index.html.haml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/simple_form.en.yml
Simple merge

diff --cc config/navigation.rb
Simple merge

diff --cc config/routes.rb
index cdc1746b5c693179f9e7cd7fbc6937bc9e98ffdb,60f7d2e053a41bd370aa89b6ca1e4c53c5d930a2..92271b00f98684ff3610877b641114db37bf2554
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -314,14 -302,10 +308,15 @@@ Rails.application.routes.draw d
  
        resources :media,        only: [:create, :update]
        resources :blocks,       only: [:index]
 -      resources :mutes,        only: [:index]
 +      resources :mutes,        only: [:index] do
 +        collection do
 +          get 'details'
 +        end
 +      end
        resources :favourites,   only: [:index]
 +      resources :bookmarks,    only: [:index]
        resources :reports,      only: [:create]
+       resources :trends,       only: [:index]
        resources :filters,      only: [:index, :create, :show, :update, :destroy]
        resources :endorsements, only: [:index]
  

diff --cc config/settings.yml
Simple merge

diff --cc db/schema.rb
Simple merge