From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 6 Aug 2019 11:16:53 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cad2e6eb7afe96f781175cd829b70a0667d3498a;p=mastodon.git

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

cad2e6eb7afe96f781175cd829b70a0667d3498a
diff --cc app/controllers/admin/dashboard_controller.rb
index faa2df1b5,70afdedd7..4f4341918
--- a/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 ab6b5c0b0,d548072a8..ea4491d1e
--- a/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 config/routes.rb
index cdc1746b5,60f7d2e05..92271b00f
--- a/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]