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

Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/about_controller.rb
index 179f013b5001a785a7ff5f8d3d77b09da757402a,d276e8fe5fa5ff7fd1cc7376db8f10bdcf12e35d..f41e52aae9449304c7139ec1449dfc0e2eb03da1
--- 1/app/controllers/about_controller.rb
--- 2/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@@ -1,9 -1,9 +1,10 @@@
  # frozen_string_literal: true
  
  class AboutController < ApplicationController
 +  before_action :set_pack
    layout 'public'
  
+   before_action :require_open_federation!, only: [:show, :more]
    before_action :set_body_classes, only: :show
    before_action :set_instance_presenter
    before_action :set_expires_in

diff --cc app/controllers/application_controller.rb
index 4a6b96982f3e890eb0b227636704b6af770fa20d,0d3913ee07daaa84df486980dfa147dfee0ee4be..19efc8838b6e3054b50adf6615aef3ec7717eb6d
--- 1/app/controllers/application_controller.rb
--- 2/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -14,10 -15,10 +15,11 @@@ class ApplicationController < ActionCon
  
    helper_method :current_account
    helper_method :current_session
 -  helper_method :current_theme
 +  helper_method :current_flavour
 +  helper_method :current_skin
    helper_method :single_user_mode?
    helper_method :use_seamless_external_login?
+   helper_method :whitelist_mode?
  
    rescue_from ActionController::RoutingError, with: :not_found
    rescue_from ActiveRecord::RecordNotFound, with: :not_found

diff --cc app/controllers/directories_controller.rb
index 59247a21f10a71b6626f817ae3db7ef75188909d,d2ef76f0691936794cb959902e34cbde35d20e88..0702ebc04a6e27b68ed0355be3f1fd2ee98d8a6f
--- 1/app/controllers/directories_controller.rb
--- 2/app/controllers/directories_controller.rb
+++ b/app/controllers/directories_controller.rb
@@@ -20,11 -20,7 +21,11 @@@ class DirectoriesController < Applicati
  
    private
  
-   def check_enabled
 +  def set_pack
 +    use_pack 'share'
 +  end
 +
+   def require_enabled!
      return not_found unless Setting.profile_directory
    end
  

diff --cc app/controllers/home_controller.rb
Simple merge

diff --cc app/controllers/public_timelines_controller.rb
index a5c981c7f53de4647df8309b29abe1d91e925c3a,324bdc50880fff4c30da0fcbe0a9b58bca911165..940b2f7cd1287b454a33699c71fe1a47d4e08aa9
--- 1/app/controllers/public_timelines_controller.rb
--- 2/app/controllers/public_timelines_controller.rb
+++ b/app/controllers/public_timelines_controller.rb
@@@ -1,10 -1,10 +1,11 @@@
  # frozen_string_literal: true
  
  class PublicTimelinesController < ApplicationController
 +  before_action :set_pack
    layout 'public'
  
-   before_action :check_enabled
+   before_action :authenticate_user!, if: :whitelist_mode?
+   before_action :require_enabled!
    before_action :set_body_classes
    before_action :set_instance_presenter
  

diff --cc app/controllers/remote_interaction_controller.rb
Simple merge

diff --cc app/controllers/tags_controller.rb
Simple merge

diff --cc app/views/admin/settings/edit.html.haml
index 854f4cf8708f0801b733f1f72fa9873fac2da9af,1e2ed3f77f21c271eef5107f7a7561358a846aea..efe6ea56bda5c6760a4903da70bd071b1fb1b326
--- 1/app/views/admin/settings/edit.html.haml
--- 2/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@@ -54,30 -55,19 +55,31 @@@
    .fields-group
      = f.input :open_deletion, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.deletion.title'), hint: t('admin.settings.registrations.deletion.desc_html')
  
-   .fields-group
-     = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.activity_api_enabled.title'), hint: t('admin.settings.activity_api_enabled.desc_html')
+   - unless whitelist_mode?
+     .fields-group
+       = f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.activity_api_enabled.title'), hint: t('admin.settings.activity_api_enabled.desc_html')
  
-   .fields-group
-     = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.peers_api_enabled.title'), hint: t('admin.settings.peers_api_enabled.desc_html')
+     .fields-group
+       = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.peers_api_enabled.title'), hint: t('admin.settings.peers_api_enabled.desc_html')
  
-   .fields-group
-     = f.input :preview_sensitive_media, as: :boolean, wrapper: :with_label, label: t('admin.settings.preview_sensitive_media.title'), hint: t('admin.settings.preview_sensitive_media.desc_html')
+     .fields-group
+       = f.input :preview_sensitive_media, as: :boolean, wrapper: :with_label, label: t('admin.settings.preview_sensitive_media.title'), hint: t('admin.settings.preview_sensitive_media.desc_html')
  
-   .fields-group
-     = f.input :profile_directory, as: :boolean, wrapper: :with_label, label: t('admin.settings.profile_directory.title'), hint: t('admin.settings.profile_directory.desc_html')
+     .fields-group
+       = f.input :profile_directory, as: :boolean, wrapper: :with_label, label: t('admin.settings.profile_directory.title'), hint: t('admin.settings.profile_directory.desc_html')
  
 +  .fields-group
 +    = f.input :hide_followers_count, as: :boolean, wrapper: :with_label, label: t('admin.settings.hide_followers_count.title'), hint: t('admin.settings.hide_followers_count.desc_html')
 +
 +  .fields-group
 +    = f.input :enable_keybase, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_keybase.title'), hint: t('admin.settings.enable_keybase.desc_html')
 +
 +  .fields-group
 +    = f.input :show_reblogs_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_reblogs_in_public_timelines.title'), hint: t('admin.settings.show_reblogs_in_public_timelines.desc_html')
 +
 +  .fields-group
 +    = f.input :show_replies_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_replies_in_public_timelines.title'), hint: t('admin.settings.show_replies_in_public_timelines.desc_html')
 +
    .fields-group
      = f.input :spam_check_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.spam_check_enabled.title'), hint: t('admin.settings.spam_check_enabled.desc_html')
  

diff --cc app/views/layouts/public.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
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index b6d2a514b84f4ffff5e5342e59d8e2269e93fcfc,ab35f9e0b6aaa1ff610f9fd26a15dea4c5dddedf..677523508b9cd133d3a85b56a1be679439411fdc
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -74,8 -73,7 +74,8 @@@
      "@babel/runtime": "^7.5.4",
      "@clusterws/cws": "^0.15.0",
      "array-includes": "^3.0.3",
-     "autoprefixer": "^9.6.0",
 +    "atrament": "^0.2.3",
+     "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.6",
      "babel-plugin-lodash": "^3.3.4",
@@@ -96,8 -94,7 +96,8 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
-     "file-loader": "^4.0.0",
 +    "favico.js": "^0.3.10",
+     "file-loader": "^4.1.0",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.1",
      "http-link-header": "^1.0.2",

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
index ff520ad78db9922324c0fcbc394127066d632988,b9aef376e345cc4f3f8fb33a1b5f52498d698484..6707f2d8defa4cbea0c5979d5b40789d84539660
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -1628,17 -1704,13 +1704,17 @@@ atob@^2.1.1
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
- autoprefixer@^9.6.0:
-   version "9.6.0"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
-   integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
 +atrament@^0.2.3:
 +  version "0.2.3"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
 +
+ autoprefixer@^9.6.1:
+   version "9.6.1"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+   integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
    dependencies:
-     browserslist "^4.6.1"
-     caniuse-lite "^1.0.30000971"
+     browserslist "^4.6.3"
+     caniuse-lite "^1.0.30000980"
      chalk "^2.4.2"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"